[PATCH] RISC-V: Align SBI probe implementation with spec
Conor Dooley
conor.dooley at microchip.com
Thu Apr 27 02:42:41 PDT 2023
On Wed, Apr 26, 2023 at 07:22:54PM +0200, Andrew Jones wrote:
> 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.
Does this need a fixes tag (or tags) then, since we could easily return
a negative value as things stand if the SBI implementation decides to
return 0b1...1 for success?
> Signed-off-by: Andrew Jones <ajones at ventanamicro.com>
> ---
> arch/riscv/include/asm/sbi.h | 2 +-
> arch/riscv/kernel/cpu_ops.c | 2 +-
> arch/riscv/kernel/sbi.c | 17 ++++++++---------
> arch/riscv/kvm/main.c | 2 +-
> drivers/cpuidle/cpuidle-riscv-sbi.c | 2 +-
> drivers/perf/riscv_pmu_sbi.c | 2 +-
> 6 files changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h
> index 945b7be249c1..119355485703 100644
> --- a/arch/riscv/include/asm/sbi.h
> +++ b/arch/riscv/include/asm/sbi.h
> @@ -296,7 +296,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 8275f237a59d..eb479a88a954 100644
> --- 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 5c87db8fdff2..015ce8eef2de 100644
> --- a/arch/riscv/kernel/sbi.c
> +++ b/arch/riscv/kernel/sbi.c
> @@ -581,19 +581,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;
Why not make it return -ENOTSUPP for failures and 0 for success instead,
as it does not appear that any users actually care what the return value
is, once it is not an error?
Concerned that it'll look weird to have
if(!sbi_probe_extension(foo))
print(foo is available!)
since it looks a bit weird that the !case is success?
If so, perhaps it could just return a bool instead, unless of course I
am missing some pending user that make some decision on the actual value
returned here is.
Cheers,
Conor.
> }
> EXPORT_SYMBOL(sbi_probe_extension);
>
> @@ -665,26 +664,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 41ad7639a17b..c923c113a129 100644
> --- 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 be383f4b6855..c6b599167036 100644
> --- 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 70cb50fd41c2..4f3ac296b3e2 100644
> --- 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;
> }
>
> --
> 2.39.2
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kvm-riscv/attachments/20230427/c777b33f/attachment-0001.sig>
More information about the kvm-riscv
mailing list