diff mbox series

ARM: shmobile: fix build regressions

Message ID 20181210210033.3276054-1-arnd@arndb.de
State Accepted
Commit 8070ba6348608aa1da15eb83dbaa9ece596aaa67
Headers show
Series ARM: shmobile: fix build regressions | expand

Commit Message

Arnd Bergmann Dec. 10, 2018, 9 p.m. UTC
A number of Kconfig options have become available now to random ARM
platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig
warnings, and other build errors when those select options that
lack additonal dependencies, e.g.:

WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER
  Depends on [n]: CPU_V7 [=n]
  Selected by [y]:
  - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]
  - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]

WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI
  Depends on [n]: GENERIC_CLOCKEVENTS [=n]
  Selected by [y]:
  - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]

Put the old dependency on ARCH_RENESAS back for the moment to restore
the previous behavior.

Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/soc/renesas/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

Comments

Geert Uytterhoeven Dec. 11, 2018, 8:22 a.m. UTC | #1
Hi Arnd,

On Mon, Dec 10, 2018 at 10:00 PM Arnd Bergmann <arnd@arndb.de> wrote:
> A number of Kconfig options have become available now to random ARM

> platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig

> warnings, and other build errors when those select options that

> lack additonal dependencies, e.g.:

>

> WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER

>   Depends on [n]: CPU_V7 [=n]

>   Selected by [y]:

>   - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]

>   - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]

>

> WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI

>   Depends on [n]: GENERIC_CLOCKEVENTS [=n]

>   Selected by [y]:

>   - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]

>

> Put the old dependency on ARCH_RENESAS back for the moment to restore

> the previous behavior.


Thanks, the build bots must be lazy or overloaded these days...
The ARM selects are indeed more troublesome than the ARM64 ones.

BTW, did you see issues with the ARM64 Kconfig symbol move too,
or is that mitigated by ARM64 always selecting GENERIC_CLOCKEVENTS?

> Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")

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


Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>


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
Arnd Bergmann Dec. 11, 2018, 8:37 a.m. UTC | #2
On Tue, Dec 11, 2018 at 9:22 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>

> Hi Arnd,

>

> On Mon, Dec 10, 2018 at 10:00 PM Arnd Bergmann <arnd@arndb.de> wrote:

> > A number of Kconfig options have become available now to random ARM

> > platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig

> > warnings, and other build errors when those select options that

> > lack additonal dependencies, e.g.:

> >

> > WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER

> >   Depends on [n]: CPU_V7 [=n]

> >   Selected by [y]:

> >   - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]

> >   - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]

> >

> > WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI

> >   Depends on [n]: GENERIC_CLOCKEVENTS [=n]

> >   Selected by [y]:

> >   - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]

> >

> > Put the old dependency on ARCH_RENESAS back for the moment to restore

> > the previous behavior.

>

> Thanks, the build bots must be lazy or overloaded these days...

> The ARM selects are indeed more troublesome than the ARM64 ones.

>

> BTW, did you see issues with the ARM64 Kconfig symbol move too,

> or is that mitigated by ARM64 always selecting GENERIC_CLOCKEVENTS?


I restarted my randconfig builder yesterday, and after a few hundred builds
on each architecture, I did not see any arm64 failures, so it's
probably ok there.
I have a clean build now (about to rebase to today's linux-next, which will
surely change that).

> > Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")

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

>

> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>


Thanks.

     Arnd
Geert Uytterhoeven Dec. 11, 2018, 8:58 a.m. UTC | #3
Hi Arnd,

On Mon, Dec 10, 2018 at 10:00 PM Arnd Bergmann <arnd@arndb.de> wrote:
> A number of Kconfig options have become available now to random ARM

> platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig

> warnings, and other build errors when those select options that

> lack additonal dependencies, e.g.:

>

> WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER

>   Depends on [n]: CPU_V7 [=n]

>   Selected by [y]:

>   - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]

>   - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]

>

> WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI

>   Depends on [n]: GENERIC_CLOCKEVENTS [=n]

>   Selected by [y]:

>   - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]

>

> Put the old dependency on ARCH_RENESAS back for the moment to restore

> the previous behavior.

>

> Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")

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

> ---

>  drivers/soc/renesas/Kconfig | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig

> index 4d8012e1205c..68bfca6f20dd 100644

> --- a/drivers/soc/renesas/Kconfig

> +++ b/drivers/soc/renesas/Kconfig

> @@ -44,7 +44,7 @@ config ARCH_RZN1

>         bool

>         select ARM_AMBA

>

> -if ARM

> +if ARM && ARCH_RENESAS


After a closer look, I think restricting this from ARM to ARCH_MULTI_V7
should work, too (ARCH_MULTI_V7 selects CPU_V7, and ARCH_MULTIPLATFORM
selects GENERIC_CLOCKEVENTS).

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
Simon Horman Dec. 12, 2018, 10:30 a.m. UTC | #4
On Tue, Dec 11, 2018 at 09:58:05AM +0100, Geert Uytterhoeven wrote:
> Hi Arnd,

> 

> On Mon, Dec 10, 2018 at 10:00 PM Arnd Bergmann <arnd@arndb.de> wrote:

> > A number of Kconfig options have become available now to random ARM

> > platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig

> > warnings, and other build errors when those select options that

> > lack additonal dependencies, e.g.:

> >

> > WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER

> >   Depends on [n]: CPU_V7 [=n]

> >   Selected by [y]:

> >   - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]

> >   - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]

> >

> > WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI

> >   Depends on [n]: GENERIC_CLOCKEVENTS [=n]

> >   Selected by [y]:

> >   - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]

> >

> > Put the old dependency on ARCH_RENESAS back for the moment to restore

> > the previous behavior.

> >

> > Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")

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

> > ---

> >  drivers/soc/renesas/Kconfig | 2 +-

> >  1 file changed, 1 insertion(+), 1 deletion(-)

> >

> > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig

> > index 4d8012e1205c..68bfca6f20dd 100644

> > --- a/drivers/soc/renesas/Kconfig

> > +++ b/drivers/soc/renesas/Kconfig

> > @@ -44,7 +44,7 @@ config ARCH_RZN1

> >         bool

> >         select ARM_AMBA

> >

> > -if ARM

> > +if ARM && ARCH_RENESAS

> 

> After a closer look, I think restricting this from ARM to ARCH_MULTI_V7

> should work, too (ARCH_MULTI_V7 selects CPU_V7, and ARCH_MULTIPLATFORM

> selects GENERIC_CLOCKEVENTS).


Hi Arnd,

what is your preferred way forwards here?
I'm tempted to take your patch as-is and then work on
refining the dependency as a follow-up.
Simon Horman Dec. 17, 2018, 12:47 p.m. UTC | #5
On Wed, Dec 12, 2018 at 11:30:33AM +0100, Simon Horman wrote:
> On Tue, Dec 11, 2018 at 09:58:05AM +0100, Geert Uytterhoeven wrote:

> > Hi Arnd,

> > 

> > On Mon, Dec 10, 2018 at 10:00 PM Arnd Bergmann <arnd@arndb.de> wrote:

> > > A number of Kconfig options have become available now to random ARM

> > > platforms outside of ARCH_MULTIPLATFORM, which now causes Kconfig

> > > warnings, and other build errors when those select options that

> > > lack additonal dependencies, e.g.:

> > >

> > > WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER

> > >   Depends on [n]: CPU_V7 [=n]

> > >   Selected by [y]:

> > >   - ARCH_RCAR_GEN2 [=y] && SOC_RENESAS [=y]

> > >   - ARCH_R8A73A4 [=y] && SOC_RENESAS [=y] && ARM [=y]

> > >

> > > WARNING: unmet direct dependencies detected for SYS_SUPPORTS_EM_STI

> > >   Depends on [n]: GENERIC_CLOCKEVENTS [=n]

> > >   Selected by [y]:

> > >   - ARCH_EMEV2 [=y] && SOC_RENESAS [=y] && ARM [=y]

> > >

> > > Put the old dependency on ARCH_RENESAS back for the moment to restore

> > > the previous behavior.

> > >

> > > Fixes: 062887bf5ef7 ("ARM: shmobile: Move SoC Kconfig symbols to drivers/soc/renesas/")

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

> > > ---

> > >  drivers/soc/renesas/Kconfig | 2 +-

> > >  1 file changed, 1 insertion(+), 1 deletion(-)

> > >

> > > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig

> > > index 4d8012e1205c..68bfca6f20dd 100644

> > > --- a/drivers/soc/renesas/Kconfig

> > > +++ b/drivers/soc/renesas/Kconfig

> > > @@ -44,7 +44,7 @@ config ARCH_RZN1

> > >         bool

> > >         select ARM_AMBA

> > >

> > > -if ARM

> > > +if ARM && ARCH_RENESAS

> > 

> > After a closer look, I think restricting this from ARM to ARCH_MULTI_V7

> > should work, too (ARCH_MULTI_V7 selects CPU_V7, and ARCH_MULTIPLATFORM

> > selects GENERIC_CLOCKEVENTS).

> 

> Hi Arnd,

> 

> what is your preferred way forwards here?

> I'm tempted to take your patch as-is and then work on

> refining the dependency as a follow-up.


I have gone ahead and applied Arnd's patch as a fix for v4.21.
It seems like the safest option for a fix.
diff mbox series

Patch

diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 4d8012e1205c..68bfca6f20dd 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -44,7 +44,7 @@  config ARCH_RZN1
 	bool
 	select ARM_AMBA
 
-if ARM
+if ARM && ARCH_RENESAS
 
 #comment "Renesas ARM SoCs System Type"