powerpc/of: Fix comparison of "compatible" properties
PATCH 1/1 powerpc/of: Fix comparison of "compatible" properties
Commit 7c7b60cb87547b1664a4385c187f029bf514a737
"of: put default string compare and #a/s-cell values into common header"
Breaks various things on powerpc due to using strncasecmp instead of strcasecmp for comparing against "compatible" strings.
This causes things like the 4xx PCI code to fail miserably due to the partial matches in code like this:
for_each_compatible_node(np, NULL, "ibm,plb-pcix") ppc4xx_probe_pcix_bridge(np); for_each_compatible_node(np, NULL, "ibm,plb-pci") ppc4xx_probe_pci_bridge(np);
This reverts us to use strcasecmp. I do wonder why microblase and sparc want the partial matches though. For sparc it could be historical, but microblaze might want to change.
It's not quite right to do partial name match. Entries in a compatible list are meant to be matched whole. If a device is compatible with both "foo" and "foo1", then the device should have both strings in its "compatible" property.
--- arch/powerpc/include/asm/prom.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
arch/powerpc/include/asm/prom.h +8 -0
@@ -23,6 +23,14 @@#include <asm/irq.h> #include <asm/atomic.h> +/* We do -not- want the generic "strncasecmp" here for of_compat_cmp. +* We have cases where we could otherwise mismatch "pcix" and "pci" +* and similar. +*/ +#define of_compat_cmp (s1, s2, l) strcasecmp((s1), (s2)) +#define of_prop_cmp (s1, s2) strcmp((s1), (s2)) +#define of_node_cmp (s1, s2) strcasecmp((s1), (s2)) +#define HAVE_ARCH_DEVTREE_FIXUPS #ifdef CONFIG_PPC32
Quoted 14 lines · Benjamin Herrenschmidt
Commit
7c7b60cb87547b1664a4385c187f029bf514a737
"of: put default string compare and #a/s-cell values into common header"Breaks various things on powerpc due to using strncasecmp instead of strcasecmp for comparing against "compatible" strings.
This causes things like the 4xx PCI code to fail miserably due to the partial matches in code like this:
for_each_compatible_node(np, NULL, "ibm,plb-pcix")
ppc4xx_probe_pcix_bridge(np);for_each_compatible_node(np, NULL, "ibm,plb-pci")ppc4xx_probe_pci_bridge(np);
Quoted 8 lines
This reverts us to use strcasecmp. I do wonder why microblase and sparc want the partial matches though. For sparc it could be historical, but microblaze might want to change.
It's not quite right to do partial name match. Entries in a compatible list are meant to be matched whole. If a device is compatible with both "foo" and "foo1", then the device should have both strings in its "compatible" property.
Hmmm. That's a mistake I made then in commit 7c7b60cb. I had meant to use strcasecmp(), and had missed that microblaze was doing it differently. I certainly don't want to carry over partial name match when other architectures pick up device tree support. If anything, microblaze should have the exception and the common code fixed.
Michal, why does microblaze differ from powerpc on this point?
Cheers,
g.
Quoted 29 lines
Signed-off-by Benjamin Herrenschmidt <[email protected]>---
arch/powerpc/include/asm/prom.h | 8 ++++++++1 files changed, 8 insertions(+), 0 deletions(-)arch/powerpc/include/asm/prom.h +8
-0@@ -23,6 +23,14 @@ #include <asm/irq.h> #include <asm/atomic.h> +/* We do -not- want the generic "strncasecmp" here for of_compat_cmp. +* We have cases where we could otherwise mismatch "pcix" and "pci" +* and similar. +*/ +#define of_compat_cmp (s1, s2, l) strcasecmp((s1), (s2)) +#define of_prop_cmp (s1, s2) strcmp((s1), (s2)) +#define of_node_cmp (s1, s2) strcasecmp((s1), (s2)) + #define HAVE_ARCH_DEVTREE_FIXUPS #ifdef CONFIG_PPC32
Signature · 2 lines
Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
A message that is not in the archive (sent off-list or not yet received): fa686aa41003171735v1e9b62bci9273b6ae0e7b7a15-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 25 lines · Grant Likely
Quoted 14 lines · Benjamin Herrenschmidt
Commit
7c7b60cb87547b1664a4385c187f029bf514a737
"of: put default string compare and #a/s-cell values into common header"Breaks various things on powerpc due to using strncasecmp instead of strcasecmp for comparing against "compatible" strings.
This causes things like the 4xx PCI code to fail miserably due to the partial matches in code like this:
for_each_compatible_node(np, NULL, "ibm,plb-pcix")
ppc4xx_probe_pcix_bridge(np);
for_each_compatible_node(np, NULL, "ibm,plb-pci")
ppc4xx_probe_pci_bridge(np);Quoted 8 lines
This reverts us to use strcasecmp. I do wonder why microblase and sparc want the partial matches though. For sparc it could be historical, but microblaze might want to change.
It's not quite right to do partial name match. Entries in a compatible list are meant to be matched whole. If a device is compatible with both "foo" and "foo1", then the device should have both strings in its "compatible" property.
Quoted 7 lines
Hmmm. That's a mistake I made then in commit
7c7b60cb. I had meant to usestrcasecmp(), and had missed that microblaze was doing it differently. I certainly don't want to carry over partial name match when other architectures pick up device tree support. If anything, microblaze should have the exception and the common code fixed.Michal, why does microblaze differ from powerpc on this point?
As I wrote. Microblaze doesn't need any partial name match.
Michal
Quoted 35 lines
Cheers,
g.Quoted 28 lines
Signed-off-by Benjamin Herrenschmidt <[email protected]>--- arch/powerpc/include/asm/prom.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)arch/powerpc/include/asm/prom.h +8
-0@@ -23,6 +23,14 @@#include <asm/irq.h> #include <asm/atomic.h> +/* We do -not- want the generic "strncasecmp" here for of_compat_cmp. +* We have cases where we could otherwise mismatch "pcix" and "pci" +* and similar. +*/ +#define of_compat_cmp (s1, s2, l) strcasecmp((s1), (s2)) +#define of_prop_cmp (s1, s2) strcmp((s1), (s2)) +#define of_node_cmp (s1, s2) strcasecmp((s1), (s2)) +#define HAVE_ARCH_DEVTREE_FIXUPS #ifdef CONFIG_PPC32
Signature · 3 lines
Michal Simek, Ing. (M.Eng) PetaLogix - Linux Solutions for a Reconfigurable World w: www.petalogix.com p: +61-7-30090663,+42-0-721842854 f: +61-7-30090663