lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0974/1157] riscv: spinwait: Fix hartid variable type
    Date
    From: Sunil V L <sunilvl@ventanamicro.com>

    [ Upstream commit c029e487e7c00e5594a4ae946952605db34e359b ]

    The hartid variable is of type int but compared with
    ULONG_MAX(INVALID_HARTID). This issue is fixed by changing
    the hartid variable type to unsigned long.

    Fixes: c78f94f35cf6 ("RISC-V: Use __cpu_up_stack/task_pointer only for spinwait method")

    Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
    Reviewed-by: Atish Patra <atishp@rivosinc.com>
    Link: https://lore.kernel.org/r/20220527051743.2829940-3-sunilvl@ventanamicro.com
    Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/riscv/kernel/cpu_ops_spinwait.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/riscv/kernel/cpu_ops_spinwait.c b/arch/riscv/kernel/cpu_ops_spinwait.c
    index c662a7cf10a4..d98d19226b5f 100644
    --- a/arch/riscv/kernel/cpu_ops_spinwait.c
    +++ b/arch/riscv/kernel/cpu_ops_spinwait.c
    @@ -20,7 +20,7 @@ void *__cpu_spinwait_task_pointer[NR_CPUS] __section(".data");
    static void cpu_update_secondary_bootdata(unsigned int cpuid,
    struct task_struct *tidle)
    {
    - int hartid = cpuid_to_hartid_map(cpuid);
    + unsigned long hartid = cpuid_to_hartid_map(cpuid);

    /*
    * The hartid must be less than NR_CPUS to avoid out-of-bound access
    @@ -29,7 +29,7 @@ static void cpu_update_secondary_bootdata(unsigned int cpuid,
    * spinwait booting is not the recommended approach for any platforms
    * booting Linux in S-mode and can be disabled in the future.
    */
    - if (hartid == INVALID_HARTID || hartid >= NR_CPUS)
    + if (hartid == INVALID_HARTID || hartid >= (unsigned long) NR_CPUS)
    return;

    /* Make sure tidle is updated */
    --
    2.35.1


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