dt-bindings: mediatek: add mediatek,infracfg phandle
Subsystems (4)
PATCH 1/4 dt-bindings: mediatek: add mediatek,infracfg phandle
Add a description for mediatek,infracfg. We can check if 4GB mode is enable by reading it instead of checking the unexported symbol "max_pfn".
This is a step towards building mtk_iommu as a kernel module.
--- Documentation/devicetree/bindings/iommu/mediatek,iommu.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +2 -0
@@ -74,6 +74,8 @@ Required properties: - mediatek,larbs : List of phandle to the local arbiters in the current Socs. Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort according to the local arbiter index, like larb0, larb1, larb2... +- mediatek,infracfg: a phandle to infracfg. It is used to confirm if 4GB mode is set. + It is an optional property, add it when the SoC have 4g mode. - iommu-cells : must be 1. This is the mtk_m4u_id according to the HW. Specifies the mtk_m4u_id as defined in dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 2/4 arm64: dts: mt2712: add mediatek,infracfg to iommu
Add mediatek,infracfg to iommu node.
--- arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/mediatek/mt2712e.dtsi +1 -0
@@ -331,6 +331,7 @@ clock-names = "bclk"; mediatek,larbs = <&larb0 &larb1 &larb2 &larb3 &larb6>; + mediatek,infracfg = <&infracfg>; #iommu-cells = <1>; };
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 3/4 arm64: dts: mt8173: add mediatek,infracfg to iommu
In reply to Miles ChenAdd mediatek,infracfg to iommu node.
--- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/mediatek/mt8173.dtsi +1 -0
@@ -524,6 +524,7 @@ clock-names = "bclk"; mediatek,larbs = <&larb0 &larb1 &larb2 &larb3 &larb4 &larb5>; + mediatek,infracfg = <&infracfg>; #iommu-cells = <1>; };
Signature · 1 line
2.18.0
PATCH 4/4 iommu/mediatek: check 4GB mode by reading infracfg
In reply to Miles ChenIn previous disscusion [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 unexported symbol max_pfn.
[1] https://lkml.org/lkml/2020/6/3/733
[2] https://lkml.org/lkml/2020/6/4/136
--- drivers/iommu/mtk_iommu.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +18 -4
@@ -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,11 +14,13 @@#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 <asm/barrier.h>
@@ -91,6 +92,9 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f) +#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +#define MTK_PROTECT_PA_ALIGN 128/*
@@ -599,8 +603,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg_regmap;void *protect;int i, larb_nr, ret; +u32 val; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)
@@ -614,10 +620,18 @@ 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 (!data->plat_data->has_4gb_mode) +if (data->plat_data->has_4gb_mode) { + infracfg_regmap =syscon_regmap_lookup_by_phandle (dev->of_node, +"mediatek,infracfg" ); +if (IS_ERR (infracfg_regmap)) +return PTR_ERR (infracfg_regmap); + ret =regmap_read (infracfg_regmap,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + }else { data->enable_4GB = false; + } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH 4/4] iommu/mediatek: check 4GB mode by reading infracfg
Quoted 46 lines · Miles Chen
In previous disscusion [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 unexported symbol
max_pfn.[1] https://lkml.org/lkml/2020/6/3/733
[2] https://lkml.org/lkml/2020/6/4/136Cc Mike Rapoport <[email protected]>Cc David Hildenbrand <[email protected]>Cc Yong Wu <[email protected]>Cc Yingjoe Chen <[email protected]>Cc Christoph Hellwig <[email protected]>Signed-off-by Miles Chen <[email protected]>--- drivers/iommu/mtk_iommu.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)drivers/iommu/mtk_iommu.c +2
-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,11 +14,13 @@#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 <asm/barrier.h>
drivers/iommu/mtk_iommu.c line 97
Quoted 6 lines
drivers/iommu/mtk_iommu.c +3
-0@@ -91,6 +92,9 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f) +#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +
As this is used for infracfg, I think it would be good to add it to include/linux/soc/mediatek/infracfg.h and include that file here.
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 606
Quoted 8 lines
drivers/iommu/mtk_iommu.c +1
-0#define MTK_PROTECT_PA_ALIGN 128/* @@ -599,8 +603,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg_regmap;
Maybe call it just infracfg.
Quoted 8 lines
drivers/iommu/mtk_iommu.c +1
-0void *protect;int i, larb_nr, ret; +u32 val; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -614,10 +620,18 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ;
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 627
Quoted 10 lines
drivers/iommu/mtk_iommu.c +5
-3data->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 (!data->plat_data->has_4gb_mode) +if (data->plat_data->has_4gb_mode) { + infracfg_regmap =syscon_regmap_lookup_by_phandle (dev->of_node, +"mediatek,infracfg" ); +if (IS_ERR (infracfg_regmap)) +return PTR_ERR (infracfg_regmap);
Do we need to error out, or could we be conservative and set endable_4GB = false?
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 633
Quoted 6 lines
drivers/iommu/mtk_iommu.c +5
-0+ ret =regmap_read (infracfg_regmap,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + }else { data->enable_4GB = false;
Move that before the if() and update enable_4GB only in case of has_4gb_mode.
Quoted 5 lines
drivers/iommu/mtk_iommu.c +1
-0+ } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);
Re: [PATCH 4/4] iommu/mediatek: check 4GB mode by reading infracfg
Quoted 51 lines · Matthias Brugger
Quoted 49 lines · Miles Chen
In previous disscusion [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 unexported symbol
max_pfn.[1] https://urldefense.com/v3/__https://lkml.org/lkml/2020/6/3/733__;!!CTRNKA9wMg0ARbw!16gAfVnSY87W4t5kE4iw20QPxBgS_SHBvPKlePKU7CGIb18nUzuRUjHumcf4oYVhIQ$
[2] https://urldefense.com/v3/__https://lkml.org/lkml/2020/6/4/136__;!!CTRNKA9wMg0ARbw!16gAfVnSY87W4t5kE4iw20QPxBgS_SHBvPKlePKU7CGIb18nUzuRUjHumcfr4i9p5g$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]>Signed-off-by Miles Chen <[email protected]>--- drivers/iommu/mtk_iommu.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)drivers/iommu/mtk_iommu.c +2
-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,11 +14,13 @@#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 <asm/barrier.h> @@ -91,6 +92,9 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f)
Quoted 6 lines
drivers/iommu/mtk_iommu.c line 97
Quoted 3 lines
drivers/iommu/mtk_iommu.c +3
-0+#define REG_INFRA_MISC 0xf00 +#define F_DDR_4GB_SUPPORT_EN BIT(13) +As this is used for infracfg, I think it would be good to add it to
include/linux/soc/mediatek/infracfg.hand include that file here.
Thanks for your comment.
ok. I'll do this in next version.
Quoted 11 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 606
Quoted 9 lines
drivers/iommu/mtk_iommu.c +1
-0#define MTK_PROTECT_PA_ALIGN 128/* @@ -599,8 +603,10 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ; +struct regmap *infracfg_regmap;Maybe call it just infracfg.
ok. I'll do this in next version.
Quoted 11 lines
Quoted 11 lines
drivers/iommu/mtk_iommu.c +1
-0void *protect;int i, larb_nr, ret; +u32 val; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)@@ -614,10 +620,18 @@ static int mtk_iommu_probe(struct platform_device *pdev)return -ENOMEM ; data->protect_base =ALIGN (virt_to_phys (protect),MTK_PROTECT_PA_ALIGN );
Quoted 10 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 627
Quoted 8 lines
drivers/iommu/mtk_iommu.c +5
-3-/* Whether the current dram is over 4GB */ - data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!data->plat_data->has_4gb_mode) +if (data->plat_data->has_4gb_mode) { + infracfg_regmap =syscon_regmap_lookup_by_phandle (dev->of_node, +"mediatek,infracfg" ); +if (IS_ERR (infracfg_regmap)) +return PTR_ERR (infracfg_regmap);Do we need to error out, or could we be conservative and set
endable_4GB= false?
We have to error out in this case because the 4gb_mode setting must be consistent with the h/w setting.
Quoted 9 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_probe(struct platform_device *pdev) · line 633
Quoted 7 lines
drivers/iommu/mtk_iommu.c +5
-0+ ret =regmap_read (infracfg_regmap,REG_INFRA_MISC , &val); +if (ret) +return ret; + data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); + }else { data->enable_4GB = false;Move that before the
if()and updateenable_4GBonly in case ofhas_4gb_mode.
ok. I'll do this in next version.
Miles
Quoted 6 lines
Quoted 6 lines
drivers/iommu/mtk_iommu.c +1
-0+ } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); data->base =devm_ioremap_resource (dev, res);
Rob Herring
maintainerQuoted 5 lines · Miles Chen
Add a description for mediatek,infracfg. We can check if 4GB mode is enable by reading it instead of checking the unexported symbol "
max_pfn".This is a step towards building
mtk_iommuas a kernel module.
You determined this before without DT, so it is an OS problem and shouldn't need a DT update.
I'd assume there's only one instance of the node mediatek,infracfg points to, so just search for it if you want to get the info from DT.
Quoted 22 lines
Cc Yong Wu <[email protected]>Signed-off-by Miles Chen <[email protected]>--- Documentation/devicetree/bindings/iommu/mediatek,iommu.txt | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +2
-0@@ -74,6 +74,8 @@ Required properties: - mediatek,larbs : List of phandle to the local arbiters in the current Socs. Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort according to the local arbiter index, like larb0, larb1, larb2... +- mediatek,infracfg: a phandle to infracfg. It is used to confirm if 4GB mode is set. + It is an optional property, add it when the SoC have 4g mode. - iommu-cells : must be 1. This is the mtk_m4u_id according to the HW. Specifies the mtk_m4u_id as defined in dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623Signature · 1 line
2.18.0
Quoted 9 lines · Rob Herring
Quoted 5 lines · Miles Chen
Add a description for mediatek,infracfg. We can check if 4GB mode is enable by reading it instead of checking the unexported symbol "
max_pfn".This is a step towards building
mtk_iommuas a kernel module.You determined this before without DT, so it is an OS problem and shouldn't need a DT update.
Thanks for your comment.
The old way (using max_pfn) do determine this is risky because the max_pfn may lower than (GB if reserved memory regions occupy memory higher than 4GB.
So, the better way to do this is by reading register from H/W.
Quoted 4 lines
I'd assume there's only one instance of the node mediatek,infracfg points to, so just search for it if you want to get the info from DT.
I can do syscon_regmap_lookup_by_compatible() to search for it. However, the compatibles are different in mt2712e.dtsi and mt8173.dtsi. so I have to search "mediatek,mt2712-infracfg" and "mediatek,mt8173-infracfg" respectively.
Using mediatek,infracfg phandle can make the code easier to read. Is it possible to reconsider the phandle approach, please?
arch/arm64/boot/dts/mediatek/mt2712e.dtsi:253:
infracfg: syscon@10001000 {
compatible = "mediatek,mt2712-infracfg", "syscon"; arch/arm64/boot/dts/mediatek/mt8173.dtsi:363:
infracfg: power-controller@10001000 { compatible = "mediatek,mt8173-infracfg", "syscon";
Quoted 23 lines
Quoted 23 lines
Cc Yong Wu <[email protected]>Signed-off-by Miles Chen <[email protected]>--- Documentation/devicetree/bindings/iommu/mediatek,iommu.txt | 2 ++ 1 file changed, 2 insertions(+)Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +2
-0@@ -74,6 +74,8 @@ Required properties: - mediatek,larbs : List of phandle to the local arbiters in the current Socs. Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort according to the local arbiter index, like larb0, larb1, larb2... +- mediatek,infracfg: a phandle to infracfg. It is used to confirm if 4GB mode is set. + It is an optional property, add it when the SoC have 4g mode. - iommu-cells : must be 1. This is the mtk_m4u_id according to the HW. Specifies the mtk_m4u_id as defined in dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623Signature · 1 line
2.18.0