Skip to content

Commit 310d134

Browse files
committed
Revert "powerpc: Remove unused FW_FEATURE_NATIVE references"
This reverts commit 79b74a6. It broke booting on IBM Cell machines when the kernel is also built with CONFIG_PPC_PS3=y. That's because FW_FEATURE_NATIVE_ALWAYS = 0 does have an important effect, which is to clear the PS3 ALWAYS features from FW_FEATURE_ALWAYS. Note that CONFIG_PPC_NATIVE has since been renamed CONFIG_PPC_HASH_MMU_NATIVE. Fixes: 79b74a6 ("powerpc: Remove unused FW_FEATURE_NATIVE references") Cc: stable@vger.kernel.org # v5.17+ Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20220823115952.1203106-1-mpe@ellerman.id.au
1 parent c7acee3 commit 310d134

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

arch/powerpc/include/asm/firmware.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ enum {
8383
FW_FEATURE_POWERNV_ALWAYS = 0,
8484
FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
8585
FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
86+
FW_FEATURE_NATIVE_POSSIBLE = 0,
87+
FW_FEATURE_NATIVE_ALWAYS = 0,
8688
FW_FEATURE_POSSIBLE =
8789
#ifdef CONFIG_PPC_PSERIES
8890
FW_FEATURE_PSERIES_POSSIBLE |
@@ -92,6 +94,9 @@ enum {
9294
#endif
9395
#ifdef CONFIG_PPC_PS3
9496
FW_FEATURE_PS3_POSSIBLE |
97+
#endif
98+
#ifdef CONFIG_PPC_HASH_MMU_NATIVE
99+
FW_FEATURE_NATIVE_ALWAYS |
95100
#endif
96101
0,
97102
FW_FEATURE_ALWAYS =
@@ -103,6 +108,9 @@ enum {
103108
#endif
104109
#ifdef CONFIG_PPC_PS3
105110
FW_FEATURE_PS3_ALWAYS &
111+
#endif
112+
#ifdef CONFIG_PPC_HASH_MMU_NATIVE
113+
FW_FEATURE_NATIVE_ALWAYS &
106114
#endif
107115
FW_FEATURE_POSSIBLE,
108116

0 commit comments

Comments
 (0)