RISC-V: Fix error code returned by riscv_hartid_to_cpuid()

avpatel · palmer-dabbelt · commit 533b4f3a789d · 2021-05-01T08:53:19.000-07:00
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: 6825c7a ("RISC-V: Add logical CPU indexing for RISC-V") Fixes: f99fb60 ("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>
diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c
@@ -56,7 +56,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)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ int riscv_hartid_to_cpuid(int hartid)`
`56`	`56`	`return i;`
`57`	`57`
`58`	`58`	`pr_err("Couldn't find cpu id for hartid [%d]\n", hartid);`
`59`		`- return i;`
	`59`	`+ return -ENOENT;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`void riscv_cpuid_to_hartid_mask(const struct cpumask in, struct cpumask out)`