Skip to contentSkip to conversation

iommu/mediatek: TTBR up to 35bit support

PATCH Superseded [email protected] 3 participants 11 messages Jun 15, 2022 – Jun 16, 2022

Subsystems (4)

v9 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

v9 cover iommu/mediatek: TTBR up to 35bit support

Changes in v8:
- Add and update patch
- Add [2/3] patch update MTK_IOMMU_ADDR to calculate the special ttbr.
- Save the special ttbr to mtk_iommu_domain avoid calculate it again.

Changes in v7:
- Update patch and commit message
- Extend arm_v7s_cfg.ttbr to u64.
- Move the special ttbr logical into mtk_iommu.c.
- Update commit message for single normal zone.

Changes in v6:
- Update patch: gfp_l1 = GFP_KERNEL | __GFP_ZERO;
- Update commit message for single normal zone.

Changes in v5:
- Only update message-ID.

Changes in v4:
- Fix build test WARNING: use GENMASK_ULL replace GENMASK.

Changes in v3:
- Add version changes description, there is No new code change in V3.

Changes in v2:
- Update patch and commit message
- Add Level 1 pgtable PA up to 35bit.
- This is new feature, remove [email protected]
- Update commit message.

Yunfei Wang (1):
iommu/mediatek: Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR

Ning Li (2):
iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit iommu/mediatek: Allow page table PA up to 35bit

 drivers/iommu/io-pgtable-arm-v7s.c | 58 +++++++++++++++++++++++-------
 drivers/iommu/mtk_iommu.c          | 22 ++++++++------
 include/linux/io-pgtable.h         | 17 +++++----
 3 files changed, 69 insertions(+), 28 deletions(-)
#1 lore raw

PATCH v9 1/3 iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit

From: Yunfei Wang <[email protected]>

Single memory zone feature will remove ZONE_DMA32 and ZONE_DMA and cause pgtable PA size larger than 32bit.

Since Mediatek IOMMU hardware support at most 35bit PA in pgtable, so add a quirk to allow the PA of pgtables support up to bit35.

---
 drivers/iommu/io-pgtable-arm-v7s.c | 58 +++++++++++++++++++++++-------
 include/linux/io-pgtable.h         | 17 +++++----
 2 files changed, 56 insertions(+), 19 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +45 -13
index be066c1503d3..39e5503ac75a 100644
@@ -182,14 +182,8 @@ static bool arm_v7s_is_mtk_enabled(struct io_pgtable_cfg *cfg)
 		(cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT);
 }
 
-static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
-				    struct io_pgtable_cfg *cfg)
+static arm_v7s_iopte to_mtk_iopte(phys_addr_t paddr, arm_v7s_iopte pte)
 {
-	arm_v7s_iopte pte = paddr & ARM_V7S_LVL_MASK(lvl);
-
-	if (!arm_v7s_is_mtk_enabled(cfg))
-		return pte;
-
 	if (paddr & BIT_ULL(32))
 		pte |= ARM_V7S_ATTR_MTK_PA_BIT32;
 	if (paddr & BIT_ULL(33))
@@ -199,6 +193,17 @@ static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
 	return pte;
 }
 
+static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
+				    struct io_pgtable_cfg *cfg)
+{
+	arm_v7s_iopte pte = paddr & ARM_V7S_LVL_MASK(lvl);
+
+	if (arm_v7s_is_mtk_enabled(cfg))
+		return to_mtk_iopte(paddr, pte);
+
+	return pte;
+}
+
 static phys_addr_t iopte_to_paddr(arm_v7s_iopte pte, int lvl,
 				  struct io_pgtable_cfg *cfg)
 {
@@ -240,10 +245,17 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
 	dma_addr_t dma;
 	size_t size = ARM_V7S_TABLE_SIZE(lvl, cfg);
 	void *table = NULL;
+	gfp_t gfp_l1;
+
+	/*
+	 * ARM_MTK_TTBR_EXT extend the translation table base support all
+	 * memory address.
+	 */
+	gfp_l1 = cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+		 GFP_KERNEL : ARM_V7S_TABLE_GFP_DMA;
 
 	if (lvl == 1)
-		table = (void *)__get_free_pages(
-			__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));
+		table = (void *)__get_free_pages(gfp_l1 | __GFP_ZERO, get_order(size));
 	else if (lvl == 2)
 		table = kmem_cache_zalloc(data->l2_tables, gfp);
 
@@ -251,7 +263,8 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
 		return NULL;
 
 	phys = virt_to_phys(table);
-	if (phys != (arm_v7s_iopte)phys) {
+	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+	    phys >= (1ULL << cfg->oas) : phys != (arm_v7s_iopte)phys) {
 		/* Doesn't fit in PTE */
 		dev_err(dev, "Page table does not fit in PTE: %pa", &phys);
 		goto out_free;
@@ -457,9 +470,14 @@ static arm_v7s_iopte arm_v7s_install_table(arm_v7s_iopte *table,
 					   arm_v7s_iopte curr,
 					   struct io_pgtable_cfg *cfg)
 {
+	phys_addr_t phys = virt_to_phys(table);
 	arm_v7s_iopte old, new;
 
-	new = virt_to_phys(table) | ARM_V7S_PTE_TYPE_TABLE;
+	new = phys | ARM_V7S_PTE_TYPE_TABLE;
+
+	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT)
+		new = to_mtk_iopte(phys, new);
+
 	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS)
 		new |= ARM_V7S_ATTR_NS_TABLE;
 
@@ -779,6 +797,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 						void *cookie)
 {
 	struct arm_v7s_io_pgtable *data;
+	slab_flags_t slab_flag;
 
 	if (cfg->ias > (arm_v7s_is_mtk_enabled(cfg) ? 34 : ARM_V7S_ADDR_BITS))
 		return NULL;
@@ -788,7 +807,8 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 
 	if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS |
 			    IO_PGTABLE_QUIRK_NO_PERMS |
-			    IO_PGTABLE_QUIRK_ARM_MTK_EXT))
+			    IO_PGTABLE_QUIRK_ARM_MTK_EXT |
+			    IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT))
 		return NULL;
 
 	/* If ARM_MTK_4GB is enabled, the NO_PERMS is also expected. */
@@ -796,15 +816,27 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 	    !(cfg->quirks & IO_PGTABLE_QUIRK_NO_PERMS))
 			return NULL;
 
+	if ((cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT) &&
+	    !arm_v7s_is_mtk_enabled(cfg))
+		return NULL;
+
 	data = kmalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)
 		return NULL;
 
 	spin_lock_init(&data->split_lock);
+
+	/*
+	 * ARM_MTK_TTBR_EXT extend the translation table base support all
+	 * memory address.
+	 */
+	slab_flag = cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+		    0 : ARM_V7S_TABLE_SLAB_FLAGS;
+
 	data->l2_tables = kmem_cache_create("io-pgtable_armv7s_l2",
 					    ARM_V7S_TABLE_SIZE(2, cfg),
 					    ARM_V7S_TABLE_SIZE(2, cfg),
-					    ARM_V7S_TABLE_SLAB_FLAGS, NULL);
+					    slab_flag, NULL);
 	if (!data->l2_tables)
 		goto out_free_data;
 
include/linux/io-pgtable.h +11 -6
index 86af6f0a00a2..c9189716f6bd 100644
@@ -74,17 +74,22 @@ struct io_pgtable_cfg {
 	 *	to support up to 35 bits PA where the bit32, bit33 and bit34 are
 	 *	encoded in the bit9, bit4 and bit5 of the PTE respectively.
 	 *
+	 * IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT: (ARM v7s format) MediaTek IOMMUs
+	 *	extend the translation table base support up to 35 bits PA, the
+	 *	encoding format is same with IO_PGTABLE_QUIRK_ARM_MTK_EXT.
+	 *
 	 * IO_PGTABLE_QUIRK_ARM_TTBR1: (ARM LPAE format) Configure the table
 	 *	for use in the upper half of a split address space.
 	 *
 	 * IO_PGTABLE_QUIRK_ARM_OUTER_WBWA: Override the outer-cacheability
 	 *	attributes set in the TCR for a non-coherent page-table walker.
 	 */
-	#define IO_PGTABLE_QUIRK_ARM_NS		BIT(0)
-	#define IO_PGTABLE_QUIRK_NO_PERMS	BIT(1)
-	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT	BIT(3)
-	#define IO_PGTABLE_QUIRK_ARM_TTBR1	BIT(5)
-	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA	BIT(6)
+	#define IO_PGTABLE_QUIRK_ARM_NS			BIT(0)
+	#define IO_PGTABLE_QUIRK_NO_PERMS		BIT(1)
+	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT		BIT(3)
+	#define IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT	BIT(4)
+	#define IO_PGTABLE_QUIRK_ARM_TTBR1		BIT(5)
+	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA		BIT(6)
 	unsigned long			quirks;
 	unsigned long			pgsize_bitmap;
 	unsigned int			ias;
@@ -122,7 +127,7 @@ struct io_pgtable_cfg {
 		} arm_lpae_s2_cfg;
 
 		struct {
-			u32	ttbr;
+			u64	ttbr;
 			u32	tcr;
 			u32	nmrr;
 			u32	prrr;
Signature · 6 lines
2.18.0

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
reviewer
#2 lore raw

Re: [PATCH v9 1/3] iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit

Quoted 74 lines · On 2022-06-15 17:12, [email protected] wrote:

From: Yunfei Wang <[email protected]>

Single memory zone feature will remove ZONE_DMA32 and ZONE_DMA and cause pgtable PA size larger than 32bit.

Since Mediatek IOMMU hardware support at most 35bit PA in pgtable, so add a quirk to allow the PA of pgtables support up to bit35.

---
  drivers/iommu/io-pgtable-arm-v7s.c | 58 +++++++++++++++++++++++-------
  include/linux/io-pgtable.h         | 17 +++++----
  2 files changed, 56 insertions(+), 19 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +21 -9
index be066c1503d3..39e5503ac75a 100644
@@ -182,14 +182,8 @@ static bool arm_v7s_is_mtk_enabled(struct io_pgtable_cfg *cfg)
  		(cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_EXT);
  }
 
-static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
-				    struct io_pgtable_cfg *cfg)
+static arm_v7s_iopte to_mtk_iopte(phys_addr_t paddr, arm_v7s_iopte pte)
  {
-	arm_v7s_iopte pte = paddr & ARM_V7S_LVL_MASK(lvl);
-
-	if (!arm_v7s_is_mtk_enabled(cfg))
-		return pte;
-
  	if (paddr & BIT_ULL(32))
  		pte |= ARM_V7S_ATTR_MTK_PA_BIT32;
  	if (paddr & BIT_ULL(33))
@@ -199,6 +193,17 @@ static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
  	return pte;
  }
 
+static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl,
+				    struct io_pgtable_cfg *cfg)
+{
+	arm_v7s_iopte pte = paddr & ARM_V7S_LVL_MASK(lvl);
+
+	if (arm_v7s_is_mtk_enabled(cfg))
+		return to_mtk_iopte(paddr, pte);
+
+	return pte;
+}
+
  static phys_addr_t iopte_to_paddr(arm_v7s_iopte pte, int lvl,
  				  struct io_pgtable_cfg *cfg)
  {
@@ -240,10 +245,17 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
  	dma_addr_t dma;
  	size_t size = ARM_V7S_TABLE_SIZE(lvl, cfg);
  	void *table = NULL;
+	gfp_t gfp_l1;
+
+	/*
+	 * ARM_MTK_TTBR_EXT extend the translation table base support all
+	 * memory address.
+	 */
+	gfp_l1 = cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+		 GFP_KERNEL : ARM_V7S_TABLE_GFP_DMA;
 
  	if (lvl == 1)
-		table = (void *)__get_free_pages(
-			__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size));
+		table = (void *)__get_free_pages(gfp_l1 | __GFP_ZERO, get_order(size));
  	else if (lvl == 2)
  		table = kmem_cache_zalloc(data->l2_tables, gfp);
 

drivers/iommu/io-pgtable-arm-v7s.c static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, · line 267

Quoted 6 lines
drivers/iommu/io-pgtable-arm-v7s.c +2 -1
@@ -251,7 +263,8 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
  		return NULL;
 
  	phys = virt_to_phys(table);
-	if (phys != (arm_v7s_iopte)phys) {
+	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+	    phys >= (1ULL << cfg->oas) : phys != (arm_v7s_iopte)phys) {

Given that the comment above says it supports all of memory, how would phys >= (1ULL << cfg->oas) ever be true?

Quoted 99 lines
drivers/iommu/io-pgtable-arm-v7s.c +22 -3
  		/* Doesn't fit in PTE */
  		dev_err(dev, "Page table does not fit in PTE: %pa", &phys);
  		goto out_free;
@@ -457,9 +470,14 @@ static arm_v7s_iopte arm_v7s_install_table(arm_v7s_iopte *table,
  					   arm_v7s_iopte curr,
  					   struct io_pgtable_cfg *cfg)
  {
+	phys_addr_t phys = virt_to_phys(table);
  	arm_v7s_iopte old, new;
 
-	new = virt_to_phys(table) | ARM_V7S_PTE_TYPE_TABLE;
+	new = phys | ARM_V7S_PTE_TYPE_TABLE;
+
+	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT)
+		new = to_mtk_iopte(phys, new);
+
  	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_NS)
  		new |= ARM_V7S_ATTR_NS_TABLE;
 
@@ -779,6 +797,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
  						void *cookie)
  {
  	struct arm_v7s_io_pgtable *data;
+	slab_flags_t slab_flag;
 
  	if (cfg->ias > (arm_v7s_is_mtk_enabled(cfg) ? 34 : ARM_V7S_ADDR_BITS))
  		return NULL;
@@ -788,7 +807,8 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 
  	if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS |
  			    IO_PGTABLE_QUIRK_NO_PERMS |
-			    IO_PGTABLE_QUIRK_ARM_MTK_EXT))
+			    IO_PGTABLE_QUIRK_ARM_MTK_EXT |
+			    IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT))
  		return NULL;
 
  	/* If ARM_MTK_4GB is enabled, the NO_PERMS is also expected. */
@@ -796,15 +816,27 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
  	    !(cfg->quirks & IO_PGTABLE_QUIRK_NO_PERMS))
  			return NULL;
 
+	if ((cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT) &&
+	    !arm_v7s_is_mtk_enabled(cfg))
+		return NULL;
+
  	data = kmalloc(sizeof(*data), GFP_KERNEL);
  	if (!data)
  		return NULL;
 
  	spin_lock_init(&data->split_lock);
+
+	/*
+	 * ARM_MTK_TTBR_EXT extend the translation table base support all
+	 * memory address.
+	 */
+	slab_flag = cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+		    0 : ARM_V7S_TABLE_SLAB_FLAGS;
+
  	data->l2_tables = kmem_cache_create("io-pgtable_armv7s_l2",
  					    ARM_V7S_TABLE_SIZE(2, cfg),
  					    ARM_V7S_TABLE_SIZE(2, cfg),
-					    ARM_V7S_TABLE_SLAB_FLAGS, NULL);
+					    slab_flag, NULL);
  	if (!data->l2_tables)
  		goto out_free_data;
 
include/linux/io-pgtable.h +10 -5
index 86af6f0a00a2..c9189716f6bd 100644
@@ -74,17 +74,22 @@ struct io_pgtable_cfg {
  	 *	to support up to 35 bits PA where the bit32, bit33 and bit34 are
  	 *	encoded in the bit9, bit4 and bit5 of the PTE respectively.
  	 *
+	 * IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT: (ARM v7s format) MediaTek IOMMUs
+	 *	extend the translation table base support up to 35 bits PA, the
+	 *	encoding format is same with IO_PGTABLE_QUIRK_ARM_MTK_EXT.
+	 *
  	 * IO_PGTABLE_QUIRK_ARM_TTBR1: (ARM LPAE format) Configure the table
  	 *	for use in the upper half of a split address space.
  	 *
  	 * IO_PGTABLE_QUIRK_ARM_OUTER_WBWA: Override the outer-cacheability
  	 *	attributes set in the TCR for a non-coherent page-table walker.
  	 */
-	#define IO_PGTABLE_QUIRK_ARM_NS		BIT(0)
-	#define IO_PGTABLE_QUIRK_NO_PERMS	BIT(1)
-	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT	BIT(3)
-	#define IO_PGTABLE_QUIRK_ARM_TTBR1	BIT(5)
-	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA	BIT(6)
+	#define IO_PGTABLE_QUIRK_ARM_NS			BIT(0)
+	#define IO_PGTABLE_QUIRK_NO_PERMS		BIT(1)
+	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT		BIT(3)
+	#define IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT	BIT(4)
+	#define IO_PGTABLE_QUIRK_ARM_TTBR1		BIT(5)
+	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA		BIT(6)
  	unsigned long			quirks;
  	unsigned long			pgsize_bitmap;
  	unsigned int			ias;

include/linux/io-pgtable.h struct io_pgtable_cfg { · line 130

Quoted 5 lines
include/linux/io-pgtable.h +1 -1
@@ -122,7 +127,7 @@ struct io_pgtable_cfg {
  		} arm_lpae_s2_cfg;
 
  		struct {
-			u32	ttbr;
+			u64	ttbr;

The point of this is to return an encoded TTBR register value, not a raw base address. I see from the other patches that your register is still 32 bits, so I'd prefer to follow the standard pattern and not need this change.

Thanks,
Robin.

include/linux/io-pgtable.h struct io_pgtable_cfg { · line 133

Quoted 3 lines
include/linux/io-pgtable.h +0 -0
  			u32	tcr;
  			u32	nmrr;
  			u32	prrr;

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#3 lore raw

Re: [PATCH v9 1/3] iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit

Quoted 33 lines · Robin Murphy
Quoted 32 lines · On 2022-06-15 17:12, [email protected] wrote:

static phys_addr_t iopte_to_paddr(arm_v7s_iopte pte, int lvl,
struct io_pgtable_cfg *cfg)
{

drivers/iommu/io-pgtable-arm-v7s.c +4 -0
@@ -240,10 +245,17 @@ static void *__arm_v7s_alloc_table(int lvl,
 gfp_t gfp,
  	dma_addr_t dma;
  	size_t size = ARM_V7S_TABLE_SIZE(lvl, cfg);
  	void *table = NULL;
+	gfp_t gfp_l1;
+
+	/*
+	 * ARM_MTK_TTBR_EXT extend the translation table base support

all

drivers/iommu/io-pgtable-arm-v7s.c +4 -2
+	 * memory address.
+	 */
+	gfp_l1 = cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+		 GFP_KERNEL : ARM_V7S_TABLE_GFP_DMA;
 
  	if (lvl == 1)
-		table = (void *)__get_free_pages(
-			__GFP_ZERO | ARM_V7S_TABLE_GFP_DMA,

get_order(size));

(quoted diff) +1 -0
+		table = (void *)__get_free_pages(gfp_l1 | __GFP_ZERO,

get_order(size));
else if (lvl == 2)
table = kmem_cache_zalloc(data->l2_tables, gfp);

drivers/iommu/io-pgtable-arm-v7s.c +0 -0
@@ -251,7 +263,8 @@ static void *__arm_v7s_alloc_table(int lvl,
 gfp_t gfp,
  		return NULL;
 
Quoted 9 lines

drivers/iommu/io-pgtable-arm-v7s.c static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, · line 267

Quoted 4 lines
drivers/iommu/io-pgtable-arm-v7s.c +2 -1
  	phys = virt_to_phys(table);
-	if (phys != (arm_v7s_iopte)phys) {
+	if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ?
+	    phys >= (1ULL << cfg->oas) : phys != (arm_v7s_iopte)phys) {

Given that the comment above says it supports all of memory, how would
phys >= (1ULL << cfg->oas) ever be true?

Hi Robin,

Since Mediatek IOMMU hardware support at most 35bit PA in pgtable, so add a quirk to allow the PA of pgtables support up to bit35, but need to check oas do error hanlde.

Quoted 7 lines
Quoted 7 lines
(quoted diff) +0 -0
  		/* Doesn't fit in PTE */
  		dev_err(dev, "Page table does not fit in PTE: %pa",

&phys);
goto out_free;
arm_v7s_install_table(arm_v7s_iopte *table,
arm_v7s_iopte curr, struct io_pgtable_cfg *cfg)

...

Quoted 54 lines
Quoted 40 lines
include/linux/io- renamed from include/linux/io-pgtable.h +0 -0

pgtable.h
index 86af6f0a00a2..c9189716f6bd 100644

include/linux/io-pgtable.h +0 -0
@@ -74,17 +74,22 @@ struct io_pgtable_cfg {
  	 *	to support up to 35 bits PA where the bit32, bit33 and

bit34 are
* encoded in the bit9, bit4 and bit5 of the PTE respectively.
*

include/linux/io-pgtable.h +1 -0
+	 * IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT: (ARM v7s format) MediaTek

IOMMUs

include/linux/io-pgtable.h +1 -0
+	 *	extend the translation table base support up to 35 bits PA,

the

include/linux/io-pgtable.h +2 -0
+	 *	encoding format is same with IO_PGTABLE_QUIRK_ARM_MTK_EXT.
+	 *
  	 * IO_PGTABLE_QUIRK_ARM_TTBR1: (ARM LPAE format) Configure the

table
* for use in the upper half of a split address space.
*
* IO_PGTABLE_QUIRK_ARM_OUTER_WBWA: Override the outer-
cacheability
* attributes set in the TCR for a non-coherent page-table
walker.
*/

include/linux/io-pgtable.h +6 -5
-	#define IO_PGTABLE_QUIRK_ARM_NS		BIT(0)
-	#define IO_PGTABLE_QUIRK_NO_PERMS	BIT(1)
-	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT	BIT(3)
-	#define IO_PGTABLE_QUIRK_ARM_TTBR1	BIT(5)
-	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA	BIT(6)
+	#define IO_PGTABLE_QUIRK_ARM_NS			BIT(0)
+	#define IO_PGTABLE_QUIRK_NO_PERMS		BIT(1)
+	#define IO_PGTABLE_QUIRK_ARM_MTK_EXT		BIT(3)
+	#define IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT	BIT(4)
+	#define IO_PGTABLE_QUIRK_ARM_TTBR1		BIT(5)
+	#define IO_PGTABLE_QUIRK_ARM_OUTER_WBWA		BIT(6)
  	unsigned long			quirks;
  	unsigned long			pgsize_bitmap;
  	unsigned int			ias;

include/linux/io-pgtable.h struct io_pgtable_cfg { · line 130

Quoted 5 lines
include/linux/io-pgtable.h +1 -1
@@ -122,7 +127,7 @@ struct io_pgtable_cfg {
  		} arm_lpae_s2_cfg;
 
  		struct {
-			u32	ttbr;
+			u64	ttbr;

The point of this is to return an encoded TTBR register value, not a raw
base address. I see from the other patches that your register is still
32 bits, so I'd prefer to follow the standard pattern and not need this
change.

Quoted 3 lines

Thanks,
Robin.

Hi Robin,
Thanks for your suggestion, next version will recovery ttbr to 32 bits, will modify arm_v7s_alloc_pgtable to return an encoded TTBR, encoded PA bits[34:32] to to lower bits, as follows:

/* TTBR */
phys_addr_t paddr;
paddr = virt_to_phys(data->pgd);
cfg->arm_v7s_cfg.ttbr = virt_to_phys(data->pgd) | ARM_V7S_TTBR_S |

			(cfg->coherent_walk ? (ARM_V7S_TTBR_NOS |
			 ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_WBWA) |
			 ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_WBWA)) :
			(ARM_V7S_TTBR_IRGN_ATTR(ARM_V7S_RGN_NC) |
			 ARM_V7S_TTBR_ORGN_ATTR(ARM_V7S_RGN_NC)));

if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT)

	cfg->arm_v7s_cfg.ttbr = (paddr & GENMASK(31, 7)) |
				upper_32_bits(paddr);

Thanks,
Yunfei.

Quoted 3 lines
Quoted 3 lines
include/linux/io-pgtable.h +0 -0
  			u32	tcr;
  			u32	nmrr;
  			u32	prrr;
#4 lore raw

PATCH v9 2/3 iommu/mediatek: Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR

In reply to [email protected]

From: Yunfei Wang <[email protected]>

Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR, and update MTK_IOMMU_ADDR definition for better generality.

---
 drivers/iommu/mtk_iommu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +4 -4
index bb9dd92c9898..3d62399e8865 100644
@@ -265,8 +265,8 @@ static const struct iommu_ops mtk_iommu_ops;
 
 static int mtk_iommu_hw_init(const struct mtk_iommu_data *data, unsigned int bankid);
 
-#define MTK_IOMMU_TLB_ADDR(iova) ({					\
-	dma_addr_t _addr = iova;					\
+#define MTK_IOMMU_ADDR(addr) ({						\
+	unsigned long long _addr = addr;				\
 	((lower_32_bits(_addr) & GENMASK(31, 12)) | upper_32_bits(_addr));\
 })
 
@@ -381,8 +381,8 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
 		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
 			       base + data->plat_data->inv_sel_reg);
 
-		writel_relaxed(MTK_IOMMU_TLB_ADDR(iova), base + REG_MMU_INVLD_START_A);
-		writel_relaxed(MTK_IOMMU_TLB_ADDR(iova + size - 1),
+		writel_relaxed(MTK_IOMMU_ADDR(iova), base + REG_MMU_INVLD_START_A);
+		writel_relaxed(MTK_IOMMU_ADDR(iova + size - 1),
 			       base + REG_MMU_INVLD_END_A);
 		writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE);
 
Signature · 6 lines
2.18.0

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
reviewer
#5 lore raw

Re: [PATCH v9 2/3] iommu/mediatek: Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR

Quoted 16 lines · yf.wang--- via iommu

From: Yunfei Wang <[email protected]>

Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR, and update MTK_IOMMU_ADDR definition for better generality.

---
  drivers/iommu/mtk_iommu.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +0 -0
index bb9dd92c9898..3d62399e8865 100644

drivers/iommu/mtk_iommu.c static const struct iommu_ops mtk_iommu_ops; · line 269

Quoted 7 lines
drivers/iommu/mtk_iommu.c +2 -2
@@ -265,8 +265,8 @@ static const struct iommu_ops mtk_iommu_ops;
 
  static int mtk_iommu_hw_init(const struct mtk_iommu_data *data, unsigned int bankid);
 
-#define MTK_IOMMU_TLB_ADDR(iova) ({					\
-	dma_addr_t _addr = iova;					\
+#define MTK_IOMMU_ADDR(addr) ({						\
+	unsigned long long _addr = addr;				\

If phys_addr_t is 64-bit, then dma_addr_t is also 64-bit, so there is no loss of generality from using an appropriate type - IOVAs have to fit into dma_addr_t for iommu-dma, after all. However, since IOVAs also have to fit into unsigned long in the general IOMMU API, as "addr" is here, then this is still just as broken for 32-bit LPAE as the existing code is.

Thanks,
Robin.

Quoted 4 lines
drivers/iommu/mtk_iommu.c +0 -0
  	((lower_32_bits(_addr) & GENMASK(31, 12)) | upper_32_bits(_addr));\
  })
 

drivers/iommu/mtk_iommu.c static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size, · line 388

Quoted 10 lines
drivers/iommu/mtk_iommu.c +2 -2
@@ -381,8 +381,8 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
  		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
  			       base + data->plat_data->inv_sel_reg);
 
-		writel_relaxed(MTK_IOMMU_TLB_ADDR(iova), base + REG_MMU_INVLD_START_A);
-		writel_relaxed(MTK_IOMMU_TLB_ADDR(iova + size - 1),
+		writel_relaxed(MTK_IOMMU_ADDR(iova), base + REG_MMU_INVLD_START_A);
+		writel_relaxed(MTK_IOMMU_ADDR(iova + size - 1),
  			       base + REG_MMU_INVLD_END_A);
  		writel_relaxed(F_MMU_INV_RANGE, base + REG_MMU_INVALIDATE);
 

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#6 lore raw

Re: [PATCH v9 2/3] iommu/mediatek: Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR

Quoted 40 lines · Robin Murphy
Quoted 17 lines · yf.wang--- via iommu

From: Yunfei Wang <[email protected]>

Rename MTK_IOMMU_TLB_ADDR to MTK_IOMMU_ADDR, and update MTK_IOMMU_ADDR
definition for better generality.

---
  drivers/iommu/mtk_iommu.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +0 -0
index bb9dd92c9898..3d62399e8865 100644

drivers/iommu/mtk_iommu.c static const struct iommu_ops mtk_iommu_ops; · line 272

Quoted 10 lines
drivers/iommu/mtk_iommu.c +2 -2
@@ -265,8 +265,8 @@ static const struct iommu_ops mtk_iommu_ops;
 
  static int mtk_iommu_hw_init(const struct mtk_iommu_data *data,
 unsigned int bankid);
 
-#define MTK_IOMMU_TLB_ADDR(iova) ({				
 	\
-	dma_addr_t _addr = iova;					\
+#define MTK_IOMMU_ADDR(addr) ({					
 	\
+	unsigned long long _addr = addr;				\

If phys_addr_t is 64-bit, then dma_addr_t is also 64-bit, so there is no
loss of generality from using an appropriate type - IOVAs have to fit
into dma_addr_t for iommu-dma, after all. However, since IOVAs also have
to fit into unsigned long in the general IOMMU API, as "addr" is here,
then this is still just as broken for 32-bit LPAE as the existing code is.

Quoted 3 lines

Thanks,
Robin.

Hi Robin,
According to Path#1's suggestion, next version will keep ttbr to encoded 32 bits, then will don't need to modify it.

Thanks,
Yunfei.

Quoted 9 lines
Quoted 9 lines

((lower_32_bits(_addr) & GENMASK(31, 12)) |
upper_32_bits(_addr));\
})

drivers/iommu/mtk_iommu.c +0 -0
@@ -381,8 +381,8 @@ static void
 mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
  		writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
  			       base + data->plat_data->inv_sel_reg);
 
Quoted 10 lines
Quoted 10 lines
drivers/iommu/mtk_iommu.c +2 -2
-		writel_relaxed(MTK_IOMMU_TLB_ADDR(iova), base +
 REG_MMU_INVLD_START_A);
-		writel_relaxed(MTK_IOMMU_TLB_ADDR(iova + size - 1),
+		writel_relaxed(MTK_IOMMU_ADDR(iova), base +
 REG_MMU_INVLD_START_A);
+		writel_relaxed(MTK_IOMMU_ADDR(iova + size - 1),

base + REG_MMU_INVLD_END_A);
writel_relaxed(F_MMU_INV_RANGE, base +
REG_MMU_INVALIDATE);

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#7 lore raw

PATCH v9 3/3 iommu/mediatek: Allow page table PA up to 35bit

In reply to [email protected]

From: Yunfei Wang <[email protected]>

Single memory zone feature will remove ZONE_DMA32 and ZONE_DMA. So add the quirk IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT to let level 1 and level 2 pgtable support at most 35bit PA.

---
 drivers/iommu/mtk_iommu.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/iommu/mtk_iommu.c +9 -5
index 3d62399e8865..4dbc33758711 100644
@@ -138,6 +138,7 @@
 /* PM and clock always on. e.g. infra iommu */
 #define PM_CLK_AO			BIT(15)
 #define IFA_IOMMU_PCIE_SUPPORT		BIT(16)
+#define PGTABLE_PA_35_EN		BIT(17)
 
 #define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask)	\
 				((((pdata)->flags) & (mask)) == (_x))
@@ -240,6 +241,7 @@ struct mtk_iommu_data {
 struct mtk_iommu_domain {
 	struct io_pgtable_cfg		cfg;
 	struct io_pgtable_ops		*iop;
+	u32				ttbr;
 
 	struct mtk_iommu_bank_data	*bank;
 	struct iommu_domain		domain;
@@ -596,6 +598,9 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
 		.iommu_dev = data->dev,
 	};
 
+	if (MTK_IOMMU_HAS_FLAG(data->plat_data, PGTABLE_PA_35_EN))
+		dom->cfg.quirks |= IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT;
+
 	if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_4GB_MODE))
 		dom->cfg.oas = data->enable_4GB ? 33 : 32;
 	else
@@ -684,8 +689,8 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
 			goto err_unlock;
 		}
 		bank->m4u_dom = dom;
-		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       bank->base + REG_MMU_PT_BASE_ADDR);
+		bank->m4u_dom->ttbr = MTK_IOMMU_ADDR(dom->cfg.arm_v7s_cfg.ttbr);
+		writel(bank->m4u_dom->ttbr, data->base + REG_MMU_PT_BASE_ADDR);
 
 		pm_runtime_put(m4udev);
 	}
@@ -1366,8 +1371,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
 		writel_relaxed(reg->int_control[i], base + REG_MMU_INT_CONTROL0);
 		writel_relaxed(reg->int_main_control[i], base + REG_MMU_INT_MAIN_CONTROL);
 		writel_relaxed(reg->ivrp_paddr[i], base + REG_MMU_IVRP_PADDR);
-		writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       base + REG_MMU_PT_BASE_ADDR);
+		writel(m4u_dom->ttbr, base + REG_MMU_PT_BASE_ADDR);
 	} while (++i < data->plat_data->banks_num);
 
 	/*
@@ -1401,7 +1405,7 @@ static const struct mtk_iommu_plat_data mt2712_data = {
 static const struct mtk_iommu_plat_data mt6779_data = {
 	.m4u_plat      = M4U_MT6779,
 	.flags         = HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN | WR_THROT_EN |
-			 MTK_IOMMU_TYPE_MM,
+			 MTK_IOMMU_TYPE_MM | PGTABLE_PA_35_EN,
 	.inv_sel_reg   = REG_MMU_INV_SEL_GEN2,
 	.banks_num    = 1,
 	.banks_enable = {true},
Signature · 6 lines
2.18.0

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
reviewer
#8 lore raw

Re: [PATCH v9 3/3] iommu/mediatek: Allow page table PA up to 35bit

Quoted 5 lines · yf.wang--- via iommu

From: Yunfei Wang <[email protected]>

Single memory zone feature will remove ZONE_DMA32 and ZONE_DMA. So add the quirk IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT to let level 1 and level 2 pgtable support at most 35bit PA.

I'm not sure how this works in practice, given that you don't seem to be setting the IOMMU's own DMA masks to more than 32 bits, so the DMA mapping in io-pgtable is going to fail if you ever do actually allocate a pagetable page above 4GB :/

Quoted 37 lines
---
  drivers/iommu/mtk_iommu.c | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
drivers/iommu/mtk_iommu.c +5 -0
index 3d62399e8865..4dbc33758711 100644
@@ -138,6 +138,7 @@
  /* PM and clock always on. e.g. infra iommu */
  #define PM_CLK_AO			BIT(15)
  #define IFA_IOMMU_PCIE_SUPPORT		BIT(16)
+#define PGTABLE_PA_35_EN		BIT(17)
 
  #define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask)	\
  				((((pdata)->flags) & (mask)) == (_x))
@@ -240,6 +241,7 @@ struct mtk_iommu_data {
  struct mtk_iommu_domain {
  	struct io_pgtable_cfg		cfg;
  	struct io_pgtable_ops		*iop;
+	u32				ttbr;
 
  	struct mtk_iommu_bank_data	*bank;
  	struct iommu_domain		domain;
@@ -596,6 +598,9 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
  		.iommu_dev = data->dev,
  	};
 
+	if (MTK_IOMMU_HAS_FLAG(data->plat_data, PGTABLE_PA_35_EN))
+		dom->cfg.quirks |= IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT;
+
  	if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_4GB_MODE))
  		dom->cfg.oas = data->enable_4GB ? 33 : 32;
  	else

drivers/iommu/mtk_iommu.c static int mtk_iommu_attach_device(struct iommu_domain *domain, · line 693

Quoted 7 lines
drivers/iommu/mtk_iommu.c +2 -2
@@ -684,8 +689,8 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
  			goto err_unlock;
  		}
  		bank->m4u_dom = dom;
-		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       bank->base + REG_MMU_PT_BASE_ADDR);
+		bank->m4u_dom->ttbr = MTK_IOMMU_ADDR(dom->cfg.arm_v7s_cfg.ttbr);
+		writel(bank->m4u_dom->ttbr, data->base + REG_MMU_PT_BASE_ADDR);

To add to my comment on patch #1, having to make this change here further indicates that you're using it the wrong way.

Thanks,
Robin.

Quoted 14 lines
drivers/iommu/mtk_iommu.c +1 -2
  		pm_runtime_put(m4udev);
  	}
@@ -1366,8 +1371,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)
  		writel_relaxed(reg->int_control[i], base + REG_MMU_INT_CONTROL0);
  		writel_relaxed(reg->int_main_control[i], base + REG_MMU_INT_MAIN_CONTROL);
  		writel_relaxed(reg->ivrp_paddr[i], base + REG_MMU_IVRP_PADDR);
-		writel(m4u_dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       base + REG_MMU_PT_BASE_ADDR);
+		writel(m4u_dom->ttbr, base + REG_MMU_PT_BASE_ADDR);
  	} while (++i < data->plat_data->banks_num);
 
  	/*

drivers/iommu/mtk_iommu.c static const struct mtk_iommu_plat_data mt2712_data = { · line 1411

Quoted 8 lines
drivers/iommu/mtk_iommu.c +1 -1
@@ -1401,7 +1405,7 @@ static const struct mtk_iommu_plat_data mt2712_data = {
  static const struct mtk_iommu_plat_data mt6779_data = {
  	.m4u_plat      = M4U_MT6779,
  	.flags         = HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN | WR_THROT_EN |
-			 MTK_IOMMU_TYPE_MM,
+			 MTK_IOMMU_TYPE_MM | PGTABLE_PA_35_EN,
  	.inv_sel_reg   = REG_MMU_INV_SEL_GEN2,
  	.banks_num    = 1,
  	.banks_enable = {true},

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#9 lore raw

Re: [PATCH v9 3/3] iommu/mediatek: Allow page table PA up to 35bit

Quoted 9 lines · Robin Murphy
Quoted 7 lines · yf.wang--- via iommu

From: Yunfei Wang <[email protected]>

Single memory zone feature will remove ZONE_DMA32 and ZONE_DMA. So add
the quirk IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT to let level 1 and level 2
pgtable support at most 35bit PA.

Quoted 7 lines

I'm not sure how this works in practice, given that you don't seem to be
setting the IOMMU's own DMA masks to more than 32 bits, so the DMA mapping in io-pgtable is going to fail if you ever do actually allocate
a pagetable page above 4GB :/

Hi Robin,
About DMA masks, the master device has set dma mask, when iommu do dma map, it will check the dam_mask of the master dev to determine which range the address of the iova alloc is in.

Add the quirk ARM_MTK_TTBR_EXT to let pgtable support larger phys memory. Do actually test work fine, example:
pgtable phys address:0x12054006a, encoded to 32 bits ttbr:0x20540001

Quoted 46 lines
Quoted 46 lines
---
  drivers/iommu/mtk_iommu.c | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
drivers/iommu/mtk_iommu.c +5 -0
index 3d62399e8865..4dbc33758711 100644
@@ -138,6 +138,7 @@
  /* PM and clock always on. e.g. infra iommu */
  #define PM_CLK_AO			BIT(15)
  #define IFA_IOMMU_PCIE_SUPPORT		BIT(16)
+#define PGTABLE_PA_35_EN		BIT(17)
 
  #define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask)	\
  				((((pdata)->flags) & (mask)) == (_x))
@@ -240,6 +241,7 @@ struct mtk_iommu_data {
  struct mtk_iommu_domain {
  	struct io_pgtable_cfg		cfg;
  	struct io_pgtable_ops		*iop;
+	u32				ttbr;
 
  	struct mtk_iommu_bank_data	*bank;
  	struct iommu_domain		domain;
@@ -596,6 +598,9 @@ static int mtk_iommu_domain_finalise(struct
 mtk_iommu_domain *dom,
  		.iommu_dev = data->dev,
  	};
 
+	if (MTK_IOMMU_HAS_FLAG(data->plat_data, PGTABLE_PA_35_EN))
+		dom->cfg.quirks |= IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT;
+
  	if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_4GB_MODE))
  		dom->cfg.oas = data->enable_4GB ? 33 : 32;

else

drivers/iommu/mtk_iommu.c +1 -2
@@ -684,8 +689,8 @@ static int mtk_iommu_attach_device(struct
 iommu_domain *domain,
  			goto err_unlock;
  		}
  		bank->m4u_dom = dom;
-		writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
-		       bank->base + REG_MMU_PT_BASE_ADDR);
+		bank->m4u_dom->ttbr = MTK_IOMMU_ADDR(dom-
 >cfg.arm_v7s_cfg.ttbr);
Quoted 9 lines

drivers/iommu/mtk_iommu.c static int mtk_iommu_attach_device(struct · line 696

Quoted 2 lines
drivers/iommu/mtk_iommu.c +1 -0
+		writel(bank->m4u_dom->ttbr, data->base +
 REG_MMU_PT_BASE_ADDR);

To add to my comment on patch #1, having to make this change here further indicates that you're using it the wrong way.

Thanks,
Robin.

Hi Robin,
According to your Path#1's suggestion, next version will keep ttbr to encoded 32 bits, then will don't need to modify it.

Thanks,
Yunfei.

#10 lore raw

Re: [PATCH v9 3/3] iommu/mediatek: Allow page table PA up to 35bit

In reply to [email protected]
Thank you for the patch! Yet something to improve:

Hi,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on joro-iommu/next]
[also build test ERROR on linus/master v5.19-rc2 next-20220615] [cannot apply to arm-perf/for-next/perf]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/yf-wang-mediatek-com/iommu-io-pgtable-arm-v7s-Add-a-quirk-to-allow-pgtable-PA-up-to-35bit/20220616-011227
base:   https://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git next
config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20220616/[email protected]/config)
compiler: arceb-elf-gcc (GCC) 11.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/0032fcce9c1ab50caec1ef5dd4089a8a61fcf15c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review yf-wang-mediatek-com/iommu-io-pgtable-arm-v7s-Add-a-quirk-to-allow-pgtable-PA-up-to-35bit/20220616-011227 git checkout 0032fcce9c1ab50caec1ef5dd4089a8a61fcf15c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arc SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable

All errors (new ones prefixed by >>):

In file included from include/linux/scatterlist.h:9,
from include/linux/dma-mapping.h:10, from include/linux/dma-direct.h:9, from drivers/iommu/mtk_iommu.c:11:
drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_attach_device':

>> drivers/iommu/mtk_iommu.c:693:49: error: 'struct mtk_iommu_data' has no member named 'base'
     693 |                 writel(bank->m4u_dom->ttbr, data->base + REG_MMU_PT_BASE_ADDR);
         |                                                 ^~
   arch/arc/include/asm/io.h:231:75: note: in definition of macro 'writel_relaxed'
     231 | #define writel_relaxed(v,c)     __raw_writel((__force u32) cpu_to_le32(v),c)
         |                                                                           ^
   drivers/iommu/mtk_iommu.c:693:17: note: in expansion of macro 'writel'
     693 |                 writel(bank->m4u_dom->ttbr, data->base + REG_MMU_PT_BASE_ADDR);
         |                 ^~~~~~

vim +693 drivers/iommu/mtk_iommu.c

646
647 static int mtk_iommu_attach_device(struct iommu_domain *domain,
648 struct device *dev)
649 {
650 struct mtk_iommu_data *data = dev_iommu_priv_get(dev), *frstdata;
651 struct mtk_iommu_domain *dom = to_mtk_domain(domain);
652 struct list_head *hw_list = data->hw_list;
653 struct device *m4udev = data->dev;
654 struct mtk_iommu_bank_data *bank;
655 unsigned int bankid;
656 int ret, region_id;
657
658 region_id = mtk_iommu_get_iova_region_id(dev, data->plat_data);
659 if (region_id < 0)
660 return region_id;
661
662 bankid = mtk_iommu_get_bank_id(dev, data->plat_data);
663 mutex_lock(&dom->mutex);
664 if (!dom->bank) {
665 /* Data is in the frstdata in sharing pgtable case. */
666 frstdata = mtk_iommu_get_frst_data(hw_list);
667
668 ret = mtk_iommu_domain_finalise(dom, frstdata, region_id);
669 if (ret) {
670 mutex_unlock(&dom->mutex);
671 return -ENODEV;
672 }
673 dom->bank = &data->bank[bankid];
674 }
675 mutex_unlock(&dom->mutex);
676
677 mutex_lock(&data->mutex);
678 bank = &data->bank[bankid];
679 if (!bank->m4u_dom) { /* Initialize the M4U HW for each a BANK */
680 ret = pm_runtime_resume_and_get(m4udev);
681 if (ret < 0) {
682 dev_err(m4udev, "pm get fail(%d) in attach.\n", ret);
683 goto err_unlock;
684 }
685
686 ret = mtk_iommu_hw_init(data, bankid);
687 if (ret) {
688 pm_runtime_put(m4udev);
689 goto err_unlock;
690 }
691 bank->m4u_dom = dom;
692 bank->m4u_dom->ttbr = MTK_IOMMU_ADDR(dom->cfg.arm_v7s_cfg.ttbr);

 > 693			writel(bank->m4u_dom->ttbr, data->base + REG_MMU_PT_BASE_ADDR);

694
695 pm_runtime_put(m4udev);
696 }
697 mutex_unlock(&data->mutex);
698
699 return mtk_iommu_config(data, dev, true, region_id);
700
701 err_unlock:
702 mutex_unlock(&data->mutex);
703 return ret;
704 }
705

Signature · 6 lines
0-DAY CI Kernel Test Service
https://01.org/lkp
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu