tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "powerpc: Remove unused FW_FEATURE_NATIVE references"

This reverts commit 79b74a68486765a4fe685ac4069bc71366c538f5.

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: 79b74a684867 ("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

Michael Ellerman 310d1344 c7acee3d

+8
unified split
+8
arch/powerpc/include/asm/firmware.h
··· 83 FW_FEATURE_POWERNV_ALWAYS = 0, 84 FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, 85 FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, 86 FW_FEATURE_POSSIBLE = 87 #ifdef CONFIG_PPC_PSERIES 88 FW_FEATURE_PSERIES_POSSIBLE | ··· 94 #endif 95 #ifdef CONFIG_PPC_PS3 96 FW_FEATURE_PS3_POSSIBLE | 97 #endif 98 0, 99 FW_FEATURE_ALWAYS = ··· 108 #endif 109 #ifdef CONFIG_PPC_PS3 110 FW_FEATURE_PS3_ALWAYS & 111 #endif 112 FW_FEATURE_POSSIBLE, 113
··· 83 FW_FEATURE_POWERNV_ALWAYS = 0, 84 FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, 85 FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, 86 + FW_FEATURE_NATIVE_POSSIBLE = 0, 87 + FW_FEATURE_NATIVE_ALWAYS = 0, 88 FW_FEATURE_POSSIBLE = 89 #ifdef CONFIG_PPC_PSERIES 90 FW_FEATURE_PSERIES_POSSIBLE | ··· 92 #endif 93 #ifdef CONFIG_PPC_PS3 94 FW_FEATURE_PS3_POSSIBLE | 95 + #endif 96 + #ifdef CONFIG_PPC_HASH_MMU_NATIVE 97 + FW_FEATURE_NATIVE_ALWAYS | 98 #endif 99 0, 100 FW_FEATURE_ALWAYS = ··· 103 #endif 104 #ifdef CONFIG_PPC_PS3 105 FW_FEATURE_PS3_ALWAYS & 106 + #endif 107 + #ifdef CONFIG_PPC_HASH_MMU_NATIVE 108 + FW_FEATURE_NATIVE_ALWAYS & 109 #endif 110 FW_FEATURE_POSSIBLE, 111