[PATCH] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block

[PATCH] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block

[Masahiro Yamada]

There are two CONFIG_POWERPC64_CPU entries in the "CPU selection"
choice block.

I guess the intent is to display a different prompt depending on
CPU_LITTLE_ENDIAN: "Generic (POWER5 and PowerPC 970 and above)" for big
endian, and "Generic (POWER8 and above)" for little endian.

I stumbled on this tricky use case, and worked around it on Kconfig with
commit 4d46b5b623e0 ("kconfig: fix infinite loop in sym_calc_choice()").
However, I doubt that supporting multiple entries with the same symbol
in a choice block is worth the complexity - this is the only such case
in the kernel tree.

This commit merges the two entries. Once this cleanup is accepted in
the powerpc subsystem, I will proceed to refactor the Kconfig parser.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/powerpc/platforms/Kconfig.cputype | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 613b383ed8b3..7b527d18aa5e 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -122,16 +122,11 @@ choice
 	  If unsure, select Generic.
 
 config POWERPC64_CPU
-	bool "Generic (POWER5 and PowerPC 970 and above)"
-	depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN
+	bool "Generic 64 bits powerpc"
+	depends on PPC_BOOK3S_64
+	select ARCH_HAS_FAST_MULTIPLIER if CPU_LITTLE_ENDIAN
 	select PPC_64S_HASH_MMU
-
-config POWERPC64_CPU
-	bool "Generic (POWER8 and above)"
-	depends on PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN
-	select ARCH_HAS_FAST_MULTIPLIER
-	select PPC_64S_HASH_MMU
-	select PPC_HAS_LBARX_LHARX
+	select PPC_HAS_LBARX_LHARX if CPU_LITTLE_ENDIAN
 
 config POWERPC_CPU
 	bool "Generic 32 bits powerpc"
-- 
2.43.0

Re: [PATCH] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block

[Christophe Leroy]

Le 07/06/2025 à 12:13, Masahiro Yamada a écrit :
> There are two CONFIG_POWERPC64_CPU entries in the "CPU selection"
> choice block.
> 
> I guess the intent is to display a different prompt depending on
> CPU_LITTLE_ENDIAN: "Generic (POWER5 and PowerPC 970 and above)" for big
> endian, and "Generic (POWER8 and above)" for little endian.
> 
> I stumbled on this tricky use case, and worked around it on Kconfig with
> commit 4d46b5b623e0 ("kconfig: fix infinite loop in sym_calc_choice()").
> However, I doubt that supporting multiple entries with the same symbol
> in a choice block is worth the complexity - this is the only such case
> in the kernel tree.
> 
> This commit merges the two entries. Once this cleanup is accepted in
> the powerpc subsystem, I will proceed to refactor the Kconfig parser.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> ---
> 
>   arch/powerpc/platforms/Kconfig.cputype | 13 ++++---------
>   1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
> index 613b383ed8b3..7b527d18aa5e 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -122,16 +122,11 @@ choice
>   	  If unsure, select Generic.
>   
>   config POWERPC64_CPU
> -	bool "Generic (POWER5 and PowerPC 970 and above)"
> -	depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN
> +	bool "Generic 64 bits powerpc"
> +	depends on PPC_BOOK3S_64
> +	select ARCH_HAS_FAST_MULTIPLIER if CPU_LITTLE_ENDIAN
>   	select PPC_64S_HASH_MMU
> -
> -config POWERPC64_CPU
> -	bool "Generic (POWER8 and above)"
> -	depends on PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN
> -	select ARCH_HAS_FAST_MULTIPLIER
> -	select PPC_64S_HASH_MMU
> -	select PPC_HAS_LBARX_LHARX
> +	select PPC_HAS_LBARX_LHARX if CPU_LITTLE_ENDIAN
>   
>   config POWERPC_CPU
>   	bool "Generic 32 bits powerpc"

Re: [PATCH] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block

[Michael Ellerman]

Masahiro Yamada <masahiroy@kernel.org> writes:
> There are two CONFIG_POWERPC64_CPU entries in the "CPU selection"
> choice block.
>
> I guess the intent is to display a different prompt depending on
> CPU_LITTLE_ENDIAN: "Generic (POWER5 and PowerPC 970 and above)" for big
> endian, and "Generic (POWER8 and above)" for little endian.

Yeah.

> I stumbled on this tricky use case, and worked around it on Kconfig with
> commit 4d46b5b623e0 ("kconfig: fix infinite loop in sym_calc_choice()").
> However, I doubt that supporting multiple entries with the same symbol
> in a choice block is worth the complexity - this is the only such case
> in the kernel tree.
>
> This commit merges the two entries. Once this cleanup is accepted in
> the powerpc subsystem, I will proceed to refactor the Kconfig parser.

OK. Sorry for the trouble.

It could be split into two symbols to keep the separate prompts, but it's
probably not worth the trouble.

Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)

cheers

> diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
> index 613b383ed8b3..7b527d18aa5e 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -122,16 +122,11 @@ choice
>  	  If unsure, select Generic.
>  
>  config POWERPC64_CPU
> -	bool "Generic (POWER5 and PowerPC 970 and above)"
> -	depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN
> +	bool "Generic 64 bits powerpc"
> +	depends on PPC_BOOK3S_64
> +	select ARCH_HAS_FAST_MULTIPLIER if CPU_LITTLE_ENDIAN
>  	select PPC_64S_HASH_MMU
> -
> -config POWERPC64_CPU
> -	bool "Generic (POWER8 and above)"
> -	depends on PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN
> -	select ARCH_HAS_FAST_MULTIPLIER
> -	select PPC_64S_HASH_MMU
> -	select PPC_HAS_LBARX_LHARX
> +	select PPC_HAS_LBARX_LHARX if CPU_LITTLE_ENDIAN
>  
>  config POWERPC_CPU
>  	bool "Generic 32 bits powerpc"
> -- 
> 2.43.0

Re: [PATCH] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block

[Masahiro Yamada]

On Mon, Jun 9, 2025 at 9:59 AM Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Masahiro Yamada <masahiroy@kernel.org> writes:
> > There are two CONFIG_POWERPC64_CPU entries in the "CPU selection"
> > choice block.
> >
> > I guess the intent is to display a different prompt depending on
> > CPU_LITTLE_ENDIAN: "Generic (POWER5 and PowerPC 970 and above)" for big
> > endian, and "Generic (POWER8 and above)" for little endian.
>
> Yeah.
>
> > I stumbled on this tricky use case, and worked around it on Kconfig with
> > commit 4d46b5b623e0 ("kconfig: fix infinite loop in sym_calc_choice()").
> > However, I doubt that supporting multiple entries with the same symbol
> > in a choice block is worth the complexity - this is the only such case
> > in the kernel tree.
> >
> > This commit merges the two entries. Once this cleanup is accepted in
> > the powerpc subsystem, I will proceed to refactor the Kconfig parser.
>
> OK. Sorry for the trouble.
>
> It could be split into two symbols to keep the separate prompts, but it's
> probably not worth the trouble.
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)

No rush for this patch.
Please take it to your ppc tree.
Thank you.


Best Regards
Masahiro Yamada

Re: [PATCH] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block

[Madhavan Srinivasan]

On Sat, 07 Jun 2025 19:13:51 +0900, Masahiro Yamada wrote:
> There are two CONFIG_POWERPC64_CPU entries in the "CPU selection"
> choice block.
> 
> I guess the intent is to display a different prompt depending on
> CPU_LITTLE_ENDIAN: "Generic (POWER5 and PowerPC 970 and above)" for big
> endian, and "Generic (POWER8 and above)" for little endian.
> 
> [...]

Applied to powerpc/fixes.

[1/1] powerpc: unify two CONFIG_POWERPC64_CPU entries in the same choice block
      https://git.kernel.org/powerpc/c/6a859f1a19d1f8756ffb097f5973dfebbca4811a

Thanks