| Message ID | 1403514104.12982.20.camel@x220 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
It's nice to be ignored... On Mon, Jun 23, 2014 at 11:01:44AM +0200, Paul Bolle wrote: > ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through > commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for > PL310 errata workarounds"). Two selects were added in v3.15 that still > use the previous name. Rename these. > > Signed-off-by: Paul Bolle <pebolle@tiscali.nl> > --- > v2: redone on top of next-21040623, and therefor on top of commit > a641f3a6abce ("ARM: l2c: fix dependencies on PL310 errata symbols"). And you obviously didn't read the commit or understand it. > Dropped the "if CACHE_PL310" fragments used in v1. No need to use "if > CACHE_L2X0" instead. Both CACHE_PL310 and CACHE_L2X0 will be > (indirectly) selected if MACH_ARMADA_375 or MACH_ARMADA_38X are set. Yes there is. We've recently seen the selection of CACHE_L2X0 be removed from platforms, while leaving the selection of the errata behind. The result is Kconfig warnings. My commit above ensures that this doesn't happen in the future by adding the proper dependencies onto those errata selects. Please do the same. NAK.
On Mon, 2014-06-23 at 10:07 +0100, Russell King - ARM Linux wrote: > On Mon, Jun 23, 2014 at 11:01:44AM +0200, Paul Bolle wrote: > > Dropped the "if CACHE_PL310" fragments used in v1. No need to use "if > > CACHE_L2X0" instead. Both CACHE_PL310 and CACHE_L2X0 will be > > (indirectly) selected if MACH_ARMADA_375 or MACH_ARMADA_38X are set. > > Yes there is. We've recently seen the selection of CACHE_L2X0 be removed > from platforms, while leaving the selection of the errata behind. The > result is Kconfig warnings. My commit above ensures that this doesn't > happen in the future by adding the proper dependencies onto those errata > selects. The entries I touched read (in summary): config MACH_MVEBU_V7 bool select CACHE_L2X0 config MACH_ARMADA_370 bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 select MACH_MVEBU_V7 help [...]. config MACH_ARMADA_375 bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 select MACH_MVEBU_V7 help [...]. So the choice I faced was between: - using "select PL310_ERRATA_753970 if CACHE_L2X0": that matches all current occurrences of "select PL310_ERRATA_*" but adds a superfluous dependency on CACHE_L2X0 - using just "select PL310_ERRATA_753970": sufficient, but will break if CACHE_L2X0 isn't selected through MACH_MVEBU_V7 anymore. I chose to just "select PL310_ERRATA_753970" but adding "if CACHE_L2X0" is fine with me too. > Please do the same. Will do later today. Thanks, Paul Bolle
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 955d4a3afabd..8d4cf4fa118a 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -33,7 +33,7 @@ config MACH_ARMADA_370 config MACH_ARMADA_375 bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARMADA_375_CLK select HAVE_ARM_SCU @@ -48,7 +48,7 @@ config MACH_ARMADA_375 config MACH_ARMADA_38X bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARMADA_38X_CLK select HAVE_ARM_SCU
ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds"). Two selects were added in v3.15 that still use the previous name. Rename these. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- v2: redone on top of next-21040623, and therefor on top of commit a641f3a6abce ("ARM: l2c: fix dependencies on PL310 errata symbols"). Dropped the "if CACHE_PL310" fragments used in v1. No need to use "if CACHE_L2X0" instead. Both CACHE_PL310 and CACHE_L2X0 will be (indirectly) selected if MACH_ARMADA_375 or MACH_ARMADA_38X are set. Tested only with "make ARCH=arm menuconfig". So not compile tested! If that's not acceptable please let me know. (I have no access to these machines so runtime testing is not possible for me.) Perhaps we want something similar for v3.15+ stable. But that would require a different patch (v1 could probably be used for stable). arch/arm/mach-mvebu/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)