Commit 9314c996 authored Nov 03, 2020 by Christophe Leroy Committed by Greg Kroah-Hartman Dec 29, 2020

powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32



[ Upstream commit 78665179e569c7e1fe102fb6c21d0f5b6951f084 ]

On 8xx, we get the following features:

[    0.000000] cpu_features      = 0x0000000000000100
[    0.000000]   possible        = 0x0000000000000120
[    0.000000]   always          = 0x0000000000000000

This is not correct. As CONFIG_PPC_8xx is mutually exclusive with all
other configurations, the three lines should be equal.

The problem is due to CPU_FTRS_GENERIC_32 which is taken when
CONFIG_BOOK3S_32 is NOT selected. This CPU_FTRS_GENERIC_32 is
pointless because there is no generic configuration supporting
all 32 bits but book3s/32.

Remove this pointless generic features definition to unbreak the
calculation of 'possible' features and 'always' features.

Fixes: 76bc080e ("[POWERPC] Make default cputable entries reflect selected CPU family")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/76a85f30bf981d1aeaae00df99321235494da254.1604426550.git.christophe.leroy@csgroup.eu


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent b4fbbb75

arch/powerpc/include/asm/cputable.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -419,7 +419,6 @@ enum {
		CPU_FTR_DBELL \| CPU_FTR_POPCNTB \| CPU_FTR_POPCNTD \| \
		CPU_FTR_DEBUG_LVL_EXC \| CPU_FTR_EMB_HV \| CPU_FTR_ALTIVEC_COMP \| \
		CPU_FTR_CELL_TB_BUG \| CPU_FTR_SMT)
		#define CPU_FTRS_GENERIC_32 (CPU_FTR_COMMON \| CPU_FTR_NODSISRALIGN)

		/* 64-bit CPUs */
		#define CPU_FTRS_POWER4 (CPU_FTR_USE_TB \| CPU_FTR_LWSYNC \| \
		@@ -510,8 +509,6 @@ enum {
		CPU_FTRS_7447 \| CPU_FTRS_7447A \| CPU_FTRS_82XX \|
		CPU_FTRS_G2_LE \| CPU_FTRS_E300 \| CPU_FTRS_E300C2 \|
		CPU_FTRS_CLASSIC32 \|
		#else
		CPU_FTRS_GENERIC_32 \|
		#endif
		#ifdef CONFIG_8xx
		CPU_FTRS_8XX \|
		@@ -562,8 +559,6 @@ enum {
		CPU_FTRS_7447 & CPU_FTRS_7447A & CPU_FTRS_82XX &
		CPU_FTRS_G2_LE & CPU_FTRS_E300 & CPU_FTRS_E300C2 &
		CPU_FTRS_CLASSIC32 &
		#else
		CPU_FTRS_GENERIC_32 &
		#endif
		#ifdef CONFIG_8xx
		CPU_FTRS_8XX &