From: Andrew Jones <andrew.jones@linux.dev>
To: Xiang W <wangxiang@iscas.ac.cn>
Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
pbonzini@redhat.com, thuth@redhat.com
Subject: Re: [kvm-unit-tests PATCH v2 8/8] riscv: Add BRS SBI requirement tests
Date: Fri, 20 Nov 2026 15:09:26 +0100 [thread overview]
Message-ID: <awAxIHVLgbqTIYq5@orel> (raw)
In-Reply-To: <20261105082035.133680-9-wangxiang@iscas.ac.cn>
On Thu, Nov 05, 2026 at 04:20:35PM +0800, Xiang W wrote:
> Add a riscv-brs unit test for the SBI rules in the RISC-V Boot and
> Runtime Services specification:
>
> SBI_010 spec version must be v2.0 or later
> SBI_020 HSM must be implemented
> SBI_030 TIME is required unless Sstc is present
> SBI_040 IPI is required unless IMSIC is present
> SBI_050 RFENCE is required unless IMSIC is present
> SBI_060 PMU is required unless Sscsrind and Ssccfg are all present
> SBI_070 DBCN is required when ACPI SPCR Interface Type is 0x15
>
> Parse the extra ISA names used as skip conditions, and add the RFNC
> and PMU extension IDs needed to probe those extensions.
>
> Signed-off-by: Xiang W <wangxiang@iscas.ac.cn>
> ---
> lib/riscv/asm/isa.h | 3 +
> lib/riscv/asm/sbi.h | 2 +
> lib/riscv/isa.c | 12 +-
> riscv/Makefile | 1 +
> riscv/riscv-brs.c | 265 ++++++++++++++++++++++++++++++++++++++++++++
> riscv/unittests.cfg | 4 +
> 6 files changed, 285 insertions(+), 2 deletions(-)
> create mode 100644 riscv/riscv-brs.c
>
> diff --git a/lib/riscv/asm/isa.h b/lib/riscv/asm/isa.h
> index fb3af67d..6516c869 100644
> --- a/lib/riscv/asm/isa.h
> +++ b/lib/riscv/asm/isa.h
> @@ -13,6 +13,9 @@
> * by name not tracked here with cpu_has_extension_name()
> */
> enum {
> + ISA_SSAIA,
> + ISA_SSCCFG,
> + ISA_SSCSRIND,
> ISA_SSTC,
> ISA_MAX,
> };
> diff --git a/lib/riscv/asm/sbi.h b/lib/riscv/asm/sbi.h
> index 289a6a24..c92a66dc 100644
> --- a/lib/riscv/asm/sbi.h
> +++ b/lib/riscv/asm/sbi.h
> @@ -45,8 +45,10 @@ enum sbi_ext_id {
> SBI_EXT_BASE = 0x10,
> SBI_EXT_TIME = 0x54494d45,
> SBI_EXT_IPI = 0x735049,
> + SBI_EXT_RFNC = 0x52464E43,
> SBI_EXT_HSM = 0x48534d,
> SBI_EXT_SRST = 0x53525354,
> + SBI_EXT_PMU = 0x504D55,
While adding another three char name line it and all the other three char
names up so the '=' are aligned, i.e. add an extra space before the =.
> SBI_EXT_DBCN = 0x4442434E,
> SBI_EXT_SUSP = 0x53555350,
> SBI_EXT_FWFT = 0x46574654,
> diff --git a/lib/riscv/isa.c b/lib/riscv/isa.c
> index 91c7302c..6aa27948 100644
> --- a/lib/riscv/isa.c
> +++ b/lib/riscv/isa.c
> @@ -39,8 +39,16 @@ static void isa_bit(const char *name, int len, void *data)
> {
> struct thread_info *info = (struct thread_info *)data;
>
> - if (isa_match("sstc", name, len))
> - set_bit(ISA_SSTC, info->isa);
> +#define ISA_MATCH_AND_SET(ext) \
> + if (isa_match(#ext, name, len)) \
> + set_bit(ISA_##ext, info->isa)
> +
> + ISA_MATCH_AND_SET(SSAIA);
> + ISA_MATCH_AND_SET(SSCCFG);
> + ISA_MATCH_AND_SET(SSCSRIND);
> + ISA_MATCH_AND_SET(SSTC);
> +
> +#undef ISA_MATCH_AND_SET
> }
>
> static void isa_parse(const char *isa_string, int len, struct isa_info *info)
> diff --git a/riscv/Makefile b/riscv/Makefile
> index 348a30a7..7da7526f 100644
> --- a/riscv/Makefile
> +++ b/riscv/Makefile
> @@ -15,6 +15,7 @@ tests += $(TEST_DIR)/sbi.$(exe)
> tests += $(TEST_DIR)/selftest.$(exe)
> tests += $(TEST_DIR)/sieve.$(exe)
> tests += $(TEST_DIR)/isa-dbltrp.$(exe)
> +tests += $(TEST_DIR)/riscv-brs.$(exe)
>
> all: $(tests)
>
> diff --git a/riscv/riscv-brs.c b/riscv/riscv-brs.c
> new file mode 100644
> index 00000000..2813fa73
> --- /dev/null
> +++ b/riscv/riscv-brs.c
> @@ -0,0 +1,265 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * RISC-V BRS SBI requirement tests
^
^ extra space
> + *
> + * Copyright (C) 2026, Institute of Software, CAS., Xiang W <wangxiang@iscas.ac.cn>
> + */
> +
> +#include <libcflat.h>
> +#include <devicetree.h>
> +#include <asm/sbi.h>
> +#include <asm/isa.h>
> +#include <asm/smp.h>
> +
> +#ifdef CONFIG_EFI
> +#include <acpi.h>
> +#endif
No need for the CONFIG_EFI guard.
> +
> +static void check_sbi_010(void)
> +{
> + struct sbiret ret;
> + unsigned long major, minor;
> +
> + report_prefix_push("SBI_010");
> +
> + ret = sbi_get_spec_version();
> + if (ret.error)
> + report_fail("sbi_get_spec_version failed with %ld", ret.error);
> + else {
The else has {} so the if needs them too.
> + major = ret.value >> SBI_SPEC_VERSION_MAJOR_SHIFT;
> + major = major & SBI_SPEC_VERSION_MAJOR_MASK;
> + minor = ret.value & SBI_SPEC_VERSION_MINOR_MASK;
> +
> + report(ret.value >= sbi_mk_version(2, 0),
ret.value & SBI_SPEC_VERSION_MASK
> + "SBI spec version is v2.0 or later (current %lu.%lu)", major, minor);
> + }
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_020(void)
> +{
> + report_prefix_push("SBI_020");
> + report(sbi_probe(SBI_EXT_HSM), "HSM extension is implemented");
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_030(void)
> +{
> + report_prefix_push("SBI_030");
> +
> + if (cpu_has_extension(smp_processor_id(), ISA_SSTC))
> + report_skip("Sstc is present, TIME is not mandated");
> + else
> + report(sbi_probe(SBI_EXT_TIME), "TIME extension is implemented");
> +
Shouldn't all harts be checked?
> + report_prefix_pop();
> +}
> +
> +#define IMSIC_SLEVEL_IRQ 9
We already have IRQ_S_EXT.
> +static bool hart_has_imsic[NR_CPUS];
> +
> +#ifdef CONFIG_EFI
> +static int acpi_collect_imsic(struct acpi_subtable_header *header)
> +{
> + struct acpi_madt_rintc *rintc = (void *)header;
> + int cpu;
> +
> + if (!rintc->imsic_size)
> + return 0;
> +
> + cpu = hartid_to_cpu(rintc->hart_id);
> + if (cpu >= 0 && cpu < nr_cpus)
> + hart_has_imsic[cpu] = true;
> +
> + return 0;
> +}
> +#endif
> +
> +static int dt_intc_phandle_to_cpu(const void *fdt, uint32_t phandle)
> +{
> + int intc_node, cpu_node, cpus_node, ret, i;
> + struct dt_reg raw_reg;
> + u32 nac, nsc;
> + u64 hartid;
> +
> + intc_node = fdt_node_offset_by_phandle(fdt, phandle);
> + if (intc_node < 0)
> + return -1;
> +
> + /* cpu-intc -> cpu node -> /cpus */
> + cpu_node = fdt_parent_offset(fdt, intc_node);
> + if (cpu_node < 0)
> + return -1;
> +
> + cpus_node = fdt_parent_offset(fdt, cpu_node);
> + if (cpus_node < 0)
> + return -1;
> +
> + /* #address-cells / #size-cells live on /cpus, not on the cpu node */
> + ret = dt_get_nr_cells(cpus_node, &nac, &nsc);
> + if (ret < 0)
> + return -1;
> +
> + dt_reg_init(&raw_reg, nac, nsc);
> + ret = dt_get_reg(cpu_node, 0, &raw_reg);
> + if (ret < 0)
> + return -1;
> +
> + hartid = raw_reg.address_cells[0];
> + if (nac == 2)
> + hartid = (hartid << 32) | raw_reg.address_cells[1];
> +
> + for (i = 0; i < nr_cpus; i++) {
> + if (cpus[i].hartid == hartid)
> + return i;
> + }
> + return -1;
> +}
> +
> +static void dt_collect_imsic(void)
> +{
> + const void *fdt = dt_fdt();
> + const fdt32_t *prop;
> + int node, len, ncells, i, cpu;
> + uint32_t phandle, irq;
> +
> + node = -1;
> + while ((node = fdt_node_offset_by_compatible(fdt, node, "riscv,imsics")) >= 0) {
> + prop = fdt_getprop(fdt, node, "interrupts-extended", &len);
> + if (!prop || len < 0)
> + continue;
> +
> + /* Each entry is <phandle irq> (cpu-intc #interrupt-cells = 1) */
> + ncells = len / (int)sizeof(fdt32_t);
> + for (i = 0; i + 1 < ncells; i += 2) {
> + phandle = fdt32_to_cpu(prop[i]);
> + irq = fdt32_to_cpu(prop[i + 1]);
> +
> + if (irq != IMSIC_SLEVEL_IRQ)
> + continue;
> +
> + cpu = dt_intc_phandle_to_cpu(fdt, phandle);
> + if (cpu >= 0 && cpu < nr_cpus)
> + hart_has_imsic[cpu] = true;
> + }
> + }
> +}
I've sent https://lore.kernel.org/all/20261120135613.1388647-1-andrew.jones@linux.dev/
to avoid having to do all this DT parsing in the test code. Your next
version should add a patch that adds the ACPI support for setting
thread_info.imsic_addr and then this patch should use it.
> +
> +static bool all_harts_have_imsic(void)
> +{
> + int cpu;
> +
> + memset(hart_has_imsic, 0, sizeof(hart_has_imsic));
I see you call all_harts_have_imsic() twice. So instead of zeroing this
you should have a way to know that it's already been set once and then
the second time can just return true/false.
> +
> + if (dt_available())
> + dt_collect_imsic();
> +#ifdef CONFIG_EFI
> + else
> + acpi_table_parse_madt(ACPI_MADT_TYPE_RINTC, acpi_collect_imsic);
> +#endif
> +
> + for (cpu = 0; cpu < nr_cpus; cpu++) {
> + if (!cpu_present(cpu))
> + continue;
> + if (!cpu_has_extension(cpu, ISA_SSAIA)) {
> + report_info("CPU %d (hartid %lu) has no Ssaia",
> + cpu, cpus[cpu].hartid);
> + return false;
> + }
> + if (!hart_has_imsic[cpu]) {
> + report_info("CPU %d (hartid %lu) has no S-level IMSIC",
> + cpu, cpus[cpu].hartid);
> + return false;
> + }
> + }
> +
> + return true;
> +}
> +
> +static void check_sbi_040(void)
> +{
> + report_prefix_push("SBI_040");
> +
> + if (all_harts_have_imsic())
> + report_skip("IMSIC is present, IPI is not mandated");
> + else
> + report(sbi_probe(SBI_EXT_IPI), "IPI extension is implemented");
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_050(void)
> +{
> + report_prefix_push("SBI_050");
> +
> + if (all_harts_have_imsic())
> + report_skip("IMSIC is present, RFENCE is not mandated");
> + else
> + report(sbi_probe(SBI_EXT_RFNC), "RFENCE extension is implemented");
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_060(void)
> +{
> + int cpu = smp_processor_id();
> +
> + report_prefix_push("SBI_060");
> +
> + if (cpu_has_extension(cpu, ISA_SSCSRIND) && cpu_has_extension(cpu, ISA_SSCCFG))
Shouldn't all harts be checked?
> + /*
> + * TODO: OE_SBI_060_010 also requires Smcsrind and Smcdeleg,
> + * but they are M-mode extensions and not present in the S-mode
> + * ISA string (DT or RHCT). Revisit if BRS clarifies how to detect them.
> + */
> + report_skip("Sscsrind and Ssccfg are present, PMU is not mandated");
More than one line (even when they're comments means the if should have
{}, which means the else too.
> + else
> + report(sbi_probe(SBI_EXT_PMU), "PMU extension is implemented");
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_070(void)
> +{
> + report_prefix_push("SBI_070");
> +
> + if (dt_available())
> + report_skip("ACPI not available, DBCN is not mandated");
> + else {
The else has {} so the if needs them too.
> +#ifdef CONFIG_EFI
> + struct spcr_descriptor *spcr;
> +
> + spcr = find_acpi_table_addr(SPCR_SIGNATURE);
> + if (spcr == NULL)
> + report_skip("SPCR is not present, DBCN is not mandated");
> + else {
> + if (spcr->interface_type == 0x15)
> + report(sbi_probe(SBI_EXT_DBCN), "DBCN extension is implemented");
> + else
> + report_skip(
> + "SPCR interface type is %#x (not 0x15), DBCN is not mandated",
This line goes past 100 anyway, so put it on the same line as the
report_skip(
> + spcr->interface_type);
> + }
> +#else
> + report_skip("ACPI not available, DBCN is not mandated");
> +#endif
> + }
> +
> + report_prefix_pop();
> +}
> +
> +int main(int argc, char **argv)
> +{
> + report_prefix_push("riscv-brs");
> +
> + check_sbi_010();
> + check_sbi_020();
> + check_sbi_030();
> + check_sbi_040();
> + check_sbi_050();
> + check_sbi_060();
> + check_sbi_070();
> +
> + return report_summary();
> +}
> diff --git a/riscv/unittests.cfg b/riscv/unittests.cfg
> index 9e9f58d9..990f03db 100644
> --- a/riscv/unittests.cfg
> +++ b/riscv/unittests.cfg
> @@ -22,3 +22,7 @@ groups = sbi
> [dbltrp]
> file = isa-dbltrp.flat
> groups = isa sbi
> +
> +[riscv-brs]
> +file = riscv-brs.flat
> +groups = riscv-brs nodefault
> --
> 2.47.3
>
Thanks,
drew
--
kvm-riscv mailing list
kvm-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kvm-riscv
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <andrew.jones@linux.dev>
To: Xiang W <wangxiang@iscas.ac.cn>
Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
pbonzini@redhat.com, thuth@redhat.com
Subject: Re: [kvm-unit-tests PATCH v2 8/8] riscv: Add BRS SBI requirement tests
Date: Fri, 20 Nov 2026 15:09:26 +0100 [thread overview]
Message-ID: <awAxIHVLgbqTIYq5@orel> (raw)
In-Reply-To: <20261105082035.133680-9-wangxiang@iscas.ac.cn>
On Thu, Nov 05, 2026 at 04:20:35PM +0800, Xiang W wrote:
> Add a riscv-brs unit test for the SBI rules in the RISC-V Boot and
> Runtime Services specification:
>
> SBI_010 spec version must be v2.0 or later
> SBI_020 HSM must be implemented
> SBI_030 TIME is required unless Sstc is present
> SBI_040 IPI is required unless IMSIC is present
> SBI_050 RFENCE is required unless IMSIC is present
> SBI_060 PMU is required unless Sscsrind and Ssccfg are all present
> SBI_070 DBCN is required when ACPI SPCR Interface Type is 0x15
>
> Parse the extra ISA names used as skip conditions, and add the RFNC
> and PMU extension IDs needed to probe those extensions.
>
> Signed-off-by: Xiang W <wangxiang@iscas.ac.cn>
> ---
> lib/riscv/asm/isa.h | 3 +
> lib/riscv/asm/sbi.h | 2 +
> lib/riscv/isa.c | 12 +-
> riscv/Makefile | 1 +
> riscv/riscv-brs.c | 265 ++++++++++++++++++++++++++++++++++++++++++++
> riscv/unittests.cfg | 4 +
> 6 files changed, 285 insertions(+), 2 deletions(-)
> create mode 100644 riscv/riscv-brs.c
>
> diff --git a/lib/riscv/asm/isa.h b/lib/riscv/asm/isa.h
> index fb3af67d..6516c869 100644
> --- a/lib/riscv/asm/isa.h
> +++ b/lib/riscv/asm/isa.h
> @@ -13,6 +13,9 @@
> * by name not tracked here with cpu_has_extension_name()
> */
> enum {
> + ISA_SSAIA,
> + ISA_SSCCFG,
> + ISA_SSCSRIND,
> ISA_SSTC,
> ISA_MAX,
> };
> diff --git a/lib/riscv/asm/sbi.h b/lib/riscv/asm/sbi.h
> index 289a6a24..c92a66dc 100644
> --- a/lib/riscv/asm/sbi.h
> +++ b/lib/riscv/asm/sbi.h
> @@ -45,8 +45,10 @@ enum sbi_ext_id {
> SBI_EXT_BASE = 0x10,
> SBI_EXT_TIME = 0x54494d45,
> SBI_EXT_IPI = 0x735049,
> + SBI_EXT_RFNC = 0x52464E43,
> SBI_EXT_HSM = 0x48534d,
> SBI_EXT_SRST = 0x53525354,
> + SBI_EXT_PMU = 0x504D55,
While adding another three char name line it and all the other three char
names up so the '=' are aligned, i.e. add an extra space before the =.
> SBI_EXT_DBCN = 0x4442434E,
> SBI_EXT_SUSP = 0x53555350,
> SBI_EXT_FWFT = 0x46574654,
> diff --git a/lib/riscv/isa.c b/lib/riscv/isa.c
> index 91c7302c..6aa27948 100644
> --- a/lib/riscv/isa.c
> +++ b/lib/riscv/isa.c
> @@ -39,8 +39,16 @@ static void isa_bit(const char *name, int len, void *data)
> {
> struct thread_info *info = (struct thread_info *)data;
>
> - if (isa_match("sstc", name, len))
> - set_bit(ISA_SSTC, info->isa);
> +#define ISA_MATCH_AND_SET(ext) \
> + if (isa_match(#ext, name, len)) \
> + set_bit(ISA_##ext, info->isa)
> +
> + ISA_MATCH_AND_SET(SSAIA);
> + ISA_MATCH_AND_SET(SSCCFG);
> + ISA_MATCH_AND_SET(SSCSRIND);
> + ISA_MATCH_AND_SET(SSTC);
> +
> +#undef ISA_MATCH_AND_SET
> }
>
> static void isa_parse(const char *isa_string, int len, struct isa_info *info)
> diff --git a/riscv/Makefile b/riscv/Makefile
> index 348a30a7..7da7526f 100644
> --- a/riscv/Makefile
> +++ b/riscv/Makefile
> @@ -15,6 +15,7 @@ tests += $(TEST_DIR)/sbi.$(exe)
> tests += $(TEST_DIR)/selftest.$(exe)
> tests += $(TEST_DIR)/sieve.$(exe)
> tests += $(TEST_DIR)/isa-dbltrp.$(exe)
> +tests += $(TEST_DIR)/riscv-brs.$(exe)
>
> all: $(tests)
>
> diff --git a/riscv/riscv-brs.c b/riscv/riscv-brs.c
> new file mode 100644
> index 00000000..2813fa73
> --- /dev/null
> +++ b/riscv/riscv-brs.c
> @@ -0,0 +1,265 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * RISC-V BRS SBI requirement tests
^
^ extra space
> + *
> + * Copyright (C) 2026, Institute of Software, CAS., Xiang W <wangxiang@iscas.ac.cn>
> + */
> +
> +#include <libcflat.h>
> +#include <devicetree.h>
> +#include <asm/sbi.h>
> +#include <asm/isa.h>
> +#include <asm/smp.h>
> +
> +#ifdef CONFIG_EFI
> +#include <acpi.h>
> +#endif
No need for the CONFIG_EFI guard.
> +
> +static void check_sbi_010(void)
> +{
> + struct sbiret ret;
> + unsigned long major, minor;
> +
> + report_prefix_push("SBI_010");
> +
> + ret = sbi_get_spec_version();
> + if (ret.error)
> + report_fail("sbi_get_spec_version failed with %ld", ret.error);
> + else {
The else has {} so the if needs them too.
> + major = ret.value >> SBI_SPEC_VERSION_MAJOR_SHIFT;
> + major = major & SBI_SPEC_VERSION_MAJOR_MASK;
> + minor = ret.value & SBI_SPEC_VERSION_MINOR_MASK;
> +
> + report(ret.value >= sbi_mk_version(2, 0),
ret.value & SBI_SPEC_VERSION_MASK
> + "SBI spec version is v2.0 or later (current %lu.%lu)", major, minor);
> + }
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_020(void)
> +{
> + report_prefix_push("SBI_020");
> + report(sbi_probe(SBI_EXT_HSM), "HSM extension is implemented");
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_030(void)
> +{
> + report_prefix_push("SBI_030");
> +
> + if (cpu_has_extension(smp_processor_id(), ISA_SSTC))
> + report_skip("Sstc is present, TIME is not mandated");
> + else
> + report(sbi_probe(SBI_EXT_TIME), "TIME extension is implemented");
> +
Shouldn't all harts be checked?
> + report_prefix_pop();
> +}
> +
> +#define IMSIC_SLEVEL_IRQ 9
We already have IRQ_S_EXT.
> +static bool hart_has_imsic[NR_CPUS];
> +
> +#ifdef CONFIG_EFI
> +static int acpi_collect_imsic(struct acpi_subtable_header *header)
> +{
> + struct acpi_madt_rintc *rintc = (void *)header;
> + int cpu;
> +
> + if (!rintc->imsic_size)
> + return 0;
> +
> + cpu = hartid_to_cpu(rintc->hart_id);
> + if (cpu >= 0 && cpu < nr_cpus)
> + hart_has_imsic[cpu] = true;
> +
> + return 0;
> +}
> +#endif
> +
> +static int dt_intc_phandle_to_cpu(const void *fdt, uint32_t phandle)
> +{
> + int intc_node, cpu_node, cpus_node, ret, i;
> + struct dt_reg raw_reg;
> + u32 nac, nsc;
> + u64 hartid;
> +
> + intc_node = fdt_node_offset_by_phandle(fdt, phandle);
> + if (intc_node < 0)
> + return -1;
> +
> + /* cpu-intc -> cpu node -> /cpus */
> + cpu_node = fdt_parent_offset(fdt, intc_node);
> + if (cpu_node < 0)
> + return -1;
> +
> + cpus_node = fdt_parent_offset(fdt, cpu_node);
> + if (cpus_node < 0)
> + return -1;
> +
> + /* #address-cells / #size-cells live on /cpus, not on the cpu node */
> + ret = dt_get_nr_cells(cpus_node, &nac, &nsc);
> + if (ret < 0)
> + return -1;
> +
> + dt_reg_init(&raw_reg, nac, nsc);
> + ret = dt_get_reg(cpu_node, 0, &raw_reg);
> + if (ret < 0)
> + return -1;
> +
> + hartid = raw_reg.address_cells[0];
> + if (nac == 2)
> + hartid = (hartid << 32) | raw_reg.address_cells[1];
> +
> + for (i = 0; i < nr_cpus; i++) {
> + if (cpus[i].hartid == hartid)
> + return i;
> + }
> + return -1;
> +}
> +
> +static void dt_collect_imsic(void)
> +{
> + const void *fdt = dt_fdt();
> + const fdt32_t *prop;
> + int node, len, ncells, i, cpu;
> + uint32_t phandle, irq;
> +
> + node = -1;
> + while ((node = fdt_node_offset_by_compatible(fdt, node, "riscv,imsics")) >= 0) {
> + prop = fdt_getprop(fdt, node, "interrupts-extended", &len);
> + if (!prop || len < 0)
> + continue;
> +
> + /* Each entry is <phandle irq> (cpu-intc #interrupt-cells = 1) */
> + ncells = len / (int)sizeof(fdt32_t);
> + for (i = 0; i + 1 < ncells; i += 2) {
> + phandle = fdt32_to_cpu(prop[i]);
> + irq = fdt32_to_cpu(prop[i + 1]);
> +
> + if (irq != IMSIC_SLEVEL_IRQ)
> + continue;
> +
> + cpu = dt_intc_phandle_to_cpu(fdt, phandle);
> + if (cpu >= 0 && cpu < nr_cpus)
> + hart_has_imsic[cpu] = true;
> + }
> + }
> +}
I've sent https://lore.kernel.org/all/20261120135613.1388647-1-andrew.jones@linux.dev/
to avoid having to do all this DT parsing in the test code. Your next
version should add a patch that adds the ACPI support for setting
thread_info.imsic_addr and then this patch should use it.
> +
> +static bool all_harts_have_imsic(void)
> +{
> + int cpu;
> +
> + memset(hart_has_imsic, 0, sizeof(hart_has_imsic));
I see you call all_harts_have_imsic() twice. So instead of zeroing this
you should have a way to know that it's already been set once and then
the second time can just return true/false.
> +
> + if (dt_available())
> + dt_collect_imsic();
> +#ifdef CONFIG_EFI
> + else
> + acpi_table_parse_madt(ACPI_MADT_TYPE_RINTC, acpi_collect_imsic);
> +#endif
> +
> + for (cpu = 0; cpu < nr_cpus; cpu++) {
> + if (!cpu_present(cpu))
> + continue;
> + if (!cpu_has_extension(cpu, ISA_SSAIA)) {
> + report_info("CPU %d (hartid %lu) has no Ssaia",
> + cpu, cpus[cpu].hartid);
> + return false;
> + }
> + if (!hart_has_imsic[cpu]) {
> + report_info("CPU %d (hartid %lu) has no S-level IMSIC",
> + cpu, cpus[cpu].hartid);
> + return false;
> + }
> + }
> +
> + return true;
> +}
> +
> +static void check_sbi_040(void)
> +{
> + report_prefix_push("SBI_040");
> +
> + if (all_harts_have_imsic())
> + report_skip("IMSIC is present, IPI is not mandated");
> + else
> + report(sbi_probe(SBI_EXT_IPI), "IPI extension is implemented");
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_050(void)
> +{
> + report_prefix_push("SBI_050");
> +
> + if (all_harts_have_imsic())
> + report_skip("IMSIC is present, RFENCE is not mandated");
> + else
> + report(sbi_probe(SBI_EXT_RFNC), "RFENCE extension is implemented");
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_060(void)
> +{
> + int cpu = smp_processor_id();
> +
> + report_prefix_push("SBI_060");
> +
> + if (cpu_has_extension(cpu, ISA_SSCSRIND) && cpu_has_extension(cpu, ISA_SSCCFG))
Shouldn't all harts be checked?
> + /*
> + * TODO: OE_SBI_060_010 also requires Smcsrind and Smcdeleg,
> + * but they are M-mode extensions and not present in the S-mode
> + * ISA string (DT or RHCT). Revisit if BRS clarifies how to detect them.
> + */
> + report_skip("Sscsrind and Ssccfg are present, PMU is not mandated");
More than one line (even when they're comments means the if should have
{}, which means the else too.
> + else
> + report(sbi_probe(SBI_EXT_PMU), "PMU extension is implemented");
> +
> + report_prefix_pop();
> +}
> +
> +static void check_sbi_070(void)
> +{
> + report_prefix_push("SBI_070");
> +
> + if (dt_available())
> + report_skip("ACPI not available, DBCN is not mandated");
> + else {
The else has {} so the if needs them too.
> +#ifdef CONFIG_EFI
> + struct spcr_descriptor *spcr;
> +
> + spcr = find_acpi_table_addr(SPCR_SIGNATURE);
> + if (spcr == NULL)
> + report_skip("SPCR is not present, DBCN is not mandated");
> + else {
> + if (spcr->interface_type == 0x15)
> + report(sbi_probe(SBI_EXT_DBCN), "DBCN extension is implemented");
> + else
> + report_skip(
> + "SPCR interface type is %#x (not 0x15), DBCN is not mandated",
This line goes past 100 anyway, so put it on the same line as the
report_skip(
> + spcr->interface_type);
> + }
> +#else
> + report_skip("ACPI not available, DBCN is not mandated");
> +#endif
> + }
> +
> + report_prefix_pop();
> +}
> +
> +int main(int argc, char **argv)
> +{
> + report_prefix_push("riscv-brs");
> +
> + check_sbi_010();
> + check_sbi_020();
> + check_sbi_030();
> + check_sbi_040();
> + check_sbi_050();
> + check_sbi_060();
> + check_sbi_070();
> +
> + return report_summary();
> +}
> diff --git a/riscv/unittests.cfg b/riscv/unittests.cfg
> index 9e9f58d9..990f03db 100644
> --- a/riscv/unittests.cfg
> +++ b/riscv/unittests.cfg
> @@ -22,3 +22,7 @@ groups = sbi
> [dbltrp]
> file = isa-dbltrp.flat
> groups = isa sbi
> +
> +[riscv-brs]
> +file = riscv-brs.flat
> +groups = riscv-brs nodefault
> --
> 2.47.3
>
Thanks,
drew
next prev parent reply other threads:[~2026-11-20 14:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-05 8:20 [kvm-unit-tests PATCH v2 0/8] riscv: ACPI boot and BRS-I SBI tests Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 1/8] riscv: Initialize the ACPI RSDP from the EFI system table Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 2/8] riscv: Add ACPI support for CPU initialization Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 3/8] riscv: Add ACPI support for timer frequency discovery Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-20 13:51 ` Andrew Jones
2026-11-20 13:51 ` Andrew Jones
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 4/8] riscv: Add ACPI support for ISA string discovery Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-20 8:54 ` Andrew Jones
2026-11-20 8:54 ` Andrew Jones
2026-11-20 9:14 ` Andrew Jones
2026-11-20 9:14 ` Andrew Jones
2026-11-20 11:20 ` Andrew Jones
2026-11-20 11:20 ` Andrew Jones
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 5/8] riscv: Prefer SBI DBCN console with UART fallback Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-20 10:08 ` Andrew Jones
2026-11-20 10:08 ` Andrew Jones
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 6/8] riscv: efi: Allow ACPI boots Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-20 10:12 ` Andrew Jones
2026-11-20 10:12 ` Andrew Jones
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 7/8] riscv: initialize ISA extensions for all harts in cpu_init Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-20 11:37 ` Andrew Jones
2026-11-20 11:37 ` Andrew Jones
2026-11-20 13:49 ` Andrew Jones
2026-11-20 13:49 ` Andrew Jones
2026-11-05 8:20 ` [kvm-unit-tests PATCH v2 8/8] riscv: Add BRS SBI requirement tests Xiang W
2026-11-05 8:20 ` Xiang W
2026-11-20 14:09 ` Andrew Jones [this message]
2026-11-20 14:09 ` Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=awAxIHVLgbqTIYq5@orel \
--to=andrew.jones@linux.dev \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
--cc=wangxiang@iscas.ac.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.