Commit 65df7d82 authored by Fabien Parent's avatar Fabien Parent Committed by Joerg Roedel
Browse files

iommu/mediatek: add support for 6-bit encoded port IDs 



Until now the port ID was always encoded as a 5-bit data. On MT8365,
the port ID is encoded as a 6-bit data. This requires to add extra
macro F_MMU_INT_ID_LARB_ID_EXT, and F_MMU_INT_ID_PORT_ID_EXT in order
to support 6-bit encoded port IDs.

Signed-off-by: default avatarFabien Parent <fparent@baylibre.com>
Signed-off-by: default avatarMarkus Schneider-Pargmann <msp@baylibre.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarYong Wu <yong.wu@mediatek.com>
Signed-off-by: default avatarAlexandre Mergnat <amergnat@baylibre.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/20221001-iommu-support-v6-2-be4fe8da254b@baylibre.com


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

drivers/iommu/mtk_iommu.c

+11 −1
Original line number Diff line number Diff line
@@ -108,8 +108,12 @@ 
#define F_MMU_INT_ID_SUB_COMM_ID(a)		(((a) >> 7) & 0x3)

#define F_MMU_INT_ID_COMM_ID_EXT(a)		(((a) >> 10) & 0x7)

#define F_MMU_INT_ID_SUB_COMM_ID_EXT(a)		(((a) >> 7) & 0x7)

/* Macro for 5 bits length port ID field (default) */

#define F_MMU_INT_ID_LARB_ID(a)			(((a) >> 7) & 0x7)

#define F_MMU_INT_ID_PORT_ID(a)			(((a) >> 2) & 0x1f)

/* Macro for 6 bits length port ID field */

#define F_MMU_INT_ID_LARB_ID_WID_6(a)		(((a) >> 8) & 0x7)

#define F_MMU_INT_ID_PORT_ID_WID_6(a)		(((a) >> 2) & 0x3f)



#define MTK_PROTECT_PA_ALIGN			256

#define MTK_IOMMU_BANK_SZ			0x1000
@@ -139,6 +143,7 @@ 
#define IFA_IOMMU_PCIE_SUPPORT		BIT(16)

#define PGTABLE_PA_35_EN		BIT(17)

#define TF_PORT_TO_ADDR_MT8173		BIT(18)

#define INT_ID_PORT_WIDTH_6		BIT(19)



#define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask)	\

				((((pdata)->flags) & (mask)) == (_x))
@@ -441,14 +446,19 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) 
	fault_pa |= (u64)pa34_32 << 32;



	if (MTK_IOMMU_IS_TYPE(plat_data, MTK_IOMMU_TYPE_MM)) {

		fault_port = F_MMU_INT_ID_PORT_ID(regval);

		if (MTK_IOMMU_HAS_FLAG(plat_data, HAS_SUB_COMM_2BITS)) {

			fault_larb = F_MMU_INT_ID_COMM_ID(regval);

			sub_comm = F_MMU_INT_ID_SUB_COMM_ID(regval);

			fault_port = F_MMU_INT_ID_PORT_ID(regval);

		} else if (MTK_IOMMU_HAS_FLAG(plat_data, HAS_SUB_COMM_3BITS)) {

			fault_larb = F_MMU_INT_ID_COMM_ID_EXT(regval);

			sub_comm = F_MMU_INT_ID_SUB_COMM_ID_EXT(regval);

			fault_port = F_MMU_INT_ID_PORT_ID(regval);

		} else if (MTK_IOMMU_HAS_FLAG(plat_data, INT_ID_PORT_WIDTH_6)) {

			fault_port = F_MMU_INT_ID_PORT_ID_WID_6(regval);

			fault_larb = F_MMU_INT_ID_LARB_ID_WID_6(regval);

		} else {

			fault_port = F_MMU_INT_ID_PORT_ID(regval);

			fault_larb = F_MMU_INT_ID_LARB_ID(regval);

		}

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