lkml.org 
[lkml]   [2022]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 08/14] riscv: move boot alternatives to after fill_hwcap
    Date
    Move the application of boot alternatives to after the hw-capabilities
    are populated. This allows to check for available extensions when
    determining which alternatives to apply and also makes it actually
    work if CONFIG_SMP is disabled for whatever reason.

    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    ---
    arch/riscv/kernel/setup.c | 2 ++
    arch/riscv/kernel/smpboot.c | 2 --
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
    index 339ceb595b38..b4879c942b42 100644
    --- a/arch/riscv/kernel/setup.c
    +++ b/arch/riscv/kernel/setup.c
    @@ -21,6 +21,7 @@
    #include <linux/efi.h>
    #include <linux/crash_dump.h>

    +#include <asm/alternative.h>
    #include <asm/cpu_ops.h>
    #include <asm/early_ioremap.h>
    #include <asm/pgtable.h>
    @@ -295,6 +296,7 @@ void __init setup_arch(char **cmdline_p)
    #endif

    riscv_fill_hwcap();
    + apply_boot_alternatives();
    }

    static int __init topology_init(void)
    diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
    index a6d13dca1403..f1e4948a4b52 100644
    --- a/arch/riscv/kernel/smpboot.c
    +++ b/arch/riscv/kernel/smpboot.c
    @@ -32,7 +32,6 @@
    #include <asm/sections.h>
    #include <asm/sbi.h>
    #include <asm/smp.h>
    -#include <asm/alternative.h>

    #include "head.h"

    @@ -41,7 +40,6 @@ static DECLARE_COMPLETION(cpu_running);
    void __init smp_prepare_boot_cpu(void)
    {
    init_cpu_topology();
    - apply_boot_alternatives();
    }

    void __init smp_prepare_cpus(unsigned int max_cpus)
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-03-24 01:09    [W:4.148 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site