| Message ID | 20240524061411.341599-12-sunilvl@ventanamicro.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for RISC-V ACPI tests | expand |
On Fri, May 24, 2024 at 4:15 PM Sunil V L <sunilvl@ventanamicro.com> wrote: > > Add basic ACPI table test case for RISC-V. > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > tests/qtest/bios-tables-test.c | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index c73174ad00..880435a5fa 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -1935,6 +1935,29 @@ static void test_acpi_microvm_acpi_erst(void) > } > #endif /* CONFIG_POSIX */ > > +static void test_acpi_riscv64_virt_tcg(void) > +{ > + test_data data = { > + .machine = "virt", > + .arch = "riscv64", > + .tcg_only = true, > + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", > + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", > + .ram_start = 0x80000000ULL, > + .scan_len = 128ULL * 1024 * 1024, > + }; > + > + /* > + * RHCT will have ISA string encoded. To reduce the effort > + * of updating expected AML file for any new default ISA extension, > + * use the profile rva22s64. > + */ > + test_acpi_one("-cpu rva22s64 -device virtio-blk-device,drive=hd0 " > + "-drive file=tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2,id=hd0", > + &data); > + free_test_data(&data); > +} > + > static void test_acpi_aarch64_virt_tcg(void) > { > test_data data = { > @@ -2404,6 +2427,10 @@ int main(int argc, char *argv[]) > qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot); > } > } > + } else if (strcmp(arch, "riscv64") == 0) { > + if (has_tcg && qtest_has_device("virtio-blk-pci")) { > + qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); > + } > } > ret = g_test_run(); > boot_sector_cleanup(disk); > -- > 2.40.1 >
On Fri, 24 May 2024 11:44:10 +0530 Sunil V L <sunilvl@ventanamicro.com> wrote: > Add basic ACPI table test case for RISC-V. > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> > --- > tests/qtest/bios-tables-test.c | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index c73174ad00..880435a5fa 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -1935,6 +1935,29 @@ static void test_acpi_microvm_acpi_erst(void) > } > #endif /* CONFIG_POSIX */ > > +static void test_acpi_riscv64_virt_tcg(void) > +{ > + ->cd data = { > + .machine = "virt", > + .arch = "riscv64", > + .tcg_only = true, > + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", > + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", > + .ram_start = 0x80000000ULL, > + .scan_len = 128ULL * 1024 * 1024, > + }; > + > + /* > + * RHCT will have ISA string encoded. To reduce the effort > + * of updating expected AML file for any new default ISA extension, > + * use the profile rva22s64. > + */ > + test_acpi_one("-cpu rva22s64 -device virtio-blk-device,drive=hd0 " > + "-drive file=tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2,id=hd0", Can you reuse test_data->cd, instead of specifying disk here? > + &data); > + free_test_data(&data); > +} > + > static void test_acpi_aarch64_virt_tcg(void) > { > test_data data = { > @@ -2404,6 +2427,10 @@ int main(int argc, char *argv[]) > qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot); > } > } > + } else if (strcmp(arch, "riscv64") == 0) { > + if (has_tcg && qtest_has_device("virtio-blk-pci")) { > + qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); > + } > } > ret = g_test_run(); > boot_sector_cleanup(disk);
On Wed, Jun 19, 2024 at 12:12:50PM +0200, Igor Mammedov wrote: > On Fri, 24 May 2024 11:44:10 +0530 > Sunil V L <sunilvl@ventanamicro.com> wrote: > > > Add basic ACPI table test case for RISC-V. > > > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> > > --- > > tests/qtest/bios-tables-test.c | 27 +++++++++++++++++++++++++++ > > 1 file changed, 27 insertions(+) > > > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > > index c73174ad00..880435a5fa 100644 > > --- a/tests/qtest/bios-tables-test.c > > +++ b/tests/qtest/bios-tables-test.c > > @@ -1935,6 +1935,29 @@ static void test_acpi_microvm_acpi_erst(void) > > } > > #endif /* CONFIG_POSIX */ > > > > +static void test_acpi_riscv64_virt_tcg(void) > > +{ > > + ->cd data = { > > + .machine = "virt", > > + .arch = "riscv64", > > + .tcg_only = true, > > + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", > > + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", > > + .ram_start = 0x80000000ULL, > > + .scan_len = 128ULL * 1024 * 1024, > > + }; > > + > > + /* > > + * RHCT will have ISA string encoded. To reduce the effort > > + * of updating expected AML file for any new default ISA extension, > > + * use the profile rva22s64. > > + */ > > + test_acpi_one("-cpu rva22s64 -device virtio-blk-device,drive=hd0 " > > + "-drive file=tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2,id=hd0", > > Can you reuse test_data->cd, instead of specifying disk here? > Actually, currently there is an issue with RISC-V virt machine due to which -cdrom doesn't work properly. But I have a fix for that. With that fix in place , I can use cd here. I will send that fix tomorrow separately. Thanks, Sunil
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index c73174ad00..880435a5fa 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1935,6 +1935,29 @@ static void test_acpi_microvm_acpi_erst(void) } #endif /* CONFIG_POSIX */ +static void test_acpi_riscv64_virt_tcg(void) +{ + test_data data = { + .machine = "virt", + .arch = "riscv64", + .tcg_only = true, + .uefi_fl1 = "pc-bios/edk2-riscv-code.fd", + .uefi_fl2 = "pc-bios/edk2-riscv-vars.fd", + .ram_start = 0x80000000ULL, + .scan_len = 128ULL * 1024 * 1024, + }; + + /* + * RHCT will have ISA string encoded. To reduce the effort + * of updating expected AML file for any new default ISA extension, + * use the profile rva22s64. + */ + test_acpi_one("-cpu rva22s64 -device virtio-blk-device,drive=hd0 " + "-drive file=tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2,id=hd0", + &data); + free_test_data(&data); +} + static void test_acpi_aarch64_virt_tcg(void) { test_data data = { @@ -2404,6 +2427,10 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot); } } + } else if (strcmp(arch, "riscv64") == 0) { + if (has_tcg && qtest_has_device("virtio-blk-pci")) { + qtest_add_func("acpi/virt", test_acpi_riscv64_virt_tcg); + } } ret = g_test_run(); boot_sector_cleanup(disk);
Add basic ACPI table test case for RISC-V. Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> --- tests/qtest/bios-tables-test.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)