[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Russell King]

warning: (ARCH_MULTIPLATFORM && ARCH_CLPS711X && ARCH_PXA &&
 SOC_EXYNOS5440 && ARCH_EMEV2) selects AUTO_ZRELADDR which
 has unmet direct dependencies (!ZBOOT_ROM)

This is because it's possible to have ZBOOT_ROM enabled, but at the
same time have another option enabled which selects AUTO_ZRELADDR
overriding the !ZBOOT_ROM dependency.  Fix this by reversing the
dependencies between ZBOOT_ROM and the options which depend on
!ZBOOT_ROM.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
The autobuilder spotted this on one of its randconfig builds - yet again,
it's another illustration of the problems that throwing a "select"
statement at a problem is generally a bad idea.  Let's make a new year's
resolution that we're going to stop throwing "select" at a problem
without first thinking about the consequences.

 arch/arm/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c1f1a7eee953..2ec6bfdf03fd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1946,6 +1946,7 @@ config ZBOOT_ROM_BSS
 config ZBOOT_ROM
 	bool "Compressed boot loader in ROM/flash"
 	depends on ZBOOT_ROM_TEXT != ZBOOT_ROM_BSS
+	depends on !ARM_APPENDED_DTB && !XIP_KERNEL && !AUTO_ZRELADDR
 	help
 	  Say Y here if you intend to execute your compressed kernel image
 	  (zImage) directly from ROM or flash.  If unsure, say N.
@@ -1981,7 +1982,7 @@ endchoice
 
 config ARM_APPENDED_DTB
 	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
-	depends on OF && !ZBOOT_ROM
+	depends on OF
 	help
 	  With this option, the boot code will look for a device tree binary
 	  (DTB) appended to zImage
@@ -2069,7 +2070,7 @@ endchoice
 
 config XIP_KERNEL
 	bool "Kernel Execute-In-Place from ROM"
-	depends on !ZBOOT_ROM && !ARM_LPAE && !ARCH_MULTIPLATFORM
+	depends on !ARM_LPAE && !ARCH_MULTIPLATFORM
 	help
 	  Execute-In-Place allows the kernel to run from non-volatile storage
 	  directly addressable by the CPU, such as NOR flash. This saves RAM
@@ -2132,7 +2133,6 @@ config CRASH_DUMP
 
 config AUTO_ZRELADDR
 	bool "Auto calculation of the decompressed kernel image address"
-	depends on !ZBOOT_ROM
 	help
 	  ZRELADDR is the physical address where the decompressed kernel
 	  image will be placed. If AUTO_ZRELADDR is selected, the address
-- 
1.7.4.4

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Viresh Kumar]

On Thu, Jan 2, 2014 at 9:53 PM, Russell King
<rmk+kernel@arm.linux.org.uk> wrote:
> warning: (ARCH_MULTIPLATFORM && ARCH_CLPS711X && ARCH_PXA &&
>  SOC_EXYNOS5440 && ARCH_EMEV2) selects AUTO_ZRELADDR which
>  has unmet direct dependencies (!ZBOOT_ROM)
>
> This is because it's possible to have ZBOOT_ROM enabled, but at the
> same time have another option enabled which selects AUTO_ZRELADDR
> overriding the !ZBOOT_ROM dependency.  Fix this by reversing the
> dependencies between ZBOOT_ROM and the options which depend on
> !ZBOOT_ROM.
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---

After this patch I see these warnings with exynos_defconfig

arch/arm/Kconfig:1963:error: recursive dependency detected!
arch/arm/Kconfig:1963: symbol ZBOOT_ROM depends on AUTO_ZRELADDR
arch/arm/Kconfig:2151: symbol AUTO_ZRELADDR is selected by ZBOOT_ROM

I am not really sure why this happened as I don't see AUTO_ZRELADDR
selected by ZBOOT_ROM in Kconfig :)

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Arnd Bergmann]

On Wednesday 08 January 2014 13:32:35 Viresh Kumar wrote:
> On Thu, Jan 2, 2014 at 9:53 PM, Russell King
> <rmk+kernel@arm.linux.org.uk> wrote:
> > warning: (ARCH_MULTIPLATFORM && ARCH_CLPS711X && ARCH_PXA &&
> >  SOC_EXYNOS5440 && ARCH_EMEV2) selects AUTO_ZRELADDR which
> >  has unmet direct dependencies (!ZBOOT_ROM)
> >
> > This is because it's possible to have ZBOOT_ROM enabled, but at the
> > same time have another option enabled which selects AUTO_ZRELADDR
> > overriding the !ZBOOT_ROM dependency.  Fix this by reversing the
> > dependencies between ZBOOT_ROM and the options which depend on
> > !ZBOOT_ROM.
> >
> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > ---
> 
> After this patch I see these warnings with exynos_defconfig
> 
> arch/arm/Kconfig:1963:error: recursive dependency detected!
> arch/arm/Kconfig:1963: symbol ZBOOT_ROM depends on AUTO_ZRELADDR
> arch/arm/Kconfig:2151: symbol AUTO_ZRELADDR is selected by ZBOOT_ROM
> 
> I am not really sure why this happened as I don't see AUTO_ZRELADDR
> selected by ZBOOT_ROM in Kconfig :)

It's a weird dependency. You need this hunk:

--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -3,7 +3,7 @@ config ARCH_MXC
        select ARCH_REQUIRE_GPIOLIB
        select ARM_CPU_SUSPEND if PM
        select ARM_PATCH_PHYS_VIRT
-       select AUTO_ZRELADDR if !ZBOOT_ROM
+       select AUTO_ZRELADDR
        select CLKSRC_MMIO
        select COMMON_CLK
        select GENERIC_ALLOCATOR

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Viresh Kumar]

On 8 January 2014 13:50, Arnd Bergmann <arnd@arndb.de> wrote:
> It's a weird dependency. You need this hunk:
>
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -3,7 +3,7 @@ config ARCH_MXC
>         select ARCH_REQUIRE_GPIOLIB
>         select ARM_CPU_SUSPEND if PM
>         select ARM_PATCH_PHYS_VIRT
> -       select AUTO_ZRELADDR if !ZBOOT_ROM
> +       select AUTO_ZRELADDR
>         select CLKSRC_MMIO
>         select COMMON_CLK
>         select GENERIC_ALLOCATOR

Exynos already has this:

arch/arm/mach-exynos/Kconfig
config SOC_EXYNOS5440
    ...
    select AUTO_ZRELADDR

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Arnd Bergmann]

On Wednesday 08 January 2014 13:56:38 Viresh Kumar wrote:
> On 8 January 2014 13:50, Arnd Bergmann <arnd@arndb.de> wrote:
> > It's a weird dependency. You need this hunk:
> >
> > --- a/arch/arm/mach-imx/Kconfig
> > +++ b/arch/arm/mach-imx/Kconfig
> > @@ -3,7 +3,7 @@ config ARCH_MXC
> >         select ARCH_REQUIRE_GPIOLIB
> >         select ARM_CPU_SUSPEND if PM
> >         select ARM_PATCH_PHYS_VIRT
> > -       select AUTO_ZRELADDR if !ZBOOT_ROM
> > +       select AUTO_ZRELADDR
> >         select CLKSRC_MMIO
> >         select COMMON_CLK
> >         select GENERIC_ALLOCATOR
> 
> Exynos already has this:
> 
> arch/arm/mach-exynos/Kconfig
> config SOC_EXYNOS5440
>     ...
>     select AUTO_ZRELADDR

Yes, that is ok. The problem with the imx dependency is that the kconfig
parser needs to know the state of the ZBOOT_ROM symbol in order to decide
whether to select AUTO_ZRELADDR or not, but ZBOOT_ROM in turn depends on
AUTO_ZRELADDR.

On second thought, we should just remove the 'select AUTO_ZRELADDR' from
ARCH_MXC and everything that is multiplatform enabled, since it's already
selected by ARCH_MULTIPLATFORM. An interesting question is what to do
about the case where you actually want ZBOOT_ROM with a multiplatform
enabled machine. We should probably allow that, but it's not possible
to express that in Kconfig as long as ZBOOT_ROM depends on !AUTO_ZRELADDR.
Obviously such a kernel won't be true multiplatform (it will only
work on systems with the right rom address), but I think that's ok as
long as it's documented well and not enabled by default. This is similar
to what we need to allow non-MMU builds for multiplatform machines.

	Arnd

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Viresh Kumar]

On 8 January 2014 14:37, Arnd Bergmann <arnd@arndb.de> wrote:
>> > --- a/arch/arm/mach-imx/Kconfig
>> > +++ b/arch/arm/mach-imx/Kconfig
>> > @@ -3,7 +3,7 @@ config ARCH_MXC
>> >         select ARCH_REQUIRE_GPIOLIB
>> >         select ARM_CPU_SUSPEND if PM
>> >         select ARM_PATCH_PHYS_VIRT
>> > -       select AUTO_ZRELADDR if !ZBOOT_ROM
>> > +       select AUTO_ZRELADDR
>> >         select CLKSRC_MMIO
>> >         select COMMON_CLK
>> >         select GENERIC_ALLOCATOR
>>
>> Exynos already has this:
>>
>> arch/arm/mach-exynos/Kconfig
>> config SOC_EXYNOS5440
>>     ...
>>     select AUTO_ZRELADDR
>
> Yes, that is ok. The problem with the imx dependency is that the kconfig
> parser needs to know the state of the ZBOOT_ROM symbol in order to decide
> whether to select AUTO_ZRELADDR or not, but ZBOOT_ROM in turn depends on
> AUTO_ZRELADDR.
>
> On second thought, we should just remove the 'select AUTO_ZRELADDR' from
> ARCH_MXC and everything that is multiplatform enabled, since it's already
> selected by ARCH_MULTIPLATFORM. An interesting question is what to do
> about the case where you actually want ZBOOT_ROM with a multiplatform
> enabled machine. We should probably allow that, but it's not possible
> to express that in Kconfig as long as ZBOOT_ROM depends on !AUTO_ZRELADDR.
> Obviously such a kernel won't be true multiplatform (it will only
> work on systems with the right rom address), but I think that's ok as
> long as it's documented well and not enabled by default. This is similar
> to what we need to allow non-MMU builds for multiplatform machines.

I see.. So, I confirm that above diff fixes my issue.

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Thierry Reding]

On Wed, Jan 08, 2014 at 09:20:10AM +0100, Arnd Bergmann wrote:
> On Wednesday 08 January 2014 13:32:35 Viresh Kumar wrote:
> > On Thu, Jan 2, 2014 at 9:53 PM, Russell King
> > <rmk+kernel@arm.linux.org.uk> wrote:
> > > warning: (ARCH_MULTIPLATFORM && ARCH_CLPS711X && ARCH_PXA &&
> > >  SOC_EXYNOS5440 && ARCH_EMEV2) selects AUTO_ZRELADDR which
> > >  has unmet direct dependencies (!ZBOOT_ROM)
> > >
> > > This is because it's possible to have ZBOOT_ROM enabled, but at the
> > > same time have another option enabled which selects AUTO_ZRELADDR
> > > overriding the !ZBOOT_ROM dependency.  Fix this by reversing the
> > > dependencies between ZBOOT_ROM and the options which depend on
> > > !ZBOOT_ROM.
> > >
> > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > > ---
> > 
> > After this patch I see these warnings with exynos_defconfig
> > 
> > arch/arm/Kconfig:1963:error: recursive dependency detected!
> > arch/arm/Kconfig:1963: symbol ZBOOT_ROM depends on AUTO_ZRELADDR
> > arch/arm/Kconfig:2151: symbol AUTO_ZRELADDR is selected by ZBOOT_ROM
> > 
> > I am not really sure why this happened as I don't see AUTO_ZRELADDR
> > selected by ZBOOT_ROM in Kconfig :)
> 
> It's a weird dependency. You need this hunk:
> 
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -3,7 +3,7 @@ config ARCH_MXC
>         select ARCH_REQUIRE_GPIOLIB
>         select ARM_CPU_SUSPEND if PM
>         select ARM_PATCH_PHYS_VIRT
> -       select AUTO_ZRELADDR if !ZBOOT_ROM
> +       select AUTO_ZRELADDR
>         select CLKSRC_MMIO
>         select COMMON_CLK
>         select GENERIC_ALLOCATOR

Hi Arnd,

I haven't seen this go into linux-next yet. Do you plan on sending a
patch for this?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140113/0a36b637/attachment.sig>

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Russell King - ARM Linux]

On Mon, Jan 13, 2014 at 12:52:10PM +0100, Thierry Reding wrote:
> On Wed, Jan 08, 2014 at 09:20:10AM +0100, Arnd Bergmann wrote:
> > --- a/arch/arm/mach-imx/Kconfig
> > +++ b/arch/arm/mach-imx/Kconfig
> > @@ -3,7 +3,7 @@ config ARCH_MXC
> >         select ARCH_REQUIRE_GPIOLIB
> >         select ARM_CPU_SUSPEND if PM
> >         select ARM_PATCH_PHYS_VIRT
> > -       select AUTO_ZRELADDR if !ZBOOT_ROM
> > +       select AUTO_ZRELADDR
> >         select CLKSRC_MMIO
> >         select COMMON_CLK
> >         select GENERIC_ALLOCATOR
> 
> Hi Arnd,
> 
> I haven't seen this go into linux-next yet. Do you plan on sending a
> patch for this?

Maybe someone should respond to this comment from Arnd:

| On second thought, we should just remove the 'select AUTO_ZRELADDR' from
| ARCH_MXC and everything that is multiplatform enabled, since it's already
| selected by ARCH_MULTIPLATFORM.

which I think is the right way to go here.  The ARCH_MXC option is
hidden when multiplatform is not enabled.  When it is enabled,
AUTO_ZRELADDR is selected by the multiplatform option.  So having a
"select AUTO_ZRELADDR" of any kind under ARCH_MXC is entirely
redundant.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Thierry Reding]

On Mon, Jan 13, 2014 at 01:48:13PM +0000, Russell King - ARM Linux wrote:
> On Mon, Jan 13, 2014 at 12:52:10PM +0100, Thierry Reding wrote:
> > On Wed, Jan 08, 2014 at 09:20:10AM +0100, Arnd Bergmann wrote:
> > > --- a/arch/arm/mach-imx/Kconfig
> > > +++ b/arch/arm/mach-imx/Kconfig
> > > @@ -3,7 +3,7 @@ config ARCH_MXC
> > >         select ARCH_REQUIRE_GPIOLIB
> > >         select ARM_CPU_SUSPEND if PM
> > >         select ARM_PATCH_PHYS_VIRT
> > > -       select AUTO_ZRELADDR if !ZBOOT_ROM
> > > +       select AUTO_ZRELADDR
> > >         select CLKSRC_MMIO
> > >         select COMMON_CLK
> > >         select GENERIC_ALLOCATOR
> > 
> > Hi Arnd,
> > 
> > I haven't seen this go into linux-next yet. Do you plan on sending a
> > patch for this?
> 
> Maybe someone should respond to this comment from Arnd:
> 
> | On second thought, we should just remove the 'select AUTO_ZRELADDR' from
> | ARCH_MXC and everything that is multiplatform enabled, since it's already
> | selected by ARCH_MULTIPLATFORM.
> 
> which I think is the right way to go here.  The ARCH_MXC option is
> hidden when multiplatform is not enabled.  When it is enabled,
> AUTO_ZRELADDR is selected by the multiplatform option.  So having a
> "select AUTO_ZRELADDR" of any kind under ARCH_MXC is entirely
> redundant.

It looks like ARCH_MXC is the only one that matches Arnd's requirements.
All other platforms that select AUTO_ZRELADDR seem to not support multi-
platform.

Below is a patch to remove the line completely. Shall I post that to the
patch tracker?

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ARM-Remove-redundant-select-AUTO_ZRELADDR.patch
Type: text/x-diff
Size: 1302 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140113/82d5820b/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140113/82d5820b/attachment-0001.sig>

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Arnd Bergmann]

On Monday 13 January 2014, Thierry Reding wrote:
> From ee1347c28bb7cb56a3c178321253e38de4bbc676 Mon Sep 17 00:00:00 2001
> From: Thierry Reding <treding@nvidia.com>
> Date: Fri, 10 Jan 2014 17:12:07 +0100
> Subject: [PATCH] ARM: Remove redundant select AUTO_ZRELADDR
> 
> ARCH_MXC depends on ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7, both of which
> can only be enabled when ARCH_MULTIPLATFORM is selected. If so, then the
> AUTO_ZRELADDR will already be selected.
> 
> Removing the selection of AUTO_ZRELADDR from ARCH_MXC has the additional
> benefit of getting rid of the following Kconfig error:
> 
>         arch/arm/Kconfig:1965:error: recursive dependency detected!
>         arch/arm/Kconfig:1965:  symbol ZBOOT_ROM depends on AUTO_ZRELADDR
>         arch/arm/Kconfig:2153:  symbol AUTO_ZRELADDR is selected by ZBOOT_ROM
> 
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Acked-by: Arnd Bergmann <arnd@arndb.de>

I'm not sure through which tree this needs to go to make sure that 
both the arm-soc tree and rmk's arm tree are correct by themselves
as well as when they get merged.

	Arnd

[PATCH] Fix select-induced Kconfig warning for ZBOOT_ROM

[Thierry Reding]

On Mon, Jan 13, 2014 at 04:24:07PM +0100, Arnd Bergmann wrote:
> On Monday 13 January 2014, Thierry Reding wrote:
> > From ee1347c28bb7cb56a3c178321253e38de4bbc676 Mon Sep 17 00:00:00 2001
> > From: Thierry Reding <treding@nvidia.com>
> > Date: Fri, 10 Jan 2014 17:12:07 +0100
> > Subject: [PATCH] ARM: Remove redundant select AUTO_ZRELADDR
> > 
> > ARCH_MXC depends on ARCH_MULTI_V4_V5 or ARCH_MULTI_V6_V7, both of which
> > can only be enabled when ARCH_MULTIPLATFORM is selected. If so, then the
> > AUTO_ZRELADDR will already be selected.
> > 
> > Removing the selection of AUTO_ZRELADDR from ARCH_MXC has the additional
> > benefit of getting rid of the following Kconfig error:
> > 
> >         arch/arm/Kconfig:1965:error: recursive dependency detected!
> >         arch/arm/Kconfig:1965:  symbol ZBOOT_ROM depends on AUTO_ZRELADDR
> >         arch/arm/Kconfig:2153:  symbol AUTO_ZRELADDR is selected by ZBOOT_ROM
> > 
> > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> 
> I'm not sure through which tree this needs to go to make sure that 
> both the arm-soc tree and rmk's arm tree are correct by themselves
> as well as when they get merged.

The original patch went into the arm tree, so I suppose arm-soc isn't
really impacted by this unless merged with the arm tree. Therefore I
think if this goes in via Russell's tree it should be fine.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140115/28f17b50/attachment.sig>