lkml.org 
[lkml]   [2021]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 30/33] iommu/mediatek: Get the proper bankid for multi banks
    Date
    We preassign some ports in a special bank via the new defined
    bank_portmsk. Put it in the plat_data means it is not expected to be
    adjusted dynamically.

    If the iommu id in the iommu consumer's dtsi node is inside this
    bank_portmsk, then we switch it to this special iommu bank, and initialise
    the IOMMU bank HW.

    Each a bank has the independent pgtable(4GB iova range). Each a bank
    is a independent iommu domain/group. Currently we don't separate different
    iova ranges inside a bank.

    Signed-off-by: Yong Wu <yong.wu@mediatek.com>
    ---
    drivers/iommu/mtk_iommu.c | 38 +++++++++++++++++++++++++++++++++++---
    drivers/iommu/mtk_iommu.h | 1 +
    2 files changed, 36 insertions(+), 3 deletions(-)

    diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
    index 6e3f7b97f3f5..5d648f50cbe1 100644
    --- a/drivers/iommu/mtk_iommu.c
    +++ b/drivers/iommu/mtk_iommu.c
    @@ -352,6 +352,30 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
    return IRQ_HANDLED;
    }

    +static unsigned int mtk_iommu_get_bank_id(struct device *dev,
    + const struct mtk_iommu_plat_data *plat_data)
    +{
    + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
    + unsigned int i, portmsk = 0, bankid = 0; /* bank default is 0 */
    +
    + if (plat_data->bank_nr == 1)
    + return bankid;
    +
    + for (i = 0; i < fwspec->num_ids; i++)
    + portmsk |= BIT(MTK_M4U_TO_PORT(fwspec->ids[i]));
    +
    + for (i = 0; i < plat_data->bank_nr; i++) {
    + if (!plat_data->bank_enable[i])
    + continue;
    +
    + if (portmsk & plat_data->bank_portmsk[i]) {
    + bankid = i;
    + break;
    + }
    + }
    + return bankid;
    +}
    +
    static int mtk_iommu_get_iova_region_id(struct device *dev,
    const struct mtk_iommu_plat_data *plat_data)
    {
    @@ -503,13 +527,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
    struct list_head *hw_list = data->hw_list;
    struct mtk_iommu_bank_data *bank;
    struct device *m4udev = data->dev;
    - unsigned int bankid = 0;
    + unsigned int bankid;
    int ret, region_id;

    region_id = mtk_iommu_get_iova_region_id(dev, data->plat_data);
    if (region_id < 0)
    return region_id;

    + bankid = mtk_iommu_get_bank_id(dev, data->plat_data);
    bank = &data->bank[bankid];
    if (!dom->bank) {
    /* Data is in the frstdata in sharing pgtable case. */
    @@ -636,6 +661,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)
    struct mtk_iommu_data *c_data = dev_iommu_priv_get(dev), *data;
    struct list_head *hw_list = c_data->hw_list;
    struct iommu_group *group;
    + unsigned int bankid, groupid;
    int regionid;

    data = mtk_iommu_get_frst_data(hw_list);
    @@ -645,12 +671,18 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)
    regionid = mtk_iommu_get_iova_region_id(dev, data->plat_data);
    if (regionid < 0)
    return ERR_PTR(regionid);
    + bankid = mtk_iommu_get_bank_id(dev, data->plat_data);

    - group = data->m4u_group[regionid];
    + /*
    + * If the bank function is enabled, each a bank is a iommu group/domain.
    + * otherwise, each a iova region is a iommu group/domain.
    + */
    + groupid = bankid ? bankid : regionid;
    + group = data->m4u_group[groupid];
    if (!group) {
    group = iommu_group_alloc();
    if (!IS_ERR(group))
    - data->m4u_group[regionid] = group;
    + data->m4u_group[groupid] = group;
    } else {
    iommu_group_ref_get(group);
    }
    diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
    index dc0190edebf0..cf4b3d10cf2c 100644
    --- a/drivers/iommu/mtk_iommu.h
    +++ b/drivers/iommu/mtk_iommu.h
    @@ -65,6 +65,7 @@ struct mtk_iommu_plat_data {

    unsigned int bank_nr;
    bool bank_enable[MTK_IOMMU_BANK_MAX];
    + unsigned int bank_portmsk[MTK_IOMMU_BANK_MAX];
    unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX];
    };

    --
    2.18.0
    \
     
     \ /
      Last update: 2021-09-23 14:07    [W:4.103 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site