Commit b3e5eee7 authored by Yong Wu's avatar Yong Wu Committed by Joerg Roedel
Browse files

iommu/mediatek: Add larb-id remapped support 



The larb-id may be remapped in the smi-common, this means the
larb-id reported in the mtk_iommu_isr isn't the real larb-id,

Take mt8183 as a example:
                       M4U
                        |
---------------------------------------------
|               SMI common                  |
-0-----7-----5-----6-----1-----2------3-----4- <- Id remapped
 |     |     |     |     |     |      |     |
larb0 larb1 IPU0  IPU1 larb4 larb5  larb6  CCU
disp  vdec  img   cam   venc  img    cam
As above, larb0 connects with the id 0 in smi-common.
          larb1 connects with the id 7 in smi-common.
          ...
If the larb-id reported in the isr is 7, actually it's larb1(vdec).
In order to output the right larb-id in the isr, we add a larb-id
remapping relationship in this patch.

If there is no this larb-id remapping in some SoCs, use the linear
mapping array instead.

This also is a preparing patch for mt8183.

Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarNicolas Boichat <drinkcat@chromium.org>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 2aa4c259

drivers/iommu/mtk_iommu.c

+4 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) 
	fault_larb = F_MMU0_INT_ID_LARB_ID(regval);

	fault_port = F_MMU0_INT_ID_PORT_ID(regval);



	fault_larb = data->plat_data->larbid_remap[fault_larb];



	if (report_iommu_fault(&dom->domain, data->dev, fault_iova,

			       write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) {

		dev_err_ratelimited(
@@ -766,12 +768,14 @@ static const struct mtk_iommu_plat_data mt2712_data = { 
	.m4u_plat     = M4U_MT2712,

	.has_4gb_mode = true,

	.has_bclk     = true,

	.larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},

};



static const struct mtk_iommu_plat_data mt8173_data = {

	.m4u_plat     = M4U_MT8173,

	.has_4gb_mode = true,

	.has_bclk     = true,

	.larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */

};



static const struct of_device_id mtk_iommu_of_ids[] = {

drivers/iommu/mtk_iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ struct mtk_iommu_plat_data { 


	/* HW will use the EMI clock if there isn't the "bclk". */

	bool                has_bclk;



	unsigned char       larbid_remap[MTK_LARB_NR_MAX];

};



struct mtk_iommu_domain;