iommu/mediatek: check 4GB mode by reading infracfg
Subsystems (3)
PATCH RESEND v4 1/1 iommu/mediatek: check 4GB mode by reading infracfg
In previous discussion [1] and [2], we found that it is risky to use max_pfn or totalram_pages to tell if 4GB mode is enabled.
Check 4GB mode by reading infracfg register, remove the usage of the un-exported symbol max_pfn.
This is a step towards building mtk_iommu as a kernel module.
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://lore.kernel.org/lkml/20200715205120.GA778876@bogus/
---
Change since v3
- use lore.kernel.org links
- move "change since..." after "---"
Change since v2:
- determine compatible string by m4u_plat
- rebase to next-20200720
- add "---"
Change since v1:
- remove the phandle usage, search for infracfg instead [3]
- use infracfg instead of infracfg_regmap
- move infracfg definitaions to linux/soc/mediatek/infracfg.h
- update enable_4GB only when has_4gb_mode
--- drivers/iommu/mtk_iommu.c | 34 +++++++++++++++++++++++---- include/linux/soc/mediatek/infracfg.h | 3 +++ 2 files changed, 32 insertions(+), 5 deletions(-)
drivers/iommu/mtk_iommu.c +29 -5
@@ -3,7 +3,6 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#include <linux/memblock.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h>
@@ -15,13 +14,16 @@#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/list.h> +#include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/of_iommu.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/soc/mediatek/infracfg.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h>
@@ -640,8 +642,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg;void *protect;int i, larb_nr, ret; +u32 val; +char *p; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)
@@ -655,10 +660,29 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ; data->protect_base =ALIGN (virt_to_phys (protect),MTK_PROTECT_PA_ALIGN ); -/* Whether the current dram is over 4GB */ - data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) - data->enable_4GB = false; + data->enable_4GB = false; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) { +switch (data->plat_data->m4u_plat) { +case M4U_MT2712 : + p ="mediatek,mt2712-infracfg" ; +break ; +case M4U_MT8173 : + p ="mediatek,mt8173-infracfg" ; +break ; +default : + p =NULL ; + } + + infracfg =syscon_regmap_lookup_by_compatible (p); + +if (IS_ERR (infracfg)) +return PTR_ERR (infracfg); + + ret =regmap_read (infracfg,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);
include/linux/soc/mediatek/infracfg.h +3 -0
@@ -32,6 +32,9 @@#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ BIT(7) | BIT(8)) +#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask,bool reg_update); int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 94 lines · Miles Chen
In previous discussion [1] and [2], we found that it is risky to use
max_pfnortotalram_pagesto tell if 4GB mode is enabled.Check 4GB mode by reading infracfg register, remove the usage of the un-exported symbol
max_pfn.This is a step towards building
mtk_iommuas a kernel module.[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://lore.kernel.org/lkml/20200715205120.GA778876@bogus/Cc Mike Rapoport <[email protected]>Cc David Hildenbrand <[email protected]>Cc Yong Wu <[email protected]>Cc Yingjoe Chen <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Rob Herring <[email protected]>Cc Matthias Brugger <[email protected]>Signed-off-by Miles Chen <[email protected]>---
Change since v3
- use lore.kernel.org links
- move "change since..." after "---"Change since v2:
- determine compatible string bym4u_plat
- rebase to next-20200720
- add "---"Change since v1:
- remove the phandle usage, search for infracfg instead [3]
- use infracfg instead ofinfracfg_regmap
- move infracfg definitaions tolinux/soc/mediatek/infracfg.h
- updateenable_4GBonly whenhas_4gb_mode--- drivers/iommu/mtk_iommu.c | 34 +++++++++++++++++++++++---- include/linux/soc/mediatek/infracfg.h | 3 +++ 2 files changed, 32 insertions(+), 5 deletions(-)drivers/iommu/mtk_iommu.c +9
-5@@ -3,7 +3,6 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#include <linux/memblock.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h> @@ -15,13 +14,16 @@#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/list.h> +#include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/of_iommu.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/soc/mediatek/infracfg.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h> @@ -640,8 +642,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg;void *protect;int i, larb_nr, ret; +u32 val; +char *p; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -655,10 +660,29 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ; data->protect_base =ALIGN (virt_to_phys (protect),MTK_PROTECT_PA_ALIGN ); -/* Whether the current dram is over 4GB */ - data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) - data->enable_4GB = false; + data->enable_4GB = false; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) { +switch (data->plat_data->m4u_plat) {
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 675
Quoted 10 lines
drivers/iommu/mtk_iommu.c +10
-0+case M4U_MT2712 : + p ="mediatek,mt2712-infracfg" ; +break ; +case M4U_MT8173 : + p ="mediatek,mt8173-infracfg" ; +break ; +default : + p =NULL ; + } +
This can be simplified:
if (data->plat_data->m4u_plat == M4U_MT2712) p = "mediatek,mt2712-infracfg"; else if(data->plat_data->m4u_plat == M4U_MT8173) p = "mediatek,mt8173-infracfg"; else return -EINVAL;
Then,
Quoted 18 lines
drivers/iommu/mtk_iommu.c +10
-0+ infracfg =syscon_regmap_lookup_by_compatible (p); + +if (IS_ERR (infracfg)) +return PTR_ERR (infracfg); + + ret =regmap_read (infracfg,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);include/linux/soc/mediatek/infracfg.h +0
-0
include/linux/soc/mediatek/infracfg.h line 40
Quoted 9 lines
include/linux/soc/mediatek/infracfg.h +3
-0@@ -32,6 +32,9 @@#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ BIT(7) | BIT(8)) +#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask,bool reg_update); int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerQuoted 88 lines · Yong Wu
Quoted 87 lines · Miles Chen
In previous discussion [1] and [2], we found that it is risky to use
max_pfnortotalram_pagesto tell if 4GB mode is enabled.Check 4GB mode by reading infracfg register, remove the usage of the un-exported symbol
max_pfn.This is a step towards building
mtk_iommuas a kernel module.[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://lore.kernel.org/lkml/20200715205120.GA778876@bogus/Cc Mike Rapoport <[email protected]>Cc David Hildenbrand <[email protected]>Cc Yong Wu <[email protected]>Cc Yingjoe Chen <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Rob Herring <[email protected]>Cc Matthias Brugger <[email protected]>Signed-off-by Miles Chen <[email protected]>---
Change since v3
- use lore.kernel.org links
- move "change since..." after "---"Change since v2:
- determine compatible string bym4u_plat
- rebase to next-20200720
- add "---"Change since v1:
- remove the phandle usage, search for infracfg instead [3]
- use infracfg instead ofinfracfg_regmap
- move infracfg definitaions tolinux/soc/mediatek/infracfg.h
- updateenable_4GBonly whenhas_4gb_mode--- drivers/iommu/mtk_iommu.c | 34 +++++++++++++++++++++++---- include/linux/soc/mediatek/infracfg.h | 3 +++ 2 files changed, 32 insertions(+), 5 deletions(-)drivers/iommu/mtk_iommu.c +6
-1@@ -3,7 +3,6 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#include <linux/memblock.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h> @@ -15,13 +14,16 @@#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/list.h> +#include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/of_iommu.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/soc/mediatek/infracfg.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h> @@ -640,8 +642,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg;void *protect;int i, larb_nr, ret; +u32 val; +char *p; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -655,10 +660,29 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ; data->protect_base =ALIGN (virt_to_phys (protect),MTK_PROTECT_PA_ALIGN );
Quoted 5 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 663
Quoted 5 lines
drivers/iommu/mtk_iommu.c +1
-4-/* Whether the current dram is over 4GB */ - data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) - data->enable_4GB = false; + data->enable_4GB = false;
Nit: this isn't really necessary, since the structure is kzalloc()ed.
Quoted 15 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 675
Quoted 12 lines
drivers/iommu/mtk_iommu.c +12
-0+if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) { +switch (data->plat_data->m4u_plat) { +case M4U_MT2712 : + p ="mediatek,mt2712-infracfg" ; +break ; +case M4U_MT8173 : + p ="mediatek,mt8173-infracfg" ; +break ; +default : + p =NULL ; + } +This can be simplified:
Quoted 6 lines
if (data->plat_data->m4u_plat == M4U_MT2712) p = "mediatek,mt2712-infracfg"; else if(data->plat_data->m4u_plat == M4U_MT8173) p = "mediatek,mt8173-infracfg"; else return -EINVAL;
Right, at this point the HAS_4GB_MODE flag is entirely redundant and should be removed. FWIW I still think your suggestion of putting the infracfg names into plat_data would be even better and cleaner - there's plenty of precedent for that sort of thing (see "git grep '\.clk_name'" for example).
Robin.
Quoted 38 lines
Then,
Reviewed-by Yong Wu <[email protected]>Quoted 18 lines
drivers/iommu/mtk_iommu.c +10
-0+ infracfg =syscon_regmap_lookup_by_compatible (p); + +if (IS_ERR (infracfg)) +return PTR_ERR (infracfg); + + ret =regmap_read (infracfg,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);include/linux/soc/mediatek/infracfg.h +0
-0include/linux/soc/mediatek/infracfg.h line 40
Quoted 9 lines
include/linux/soc/mediatek/infracfg.h +3
-0@@ -32,6 +32,9 @@#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ BIT(7) | BIT(8)) +#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask,bool reg_update); int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 89 lines · Robin Murphy
Quoted 88 lines · Yong Wu
Quoted 87 lines · Miles Chen
In previous discussion [1] and [2], we found that it is risky to use
max_pfnortotalram_pagesto tell if 4GB mode is enabled.Check 4GB mode by reading infracfg register, remove the usage of the un-exported symbol
max_pfn.This is a step towards building
mtk_iommuas a kernel module.[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://lore.kernel.org/lkml/20200715205120.GA778876@bogus/Cc Mike Rapoport <[email protected]>Cc David Hildenbrand <[email protected]>Cc Yong Wu <[email protected]>Cc Yingjoe Chen <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Rob Herring <[email protected]>Cc Matthias Brugger <[email protected]>Signed-off-by Miles Chen <[email protected]>---
Change since v3
- use lore.kernel.org links
- move "change since..." after "---"Change since v2:
- determine compatible string bym4u_plat
- rebase to next-20200720
- add "---"Change since v1:
- remove the phandle usage, search for infracfg instead [3]
- use infracfg instead ofinfracfg_regmap
- move infracfg definitaions tolinux/soc/mediatek/infracfg.h
- updateenable_4GBonly whenhas_4gb_mode--- drivers/iommu/mtk_iommu.c | 34 +++++++++++++++++++++++---- include/linux/soc/mediatek/infracfg.h | 3 +++ 2 files changed, 32 insertions(+), 5 deletions(-)drivers/iommu/mtk_iommu.c +6
-1@@ -3,7 +3,6 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#include <linux/memblock.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h> @@ -15,13 +14,16 @@#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/list.h> +#include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/of_iommu.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/soc/mediatek/infracfg.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h> @@ -640,8 +642,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg;void *protect;int i, larb_nr, ret; +u32 val; +char *p; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -655,10 +660,29 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ; data->protect_base =ALIGN (virt_to_phys (protect),MTK_PROTECT_PA_ALIGN );
Quoted 7 lines
Quoted 5 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 663
Quoted 5 lines
drivers/iommu/mtk_iommu.c +1
-4-/* Whether the current dram is over 4GB */ - data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) - data->enable_4GB = false; + data->enable_4GB = false;Nit: this isn't really necessary, since the structure is kzalloc()ed.
Thanks for the comment, I will remove this this in v5.
Quoted 23 lines
Quoted 16 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 675
Quoted 13 lines
drivers/iommu/mtk_iommu.c +12
-0+if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) { +switch (data->plat_data->m4u_plat) { +case M4U_MT2712 : + p ="mediatek,mt2712-infracfg" ; +break ; +case M4U_MT8173 : + p ="mediatek,mt8173-infracfg" ; +break ; +default : + p =NULL ; + } +This can be simplified:
Quoted 6 lines
if (data->plat_data->m4u_plat == M4U_MT2712) p = "mediatek,mt2712-infracfg"; else if(data->plat_data->m4u_plat == M4U_MT8173) p = "mediatek,mt8173-infracfg"; else return -EINVAL;
Quoted 7 lines
Right, at this point the
HAS_4GB_MODEflag is entirely redundant and should be removed. FWIW I still think your suggestion of putting the infracfg names intoplat_datawould be even better and cleaner - there's plenty of precedent for that sort of thing (see "git grep '\.clk_name'" for example).Robin.
hmm, I have no strong opinion about this. We have discussed this approach before and built this patch based on the discussion.
https://lore.kernel.org/patchwork/patch/1276801/
Miles
Quoted 27 lines
Quoted 27 lines
Then,
Reviewed-by Yong Wu <[email protected]>Quoted 21 lines
drivers/iommu/mtk_iommu.c +10
-0+ infracfg =syscon_regmap_lookup_by_compatible (p); + +if (IS_ERR (infracfg)) +return PTR_ERR (infracfg); + + ret =regmap_read (infracfg,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);include/linux/soc/mediatek/infracfg.h +0
-0@@ -32,6 +32,9 @@#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ BIT(7) | BIT(8))
Quoted 12 lines
Quoted 12 lines
include/linux/soc/mediatek/infracfg.h line 40
Quoted 6 lines
include/linux/soc/mediatek/infracfg.h +3
-0+#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask,bool reg_update); int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 12 lines · Miles Chen
In previous discussion [1] and [2], we found that it is risky to use
max_pfnortotalram_pagesto tell if 4GB mode is enabled.Check 4GB mode by reading infracfg register, remove the usage of the un-exported symbol
max_pfn.This is a step towards building
mtk_iommuas a kernel module.[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://lore.kernel.org/lkml/20200715205120.GA778876@bogus/
Quoted 8 lines
Cc Mike Rapoport <[email protected]>Cc David Hildenbrand <[email protected]>Cc Yong Wu <[email protected]>Cc Yingjoe Chen <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Rob Herring <[email protected]>Cc Matthias Brugger <[email protected]>Signed-off-by Miles Chen <[email protected]>
Quoted 112 lines
---
Change since v3
- use lore.kernel.org links
- move "change since..." after "---"Change since v2:
- determine compatible string bym4u_plat
- rebase to next-20200720
- add "---"Change since v1:
- remove the phandle usage, search for infracfg instead [3]
- use infracfg instead ofinfracfg_regmap
- move infracfg definitaions tolinux/soc/mediatek/infracfg.h
- updateenable_4GBonly whenhas_4gb_mode--- drivers/iommu/mtk_iommu.c | 34 +++++++++++++++++++++++---- include/linux/soc/mediatek/infracfg.h | 3 +++ 2 files changed, 32 insertions(+), 5 deletions(-)drivers/iommu/mtk_iommu.c +29
-5@@ -3,7 +3,6 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#include <linux/memblock.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h> @@ -15,13 +14,16 @@#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/list.h> +#include <linux/mfd/syscon.h> #include <linux/of_address.h> #include <linux/of_iommu.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/soc/mediatek/infracfg.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h> @@ -640,8 +642,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg;void *protect;int i, larb_nr, ret; +u32 val; +char *p; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -655,10 +660,29 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ; data->protect_base =ALIGN (virt_to_phys (protect),MTK_PROTECT_PA_ALIGN ); -/* Whether the current dram is over 4GB */ - data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) - data->enable_4GB = false; + data->enable_4GB = false; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) { +switch (data->plat_data->m4u_plat) { +case M4U_MT2712 : + p ="mediatek,mt2712-infracfg" ; +break ; +case M4U_MT8173 : + p ="mediatek,mt8173-infracfg" ; +break ; +default : + p =NULL ; + } + + infracfg =syscon_regmap_lookup_by_compatible (p); + +if (IS_ERR (infracfg)) +return PTR_ERR (infracfg); + + ret =regmap_read (infracfg,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);include/linux/soc/mediatek/infracfg.h +3
-0@@ -32,6 +32,9 @@#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ BIT(7) | BIT(8)) +#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +int mtk_infracfg_set_bus_protection (struct regmap *infracfg,u32 mask,bool reg_update); int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,