| Message ID | 20140418125924.GF5904@bivouac.eciton.net |
|---|---|
| State | New |
| Headers | show |
Hei Leif, On Fri, Apr 18, 2014 at 2:59 PM, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On Fri, Apr 18, 2014 at 10:04:15AM +0200, Geert Uytterhoeven wrote: >> On Thu, Apr 17, 2014 at 7:42 PM, Leif Lindholm <leif.lindholm@linaro.org> wrote: >> > In order to deal with an firmware bug on a specific ppc32 platform >> > (longtrail), early_init_dt_scan_memory() looks for a node called >> > memory@0 on all platforms. Restrict this quirk to ppc32 kernels only. >> >> This breaks backwards compatibilty with old DTSes (at least on ARM/MIPS, >> where you added the missing property in patches 1 and 2 of the series)? > > As Rob said in response to 0/3, the MIPSs would likely not be affected, > since they embed the DT. > > How about the below v2 3/3 to address the ARM platform? Looks fine to me, thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Fri, Apr 18, 2014 at 7:59 AM, Leif Lindholm <leif.lindholm@linaro.org> wrote: > Hi Geert, > > On Fri, Apr 18, 2014 at 10:04:15AM +0200, Geert Uytterhoeven wrote: >> On Thu, Apr 17, 2014 at 7:42 PM, Leif Lindholm <leif.lindholm@linaro.org> wrote: >> > In order to deal with an firmware bug on a specific ppc32 platform >> > (longtrail), early_init_dt_scan_memory() looks for a node called >> > memory@0 on all platforms. Restrict this quirk to ppc32 kernels only. >> >> This breaks backwards compatibilty with old DTSes (at least on ARM/MIPS, >> where you added the missing property in patches 1 and 2 of the series)? > > As Rob said in response to 0/3, the MIPSs would likely not be affected, > since they embed the DT. > >> For the Longtrail, I don't care much anymore, as mine died in 2004. >> AFAIK, there have never been many users anyway. > > There are still a few mentions of it under arch/powerpc/, so I wouldn't > want to be the one to kill it off... > > How about the below v2 3/3 to address the ARM platform? > > Regards, > > Leif > > From 6fa0b837ad71780334eb97d63c507165b6c57add Mon Sep 17 00:00:00 2001 > From: Leif Lindholm <leif.lindholm@linaro.org> > Date: Thu, 17 Apr 2014 14:24:47 +0100 > Subject: [PATCH] of: arm: powerpc: Restrict memory@0 node handling to > affected platforms > > In order to deal with a firmware bug on a specific ppc32 platform > (longtrail), early_init_dt_scan_memory() looks for a node called > memory@0 on all platforms, for all nodes lacking a device_type. > Restrict this quirk to ppc32 and the arm mach-ux500 platforms (one of > which has depended on this special handling). > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig > index 889005f..230c747 100644 > --- a/drivers/of/Kconfig > +++ b/drivers/of/Kconfig > @@ -77,4 +77,7 @@ config OF_RESERVED_MEM > help > Helpers to allow for reservation of memory regions > > +config OF_MEMORY_AT_0_QUIRK > + def_bool n I do not like this because it would not scale to many quirks. As I said,, my preference here would be to just add a WARN. The other option is get approval to break compatibility on the ST platform. It may not be a concern on certain platforms. Rob
Hi, > > diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig > > index 889005f..230c747 100644 > > --- a/drivers/of/Kconfig > > +++ b/drivers/of/Kconfig > > @@ -77,4 +77,7 @@ config OF_RESERVED_MEM > > help > > Helpers to allow for reservation of memory regions > > > > +config OF_MEMORY_AT_0_QUIRK > > + def_bool n > > I do not like this because it would not scale to many quirks. As I > said,, my preference here would be to just add a WARN. I would very much like to be able to remove the quirk entirely for arm64 if possible, which would require more than the addition of a WARN. > The other option is get approval to break compatibility on the ST > platform. It may not be a concern on certain platforms. Lee, would you be able to provide an answer either way so we can get the discussion moving? Cheers, Mark.
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index b41a42d..e6b0c3b 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -13,6 +13,7 @@ config ARCH_U8500 select CLKSRC_NOMADIK_MTU select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP + select OF_MEMORY_AT_0_QUIRK select PINCTRL select PINCTRL_ABX500 select PINCTRL_NOMADIK diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index e099899..d78452d 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -3,6 +3,7 @@ source "arch/powerpc/platforms/Kconfig.cputype" config PPC32 bool default y if !PPC64 + select OF_MEMORY_AT_0_QUIRK config 32BIT bool diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 889005f..230c747 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -77,4 +77,7 @@ config OF_RESERVED_MEM help Helpers to allow for reservation of memory regions +config OF_MEMORY_AT_0_QUIRK + def_bool n + endmenu # OF diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index fa16a91..1b80b94 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -887,14 +887,22 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname, /* We are scanning "memory" nodes only */ if (type == NULL) { +#ifdef CONFIG_OF_MEMORY_AT_0_QUIRK /* * The longtrail doesn't have a device_type on the * /memory node, so look for the node called /memory@0. + * Converted to generic quirk to handle later platforms + * with inforrect DTs that work only because of this + * special handling. */ if (depth != 1 || strcmp(uname, "memory@0") != 0) return 0; - } else if (strcmp(type, "memory") != 0) +#else + return 0; +#endif + } else if (strcmp(type, "memory") != 0) { return 0; + } reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l); if (reg == NULL)