RISC-V: Align SBI probe implementation with spec

sbi_probe_extension() is specified with "Returns 0 if the given SBI
extension ID (EID) is not available, or 1 if it is available unless
defined as any other non-zero value by the implementation."
Additionally, sbiret.value is a long. Fix the implementation to
ensure any nonzero long value is considered a success, rather
than only positive int values.

Fixes: b9dcd9e41587 ("RISC-V: Add basic support for SBI v0.2")
Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230427163626.101042-1-ajones@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
index acab4410ef2a923be4871265e1f3ebfeb5b3c372..5b4a1bf5f4395ca62c952c2b5502d7877459fca0 100644 (file)
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@ -295,7 +295,7 @@ int sbi_remote_hfence_vvma_asid(const struct cpumask *cpu_mask,
                                unsigned long start,
                                unsigned long size,
                                unsigned long asid);
-int sbi_probe_extension(int ext);
+long sbi_probe_extension(int ext);
 
 /* Check if current SBI specification version is 0.1 or not */
 static inline int sbi_spec_is_0_1(void)

diff --git a/arch/riscv/kernel/cpu_ops.c b/arch/riscv/kernel/cpu_ops.c
index 8275f237a59df7d16cf12a8ba11630fe718c617d..eb479a88a954ef07be7b887485bbbb2834b1b6bd 100644 (file)
--- a/arch/riscv/kernel/cpu_ops.c
+++ b/arch/riscv/kernel/cpu_ops.c
@@ -27,7 +27,7 @@ const struct cpu_operations cpu_ops_spinwait = {
 void __init cpu_set_ops(int cpuid)
 {
 #if IS_ENABLED(CONFIG_RISCV_SBI)
-       if (sbi_probe_extension(SBI_EXT_HSM) > 0) {
+       if (sbi_probe_extension(SBI_EXT_HSM)) {
                if (!cpuid)
                        pr_info("SBI HSM extension detected\n");
                cpu_ops[cpuid] = &cpu_ops_sbi;

diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c
index 92b9b759ab3d56c8f19524b4f15353de9f54e4d0..c672c8ba9a2a6b45450993b56c41f48e3514249b 100644 (file)
--- a/arch/riscv/kernel/sbi.c
+++ b/arch/riscv/kernel/sbi.c
@@ -524,19 +524,18 @@ static void sbi_srst_power_off(void)
  * sbi_probe_extension() - Check if an SBI extension ID is supported or not.
  * @extid: The extension ID to be probed.
  *
- * Return: Extension specific nonzero value f yes, -ENOTSUPP otherwise.
+ * Return: 1 or an extension specific nonzero value if yes, 0 otherwise.
  */
-int sbi_probe_extension(int extid)
+long sbi_probe_extension(int extid)
 {
        struct sbiret ret;
 
        ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_PROBE_EXT, extid,
                        0, 0, 0, 0, 0);
        if (!ret.error)
-               if (ret.value)
-                       return ret.value;
+               return ret.value;
 
-       return -ENOTSUPP;
+       return 0;
 }
 EXPORT_SYMBOL(sbi_probe_extension);
 
@@ -599,26 +598,26 @@ void __init sbi_init(void)
        if (!sbi_spec_is_0_1()) {
                pr_info("SBI implementation ID=0x%lx Version=0x%lx\n",
                        sbi_get_firmware_id(), sbi_get_firmware_version());
-               if (sbi_probe_extension(SBI_EXT_TIME) > 0) {
+               if (sbi_probe_extension(SBI_EXT_TIME)) {
                        __sbi_set_timer = __sbi_set_timer_v02;
                        pr_info("SBI TIME extension detected\n");
                } else {
                        __sbi_set_timer = __sbi_set_timer_v01;
                }
-               if (sbi_probe_extension(SBI_EXT_IPI) > 0) {
+               if (sbi_probe_extension(SBI_EXT_IPI)) {
                        __sbi_send_ipi  = __sbi_send_ipi_v02;
                        pr_info("SBI IPI extension detected\n");
                } else {
                        __sbi_send_ipi  = __sbi_send_ipi_v01;
                }
-               if (sbi_probe_extension(SBI_EXT_RFENCE) > 0) {
+               if (sbi_probe_extension(SBI_EXT_RFENCE)) {
                        __sbi_rfence    = __sbi_rfence_v02;
                        pr_info("SBI RFENCE extension detected\n");
                } else {
                        __sbi_rfence    = __sbi_rfence_v01;
                }
                if ((sbi_spec_version >= sbi_mk_version(0, 3)) &&
-                   (sbi_probe_extension(SBI_EXT_SRST) > 0)) {
+                   sbi_probe_extension(SBI_EXT_SRST)) {
                        pr_info("SBI SRST extension detected\n");
                        pm_power_off = sbi_srst_power_off;
                        sbi_srst_reboot_nb.notifier_call = sbi_srst_reboot;

diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c
index 41ad7639a17bfca59b39cafd0248b55d3772885c..c923c113a1293de1b292c4c21128c70bf6686961 100644 (file)
--- a/arch/riscv/kvm/main.c
+++ b/arch/riscv/kvm/main.c
@@ -75,7 +75,7 @@ static int __init riscv_kvm_init(void)
                return -ENODEV;
        }
 
-       if (sbi_probe_extension(SBI_EXT_RFENCE) <= 0) {
+       if (!sbi_probe_extension(SBI_EXT_RFENCE)) {
                kvm_info("require SBI RFENCE extension\n");
                return -ENODEV;
        }

diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c
index f2ccda2c38711c5fcc339b2ac49b56b047e4b4db..e8094fc92491ebd2754c7cf89223ee5f658529d4 100644 (file)
--- a/drivers/cpuidle/cpuidle-riscv-sbi.c
+++ b/drivers/cpuidle/cpuidle-riscv-sbi.c
@@ -613,7 +613,7 @@ static int __init sbi_cpuidle_init(void)
         * 2) SBI HSM extension is available
         */
        if ((sbi_spec_version < sbi_mk_version(0, 3)) ||
-           sbi_probe_extension(SBI_EXT_HSM) <= 0) {
+           !sbi_probe_extension(SBI_EXT_HSM)) {
                pr_info("HSM suspend not available\n");
                return 0;
        }

diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index 70cb50fd41c29b2e00baf88ce259e2538a4692ac..4f3ac296b3e25afe356cd7662e32c6f6e2cbf2d5 100644 (file)
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -924,7 +924,7 @@ static int __init pmu_sbi_devinit(void)
        struct platform_device *pdev;
 
        if (sbi_spec_version < sbi_mk_version(0, 3) ||
-           sbi_probe_extension(SBI_EXT_PMU) <= 0) {
+           !sbi_probe_extension(SBI_EXT_PMU)) {
                return 0;
        }