lkml.org 
[lkml]   [2021]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 200/363] RISC-V: Fix error code returned by riscv_hartid_to_cpuid()
    Date
    From: Anup Patel <anup.patel@wdc.com>

    [ Upstream commit 533b4f3a789d49574e7ae0f6ececed153f651f97 ]

    We should return a negative error code upon failure in
    riscv_hartid_to_cpuid() instead of NR_CPUS. This is also
    aligned with all uses of riscv_hartid_to_cpuid() which
    expect negative error code upon failure.

    Fixes: 6825c7a80f18 ("RISC-V: Add logical CPU indexing for RISC-V")
    Fixes: f99fb607fb2b ("RISC-V: Use Linux logical CPU number instead of hartid")
    Signed-off-by: Anup Patel <anup.patel@wdc.com>
    Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/riscv/kernel/smp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c
    index ea028d9e0d24..d44567490d91 100644
    --- a/arch/riscv/kernel/smp.c
    +++ b/arch/riscv/kernel/smp.c
    @@ -54,7 +54,7 @@ int riscv_hartid_to_cpuid(int hartid)
    return i;

    pr_err("Couldn't find cpu id for hartid [%d]\n", hartid);
    - return i;
    + return -ENOENT;
    }

    void riscv_cpuid_to_hartid_mask(const struct cpumask *in, struct cpumask *out)
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-17 16:31    [W:4.093 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site