T2080 l2-cache-controller compatible string overwritten by ft_fixup_l2cache
Hi,
I was just looking at what it would take to add the T2080 L2 cache to the mpc85xx_edac driver in Linux. At a cursory glance all the registers appear to be there so I figured I'd just add the appropriate entry to the of match table.
To my surprise I found that the compatible string in my device tree was overwritten with "cache". I've tracked this down to the CONFIG_SYS_FSL_QORIQ_CHASSIS2 implementation of ft_fixup_l2cache in u-boot.
The CONFIG_L2_CACHE version seems to take care to update the device tree node to
compatible = "fsl,t2080-l2-cache-controller", "cache";
but the CONFIG_SYS_FSL_QORIQ_CHASSIS2 version just sets this to
compatible = "cache";
Is this an over-site or is it intentional?
Thanks,
Chris
Quoted 14 lines · Chris Packham
Hi,
I was just looking at what it would take to add the T2080 L2 cache to the
mpc85xx_edacdriver in Linux. At a cursory glance all the registers appear to be there so I figured I'd just add the appropriate entry to the of match table.To my surprise I found that the compatible string in my device tree was overwritten with "cache". I've tracked this down to the
CONFIG_SYS_FSL_QORIQ_CHASSIS2implementation offt_fixup_l2cachein u-boot.The
CONFIG_L2_CACHEversion seems to take care to update the device tree node to
Quoted 8 lines
compatible = "fsl,t2080-l2-cache-controller", "cache";but the
CONFIG_SYS_FSL_QORIQ_CHASSIS2version just sets this tocompatible = "cache";Is this an over-site or is it intentional?
I don't have any record of this discussion. Kumar wrote and committed this change. I hope he remembers.
York
PATCH 1/1 arch: powerpc: Retain compatible property for L2 cache
Instead of setting the compatible property to "cache", append the desired value retaining what may already be set in the current property.
---
Quoted 21 lines · york sun
Quoted 20 lines · Chris Packham
Hi,
I was just looking at what it would take to add the T2080 L2 cache to the
mpc85xx_edacdriver in Linux. At a cursory glance all the registers appear to be there so I figured I'd just add the appropriate
entry to the of match table.To my surprise I found that the compatible string in my device tree was overwritten with "cache". I've tracked this down to the
CONFIG_SYS_FSL_QORIQ_CHASSIS2implementation offt_fixup_l2cachein u-boot.The
CONFIG_L2_CACHEversion seems to take care to update the device tree node tocompatible = "fsl,t2080-l2-cache-controller", "cache";but the
CONFIG_SYS_FSL_QORIQ_CHASSIS2version just sets this to
Quoted 8 lines
Quoted 4 lines
compatible = "cache";Is this an over-site or is it intentional?
I don't have any record of this discussion. Kumar wrote and committed this change. I hope he remembers.
Here's a patch that retains the compatible property from the original dtb and adds the "cache" value if required. This gets the value I need through to the kernel.
arch/powerpc/cpu/mpc85xx/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/cpu/mpc85xx/fdt.c +2 -1
@@ -337,7 +337,8 @@ static inline void ft_fixup_l2cache(void *blob)fdt_setprop_cell (blob, l2_off,"cache-size" , size);fdt_setprop_cell (blob, l2_off,"cache-sets" , num_sets);fdt_setprop_cell (blob, l2_off,"cache-level" ,2 ); -fdt_setprop (blob, l2_off,"compatible" ,"cache" ,6 ); +if (fdt_node_check_compatible (blob, l2_off,"cache" ) ==1 ) +fdt_appendprop_string (blob, l2_off,"compatible" ,"cache" ); }if (l3_off <0 ) {
Signature · 1 line
2.10.2
PATCH 1/1 powerpc: Retain compatible property for L2 cache
In reply to york sunInstead of setting the compatible property to "cache", append the desired value retaining what may already be set in the current property.
---
Quoted 21 lines · york sun
Quoted 20 lines · Chris Packham
Hi,
I was just looking at what it would take to add the T2080 L2 cache to the
mpc85xx_edacdriver in Linux. At a cursory glance all the registers appear to be there so I figured I'd just add the appropriate
entry to the of match table.To my surprise I found that the compatible string in my device tree was overwritten with "cache". I've tracked this down to the
CONFIG_SYS_FSL_QORIQ_CHASSIS2implementation offt_fixup_l2cachein u-boot.The
CONFIG_L2_CACHEversion seems to take care to update the device tree node tocompatible = "fsl,t2080-l2-cache-controller", "cache";but the
CONFIG_SYS_FSL_QORIQ_CHASSIS2version just sets this to
Quoted 8 lines
Quoted 4 lines
compatible = "cache";Is this an over-site or is it intentional?
I don't have any record of this discussion. Kumar wrote and committed this change. I hope he remembers.
(re-sent because I flubbed the subject line and got bounced for Ccing all arch mainatiners, sorry for the spam)
Here's a patch that retains the compatible property from the original dtb and adds the "cache" value if required. This gets the value I need through to the kernel.
If it helps this is also consistent with the Linux documentation for this binding[1] which states that the compatible property should have both "<chip>-l2-cache-controller" and "cache" as values
[1] - Documentation/devicetree/bindings/powerpc/fsl/l2cache.txt
arch/powerpc/cpu/mpc85xx/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/cpu/mpc85xx/fdt.c +2 -1
@@ -337,7 +337,8 @@ static inline void ft_fixup_l2cache(void *blob)fdt_setprop_cell (blob, l2_off,"cache-size" , size);fdt_setprop_cell (blob, l2_off,"cache-sets" , num_sets);fdt_setprop_cell (blob, l2_off,"cache-level" ,2 ); -fdt_setprop (blob, l2_off,"compatible" ,"cache" ,6 ); +if (fdt_node_check_compatible (blob, l2_off,"cache" ) ==1 ) +fdt_appendprop_string (blob, l2_off,"compatible" ,"cache" ); }if (l3_off <0 ) {
Signature · 1 line
2.10.2
PATCH 1/1 powerpc: Retain compatible property for L2 cache
Quoted 5 lines · Chris Packham
Instead of setting the compatible property to "cache", append the desired value retaining what may already be set in the current property.
Signed-off-by Chris Packham <[email protected]>---
<snip>
Quoted 10 lines
arch/powerpc/cpu/mpc85xx/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/powerpc/cpu/mpc85xx/fdt.c +0
-0
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 344
Quoted 9 lines
arch/powerpc/cpu/mpc85xx/fdt.c +2
-1@@ -337,7 +337,8 @@ static inline void ft_fixup_l2cache(void *blob)fdt_setprop_cell (blob, l2_off,"cache-size" , size);fdt_setprop_cell (blob, l2_off,"cache-sets" , num_sets);fdt_setprop_cell (blob, l2_off,"cache-level" ,2 ); -fdt_setprop (blob, l2_off,"compatible" ,"cache" ,6 ); +if (fdt_node_check_compatible (blob, l2_off,"cache" ) ==1 ) +fdt_appendprop_string (blob, l2_off,"compatible" ,"cache" ); }if (l3_off <0 ) {
You drop fdt_setprop, check the compatible "cache" and append it with "cache" again? I thought you wanted
compatible = "fsl,t2080-l2-cache-controller", "cache";
York
PATCH 1/1 powerpc: Retain compatible property for L2 cache
Quoted 26 lines · york sun
Quoted 5 lines · Chris Packham
Instead of setting the compatible property to "cache", append the desired value retaining what may already be set in the current property.
Signed-off-by Chris Packham <[email protected]>---
<snip>
Quoted 17 lines
arch/powerpc/cpu/mpc85xx/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/powerpc/cpu/mpc85xx/fdt.c +2
-1@@ -337,7 +337,8 @@ static inline void ft_fixup_l2cache(void *blob)fdt_setprop_cell (blob, l2_off,"cache-size" , size);fdt_setprop_cell (blob, l2_off,"cache-sets" , num_sets);fdt_setprop_cell (blob, l2_off,"cache-level" ,2 ); -fdt_setprop (blob, l2_off,"compatible" ,"cache" ,6 ); +if (fdt_node_check_compatible (blob, l2_off,"cache" ) ==1 ) +fdt_appendprop_string (blob, l2_off,"compatible" ,"cache" ); }
Quoted 7 lines
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 344
Quoted 2 lines
arch/powerpc/cpu/mpc85xx/fdt.c +0
-0if (l3_off <0 ) {You drop
fdt_setprop, check the compatible "cache" and append it with "cache" again? I thought you wantedcompatible = "fsl,t2080-l2-cache-controller", "cache";
I already have "fsl,t2080-l2-cache-controller" in my dts. Really I just want
fdt_appendprop_string(blob, l2_off, "compatible", "cache");
But the check is necessary because we run through this block multiple times (once per CPU). My initial version was
struct cpu_type *cpu = identify_cpu(SVR_SOC_VER(get_svr())); int len; char buf[40];
len = sprintf(buf,
"fsl,%c%s-l2-cache-controller",tolower(cpu->name[0]), cpu->name + 1) + 1;
len += sprintf(buf + len, "cache") + 1;
fdt_setprop(blob, l2_off, "compatible", buf, len);
But that's more code.
Quoted 2 lines
York
PATCH 1/1 powerpc: Retain compatible property for L2 cache
Quoted 33 lines · Chris Packham
Quoted 32 lines · york sun
Quoted 5 lines · Chris Packham
Instead of setting the compatible property to "cache", append the desired value retaining what may already be set in the current property.
Signed-off-by Chris Packham <[email protected]>---
<snip>
Quoted 10 lines
arch/powerpc/cpu/mpc85xx/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/powerpc/cpu/mpc85xx/fdt.c +0
-0arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 344
Quoted 9 lines
arch/powerpc/cpu/mpc85xx/fdt.c +2
-1@@ -337,7 +337,8 @@ static inline void ft_fixup_l2cache(void *blob)fdt_setprop_cell (blob, l2_off,"cache-size" , size);fdt_setprop_cell (blob, l2_off,"cache-sets" , num_sets);fdt_setprop_cell (blob, l2_off,"cache-level" ,2 ); -fdt_setprop (blob, l2_off,"compatible" ,"cache" ,6 ); +if (fdt_node_check_compatible (blob, l2_off,"cache" ) ==1 ) +fdt_appendprop_string (blob, l2_off,"compatible" ,"cache" ); }if (l3_off <0 ) {You drop
fdt_setprop, check the compatible "cache" and append it with "cache" again? I thought you wanted
Quoted 5 lines
Quoted 1 line
compatible = "fsl,t2080-l2-cache-controller", "cache";
I already have "fsl,t2080-l2-cache-controller" in my dts. Really I just want
fdt_appendprop_string(blob, l2_off, "compatible", "cache");
I see.
Quoted 8 lines
But the check is necessary because we run through this block multiple times (once per CPU). My initial version was
struct cpu_type *cpu = identify_cpu(SVR_SOC_VER(get_svr())); int len; char buf[40];
Quoted 9 lines
len = sprintf(buf,
"fsl,%c%s-l2-cache-controller",tolower(cpu->name[0]),cpu->name+ 1) + 1;
len +=sprintf(buf + len, "cache")+ 1;fdt_setprop(blob, l2_off, "compatible", buf, len);But that's more code.
Ideally we don't have to fix up dts. Since if we have to do it, I like the long version better. If the dts doesn't have correct compatible, the kernel won't take it, right?
York
A message that is not in the archive (sent off-list or not yet received): CAFOYHZA7ycTE3rTQJiAgBBVBUFW9_QemAcCra33VnfGiWn0Arg@mail.gmail.com
A message that is not in the archive (sent off-list or not yet received): CAFOYHZD5JrrC=d9-kZd6tLiZHynJFjS3AtbkaPS9b9Pfy-s5hQ@mail.gmail.com
PATCH 1/1 powerpc: Retain compatible property for L2 cache
Quoted 6 lines · york sun
Quoted 4 lines · Chris Packham
Quoted 3 lines · york sun
Quoted 2 lines · Chris Packham
Instead of setting the compatible property to "cache", append the desired value retaining what may already be set in the current
property.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 3 lines
Signed-off-by Chris Packham <[email protected]>---
<snip>
Review
Quoted 5 lines
arch/powerpc/cpu/mpc85xx/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/arch/powerpc/cpu/mpc85xx/fdt.c
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 337
Quoted 5 lines
index
047c972ac78e..f31df41836d5100644arch/powerpc/cpu/mpc85xx/fdt.c +0
-0@@ -337,7 +337,8 @@ static inline void ft_fixup_l2cache(void *blob) fdt_setprop_cell(blob, l2_off, "cache-size",
size);
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 338
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c +0
-0fdt_setprop_cell(blob, l2_off, "cache-sets",
num_sets);
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 339
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c +0
-0fdt_setprop_cell(blob, l2_off, "cache-level",
2);
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 340
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c +0
-1- fdt_setprop(blob, l2_off, "compatible",
"cache", 6);
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 340
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c +1
-0+ if (fdt_node_check_compatible(blob, l2_off,
"cache") == 1)
Quoted 1 line
Quoted 1 line
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 341
Quoted 1 line
arch/powerpc/cpu/mpc85xx/fdt.c +1
-0+ fdt_appendprop_string(blob, l2_off,
"compatible", "cache");
Quoted 11 lines
Quoted 11 lines
Quoted 9 lines
arch/powerpc/cpu/mpc85xx/fdt.c static inline void ft_fixup_l2cache(void *blob) · line 344
Quoted 4 lines
arch/powerpc/cpu/mpc85xx/fdt.c +0
-0}if (l3_off <0 ) {You drop
fdt_setprop, check the compatible "cache" and append it with "cache" again? I thought you wantedcompatible = "fsl,t2080-l2-cache-controller", "cache";
I already have "fsl,t2080-l2-cache-controller" in my dts. Really I just
want
Quoted 18 lines
Quoted 2 lines
fdt_appendprop_string(blob, l2_off, "compatible", "cache");I see.
Quoted 13 lines
But the check is necessary because we run through this block multiple times (once per CPU). My initial version was
struct cpu_type *cpu = identify_cpu(SVR_SOC_VER(get_svr())); int len; char buf[40];len = sprintf(buf,
"fsl,%c%s-l2-cache-controller",tolower(cpu->name[0]),cpu->name+ 1) + 1;
len +=sprintf(buf + len, "cache")+ 1;
Quoted 9 lines
Quoted 4 lines
fdt_setprop(blob, l2_off, "compatible", buf, len);But that's more code.
Ideally we don't have to fix up dts. Since if we have to do it, I like the long version better. If the dts doesn't have correct compatible, the kernel won't take it, right?
Ok. I'll post a v2 based on the long version. As it's a repeat of code in another block I'll see if i can extract it to a helper function.
PATCH v2 1/1 powerpc: Retain compatible property for L2 cache
When setting the compatible property for the L2 cache ensure that we follow the documented binding by setting both "<chip>-l2-cache-controller" and "cache" as values.
---
Changes in v2:
- extract a helper function to set the compatible property and use it in both the CONFIG_L2_CACHE and CONFIG_BACKSIDE_L2_CACHE cases.
arch/powerpc/cpu/mpc85xx/fdt.c | 61 +++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 25 deletions(-)
arch/powerpc/cpu/mpc85xx/fdt.c +36 -25
@@ -180,6 +180,39 @@ static inline void ft_fixup_l3cache(void *blob, int off)#define ft_fixup_l3cache (x, y)#endif +#if defined(CONFIG_L2_CACHE ) || \ + defined(CONFIG_BACKSIDE_L2_CACHE ) || \ + defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2 ) +static inline void ft_fixup_l2cache_compatible (void *blob,int off) +{ +int len; +struct cpu_type *cpu =identify_cpu (SVR_SOC_VER (get_svr ())); + +if (cpu) { +char buf[40 ]; + +if (isdigit (cpu->name[0 ])) { +/* MPCxxxx, where xxxx == 4-digit number */ + len =sprintf (buf,"fsl,mpc%s-l2-cache-controller" , + cpu->name) +1 ; + }else { +/* Pxxxx or Txxxx, where xxxx == 4-digit number */ + len =sprintf (buf,"fsl,%c%s-l2-cache-controller" , +tolower (cpu->name[0 ]), cpu->name +1 ) +1 ; + } + +/* +* append "cache" after the NULL character that the previous +* sprintf wrote. This is how a device tree stores multiple +* strings in a property. +*/ + len +=sprintf (buf + len,"cache" ) +1 ; + +fdt_setprop (blob, off,"compatible" , buf, len); + } +} +#endif +#if defined(CONFIG_L2_CACHE )/* return size in kilobytes */ static inline u32 l2cache_size (void )
@@ -215,9 +248,8 @@ static inline u32 l2cache_size(void)static inline void ft_fixup_l2cache (void *blob) { -int len, off; +int off;u32 *ph; -struct cpu_type *cpu =identify_cpu (SVR_SOC_VER (get_svr ()));const u32 line_size =32 ;const u32 num_ways =8 ;
@@ -243,28 +275,7 @@ static inline void ft_fixup_l2cache(void *blob)return ; } -if (cpu) { -char buf[40 ]; - -if (isdigit (cpu->name[0 ])) { -/* MPCxxxx, where xxxx == 4-digit number */ - len =sprintf (buf,"fsl,mpc%s-l2-cache-controller" , - cpu->name) +1 ; - }else { -/* Pxxxx or Txxxx, where xxxx == 4-digit number */ - len =sprintf (buf,"fsl,%c%s-l2-cache-controller" , -tolower (cpu->name[0 ]), cpu->name +1 ) +1 ; - } - -/* -* append "cache" after the NULL character that the previous -* sprintf wrote. This is how a device tree stores multiple -* strings in a property. -*/ - len +=sprintf (buf + len,"cache" ) +1 ; - -fdt_setprop (blob, off,"compatible" , buf, len); - } +ft_fixup_l2cache_compatible (blob, off);fdt_setprop (blob, off,"cache-unified" ,NULL ,0 );fdt_setprop_cell (blob, off,"cache-block-size" , line_size);fdt_setprop_cell (blob, off,"cache-size" , size);
@@ -337,7 +348,7 @@ static inline void ft_fixup_l2cache(void *blob)fdt_setprop_cell (blob, l2_off,"cache-size" , size);fdt_setprop_cell (blob, l2_off,"cache-sets" , num_sets);fdt_setprop_cell (blob, l2_off,"cache-level" ,2 ); -fdt_setprop (blob, l2_off,"compatible" ,"cache" ,6 ); +ft_fixup_l2cache_compatible (blob, l2_off); }if (l3_off <0 ) {
Signature · 1 line
2.10.2
PATCH v2 1/1 powerpc: Retain compatible property for L2 cache
Quoted 5 lines · Chris Packham
When setting the compatible property for the L2 cache ensure that we follow the documented binding by setting both "<chip>-l2-cache-controller" and "cache" as values.
Signed-off-by Chris Packham <[email protected]>
Quoted 9 lines
---
Changes in v2:
- extract a helper function to set the compatible property and use it in both theCONFIG_L2_CACHEandCONFIG_BACKSIDE_L2_CACHEcases.arch/powerpc/cpu/mpc85xx/fdt.c | 61 +++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 25 deletions(-)
Applied to u-boot-mpc85xx master, awaiting upstream. Thanks.
York