Skip to content

Commit 57fb481

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: Get the proper bankid for multi banks
We preassign some ports in a special bank via the new defined banks_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 banks_portmsk, then we switch it to this special iommu bank, and initialise the IOMMU bank HW. Each bank has the independent pgtable(4GB iova range). Each bank is a independent iommu domain/group. Currently we don't separate different iova ranges inside a bank. Signed-off-by: Yong Wu <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Reviewed-by: Matthias Brugger <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent d72e0ff commit 57fb481

File tree

1 file changed

+48
-7
lines changed

1 file changed

+48
-7
lines changed

drivers/iommu/mtk_iommu.c

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ struct mtk_iommu_plat_data {
191191

192192
u8 banks_num;
193193
bool banks_enable[MTK_IOMMU_BANK_MAX];
194+
unsigned int banks_portmsk[MTK_IOMMU_BANK_MAX];
194195
unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX];
195196
};
196197

@@ -467,6 +468,30 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
467468
return IRQ_HANDLED;
468469
}
469470

471+
static unsigned int mtk_iommu_get_bank_id(struct device *dev,
472+
const struct mtk_iommu_plat_data *plat_data)
473+
{
474+
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
475+
unsigned int i, portmsk = 0, bankid = 0;
476+
477+
if (plat_data->banks_num == 1)
478+
return bankid;
479+
480+
for (i = 0; i < fwspec->num_ids; i++)
481+
portmsk |= BIT(MTK_M4U_TO_PORT(fwspec->ids[i]));
482+
483+
for (i = 0; i < plat_data->banks_num && i < MTK_IOMMU_BANK_MAX; i++) {
484+
if (!plat_data->banks_enable[i])
485+
continue;
486+
487+
if (portmsk & plat_data->banks_portmsk[i]) {
488+
bankid = i;
489+
break;
490+
}
491+
}
492+
return bankid; /* default is 0 */
493+
}
494+
470495
static int mtk_iommu_get_iova_region_id(struct device *dev,
471496
const struct mtk_iommu_plat_data *plat_data)
472497
{
@@ -619,13 +644,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
619644
struct list_head *hw_list = data->hw_list;
620645
struct device *m4udev = data->dev;
621646
struct mtk_iommu_bank_data *bank;
622-
unsigned int bankid = 0;
647+
unsigned int bankid;
623648
int ret, region_id;
624649

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

654+
bankid = mtk_iommu_get_bank_id(dev, data->plat_data);
629655
mutex_lock(&dom->mutex);
630656
if (!dom->bank) {
631657
/* Data is in the frstdata in sharing pgtable case. */
@@ -797,27 +823,42 @@ static void mtk_iommu_release_device(struct device *dev)
797823
iommu_fwspec_free(dev);
798824
}
799825

826+
static int mtk_iommu_get_group_id(struct device *dev, const struct mtk_iommu_plat_data *plat_data)
827+
{
828+
unsigned int bankid;
829+
830+
/*
831+
* If the bank function is enabled, each bank is a iommu group/domain.
832+
* Otherwise, each iova region is a iommu group/domain.
833+
*/
834+
bankid = mtk_iommu_get_bank_id(dev, plat_data);
835+
if (bankid)
836+
return bankid;
837+
838+
return mtk_iommu_get_iova_region_id(dev, plat_data);
839+
}
840+
800841
static struct iommu_group *mtk_iommu_device_group(struct device *dev)
801842
{
802843
struct mtk_iommu_data *c_data = dev_iommu_priv_get(dev), *data;
803844
struct list_head *hw_list = c_data->hw_list;
804845
struct iommu_group *group;
805-
int regionid;
846+
int groupid;
806847

807848
data = mtk_iommu_get_frst_data(hw_list);
808849
if (!data)
809850
return ERR_PTR(-ENODEV);
810851

811-
regionid = mtk_iommu_get_iova_region_id(dev, data->plat_data);
812-
if (regionid < 0)
813-
return ERR_PTR(regionid);
852+
groupid = mtk_iommu_get_group_id(dev, data->plat_data);
853+
if (groupid < 0)
854+
return ERR_PTR(groupid);
814855

815856
mutex_lock(&data->mutex);
816-
group = data->m4u_group[regionid];
857+
group = data->m4u_group[groupid];
817858
if (!group) {
818859
group = iommu_group_alloc();
819860
if (!IS_ERR(group))
820-
data->m4u_group[regionid] = group;
861+
data->m4u_group[groupid] = group;
821862
} else {
822863
iommu_group_ref_get(group);
823864
}

0 commit comments

Comments
 (0)