Revert "powerpc: Remove unused FW_FEATURE_NATIVE references"
This reverts commit79b74a6848. 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:79b74a6848("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
This commit is contained in:
@@ -83,6 +83,8 @@ enum {
|
|||||||
FW_FEATURE_POWERNV_ALWAYS = 0,
|
FW_FEATURE_POWERNV_ALWAYS = 0,
|
||||||
FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
|
FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
|
||||||
FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
|
FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
|
||||||
|
FW_FEATURE_NATIVE_POSSIBLE = 0,
|
||||||
|
FW_FEATURE_NATIVE_ALWAYS = 0,
|
||||||
FW_FEATURE_POSSIBLE =
|
FW_FEATURE_POSSIBLE =
|
||||||
#ifdef CONFIG_PPC_PSERIES
|
#ifdef CONFIG_PPC_PSERIES
|
||||||
FW_FEATURE_PSERIES_POSSIBLE |
|
FW_FEATURE_PSERIES_POSSIBLE |
|
||||||
@@ -92,6 +94,9 @@ enum {
|
|||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PPC_PS3
|
#ifdef CONFIG_PPC_PS3
|
||||||
FW_FEATURE_PS3_POSSIBLE |
|
FW_FEATURE_PS3_POSSIBLE |
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_PPC_HASH_MMU_NATIVE
|
||||||
|
FW_FEATURE_NATIVE_ALWAYS |
|
||||||
#endif
|
#endif
|
||||||
0,
|
0,
|
||||||
FW_FEATURE_ALWAYS =
|
FW_FEATURE_ALWAYS =
|
||||||
@@ -103,6 +108,9 @@ enum {
|
|||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PPC_PS3
|
#ifdef CONFIG_PPC_PS3
|
||||||
FW_FEATURE_PS3_ALWAYS &
|
FW_FEATURE_PS3_ALWAYS &
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_PPC_HASH_MMU_NATIVE
|
||||||
|
FW_FEATURE_NATIVE_ALWAYS &
|
||||||
#endif
|
#endif
|
||||||
FW_FEATURE_POSSIBLE,
|
FW_FEATURE_POSSIBLE,
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user