lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 061/155] Revert "powerpc: Remove unused FW_FEATURE_NATIVE references"
    Date
    From: Michael Ellerman <mpe@ellerman.id.au>

    commit 310d1344e3c58cc2d625aa4e52cfcb7d8a26fcbf upstream.

    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
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/include/asm/firmware.h | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/arch/powerpc/include/asm/firmware.h
    +++ b/arch/powerpc/include/asm/firmware.h
    @@ -82,6 +82,8 @@ enum {
    FW_FEATURE_POWERNV_ALWAYS = 0,
    FW_FEATURE_PS3_POSSIBLE = 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 =
    #ifdef CONFIG_PPC_PSERIES
    FW_FEATURE_PSERIES_POSSIBLE |
    @@ -92,6 +94,9 @@ enum {
    #ifdef CONFIG_PPC_PS3
    FW_FEATURE_PS3_POSSIBLE |
    #endif
    +#ifdef CONFIG_PPC_HASH_MMU_NATIVE
    + FW_FEATURE_NATIVE_ALWAYS |
    +#endif
    0,
    FW_FEATURE_ALWAYS =
    #ifdef CONFIG_PPC_PSERIES
    @@ -103,6 +108,9 @@ enum {
    #ifdef CONFIG_PPC_PS3
    FW_FEATURE_PS3_ALWAYS &
    #endif
    +#ifdef CONFIG_PPC_HASH_MMU_NATIVE
    + FW_FEATURE_NATIVE_ALWAYS &
    +#endif
    FW_FEATURE_POSSIBLE,

    #else /* CONFIG_PPC64 */

    \
     
     \ /
      Last update: 2022-09-06 16:06    [W:6.582 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site