iommu/mediatek: TTBR up to 35bit support
Subsystems (4)
v5 cover iommu/mediatek: TTBR up to 35bit support
This patchset adds MediaTek TTBR up to 35bit support.
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.
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 | 56 ++++++++++++++++++++++-------- drivers/iommu/mtk_iommu.c | 29 +++++++++++++--- include/linux/io-pgtable.h | 15 +++++--- 3 files changed, 77 insertions(+), 23 deletions(-)
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v5 1/2 iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit
From: Yunfei Wang <[email protected]>
The calling to kmem_cache_alloc for level 2 pgtable allocation may run in atomic context, and it fails sometimes when DMA32 zone runs out of memory.
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 | 56 ++++++++++++++++++++++-------- include/linux/io-pgtable.h | 15 +++++--- 2 files changed, 52 insertions(+), 19 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +42 -14
@@ -149,6 +149,10 @@#define ARM_V7S_TTBR_IRGN_ATTR (attr) \ ((((attr) & 0x1) << 6) | (((attr) & 0x2) >> 1)) +/* Mediatek extend ttbr bits[2:0] for PA bits[34:32] */ +#define ARM_V7S_TTBR_35BIT_PA (ttbr, pa) \ + ((ttbr & ((u32)(~0U << 3))) | ((pa & GENMASK_ULL(34, 32)) >> 32)) +#ifdef CONFIG_ZONE_DMA32 #define ARM_V7S_TABLE_GFP_DMA GFP_DMA32#define ARM_V7S_TABLE_SLAB_FLAGS SLAB_CACHE_DMA32
@@ -182,14 +186,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_iopte_mtk (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 +197,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 pte; + +return to_iopte_mtk (paddr, pte); +} +static phys_addr_t iopte_to_paddr (arm_v7s_iopte pte,int lvl,struct io_pgtable_cfg *cfg) {
@@ -234,6 +243,7 @@ static arm_v7s_iopte *iopte_deref(arm_v7s_iopte pte, int lvl,static void *__arm_v7s_alloc_table (int lvl,gfp_t gfp,struct arm_v7s_io_pgtable *data) { +gfp_t gfp_l1 = __GFP_ZERO |ARM_V7S_TABLE_GFP_DMA ;struct io_pgtable_cfg *cfg = &data->iop.cfg;struct device *dev = cfg->iommu_dev;phys_addr_t phys;
@@ -241,9 +251,11 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,size_t size =ARM_V7S_TABLE_SIZE (lvl, cfg);void *table =NULL ; +if (cfg->quirks &IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ) + gfp_l1 = __GFP_ZERO; +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,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 (phys != (arm_v7s_iopte )phys && + !(cfg->quirks &IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT )) {/* 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_iopte_mtk (phys, new); +if (cfg->quirks &IO_PGTABLE_QUIRK_ARM_NS ) new |=ARM_V7S_ATTR_NS_TABLE ;
@@ -778,7 +796,9 @@ static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops,static struct io_pgtable *arm_v7s_alloc_pgtable (struct io_pgtable_cfg *cfg,void *cookie) { +slab_flags_t slab_flag =ARM_V7S_TABLE_SLAB_FLAGS ;struct arm_v7s_io_pgtable *data; +phys_addr_t paddr;if (cfg->ias > (arm_v7s_is_mtk_enabled (cfg) ?34 :ARM_V7S_ADDR_BITS ))return NULL ;
@@ -788,7 +808,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. */
@@ -801,10 +822,12 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,return NULL ;spin_lock_init (&data->split_lock); +if (cfg->quirks &IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ) + slab_flag =0 ; 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;
@@ -850,12 +873,17 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,wmb ();/* TTBR */ - cfg->arm_v7s_cfg.ttbr =virt_to_phys (data->pgd) |ARM_V7S_TTBR_S | + paddr =virt_to_phys (data->pgd); + cfg->arm_v7s_cfg.ttbr = paddr |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 = +ARM_V7S_TTBR_35BIT_PA (cfg->arm_v7s_cfg.ttbr, paddr);return &data->iop; out_free_data:
include/linux/io-pgtable.h +10 -5
@@ -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 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;
Signature · 1 line
2.18.0
Re: [PATCH v5 1/2] iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit
Hi Yunfei,
Quoted 15 lines
The calling to
kmem_cache_allocfor level 2 pgtable allocation may run in atomic context, and it fails sometimes when DMA32 zone runs out of memory.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.
Signed-off-by Ning Li <[email protected]>Signed-off-by Yunfei Wang <[email protected]>--- drivers/iommu/io-pgtable-arm-v7s.c | 56 ++++++++++++++++++++++-------- include/linux/io-pgtable.h | 15 +++++--- 2 files changed, 52 insertions(+), 19 deletions(-)drivers/iommu/io-pgtable-arm-v7s.c +0
-0
...snip...
drivers/iommu/io-pgtable-arm-v7s.c static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, · line 255
Quoted 10 lines
drivers/iommu/io-pgtable-arm-v7s.c +3
-0+gfp_t gfp_l1 = __GFP_ZERO |ARM_V7S_TABLE_GFP_DMA ;struct io_pgtable_cfg *cfg = &data->iop.cfg;struct device *dev = cfg->iommu_dev;phys_addr_t phys;@@ -241,9 +251,11 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,size_t size =ARM_V7S_TABLE_SIZE (lvl, cfg);void *table =NULL ; +if (cfg->quirks &IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT ) + gfp_l1 = __GFP_ZERO;
__GFP_ZERO is an action modifier, if we do not want ARM_V7S_TABLE_GFP_DMA (GFP_DMA/GFP_DMA32), use gfp_l1 = (GFP_KERNEL | __GFP_ZERO)
thanks,
Miles
Quoted 8 lines
drivers/iommu/io-pgtable-arm-v7s.c +2
-2+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,get_order (size));else if (lvl ==2 ) table =kmem_cache_zalloc (data->l2_tables, gfp);
Re: [PATCH v5 1/2] iommu/io-pgtable-arm-v7s: Add a quirk to allow pgtable PA up to 35bit
Quoted 33 lines · Miles Chen
Hi Yunfei,
Quoted 19 lines
The calling to
kmem_cache_allocfor level 2 pgtable allocation may run
in atomic context, and it fails sometimes when DMA32 zone runs out of
memory.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.
Signed-off-by Ning Li <[email protected]>Signed-off-by Yunfei Wang <[email protected]>--- drivers/iommu/io-pgtable-arm-v7s.c | 56 ++++++++++++++++++++++-- ------ include/linux/io-pgtable.h | 15 +++++--- 2 files changed, 52 insertions(+), 19 deletions(-)drivers/iommu/io- renamed from drivers/iommu/io-pgtable-arm-v7s.c +0
-0
pgtable-arm-v7s.c...snip...
Quoted 9 lines
drivers/iommu/io- renamed from drivers/iommu/io-pgtable-arm-v7s.c +1
-0+ gfp_t gfp_l1 = __GFP_ZERO | ARM_V7S_TABLE_GFP_DMA; struct io_pgtable_cfg *cfg = &data->iop.cfg; struct device *dev = cfg->iommu_dev; phys_addr_t phys;@@ -241,9 +251,11 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, size_t size = ARM_V7S_TABLE_SIZE(lvl, cfg); void *table = NULL;
Quoted 7 lines
drivers/iommu/io- static void *__arm_v7s_alloc_table(int lvl, · line 256
Quoted 2 lines
drivers/iommu/io- renamed from drivers/iommu/io-pgtable-arm-v7s.c +2
-0+ if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT) + gfp_l1 = __GFP_ZERO;
__GFP_ZEROis an action modifier, if we do not wantARM_V7S_TABLE_GFP_DMA(GFP_DMA/GFP_DMA32), usegfp_l1= (GFP_KERNEL|__GFP_ZERO)
Hi Miles,
Thanks for the suggestion, we will update it in the next version.
Thanks,
Yunfei.
Quoted 10 lines
Quoted 10 lines
drivers/iommu/io- renamed from drivers/iommu/io-pgtable-arm-v7s.c +2
-2+ 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, get_order(size));else if (lvl == 2) table = kmem_cache_zalloc(data->l2_tables, gfp);
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v5 2/2 iommu/mediatek: Allow page table PA up to 35bit
In reply to [email protected]From: Yunfei Wang <[email protected]>
Add the quirk IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT support, so that allows page table PA up to 35bit, not only in ZONE_DMA32.
--- drivers/iommu/mtk_iommu.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +25 -4
@@ -33,6 +33,7 @@#define REG_MMU_PT_BASE_ADDR 0x000#define MMU_PT_ADDR_MASK GENMASK(31, 7) +#define MMU_PT_ADDR_2_0_MASK GENMASK(2, 0)#define REG_MMU_INVALIDATE 0x020#define F_ALL_INVLD 0x2
@@ -118,6 +119,7 @@#define WR_THROT_EN BIT(6)#define HAS_LEGACY_IVRP_PADDR BIT(7)#define IOVA_34_EN BIT(8) +#define PGTABLE_PA_35_EN BIT(9)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -401,6 +403,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
@@ -450,6 +455,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct mtk_iommu_domain *dom =to_mtk_domain (domain);struct device *m4udev = data->dev;int ret, domid; +u32 regval; domid =mtk_iommu_get_domain_id (dev, data->plat_data);if (domid <0 )
@@ -472,8 +478,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,return ret; } data->m4u_dom = dom; -writel (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , - data->base +REG_MMU_PT_BASE_ADDR ); + +/* Bits[6:3] are invalid for mediatek platform */ +if (MTK_IOMMU_HAS_FLAG (data->plat_data,PGTABLE_PA_35_EN )) + regval = (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK ) | + (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_2_0_MASK ); +else + regval = dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK ; +writel (regval, data->base +REG_MMU_PT_BASE_ADDR );pm_runtime_put (m4udev); }
@@ -987,6 +999,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)struct mtk_iommu_suspend_reg *reg = &data->reg;struct mtk_iommu_domain *m4u_dom = data->m4u_dom;void __iomem *base = data->base; +u32 regval;int ret; ret =clk_prepare_enable (data->bclk);
@@ -1010,7 +1023,14 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)writel_relaxed (reg->int_main_control, base +REG_MMU_INT_MAIN_CONTROL );writel_relaxed (reg->ivrp_paddr, base +REG_MMU_IVRP_PADDR );writel_relaxed (reg->vld_pa_rng, base +REG_MMU_VLD_PA_RNG ); -writel (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , base +REG_MMU_PT_BASE_ADDR ); + +/* Bits[6:3] are invalid for mediatek platform */ +if (MTK_IOMMU_HAS_FLAG (data->plat_data,PGTABLE_PA_35_EN )) + regval = (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK ) | + (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_2_0_MASK ); +else + regval = m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK ; +writel (regval, base +REG_MMU_PT_BASE_ADDR );/* * Users may allocate dma buffer before they call pm_runtime_get,
@@ -1038,7 +1058,8 @@ 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 |OUT_ORDER_WR_EN |WR_THROT_EN , + .flags =HAS_SUB_COMM |OUT_ORDER_WR_EN |WR_THROT_EN | +PGTABLE_PA_35_EN , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Yong Wu
maintainerRe: [PATCH v5 2/2] iommu/mediatek: Allow page table PA up to 35bit
Quoted 5 lines · On Mon, 2022-05-16 at 22:16 +0800, [email protected] wrote:
From: Yunfei Wang <[email protected]>
Add the quirk
IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXTsupport, so that allows
page table PA up to 35bit, not only inZONE_DMA32.
Comment why this is needed.
e.g. For single normal zone.
Quoted 61 lines
Signed-off-by Ning Li <[email protected]>Signed-off-by Yunfei Wang <[email protected]>--- drivers/iommu/mtk_iommu.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)drivers/iommu/mtk_iommu.c +5
-0@@ -33,6 +33,7 @@#define REG_MMU_PT_BASE_ADDR 0x000#define MMU_PT_ADDR_MASK GENMASK(31, 7) +#define MMU_PT_ADDR_2_0_MASK GENMASK(2, 0)#define REG_MMU_INVALIDATE 0x020#define F_ALL_INVLD 0x2@@ -118,6 +119,7 @@#define WR_THROT_EN BIT(6)#define HAS_LEGACY_IVRP_PADDR BIT(7)#define IOVA_34_EN BIT(8) +#define PGTABLE_PA_35_EN BIT(9)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))@@ -401,6 +403,9 @@ static int mtk_iommu_domain_finalise(structmtk_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 ;drivers/iommu/mtk_iommu.c +1
-0else @@ -450,6 +455,7 @@ static int mtk_iommu_attach_device(structiommu_domain *domain, struct mtk_iommu_domain *dom = to_mtk_domain(domain);struct device *m4udev = data->dev;int ret, domid; +u32 regval; domid =mtk_iommu_get_domain_id (dev, data->plat_data);drivers/iommu/mtk_iommu.c +4
-2if (domid <0 )@@ -472,8 +478,14 @@ static int mtk_iommu_attach_device(structiommu_domain *domain, return ret; } data->m4u_dom = dom; -writel (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , - data->base +REG_MMU_PT_BASE_ADDR ); + +/* Bits[6:3] are invalid for mediatek platform */ +if (MTK_IOMMU_HAS_FLAG (data->plat_data,PGTABLE_PA_35_EN )) + regval = (dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_MASK) |drivers/iommu/mtk_iommu.c +1
-0+ (dom->cfg.arm_v7s_cfg.ttbr &
Quoted 1 line
MMU_PT_ADDR_2_0_MASK);
The bits[2:0] has already handled in ARM_V7S_TTBR_35BIT_PA of patch[1/2], we need calculate it again here?
1) Extend arm_v7s_cfg.ttbr to u64, then we could put the special ttbr logical into our file.
2) if 1) is not allowed, We have to put this in v7s.
if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT) {
cfg->arm_v7s_cfg.ttbr = (paddr & GENMASK(31, 7)) |
upper_32_bits(paddr);
return &data->iop;
}This need Robin/Will confirm.
Quoted 3 lines
drivers/iommu/mtk_iommu.c +2
-0+else + regval = dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_MASK;
Save this value to our data. then we don't need calculate it again in the resume cb.
Quoted 46 lines
drivers/iommu/mtk_iommu.c +2
-0+writel (regval, data->base +REG_MMU_PT_BASE_ADDR );pm_runtime_put (m4udev); }@@ -987,6 +999,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev) struct mtk_iommu_suspend_reg *reg = &data->reg;struct mtk_iommu_domain *m4u_dom = data->m4u_dom;void __iomem *base = data->base; +u32 regval;int ret;drivers/iommu/mtk_iommu.c +4
-1ret =clk_prepare_enable (data->bclk);@@ -1010,7 +1023,14 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev) writel_relaxed(reg->int_main_control, base +REG_MMU_INT_MAIN_CONTROL );writel_relaxed (reg->ivrp_paddr, base +REG_MMU_IVRP_PADDR );writel_relaxed (reg->vld_pa_rng, base +REG_MMU_VLD_PA_RNG ); -writel (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , base + REG_MMU_PT_BASE_ADDR); + +/* Bits[6:3] are invalid for mediatek platform */ +if (MTK_IOMMU_HAS_FLAG (data->plat_data,PGTABLE_PA_35_EN )) + regval = (m4u_dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_MASK) |drivers/iommu/mtk_iommu.c +1
-0+ (m4u_dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_2_0_MASK);drivers/iommu/mtk_iommu.c +2
-0+else + regval = m4u_dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_MASK;drivers/iommu/mtk_iommu.c +1
-0+writel (regval, base +REG_MMU_PT_BASE_ADDR );/* * Users may allocate dma buffer before they call
pm_runtime_get,drivers/iommu/mtk_iommu.c +2
-1@@ -1038,7 +1058,8 @@ 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 |OUT_ORDER_WR_EN |WR_THROT_EN , + .flags =HAS_SUB_COMM |OUT_ORDER_WR_EN |WR_THROT_EN | +PGTABLE_PA_35_EN , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = single_domain,
Quoted 1 line
.iova_region_nr =
ARRAY_SIZE(single_domain),
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 2/2] iommu/mediatek: Allow page table PA up to 35bit
Quoted 11 lines · Yong Wu
Quoted 5 lines · On Mon, 2022-05-16 at 22:16 +0800, [email protected] wrote:
From: Yunfei Wang <[email protected]>
Add the quirk
IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXTsupport, so that allows
page table PA up to 35bit, not only inZONE_DMA32.Comment why this is needed.
e.g. For single normal zone.
Hi Yong,
There is no DMA32 zone in some mediatek smartphone chip for single normal zone.
The level 1 and level 2 pgtable are both allocated in ZONE_DMA32, and may have two possible problem:
1.The level 2 pgtable is allocated in ZONE_DMA32 with atomic flag, and it may fail if ZONE_DMA32 memory is used out. 2.Single memory feature will make ZONE_DMA32 empty, and cause level 1 and level 2 pgtable PA more than 32bit.
Solution:
Add the quirk IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT support, so that level 1 and level 2 pgtable can support at most 35bit PA.
I will update the commit message in next version.
Thanks,
Yunfei.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 2/2] iommu/mediatek: Allow page table PA up to 35bit
In reply to Yong WuQuoted 11 lines · Yong Wu
Quoted 5 lines · On Mon, 2022-05-16 at 22:16 +0800, [email protected] wrote:
From: Yunfei Wang <[email protected]>
Add the quirk
IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXTsupport, so that allows
page table PA up to 35bit, not only inZONE_DMA32.Comment why this is needed.
e.g. For single normal zone.
Hi Yong,
There is no DMA32 zone in some mediatek smartphone chip for single normal zone.
The level 1 and level 2 pgtable are both allocated in ZONE_DMA32, and may have two possible problem:
1.The level 2 pgtable is allocated in ZONE_DMA32 with atomic flag,
and it may fail if ZONE_DMA32 memory is used out.
2.Single memory feature will make ZONE_DMA32 empty, and cause level
1 and level 2 pgtable PA more than 32bit.
Solution:
Add the quirk IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT support, so that level 1 and level 2 pgtable can support at most 35bit PA.
I had updated the commit message in V7 version.
Quoted 18 lines
Quoted 11 lines
drivers/iommu/mtk_iommu.c +3
-2data->m4u_dom = dom; -writel (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , - data->base +REG_MMU_PT_BASE_ADDR ); + +/* Bits[6:3] are invalid for mediatek platform */ + if (MTK_IOMMU_HAS_FLAG(data->plat_data,
PGTABLE_PA_35_EN))(quoted diff) +1
-0+ regval = (dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_MASK) |(quoted diff) +1
-0+ (dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_2_0_MASK);The bits[2:0] has already handled in
ARM_V7S_TTBR_35BIT_PAof patch[1/2], we need calculate it again here?1) Extend arm_v7s_cfg.ttbr to u64, then we could put the special ttbr logical into our file.
Quoted 9 lines
2) if 1) is not allowed, We have to put this in v7s.
if (cfg->quirks & IO_PGTABLE_QUIRK_ARM_MTK_TTBR_EXT) { cfg->arm_v7s_cfg.ttbr = (paddr & GENMASK(31, 7)) | upper_32_bits(paddr); return &data->iop; }This need Robin/Will confirm.
Hi Yong,
V7 version had extended arm_v7s_cfg.ttbr to u64, then put the special ttbr logical into MediaTek file.
Quoted 7 lines
Quoted 3 lines
(quoted diff) +2
-0+ else + regval = dom->cfg.arm_v7s_cfg.ttbr &
MMU_PT_ADDR_MASK;Save this value to our data. then we don't need calculate it again in the resume cb.
Hi Yong,
V8 version will Save the special ttbr to mtk_iommu_domain avoid calculate it again.
Thanks,
Yunfei.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu