lkml.org 
[lkml]   [2022]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/19] powerpc/64e: Tie PPC_BOOK3E_64 to PPC_E500MC
    Date
    The only 64-bit Book3E CPUs we support require the selection
    of CONFIG_PPC_E500MC.

    However our Kconfig allows configurating a kernel that has 64-bit
    Book3E support, but without CONFIG_PPC_E500MC enabled. Such a kernel
    would never boot, it doesn't know about any CPUs.

    To fix this, force CONFIG_PPC_E500MC to be selected whenever we are
    building a 64-bit Book3E kernel.

    And add a test to detect future situations where cpu_specs is empty.

    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    ---
    v2: Replaced e500mc by CONFIG_PPC_E500MC in commit description.
    ---
    arch/powerpc/kernel/cputable.c | 2 ++
    arch/powerpc/platforms/Kconfig.cputype | 2 ++
    2 files changed, 4 insertions(+)

    diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
    index d8e42ef750f1..2829ea537277 100644
    --- a/arch/powerpc/kernel/cputable.c
    +++ b/arch/powerpc/kernel/cputable.c
    @@ -2018,6 +2018,8 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
    struct cpu_spec *s = cpu_specs;
    int i;

    + BUILD_BUG_ON(!ARRAY_SIZE(cpu_specs));
    +
    s = PTRRELOC(s);

    for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++) {
    diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
    index 5185d942b455..19fd95a06352 100644
    --- a/arch/powerpc/platforms/Kconfig.cputype
    +++ b/arch/powerpc/platforms/Kconfig.cputype
    @@ -108,6 +108,8 @@ config PPC_BOOK3S_64
    config PPC_BOOK3E_64
    bool "Embedded processors"
    select PPC_FSL_BOOK3E
    + select E500
    + select PPC_E500MC
    select PPC_FPU # Make it a choice ?
    select PPC_SMP_MUXED_IPI
    select PPC_DOORBELL
    --
    2.37.1
    \
     
     \ /
      Last update: 2022-09-19 19:04    [W:2.069 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site