On Thu, May 26, 2022 at 3:12 AM Sunil V L sunilvl@ventanamicro.com wrote:

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") Cc: stable@vger.kernel.org

Signed-off-by: Sunil V L sunilvl@ventanamicro.com

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 346847f6c41c..3ade9152a3c7 100644 --- a/arch/riscv/kernel/cpu_ops_spinwait.c +++ b/arch/riscv/kernel/cpu_ops_spinwait.c @@ -18,7 +18,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
  

@@ -27,7 +27,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.25.1

Reviewed-by: Atish Patra atishp@rivosinc.com