| Message ID | 20240313145336.311611-3-cem@kernel.org |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Add riscv tests to cover the base extension specs | expand |
On Wed, Mar 13, 2024 at 03:53:25PM +0100, cem@kernel.org wrote: > From: Carlos Maiolino <cem@kernel.org> > > Factor out vendor id test to a new helper, and add a new test for > probing the SBI extension. > Compare the retrieved value against an environment variable, as the > implementation can return any non-zero value. > > Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> > --- > V3: > - Adapt patch to use __base_sbi_ecall > > riscv/sbi.c | 44 ++++++++++++++++++++++++++++++++------------ > 1 file changed, 32 insertions(+), 12 deletions(-) > > diff --git a/riscv/sbi.c b/riscv/sbi.c > index 48d0b06e..55bfcd42 100644 > --- a/riscv/sbi.c > +++ b/riscv/sbi.c > @@ -19,29 +19,49 @@ static struct sbiret __base_sbi_ecall(int fid, unsigned long arg0) > return sbi_ecall(SBI_EXT_BASE, fid, arg0, 0, 0, 0, 0, 0); > } > > -int main(int argc, char **argv) > - The last patch's stray blank line is removed here, so OK, but better to not add it in the first place. > +static void check_base(void) > { > struct sbiret ret; > long expected; > > - if (argc > 1 && !strcmp(argv[1], "-h")) { > - help(); > - exit(0); > - } > - > - report_prefix_push("sbi"); > + report_prefix_push("base"); > > if (!getenv("MVENDORID")) { > report_skip("mvendorid: missing MVENDORID environment variable"); > - goto done; > + return; > } > + > + report_prefix_push("mvendorid"); > expected = strtol(getenv("MVENDORID"), NULL, 0); > > ret = __base_sbi_ecall(SBI_EXT_BASE_GET_MVENDORID, 0); > - report(!ret.error, "mvendorid: no error"); > - report(ret.value == expected, "mvendorid"); > > -done: > + report(!ret.error, "no sbi.error"); > + report(ret.value == expected, "expected sbi.value"); > + report_prefix_pop(); > + > + report_prefix_push("probe_ext"); > + expected = getenv("PROBE_EXT") ? strtol(getenv("PROBE_EXT"), NULL, 0) : 1; > + > + ret = __base_sbi_ecall(SBI_EXT_BASE_PROBE_EXT, 0); The arg shouldn't be zero for this test. Before, you probed for the base extension itself. > + > + report(!ret.error, "no sbi.error"); > + report(ret.value == expected, "expected sbi.value"); > + report_prefix_pop(); > + > + report_prefix_pop(); > +} > + > +int main(int argc, char **argv) > +{ > + > + if (argc > 1 && !strcmp(argv[1], "-h")) { > + help(); > + exit(0); > + } > + > + report_prefix_push("sbi"); > + check_base(); > + > return report_summary(); > } > -- > 2.44.0 > Thanks, drew
diff --git a/riscv/sbi.c b/riscv/sbi.c index 48d0b06e..55bfcd42 100644 --- a/riscv/sbi.c +++ b/riscv/sbi.c @@ -19,29 +19,49 @@ static struct sbiret __base_sbi_ecall(int fid, unsigned long arg0) return sbi_ecall(SBI_EXT_BASE, fid, arg0, 0, 0, 0, 0, 0); } -int main(int argc, char **argv) - +static void check_base(void) { struct sbiret ret; long expected; - if (argc > 1 && !strcmp(argv[1], "-h")) { - help(); - exit(0); - } - - report_prefix_push("sbi"); + report_prefix_push("base"); if (!getenv("MVENDORID")) { report_skip("mvendorid: missing MVENDORID environment variable"); - goto done; + return; } + + report_prefix_push("mvendorid"); expected = strtol(getenv("MVENDORID"), NULL, 0); ret = __base_sbi_ecall(SBI_EXT_BASE_GET_MVENDORID, 0); - report(!ret.error, "mvendorid: no error"); - report(ret.value == expected, "mvendorid"); -done: + report(!ret.error, "no sbi.error"); + report(ret.value == expected, "expected sbi.value"); + report_prefix_pop(); + + report_prefix_push("probe_ext"); + expected = getenv("PROBE_EXT") ? strtol(getenv("PROBE_EXT"), NULL, 0) : 1; + + ret = __base_sbi_ecall(SBI_EXT_BASE_PROBE_EXT, 0); + + report(!ret.error, "no sbi.error"); + report(ret.value == expected, "expected sbi.value"); + report_prefix_pop(); + + report_prefix_pop(); +} + +int main(int argc, char **argv) +{ + + if (argc > 1 && !strcmp(argv[1], "-h")) { + help(); + exit(0); + } + + report_prefix_push("sbi"); + check_base(); + return report_summary(); }