[PATCH v2 00/12] Add support for RISC-V ACPI tests

[PATCH v2 00/12] Add support for RISC-V ACPI tests

[Sunil V L]

Currently, bios-table-test doesn't support RISC-V. This series enables
the framework changes required and basic testing. Things like NUMA
related test cases will be added later.

This needs refactoring/renaming of ARM64 bios table tests. Importantly,
the test cases now look for the expected AML files under
tests/data/acpi/virt/aarch64 path instead of directly under
tests/data/acpi/virt. To keep test cases not to fail because of this
movement, they are updated to look for both paths first.

As part of this effort, it is found that uefi-test-tools is currently
broken to build. So, updated its Makefile as well to use python based
edk2 build script.

The changes are also available at branch
https://gitlab.com/vlsunil/qemu/-/tree/riscv_bios_table_test_v2

Changes since v1:
	1) Addressed feedback from Gerd and Alistair
	2) Rebased and added tags received

Sunil V L (12):
  uefi-test-tools/UefiTestToolsPkg: Add RISC-V support
  uefi-test-tools: Add support for python based build script
  tests/data/uefi-boot-images: Add RISC-V ISO image
  qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them
  tests/qtest/bios-tables-test.c: Add support for arch in path
  tests/data/acpi/virt: Move ACPI tables under aarch64
  meson.build: Add RISC-V to the edk2-target list
  pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs
  tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V
  tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V
  tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
  tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V

 meson.build                                   |   2 +-
 pc-bios/meson.build                           |   2 +
 tests/data/acpi/rebuild-expected-aml.sh       |   5 +-
 tests/data/acpi/virt/{ => aarch64}/APIC       | Bin
 .../acpi/virt/{ => aarch64}/APIC.acpihmatvirt | Bin
 .../acpi/virt/{ => aarch64}/APIC.topology     | Bin
 tests/data/acpi/virt/{ => aarch64}/DBG2       | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT       | Bin
 .../acpi/virt/{ => aarch64}/DSDT.acpihmatvirt | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT.memhp | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT.pxb   | Bin
 .../acpi/virt/{ => aarch64}/DSDT.topology     | Bin
 tests/data/acpi/virt/{ => aarch64}/FACP       | Bin
 tests/data/acpi/virt/{ => aarch64}/GTDT       | Bin
 .../acpi/virt/{ => aarch64}/HMAT.acpihmatvirt | Bin
 tests/data/acpi/virt/{ => aarch64}/IORT       | Bin
 tests/data/acpi/virt/{ => aarch64}/MCFG       | Bin
 tests/data/acpi/virt/{ => aarch64}/NFIT.memhp | Bin
 tests/data/acpi/virt/{ => aarch64}/PPTT       | Bin
 .../acpi/virt/{ => aarch64}/PPTT.acpihmatvirt | Bin
 .../acpi/virt/{ => aarch64}/PPTT.topology     | Bin
 tests/data/acpi/virt/{ => aarch64}/SLIT.memhp | Bin
 tests/data/acpi/virt/{ => aarch64}/SPCR       | Bin
 .../acpi/virt/{ => aarch64}/SRAT.acpihmatvirt | Bin
 tests/data/acpi/virt/{ => aarch64}/SRAT.memhp | Bin
 .../data/acpi/virt/{ => aarch64}/SRAT.numamem | Bin
 tests/data/acpi/virt/{ => aarch64}/SSDT.memhp | Bin
 tests/data/acpi/virt/{ => aarch64}/VIOT       | Bin
 tests/data/acpi/virt/riscv64/APIC             | Bin 0 -> 116 bytes
 tests/data/acpi/virt/riscv64/DSDT             | Bin 0 -> 3518 bytes
 tests/data/acpi/virt/riscv64/FACP             | Bin 0 -> 276 bytes
 tests/data/acpi/virt/riscv64/MCFG             | Bin 0 -> 60 bytes
 tests/data/acpi/virt/riscv64/RHCT             | Bin 0 -> 314 bytes
 tests/data/acpi/virt/riscv64/SPCR             | Bin 0 -> 80 bytes
 .../bios-tables-test.riscv64.iso.qcow2        | Bin 0 -> 16896 bytes
 tests/qtest/bios-tables-test.c                |  93 ++++++++++++++----
 tests/qtest/meson.build                       |   3 +
 tests/uefi-test-tools/Makefile                |  19 ++--
 .../UefiTestToolsPkg/UefiTestToolsPkg.dsc     |   6 +-
 tests/uefi-test-tools/uefi-test-build.config  |  52 ++++++++++
 40 files changed, 147 insertions(+), 35 deletions(-)
 rename tests/data/acpi/virt/{ => aarch64}/APIC (100%)
 rename tests/data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/APIC.topology (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DBG2 (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.pxb (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.topology (100%)
 rename tests/data/acpi/virt/{ => aarch64}/FACP (100%)
 rename tests/data/acpi/virt/{ => aarch64}/GTDT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/IORT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/MCFG (100%)
 rename tests/data/acpi/virt/{ => aarch64}/NFIT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/PPTT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/PPTT.topology (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SLIT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SPCR (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SRAT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SRAT.numamem (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SSDT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/VIOT (100%)
 create mode 100644 tests/data/acpi/virt/riscv64/APIC
 create mode 100644 tests/data/acpi/virt/riscv64/DSDT
 create mode 100644 tests/data/acpi/virt/riscv64/FACP
 create mode 100644 tests/data/acpi/virt/riscv64/MCFG
 create mode 100644 tests/data/acpi/virt/riscv64/RHCT
 create mode 100644 tests/data/acpi/virt/riscv64/SPCR
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2
 create mode 100644 tests/uefi-test-tools/uefi-test-build.config

-- 
2.40.1

[PATCH v2 01/12] uefi-test-tools/UefiTestToolsPkg: Add RISC-V support

[Sunil V L]

Enable building the test application for RISC-V with appropriate
dependencies updated.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
index c8511cd732..0902fd3c73 100644
--- a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
@@ -19,7 +19,7 @@
   PLATFORM_VERSION        = 0.1
   PLATFORM_NAME           = UefiTestTools
   SKUID_IDENTIFIER        = DEFAULT
-  SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
+  SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64|RISCV64
   BUILD_TARGETS           = DEBUG
 
 [BuildOptions.IA32]
@@ -60,6 +60,10 @@
 
 [LibraryClasses.IA32, LibraryClasses.X64]
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+  RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf
+
+[LibraryClasses.RISCV64]
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
 
 [PcdsFixedAtBuild]
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
-- 
2.40.1

Re: [PATCH v2 01/12] uefi-test-tools/UefiTestToolsPkg: Add RISC-V support

[Alistair Francis]

On Fri, May 24, 2024 at 4:14 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> Enable building the test application for RISC-V with appropriate
> dependencies updated.
>
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Acked-by: Gerd Hoffmann <kraxel@redhat.com>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> index c8511cd732..0902fd3c73 100644
> --- a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> @@ -19,7 +19,7 @@
>    PLATFORM_VERSION        = 0.1
>    PLATFORM_NAME           = UefiTestTools
>    SKUID_IDENTIFIER        = DEFAULT
> -  SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
> +  SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64|RISCV64
>    BUILD_TARGETS           = DEBUG
>
>  [BuildOptions.IA32]
> @@ -60,6 +60,10 @@
>
>  [LibraryClasses.IA32, LibraryClasses.X64]
>    BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
> +  RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf
> +
> +[LibraryClasses.RISCV64]
> +  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
>
>  [PcdsFixedAtBuild]
>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
> --
> 2.40.1
>

[PATCH v2 02/12] uefi-test-tools: Add support for python based build script

[Sunil V L]

edk2-funcs.sh which is used in this Makefile, was removed in the commit
c28a2891f3 ("edk2: update build script"). It is replaced with a python
based script. So, update the Makefile and add the configuration file as
required to support the python based build script.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 tests/uefi-test-tools/Makefile               | 19 +++----
 tests/uefi-test-tools/uefi-test-build.config | 52 ++++++++++++++++++++
 2 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 tests/uefi-test-tools/uefi-test-build.config

diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
index 0c003f2877..f4eaebd8ff 100644
--- a/tests/uefi-test-tools/Makefile
+++ b/tests/uefi-test-tools/Makefile
@@ -12,7 +12,7 @@
 
 edk2_dir              := ../../roms/edk2
 images_dir            := ../data/uefi-boot-images
-emulation_targets     := arm aarch64 i386 x86_64
+emulation_targets     := arm aarch64 i386 x86_64 riscv64
 uefi_binaries         := bios-tables-test
 intermediate_suffixes := .efi .fat .iso.raw
 
@@ -56,7 +56,8 @@ Build/%.iso.raw: Build/%.fat
 # stripped from, the argument.
 map_arm_to_uefi     = $(subst arm,ARM,$(1))
 map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
-map_i386_to_uefi    = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
+map_riscv64_to_uefi = $(subst riscv64,RISCV64,$(call map_aarch64_to_uefi,$(1)))
+map_i386_to_uefi    = $(subst i386,IA32,$(call map_riscv64_to_uefi,$(1)))
 map_x86_64_to_uefi  = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
 map_to_uefi         = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
 
@@ -70,7 +71,7 @@ Build/%.fat: Build/%.efi
 	uefi_bin_b=$$(stat --format=%s -- $<) && \
 		uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
 		uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
-		mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
+		mkdosfs -C $@ -n "bios-test" -- $$uefi_fat_kb
 	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
 	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
 	MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
@@ -95,15 +96,9 @@ Build/%.fat: Build/%.efi
 # we must mark the recipe manually as recursive, by using the "+" indicator.
 # This way, when the inner "make" starts a parallel build of the target edk2
 # module, it can communicate with the outer "make"'s job server.
-Build/bios-tables-test.%.efi: build-edk2-tools
-	+./build.sh $(edk2_dir) BiosTablesTest $* $@
-
-build-edk2-tools:
-	cd $(edk2_dir)/BaseTools && git submodule update --init --force
-	$(MAKE) -C $(edk2_dir)/BaseTools \
-		PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
-		EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
-		EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
+Build/bios-tables-test.%.efi:
+	$(PYTHON) ../../roms/edk2-build.py --config uefi-test-build.config \
+		--match $*
 
 clean:
 	rm -rf Build Conf log
diff --git a/tests/uefi-test-tools/uefi-test-build.config b/tests/uefi-test-tools/uefi-test-build.config
new file mode 100644
index 0000000000..1f389ae541
--- /dev/null
+++ b/tests/uefi-test-tools/uefi-test-build.config
@@ -0,0 +1,52 @@
+[global]
+core = ../../roms/edk2
+
+####################################################################################
+# arm
+
+[build.arm]
+conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc
+plat = UefiTestTools
+dest = ./Build
+arch = ARM
+cpy1 = ARM/BiosTablesTest.efi  bios-tables-test.arm.efi
+
+####################################################################################
+# aarch64
+
+[build.aarch64]
+conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc
+plat = UefiTestTools
+dest = ./Build
+arch = AARCH64
+cpy1 = AARCH64/BiosTablesTest.efi  bios-tables-test.aarch64.efi
+
+####################################################################################
+# riscv64
+
+[build.riscv]
+conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc
+plat = UefiTestTools
+dest = ./Build
+arch = RISCV64
+cpy1 = RISCV64/BiosTablesTest.efi  bios-tables-test.riscv64.efi
+
+####################################################################################
+# ia32
+
+[build.ia32]
+conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc
+plat = UefiTestTools
+dest = ./Build
+arch = IA32
+cpy1 = IA32/BiosTablesTest.efi  bios-tables-test.i386.efi
+
+####################################################################################
+# x64
+
+[build.x64]
+conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc
+plat = UefiTestTools
+dest = ./Build
+arch = X64
+cpy1 = X64/BiosTablesTest.efi  bios-tables-test.x86_64.efi
-- 
2.40.1

[PATCH v2 03/12] tests/data/uefi-boot-images: Add RISC-V ISO image

[Sunil V L]

To test ACPI tables, edk2 needs to be booted with a disk image having
EFI partition. This image is created using UefiTestToolsPkg.

The image is generated using tests/uefi-test-tools source.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 .../bios-tables-test.riscv64.iso.qcow2          | Bin 0 -> 16896 bytes
 tests/uefi-test-tools/uefi-test-build.config    |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2

diff --git a/tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..c720bf99a45fab6d1e21963cca563ee0ea059b82
GIT binary patch
literal 16896
zcmeIZbyQp5w=Wvpf_t$*DNx*s76?*Gkpjhw1#fW*1ef3~T4-^K6sNdLaVJ>O;85J1
zQtYN*dfvO^_r|&BjPd@sc6P{~`K&p2_F8kzHD!gZF8|^R005vN-~auA^AEuE|F<^$
z`wy6ZG3p<R@)!I^1RW{h_#X-V7yo~z2L4RZe;xl<Y5)bfj_+T%04(GuRHQFJ`{#`M
z_xx|@-`fAs`xiQr{%5_w|CP%9-)GSN|8x}_a8C*T_v!e5_4NOj2EhMZjSKiomH*QD
zf0~h}zj*WC@W0Y~J|4-xw*P1G-|IpDS^0mJ`+Gh2zqbEp@!#vk|2_G?{Fr}_5BZ0I
zmv=7*eEpX~|I*lh*#8Tk%v_*+yu9Y-hexM)k!r2@sfGd9K1aO*;5H00Tww@06OrZ8
z5@aa=+vz<hy9*pd5{Mqe+SZDaB|<evMXk3+)tLzSeI)XRj0gkpJ*u1_fS2sq5o_vV
ze&FE@Q?{7~eU9$yACs`VJL0a+XCzoJo{kNEx2gkp@vhq8LSKa}QG<o>wPn*YYNLL{
z@~dP#ETCmdJ*7_kgqm;AKA-YZ)H7i(_@NMQyg)%>KxsGsR-2gBcMs8>CNZu}?giTr
zW$PK&8%mMm2N;bN$uC%lqEk?%*o3+>e_ic4JOyZ|QDL}X0t1oRteN9K<8(Pw$37xF
z1|I2P6F9n_yPUW{fk&qoW*`a$lHzw{Kz0D&>R{It0_pAL#g%74US}QyK_2E*7!OJR
zAOI>3rhJGxFB1wt!!!m0K*PZ#AnIyU>wpil!a2G-TU)W^B7llPn!FEq6{Iy4q~)j}
z>{K9cNmkXnrC&tPStW#fh-_pr=`de}dA<-N&D^d}y}pq>O>MJ&j$(%bF!LVvC;g^~
zXE=dk`Gi+tSz8D<gckttvJ+qw7BAN2;VKV;y$}8fdk-ssEn__l1jJyV;RBO#Fa+F~
zE!HV_;<G6d*x2esL#Q4+W@9_-I|wh)`|6SrByNkhXb%mkM0F~aqLL8hfNCF~wZufg
zO))_I13c;qnhO2HJTH{{UuY@xaSlytsA2cMP~m*3)eGl%$tCkqb)b)jEniasuC%<y
z&Zfx4jmghJUZKH3u6RtY_`#ol>wS_3uBWFbZj%A<t3L@*11{j|hyh)flxmuWN`#Wv
zkpZ&g(|VYmZbB9TMC$l|z*Fjn^GtHR;Nn(STY^9oIQpY|qy0yKkfrVQ0ssbT{;@Lf
zD`XQ5Fs9*;hJqPVm319<jg39n2|)GqtXpmS0epFT%Q(H3L@nR8g!Qjd@O!DG*5jA<
zz%Sr!DWXGx#Ovp%MAGuCn0_Fj3AQPq--{nzKtv#jFOe_NA8zSr;dp#Oh;#f+z{T}M
z6Z|ASco~e{!Ir@X0Gvdcf@lO|O34XO4XCMJp(d(#O7d><ISTOciu^+5dngBo;RKkp
zqI?)_gAoOZaWl<>zyV%_=l~oF%n-a=AdsJV^C9}F;wuhCstjLCnUP*F48|zU^QfHp
zBMJ#O{w?+cY7szMfzGGoxOAWs2Ye9nKr0PthyUvz;D5RZZ20$j`j@}-Kj!00+{+OG
zApZywo!w&+yn9UQdymNi?=d<2o>EHQw^NnfV`{`brO~{nv}N~vdis0JU~x}DfBiTU
z_#QueeNUO^!GJ#p3peB+${KJ_*~Y>DV0OiO%z=B4IqmK-*N1z`!*k!xn|6=+obNIJ
z-|rFdzsG_R_xvXb_gE<G9t#`ZV-b&gENXd=#iH-AxZ6E``sgopzi*dNyvLH`_gLy1
z;9m|iNCr@oqQXc0cPl8<wsJMPqAOl%Y>=9YrM4Ci?)1f@8Iihn0CWpe5WAz@Sgkk!
z`gPpBm$H~L9JTE~PC!(x9k^sr57SWaemy2t{-hFrElVz*fv{aT9xicJN6~n1W2%AH
zFz7ge3Yn;tW&tB8wW|-F68=c@4o$;g>UMmqbv5_1c)wkvML<T5guB!_-Te#V+uEXw
zMn<^4q13|xeoj(hGYFBT(iMNw8Cr{oS}<?Xws8KXm)f3@BbJG9#|z~~x|f-=-<Jdn
z=Zi}}TF|Xa?;4$3@)rdFI`_xj)J|%%X7)0I%4U~Ax%2p;YI~RfuZ6><!@~3T8%cw&
zZ&idXAc=FHr%pwUhvNqkV;EFaUxWpf@9*k$Zq9Gx@BinnJ3p+5L_@0wb2<HzRP=9U
zCfM0hI4`j*4h$xmPrNHV23l6dcR7j5(Hga@hb5wH8`|kL8}$xA1N57L)5TCXejBv$
z{k)5eb)IL{`fW5O7qG}gsDQ0}t+)wZ;e3fsj0N=!BQ(!24c>raUAyg?f9Xt3O+n84
zxsFBX$^U1H-jvM19JShUm36pu-|w@BOyrj!y)XL!K-(D4iF`Jx?;EZRkq(^%-V;CE
zcCCm2TZd0Zyx9J>IzrROgqwwaV4a)5#CQHST8)M~U(xf(CglJ&*7=;~S6QbpX;V)T
zw2syD4S@~j;erLP2kkcLLaZLfMRkwS0(o~v2kvzw!X~{MrJ5esl&4GEOJV7d&hn8{
zeXmzCDRM1cZ?;5Rdn$LUpGE2RNlNXtlH|}3`e>#khWUA_OBnq{A4nn&@%q-@rrO#r
zxunkjqcl+%<=?T&QPlY8on}hQAT0X`EyB5^YASJg%Nk_nMh*dNzwzGuKByng+~1e4
z(>xQDn?MQP0zxSLe$(8ldOyAz4en>*y!(XjKOM3bU4b#c5Vo*p2u|1JNb!apiEl7F
z6oe$t^09h6zbrWyIyW4<nyyvRsrhw0;D$1?E;VKdJ1$nW*?Y}c!{%OMo$f))EWk?h
zX0m0099ygS39lB`T#P2Q_hl_{AE#DbAvz_qmXPsnFH?coYZQ&HrK&<7Cgsmv2~wa*
zS!j$Dcv<qurBZZ2s_d~J4UBnUF=;pn#_s=ZF`Bg5FKM6Pm;s<NQvR}Cjja2~*^7~m
z&k6E`v6FJ-oY)=Jb%Lm!G$R7SQ$X=1RNTd6XXzmoHI<3w_QO*QAajh+<jLr|{h(CK
zoVP^BQ6bN~{IY0aOq7^|<(^m8&iWE-GgCjyF#kUBTPd32-(SXhmEv@A8$;@ezZ4Cn
zH7>@vXsP?ApYD`Ds;wbvlic;r&SvoW5h{zAnIo~U0XGI;nY+E^rWKx**=fVr<=(@I
zO5qv}aXk5CR8{LkI<~~9xK4fKH@V}TA6(DfZG-1LPdWF)-~zu^aB6Q!#@P^;GI@u;
z4tpm`m-41mquxn8e1f?;V%ABiZlX3YrJ~3ltEae`Zce;$8)|WdW*6O}gvLkKGd3_9
zK`!RvNGvcn)8@&>_L<;<a&tktfjz9m&e<+Q_L)F-;7hJaDKNW>My9Y^gH$Wy9eAsc
z*l+dtwVGq!z*W<*a1;Eh1G*bV8qoDlueCBHZfEf7Q`bwwGQ{VxZ8~GZq<3WpzWh?k
zT^6RC1loy@L<6#`Y~N7#q0j_Ql`njd2(+Sh@_)AET3l<&=RUtU`}k1AHlY=2AWFiR
zovd$E!^p++iW<aRr$aNIc#s=dyW3P${gn98VoE9~1M*CZ7At;4--1Kn#%Al8IaHm*
zn|V@0A%f6x&Ob<(^}*dE_@{V7pA%jFdZwdu{0WWs52L0_UL@Hwz0D^&&rDIYv}AgL
zd;Un{&J$5A3n#38v3a%RllkhG_=D<zj-d{{+m)&X`~9?yv-9VqqiG*=*H|MtGBHaV
zOr|MI>WXf$oR@TjbdO6BO>4t4(8kFvAP_iAL-p&EUHtW1AuDMT@z$@l<*S619(Zb8
z11;tS2SD(-G3d&nqSq}%+pP^FazC!cZ==@6M{`LtD{*?fm96(&ehVYezoIYJk4S))
zQ@i?t9&_f*Va3bo2_~kAP|b(*l9fU*#m*RR{`>>b<@(Mp5FAI6`bxJvxvJG&>q@ii
zg+L}t4!No&{*r%U&TG_aRqAZhC;`bhs?$*wv3TL6Y8Z{_D;vpiNzt+web{los3i}D
zk=~Bo$0P=jR8wMzSnp-9$l=K-yPkD#7M)*XV5<^J@Ux1wx3U7f9})pl;@=IKPZese
z;0ivjh}nz&5sitdmdK%Rd-?DXy!yTqFG;u`lM~+0!UT^)NS`K1Wr!rt4c$`qVj_-)
zONtSn)_5x44j6~gkfT#mgH6(L1vL^s9+gzQ&xoy%{z?)E9PzpMgkLj<)^HeA(e+t;
zZ2nJZY*Z3rKz0D&^~+lf4XxuO1hZaiPlHf6rE)Ii(#RkZCY?CQ<;uT<q3xsvO8NW*
zKT8qj&;Ur3{9gE7-Oyc3ob>0a<w?Ak)YZiotnKgOCpYHM_^UxnF1MsX-F+2H3$-$v
z;LSH8Z|hK*dIA{p9DN(akscZ9+9ujptOjjpO<k4f``*LY1ob6yc-bHl!wPRsRb@gj
zdGON=+}IUs7psh6Q1bE%(g?EirSP)j2=KH2QR~0O`HI!_ine&aexc{Lf(?8r)z@}H
z7MDG?GslE0=~xc`Z`c92E@%l6Yreuv?gXKYdl2TI(5r3Gh0)9*lA|jHQhf-PC9INS
zk?MVyj>uZ$W*bk0WdiVP6=D`al1d^tu2Ltds|9(CyFZmdEpQ3olTc!W)ow(-WJ(Ev
zwi!l6z4{Hr?d$K(pG0wVla<{5y%qX0=B$2JR@RyaLH#_5k@PH40g9?rA|TJG6q(a1
zC>p><bJ6w|W^#OSa1AY1d>j>_f`2cPTO`1%Z0{y)kBl@U`3s2ou*@iRwJrR=)?3|!
zzb=BOYGq}bI)_Y74y>ePd|u(&FjaV31ajTwHU^%S`I)=w*t-w4_5w6I{@8s(;o3pc
zpx*7E`y7z@g6yD=0_y{AC4=AWCd&|}c{$yc>xfpO7C7^*=huINDC<+poR;LcId^*N
zS5G>b&k{)bw2M18?fr&;r?U|~W7K~V3y~(Hi3KlOrjzTf)YYVet_kqIdSw#a)BlA5
zd9S5Pb#T629fsBg)e2=;e!FuJ&VDozOO@zLOD#x9;*vFvdWs|d>NZ`Mn)7}K-2D*S
zME*)5h`MK&rBVny2ze4b<A#HXt_Zes0O+4)Nkg<6k?EXqKg)C9$2&fkPtstpWe?eo
zd96L?XklbjCb7S}WstkuP4~FBS-Yew^GQ_uKQ?<-K(2X{Wa%8gD8L}x;9$@J)SOTL
za(z*cs<3G6WRb$-*UDljH8f(28GFTXTkW^LeD6UTa|O^`_mfL(kJbn~zoF^qAYBI5
zhg*!Kr0XS7(s84_zHc~BiM%u-8Lg?KUb<N!Q?J|WxzttBwK#<CEpHLS<)Cf%v6~LZ
zSDP^xi@-;B{<+sm&Fw=Yo4$_3BbqV#w=*hOALF9^?(Qm$5vzC#gA5sscXpO{`v54b
zLYm${OTEu#2}U7i(&5IsN!Z|i4@^iWaPW!UrP%~-Iq8a6a9q)h+ZU`^zd!kBydy4I
z#oz4n#>-Rds`CUae3wFSI=ecVBi37ia{_9X$`wzVfKjeoX<Ou9>Ps^+Kc!n;i1!26
zA`<~LJYj@y42SeBtp3-&M_Bm81;_vhutDByM$ixe>1+AxgU^etTRa+&nY8gSK9nFV
zvE%m76x250soo4>6YDub{@fXE$$6Js#E-OMJ1x0**F?^e?p6@IM)@uO4w{iu2Cm7Z
zCQklkk*1Ea8`kz)sb-It$EnACww!*66Vcb0$!A_jrEzp}L9R;61OyxOxd9b-Y$@I-
zAF8h_ZG7UF;<J+f#ijRS>fgfVejt~<>InIEyHe52-fM<OA~|KKS~`DSMR}ni!gPSa
z;yaHY$o`G71gnQC{|Nq_zx^+p$w_1ZKuJr_qSSg0o6E3mMTJHi?qs3nlIRFFe%v$v
z6+HOTBIS|VY&;LjO#Be?E|jKda#Mj8_xgwa(SL3kszfJ^wv0>@#)Fjt12qKU-5uJ*
z6j-Jy(hHe)^D%cCW{NQ=o0_+-zf;S9l7a>>yR3cackc`@5CZh7RuG8$f+J+V@O<GX
z(da)Jt2fVI#X0itptJlj<|kU%S@D^*qw^(a>H!+K$dW|Xf^n8IhY(28FQjzKhKv?y
ze6l{<sjKUIyG$$gAdR_Pp@t8Q0dTcF8>B5)tTJ?F2fh8%aR(uX%Y=Vwmm0|L!t?qb
z{rTWLU#p-QVdwifL^>0+dA|Cy0+8l;$K4(H3_+Aofuo9Cz_7a0eC+XS7VMi0hULa{
z`k;fkY?jIg;Ik@R8MsD1R(;QX#l$h<R~~GqN+I!P3DEF68tJH|kdE3{TG?*%^@QXZ
zui6<yorhwa9-TXAy_{Wkuqfbn5nWa?Mv0h;GrtW$v$_yfu3Gle#WjXw%x&1oUdut#
zfy5zouDitcaE+nzF`nQ!g#lLZlc2p3bk`2!!~(m*I6X?RiUd0b-<h;YrQU!81pD?a
zW-=<kOvvt1{N8H>H2=v02G=?LJP8APMYjgQqLv!*QYvGgx#F);KHR7v7iorV`*AdN
zN%-<BWH}_&IB9`n`}qBP75tCEw#J_%c@@}ZIWId-<d%YaY2Fj^8-L=`P5f*pmzd}G
z>+a5@19pszp)hFGb=uz$S{&)ezk}-gX9g#<09oveKK$Z%;T2t!WrK0Evv+JX-j~Aj
zsW6n@A!HH4nuJ_l=~}bR+CerXU!<=A??#cf7^}%-SOp@SfA-ckPLDhY#Qn-5H2+;#
z$6nT{U`BWapW&(_<=C@`07VBXbnwcb1@WX|wwfiUET9Xq!1f)`S9U#S066<dq;N1b
z8v%>}Mw6trZnJ;%&bBRIBNS|kMb>&4SDDpb>mFe|)6A@ul913}EBRz{^MT-)<nEs!
zDY!S%A-D(|X8zHQt2DA6SZrB=uXEkSB1>L>_a<<8ykGHdKa24#OxJD~jA&`h6*jiA
za=)ZuHl1q7_b=#tQeKc*p|*t=7*sJBE7eb-e+yW<6{5#V;yZEr+Q|KqM)#vFAPIj3
zWl(Bp=#bdDnPl4KxpWPyA|aJXt^hCZQwNdO&fYRM*yFB`#D**|V#W@^%mUa)lx&$T
z95tgfn8`bFuUT5Fj3mfqzf28}B7?uZklwK>0x}?Fk@65+YkVnigEZw~ng`xG$kG-F
zHN1eItXKnq?Y7qSNYgodUxbSIrg{R}rm}_I{t~_{6p{TZE->;Onb7zJBdBx}k@d2)
zAxBFgooMPIqHrnX?N0f4-#09D#+sU3*>Nu3V1(E_?P@7Bl)7(F*Uk?VW$R_mILna3
zfDbHle<g$hP>E?#>Hw4VsK&8y|4{t=K}1(|XNK{H@e>m_(=V*BCAA_EYiUOnyB{Ee
zX94I~(sEda1_rwznW8A}fTA~i1dkrSikNBK6gTVITA24*JlOCmRrIvE;R$r5T@&Rz
zd)I(%RrLZF=gVfYd?qv#%Jad%fH9a#wLVb>KPcw0>Ug;ewqch_QFKw9jZzZ6hoqZY
zT%+T5%+e}#+pEt@n{;gjGpzCM7w+kom~=ga>>n&hop5q;URpHLosQK{5$)ugI?f+e
zO3uCJl^wu*S+4n^=!33x!(n$Xv-l1#A+GiBswHoJ*VmDpmY@Omm!OUV{@>}{KR-ms
zOFtLucFElC4!3wx`~c;gL(n;EnYoNfYigjqH<K?YAWJBZM#jpBhh{D^Y{m~_q{9^r
zKPSRGcPaS=J!B^Y%%av{*y0J9w6Sb28DT~G7{Smd*N>mS?GbulY@GX)Omq~=zGQwd
zlPN+Jydg0^MTOIqaZdNSsbD}-=%et71_vzEX}!wsR&?G|;N7(IN^#BDS;4+O-C3%)
zeoNCA2OA+PkEvfxqY}ogZB@w1V}A8ums3eqmGYm+{`5`MN%zT^)b-t6Q>L^fvLMKJ
z_gtdgU^(jUgRgTQ#7RB1BKc=~N4&<9pCd52?s3du{|xSEPAmTC@_uOc&mCvXG9S;h
z{eDm5+g(F|y7L^3$t<dRklnt~w5`%k3OqT3r3AM^rJ5jX0EUqzJ5M)OgMOx6W~U~F
zYY?2=JZBMgBAs7M;9WGMBhxjJwjokmC|no_M@;o2!<RiWdq*3w;Ha8mWS^#EtO3ns
z*FcavM`E2Ss!AYB{_BurtI&?7F2@twjP<tm=a^KI6vnr-%6A+kw#RGH2e@zCb(svl
zwMIA|IXUkN(duGWn$$mT2uG}=0CLpJt=qv=lBcINuU{~Z1Yp0#agEK2#MoMinRw1-
z9`n)z#`NVuz=*Y7i0n4RCX;YvFjJ%|NHRd5Q8pw#kx|9^{Y>Mu@aDU_n?;|y3qJ-c
z=8|W(008%q=gYaX8T+PT976xhl;<5ESWL_N%zo;HQ)bEn08lf}gfZcWp6jx9qt84v
z5WV@K+$VZ$9+|MYPilwlb>mR6>Sqp+8fK9LKWvN5)QD-iSz<pWHn3`M2YGQ({P-8+
zXYfa=TC|fIpS7CKE6g`ZaZNRyBpGEEzS?e9DWjjepug^MEa>acA*3o~3^6;3-#k^0
zE_=FTa-^B(xt#T!+>l&zN7)C$FCkW0vEA0yU7YzfEo@EAm~l|!+_xM1_fO_ijMu>=
z*SS2BX>OvLk&g{&%B%~d_tk2W&wbTv8qP~_=jKE(eD)ZJQWYJkFQK<TQ}#5)*g7)b
zz7oZ&phe|d8ykXrVNxr=ppFXjR~TKKQ|>Kmuem<E!FjvQ`L&y0$Wpz#_R1J(1b@6n
zOHF|=#g<y<v)-5&jznXbVM{TpOPe5SIaaBFqX&d?1u@HPPz8<vb8_NijB8vdDZ6=D
zF^X*5CrqD%<jgk-KQA^GuD)L+F3^fgN9NCt{%SRgeH%-6z7CJsWxJ>|XRUvZ*Zbu=
z3GdbP^667MSFHM482#91^()d(>Yrupewt15O%%VG+{+xxv6gtiWXf}mbyiVZl|`&F
z)%1uw!zwy_YY(K#W7_aqCl;$Vo1<X3G@pliiyKSo6ytg*Lj#q5DDe{Y2XQ2V<Izqk
zNzGUD8WST`>_VYu^FQ{{L)|8-BYX#bnAhsf1bidP#in~eF~|&Z_SS#kjfDgC%UY&q
z8PuTIsBXSB;OOG8Z6IlbT3q;jpHa)LaWa0-g3%tq23@J+ugi3((`(VrIpA1->#a@x
zfLM%?V9M6m<=iPRRoKU=&BFc~FXi?*Vs)SqS-QH#rB@0tl_$ka(>k8JL8H1aK$BAl
z5T7N;#`O1~Z{l^^etl`mpx#2jL=(BagOys1$Fb$hcV8PSx)O{zDE(I{D$o!P;BTQT
z&Z*KXO&s8+q*C=We{(XOjO{lI3%3l+1Qj->ZW~8^yFle|M2k1tk$BrRzT<8Cem8Qz
zI2-|b8Z$7}Y`j%sd$OifdG*=h&)!A4`vazv8=l^qVvuM?A7@LPLz#fI_j#q?wwVG|
zzJUL@vSkb4N&4D_<vAe%sMgj1pwW2D%MA2f3|ys|Na>_u4b<G^7QwD@<D(f64*MWq
z_F*+;7nsk^T3P9BE@X2#gLE3RC9c0i@9xrtc|X0W4(t@J^ut12pk<q_IA@5qSV?Nv
zKrR`9pU^(s%srvoY&V93wM(zoj}MglF(GcgHctn42(sFKOPi`K*3x5cp#pZEF4_(q
zYt-Fb-5FgBE-xk}!kP?`Syl7(8|dA!-JeQVKs8Xasv@upuJ4PcCuHo)mr~ngqtb#X
zMLHqFqDKC!1P5@vTU<+}z@yqqFW7YPd|w=hGb3N-9bqGu-0&*&JS6?5Ph(obfBhCE
zsoM3C?u0WGE9NbDv{t|v?b!luZLI*?>{AZ`R%*6eB_|98OU7P0<m9aH?cGVQfIqj0
zEz0g*HZz#FySQS8^zHR<fh*XcLnt$lj^l8rM+$eH7rjupf@I>Y&b3ubMOy-4{2L(&
zvgh$>@S$TAYo575!UPl7Y7_z;8h@9{Yin<Or-BB_-X?Gib<6JSJgGnFU!crVAr!gO
zV+=MWMJ#76fYqhLHkIo(QB*VX0cwH<YXiHI(2#Y<c%C0O;0O7Im+s;ny988TVzOVw
zctia78hNZBnhru{mlyyW$(qPa^+-g-8fE1yAEtaYGEp@id|t{gSjdm22QN{jrqW8{
z^5=|Z07g83dvY5GCFx0u-HiOsx@g;sMBo*%LJ14SnyV?RRdvje1!{aQd{Zdt3G79o
zYXjiVZVwtM3(_7mg)WadTwWkEy4fV8sq6oDYScrl4-j^dgOY-G`zeeU{B;MB`D$P%
zjNMPD`AZ3bV6B89vAO&XNsR7^lPl&H6pD#Gn`#23`Q($9CjFpWa({@ok-VG0>WwC)
zrN!l&3y5K;dXG@P{)9QBeQ=#-CjR=5+M=?C@s$C}Z`>FkI$Th@npuo3txPa~_;u)~
z_?@F!w4gj|LH^J}b|slK@BjF6!kHo_%<<~tt`Qkj+*GhkoHBTV5eUk?WCH$Ba`R!G
z7^9ey`u#q_F9I;##+g}v>#L>hSyt)sz+Ee3$@7`>$`HHV@)GyxrvOSA!`|yW0so(0
z4c?Kfozsn6w}8K60<MlrkQun)i4*kCfI=(<;#-RM`y>{rz*)t+pd<M+#Mmq>dnrKv
zBIPD>8@e~R&gJKOj@+2PY(;L!nB;g>th$A4Z3BVG+`isFtL2>z*nJy9Ka$;&f{+s7
zMN^r3Vu)B8XjIO>eg}<tsz95K$@ILyrlx`Q#Mi35O2ehi{5+nJ=%T7A<vMj9rPsHo
zF5qLEBl*KXCL%mkzMt&d4Va>~QFj1@Q6r#T=?*4g%bs~W-139jc6zh}6JYl@#T;Yy
zG$Rfr$kMdmoN2qIQtUIo#m|wwLrv4?o*I$nNACk+V1$Y(j%Egeh{ar>L~S`Tn2+#1
zPh%%vFLqIUZkYRi;gf#x-Hp&Hsb#+ABk>ZQ5DP{}twgr;ZfP1zw#bHp&ACI-7+JoF
zMvoo^OU6Tm52@YtsI<lM+TT@it*517EaQPf+=a^)`Y8CP`GIx7)w-P+`dA@l=8xA+
zrcve}6c(tAd#XLxJNcHq%eIp$a5REG1}p92XI*gUxTpn%ugu@2>Z4_9d_P|8Yr*;8
zOSLWY2(_gTk{;c>QLCaE{w@6Zk+T|0R_VLmM@}6(N6<+RcDsj<4G}BsBHq}cD&d+3
zxhK@RQ?T#6%hN%Tv@HNW+cOGIwb%8Gzbf9AD)RRgq$>_liM83TPgs}Mx$KkPc$hnX
zX>xl%w6X~&ryJNGC*6O}mj`ef(?#6u)NSDObUDPc-k@F`2P0ENL#yAzx9R_^7^$cD
zt9SN7R+sfjH;sXY`p&;Uwm|pd5LAgNDtfnkDK$;$x65~T8~B9u?6aI68;yY6*EI~;
zB>AB@Y{wQ;E*5b-j&XSbDqp;4L;IBTS;Xg1lIC`A*Jf7_7B4C3F$+2bE6+rG;R_ug
zS2&pbYDRZnZBW#a&O8eF+mLXgUSIJpD)_3Uwt_?7`|{isV<gCUum?e%J&T|Q?`lJd
zO4WVNPoW@>$`<wc5<0fqpGfaEn4pS2hjOlhtdp%=+(c5bu6k0}u+)Zm%Jz-1ky{_e
zD2;XpP8rj}8Hp$(Qb_0TRWavAVS$#hvuq7pS(IK*F!+@gOf{u!Dc%~ipB!Wcnrc;H
z|5M^fDWIBAbxR$*Z0YV)%#>1KSlxzffu755&RE)oJhPF(w{uIIA|@jUr6mcG6BLwF
z6I2+_SQ?pGA;H4I@7i*7xv3ZTl6vw+^o!R){l&%8(k_Lg_S*5z&725)p&_6CErT8M
z(SnGp6I|a=;fD~64t9F{4NFb}Zy~sEZuk$&j{0tjj&3|lm4|#|=oYlLzT`>{OPiX>
zenyU5$5-RS9EF5@Kb~$>oCHTr?wuK7+(a=Cvn|G~q@tx{v1nnc@D@Orxf}_Y#jn9G
zVhSwsQBN?w+!iL<lXqd40(x%QWj=7{+wY^}-4<fqJR)IuoW}BfNEfcIHFjnGQ|9r+
z+sSvVA~3a9w=e47--wD3%rutsJK_un`ia)&mS=Q+5_aXe8}P&M5-;nbTVS^1Yw~V<
zQvSWNhV|R}#cW;!FDji~Y+d<_Zzge@adbcOW|-SN6yCwVnnp3cI7wMh1j_g&{OA-E
ztVIL|;9tD+-vGKJ9=uPh|I{<Ep||)OQw@3|>0A>ob2^YC6Wf~jWZuO0My6mqr#F^E
zK4Zh6Wg~F=2E$No;AK0QjE>QMy3TR=hso$Pw<91pSX~zHa~aBy&{?sO$3mZKpt&ee
zIY!?AuY~<;lp72wSmY50`fLE^(>~^nFJAj_3FkPmCBXFJjkjMiPl7S&;gO@Je)hoF
zL9Jecpy9Xi%bkIrYr6<lKI%nPFnZs4euy|h=7UV2e?)#^MHcn3R!0nZP7c_}A~BfE
z2+U2y4~gU)K8ehoBy)c@>5}s{KRJJ^undZa`ZUx71>mxSkDZliBmQO+!zZY**{;sK
zbA*mMh?s^2y?oQ-gN!MnK5;#9LzL`A=3b&g^tihO*Qj+x_Ee;2^=lbL*<zyv)mr>L
zUqZW{-^MJ$AU<=Ww7Q;o5!GiiN-yy=S=b5_h}p#fv;ms22_04=gxEPmjb_uVX1z}p
z<c0L_6y_-DdUj0Z<$Ct(J8gf`XEp)2Y{fh04(%MA+b-2IbB%lNDoo)**V`GSDr9(0
zeqE}!w6EUiG5aGJiq#}kJ9vrC=8R236mVoqP35-18DWagG)2<Xg1L{nbl>lp_HbQ$
zDHCbT7LR?8UjFXo{AI%{?@<f)uWt~bWGW-}=r%pUkemPD%NG6L50>JTl{a}&4~Nh}
zi22saY}Y(Uj!pC}jUw<9uPx{KYrWX95We%xrZ$-IAkUZDOl>JOIxUj@G@tiq*JGc&
zSvyy%R~)GAJwiNK!e?DrzeU(7-PT3FexP|8q<!wPYgFj4H3#ZFaFxw$Z@8n`jo{nQ
zlXER3(8v)fC>^6*o=S>5wLM_?95b)f!AsV4)zq@GFa3gS@YI8x-Gz60UE#+@Y<2CE
zZz_Uz7t6*DljLONqbIS^&X;KeqE)-(JKRs|4tU^*29rdG0|bB1S&cc~cc*?jy?|gN
zQ@eS-LiUsbZT+7T=N*f76cJ2}rrcxhLaJs%=^{j<g*7&yAiU?#+cNkV&6{I66x}&V
zn-zm2%$YWMRURvw$OQV!edbn)%nerhby^1#mm&?}6+ICtv@TY(T|)Wo-0QLX0hKO7
z7G!SaN}yA<;k(OqO4B}m71yyF9^2K9^)cJn1!Q;y8Rn|LCO9)4u92T~k=L<xn2#^m
zeRdU3c(<M6mOJqT*F`+d<l#hayT(R~d-GM??aZBcvAPO!l7V}wecW2@FtQ=w+Zi$S
zf-3ct{nwu-XTSNP|8SwX_LMQ%Eqm7y`+4J+gt%vtx?-S$d<07~JeEy$O~&%^*Mi6J
z5dnGnupZjb11-EJ1~J=T>RZW_YaHuzsX)I#XxXL+YKhjYbN;s1tpP0G?P({a;ilV{
zHVPfbRuVar^Yimp*u@d-TF!&@Txkby?qV!4X#}w)k_K^du!70!O@7Ap)bZxwd@O_%
z%F1p+wNFJ@C4Bv7NVZD@z1JK9a?-<tz5Ab$47gK=PClG^WCg3<S@l>*8!UZMK(0Dy
z%rQ@~-f$u%sqZZr+&y$Xv#FLGxp-5#c!Tb$W~dqnCTdErXpZUVq(9SB?v(r_M}t;e
zI*5a3<lhJt&E6|bAf!=g^+}#hs!s#DvpS^a;58G{(`+C%XFg#IOFG_KXyVp#yL00u
zbIK-vEB#$Pz7-M9*DRFHEw8U9KmC}dC}Q9B3tkl3HC<n!x#Df7iS%15UklrW0rEa*
za%GiUw8<l91N46FW8NK0PJX+5ffG6AVdvNu?{D1Lgp!<%KDKY&kIQ3<-;W4ohZ1-(
zwVQp#9<%Wsa$B}+bP`YhAu4jHdayF4$+j(D^r|WZmoYAI#^$M>Q)l6pnm9l@w-6(@
z>$|(kQE_iq_;1h)E8^Y<;+&>Q%kFj`uNRC>>^{fKw)uoPq{R%pL@xJdmFpZK&tmY2
z-wAONN#kbb5XWTI8R~2AVk#9FQs?3NMUQ0@YL%G?`NGqjOG9D|yQpH(6^KAp@bG7_
zg12^$mT?uH4>32&3?C0X9!%qZz)cE%WAn-128eF9NGOVn5fZbArjkc0PibM)RAy`R
zOMjb7S1852lx>wt+u+HoIn+--s<ma`@SqA}{=)D%_1mC(>W)$*#om@%7{}zQT5OGe
z!q8kax#wA+Wf7D;#BSK~!mv>_S`_Yu7NF`L%`4(%;Sg`bTD*?GRz$2$<u_FOL&zH~
z&n66FF6UpN_qy9n@&phbrB(;4yP%1^7WVb$ue{uMy1Kr)(DM}p-q!apq^YSWb@Gz!
zs#5dBZuV;rrv!6{S1eJIsaAX%$v%@7{wQepp=F`!EwRh9!!-J&BzTjF{??-*bSm-J
zuj-Z*L{&-Ry{z`D`}l0lw=s0pr4kD3a*T@L4r11t#Psy$s-gRbrukKh&)*SE-bVf;
znWE)5B77UhOEB>1U4xyf9IaJ=oBWn<SqJX796~z|_>ZEqGDl86w8fYym%BB$DU5JZ
zAKQk)AN#dbIA(kzLm$uIraCqf!30;9Cx1Pomw|Bc9wpRKW7`(#Gl=-rey)Br8eIbI
zwy`pg8?a_S9vy<`eT7DP_iRebdsbM&-u%Kz`zS>iz)RG1$+iInp>cMjV2x9~xTYLU
z5>z`RVZ+2_^!4QElIzGeO!lg8zM8kOLMy4c^&p6+j#nXfraAro6E$}!S>8|Wb5awm
z77$UPkt#>C?Y=T#A?rc%*ko9YJ-NNqEK5zBng6D9m+r6_FDJymq2m_u?fLJNc3u`(
zOcMzwp<chMtQv#9(b_IS-Fh{18}sM(5S`3jGBf>G#~%rOvCt{TPnRqT<6Nvt_2TzY
z2vdh#X@8D+hP}&*ch?UT0Nf4<(@U|?-?1?n1$L|*qT9s`*ta7M`jV`)&|CxSw~@;z
z*(*l%4-be2tdoI|u4vvGywe>U=?|!ThPq$9ECt<YE7{z@`*t6HccDIxLSQJ>yb!jG
zj^^At{H)$vJSB4+nfXChJ)AI7zh^4nJ74H3AWl8rOz-TM&HFg(zUM1({?Mn$xgnXs
z2)v_6c(#$j_QA5_$OZYW0@<x=+*O>zW>r_Wgfnbg=OrZ$_6Pe6Uw&-df(CrlGpf_1
zlF_!x!UkP(2IVU$>x*>kMxMVX(8HARY^O+!6FG`rB8pInG^s~@91XfIlbgiCvKkN|
zzV^1FE7UlQqA+xyG9rpci2#1G1)Jx)cBuKm$R4EtV7Mk1wz<WnHnR3oQ*8KSDoqC7
zW@eZ_u`E7*w@14DpffgFakrf}B78B7b}>}@-xO@w!4w!DaARsqKh*`#&ADG+hCSqu
zkaJ9~z9`&ILyyYeQ+YD8G(jE2C2*8}+4qu&Ksi8uL=qm&2{yKn&4Oc&&8PNmP-n8P
z(^^m)!x?#&f(g8;Ue-Fgy0v=mI9_%=-KS;4nuS7hL8P|4bv2b=NFOsBz%1#$;w4ym
zyR3owvtDbdkqidl7oHdhyrygrC~ho--rOGY)S*7;wyI=#5prEvh8MD)-<2lO9+XOp
z;VKiS^h-FA_VN`+{HvRCzt;sdZIf=_1i0RUj7QrCc4i49)!LAT0Nl%SPbio-*;;Bx
zA!r55q82<*5ZBIh3VfDa#vE)fb9Ih^8`eQ^vWD;-9(Ib|Bstg|*;fb8sl?ehXJI6g
z<Yx0WbSWRyGod(_SPWVWM5t6(<}y*z8r5$U^9N=UQKSWykLF~xKOdd7{@m92+U#p1
z)r7@+3VKYU9xu|lbP|#8fp*Hl@QGwHajHg(rfKz(@}phSA~Ew&=l1q@J!-b%wv4>9
zib8qSYv<vSbsg~7^USuAK4q_}<f4t0io3v|MKD9d_nN4@4@y|khopHbzfqrKkBG~%
zO33o4kWc|Zc4xJ)xROUCBJ|5&upe>}pZYO)UtQw0WIF`;j;!)?$Vuj4c8x?^zhWYc
z#Bj(jEXw2vi<g{Z*~rgXyk6X(%u#DoMDEz`=0#8<is^-LV`U#^%amn+FpsEYpmCB4
zLNT_AF-x^q$>{oouijknA6hQJcR5^-<F}@&@(PP2IW4M%%58cnc)BU<Im+dfjB|$=
zzkKO%JCI(%{9*uC4a-*!r<nRhQK&<Y$@}Z!TmiB7qelS%#i-wl!Qbs!c!44;?iNf0
zqUqW56dZF`Kb5~VJ{4AhPaIM~axVt!4!bQQ3nE<KF=jOsyb9%*3^P=Dpmf=D(QDO}
zoW11COnfFEYCo^;u`O8{x0Jc24(A(76M56$EYacmyALB+ZrV~V^wpi#CCUK&#d|`9
zmq#k!df{AyuADE2;6U!j{cxp=7lTSXeIuG9+PveMW#w8UVX9b#;cf%p6jYozo!AGN
zGt}cyfVRhq&hN-RwDCh7eLde=exTDenrO|E(V1vPe@Ug~&zlO1qNa)&<m!W~1Sgq&
z$|8KE{ECbWtjs}#qD5H6iYj;VPWo39_?zR+-JOImwi!=`7$ayB&6EOk>w?eZi`wfe
zhtASXU|NPxJ{VvEn05Y%l#??}*}1!GoWHvBqa<Uf4~ImXq7yU*KR(|SGx2$$=F{U}
zHI5%t*J;=8sVY6_2gNdN!H>BOHs25jrJ!IN@DK2ZpM;Z<*^vXm-hi>;-eHvq9`3;b
z_$bdXPyeK<GIwvpuu?JGD39_W7e+;Y8}KIUdd~D_{FCiNpT$q({<|(d>G15V&MZZr
zyv`L(kpAMMO3rb3cKb9N+Y@0v0iH+I3Oq?BBLR16fS*^-w1ZNc84kubTug7GOQP7(
z=IcwvU3l<@NX!y5?EOY+51+~R^spviT(I#8($;RhaUs6BdfV?pSDNIh>XxqK{<Moo
z<@;i@qGioa^$-nwaerjds0uwnoHOFh#&Z_X0#>KPHRJSf-v~g@h=J+?p!6S&CU$%!
z*7WAbc$Kmtkwz`ElvJMXVu7Fl>oX}bwg;$WK$P(MI<eq}o<?!;lx-{zO!3g9qzrcK
z-j`Eu$VVaw{ydz)g^Bakxs4?QXFF$gm3Ik~9h};68ud8*lG>SMKq8)GlDWoV_o{Bt
zJ=MJx7oCcV)?brsj478=nHv6zvr>0e*Go6AY|AOk@v~F)5$%#_M`d(E;4rK-tTe!Z
zZV|27%KPPY+%Ky`zhx|IO+YeXwgFWWRUy?&K5r9<nG56;a%u)NiGbLe&b8JB9szzn
zmd98Jt&6Oa!lx3S>DuT9PMc2iPqR-ilwmkgIC1}c+Vi-5t-U&Iha>^T4fR5D-)+v#
zJ<*-qoy&dkaByX@{VtkeR~roz69?4Q1!~XegmjigEfaLcfe96O1$eKQe|L1X4z>=W
z2GN3h(SlIHY^XsbU^cWMTyQ>W&;xKjS`a4q4Qdbt_zhYR0eBNNh#rg$Aa5gfltDh1
zIzlMzX5%JJgf7jC9q@<Te*$3#{6BvXBnJupGKtXJ78W?Ze_rU<{`T8qumL}%#&)*c
zX1EzGG>TT-X&YXT*K*^u)n83hyMOI^(Ds#e*r>_#WWOViCs2V1hx*)jJkg1iMdi|D
zCL-N(FsT+Y8f(F!eN$mMAEKgPvo~FBwFr}a9+f8Ix;_`Ycw6VPHWR7ucH3~VG#Y2c
zWAxqQVtFi~&Fhe!-?lTK?<b3L@^MEMwbWp;fJ0lB-(DLrMLY8U_eTsN!Zg4D2rm^7
z*?G*sHV6@VAaWE7Hpl_|9ojVC?}WrNKQeif-Ohsd1xfV+8{7u3bzkev*1faa=`I$(
npx=G!ac+7rk>bW6>2rDhbE@r_>N;{0>t7xa_%HZ>v<Chg0ou+}

literal 0
HcmV?d00001

diff --git a/tests/uefi-test-tools/uefi-test-build.config b/tests/uefi-test-tools/uefi-test-build.config
index 1f389ae541..a4c61fc97a 100644
--- a/tests/uefi-test-tools/uefi-test-build.config
+++ b/tests/uefi-test-tools/uefi-test-build.config
@@ -24,7 +24,7 @@ cpy1 = AARCH64/BiosTablesTest.efi  bios-tables-test.aarch64.efi
 ####################################################################################
 # riscv64
 
-[build.riscv]
+[build.riscv64]
 conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc
 plat = UefiTestTools
 dest = ./Build
-- 
2.40.1

[PATCH v2 04/12] qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them

[Sunil V L]

Existing AARCH64 virt test functions do not have AARCH64 in their name.
To add RISC-V virt related test cases, better to rename existing
functions to indicate they are ARM only.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 tests/qtest/bios-tables-test.c | 35 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index d1ff4db7a2..c4a4d1c7bf 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1570,7 +1570,7 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
     test_acpi_tcg_dimm_pxm(MACHINE_PC);
 }
 
-static void test_acpi_virt_tcg_memhp(void)
+static void test_acpi_aarch64_virt_tcg_memhp(void)
 {
     test_data data = {
         .machine = "virt",
@@ -1663,7 +1663,7 @@ static void test_acpi_microvm_ioapic2_tcg(void)
     free_test_data(&data);
 }
 
-static void test_acpi_virt_tcg_numamem(void)
+static void test_acpi_aarch64_virt_tcg_numamem(void)
 {
     test_data data = {
         .machine = "virt",
@@ -1685,7 +1685,7 @@ static void test_acpi_virt_tcg_numamem(void)
 
 }
 
-static void test_acpi_virt_tcg_pxb(void)
+static void test_acpi_aarch64_virt_tcg_pxb(void)
 {
     test_data data = {
         .machine = "virt",
@@ -1758,7 +1758,7 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
     test_acpi_tcg_acpi_hmat(MACHINE_PC);
 }
 
-static void test_acpi_virt_tcg_acpi_hmat(void)
+static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
 {
     test_data data = {
         .machine = "virt",
@@ -1914,7 +1914,7 @@ static void test_acpi_microvm_acpi_erst(void)
 }
 #endif /* CONFIG_POSIX */
 
-static void test_acpi_virt_tcg(void)
+static void test_acpi_aarch64_virt_tcg(void)
 {
     test_data data = {
         .machine = "virt",
@@ -1933,7 +1933,7 @@ static void test_acpi_virt_tcg(void)
     free_test_data(&data);
 }
 
-static void test_acpi_virt_tcg_topology(void)
+static void test_acpi_aarch64_virt_tcg_topology(void)
 {
     test_data data = {
         .machine = "virt",
@@ -2016,7 +2016,7 @@ static void test_acpi_q35_cxl(void)
 }
 #endif /* CONFIG_POSIX */
 
-static void test_acpi_virt_viot(void)
+static void test_acpi_aarch64_virt_viot(void)
 {
     test_data data = {
         .machine = "virt",
@@ -2192,7 +2192,7 @@ static void test_acpi_microvm_oem_fields(void)
     g_free(args);
 }
 
-static void test_acpi_virt_oem_fields(void)
+static void test_acpi_aarch64_virt_oem_fields(void)
 {
     test_data data = {
         .machine = "virt",
@@ -2364,16 +2364,19 @@ int main(int argc, char *argv[])
         }
     } else if (strcmp(arch, "aarch64") == 0) {
         if (has_tcg && qtest_has_device("virtio-blk-pci")) {
-            qtest_add_func("acpi/virt", test_acpi_virt_tcg);
+            qtest_add_func("acpi/virt", test_acpi_aarch64_virt_tcg);
             qtest_add_func("acpi/virt/acpihmatvirt",
-                            test_acpi_virt_tcg_acpi_hmat);
-            qtest_add_func("acpi/virt/topology", test_acpi_virt_tcg_topology);
-            qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
-            qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
-            qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb);
-            qtest_add_func("acpi/virt/oem-fields", test_acpi_virt_oem_fields);
+                           test_acpi_aarch64_virt_tcg_acpi_hmat);
+            qtest_add_func("acpi/virt/topology",
+                           test_acpi_aarch64_virt_tcg_topology);
+            qtest_add_func("acpi/virt/numamem",
+                           test_acpi_aarch64_virt_tcg_numamem);
+            qtest_add_func("acpi/virt/memhp", test_acpi_aarch64_virt_tcg_memhp);
+            qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb);
+            qtest_add_func("acpi/virt/oem-fields",
+                           test_acpi_aarch64_virt_oem_fields);
             if (qtest_has_device("virtio-iommu-pci")) {
-                qtest_add_func("acpi/virt/viot", test_acpi_virt_viot);
+                qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot);
             }
         }
     }
-- 
2.40.1

Re: [PATCH v2 04/12] qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them

[Igor Mammedov]

On Fri, 24 May 2024 11:44:03 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> Existing AARCH64 virt test functions do not have AARCH64 in their name.
> To add RISC-V virt related test cases, better to rename existing
> functions to indicate they are ARM only.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/qtest/bios-tables-test.c | 35 ++++++++++++++++++----------------
>  1 file changed, 19 insertions(+), 16 deletions(-)
> 
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index d1ff4db7a2..c4a4d1c7bf 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -1570,7 +1570,7 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)
>      test_acpi_tcg_dimm_pxm(MACHINE_PC);
>  }
>  
> -static void test_acpi_virt_tcg_memhp(void)
> +static void test_acpi_aarch64_virt_tcg_memhp(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1663,7 +1663,7 @@ static void test_acpi_microvm_ioapic2_tcg(void)
>      free_test_data(&data);
>  }
>  
> -static void test_acpi_virt_tcg_numamem(void)
> +static void test_acpi_aarch64_virt_tcg_numamem(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1685,7 +1685,7 @@ static void test_acpi_virt_tcg_numamem(void)
>  
>  }
>  
> -static void test_acpi_virt_tcg_pxb(void)
> +static void test_acpi_aarch64_virt_tcg_pxb(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1758,7 +1758,7 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)
>      test_acpi_tcg_acpi_hmat(MACHINE_PC);
>  }
>  
> -static void test_acpi_virt_tcg_acpi_hmat(void)
> +static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1914,7 +1914,7 @@ static void test_acpi_microvm_acpi_erst(void)
>  }
>  #endif /* CONFIG_POSIX */
>  
> -static void test_acpi_virt_tcg(void)
> +static void test_acpi_aarch64_virt_tcg(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -1933,7 +1933,7 @@ static void test_acpi_virt_tcg(void)
>      free_test_data(&data);
>  }
>  
> -static void test_acpi_virt_tcg_topology(void)
> +static void test_acpi_aarch64_virt_tcg_topology(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -2016,7 +2016,7 @@ static void test_acpi_q35_cxl(void)
>  }
>  #endif /* CONFIG_POSIX */
>  
> -static void test_acpi_virt_viot(void)
> +static void test_acpi_aarch64_virt_viot(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -2192,7 +2192,7 @@ static void test_acpi_microvm_oem_fields(void)
>      g_free(args);
>  }
>  
> -static void test_acpi_virt_oem_fields(void)
> +static void test_acpi_aarch64_virt_oem_fields(void)
>  {
>      test_data data = {
>          .machine = "virt",
> @@ -2364,16 +2364,19 @@ int main(int argc, char *argv[])
>          }
>      } else if (strcmp(arch, "aarch64") == 0) {
>          if (has_tcg && qtest_has_device("virtio-blk-pci")) {
> -            qtest_add_func("acpi/virt", test_acpi_virt_tcg);
> +            qtest_add_func("acpi/virt", test_acpi_aarch64_virt_tcg);
>              qtest_add_func("acpi/virt/acpihmatvirt",
> -                            test_acpi_virt_tcg_acpi_hmat);
> -            qtest_add_func("acpi/virt/topology", test_acpi_virt_tcg_topology);
> -            qtest_add_func("acpi/virt/numamem", test_acpi_virt_tcg_numamem);
> -            qtest_add_func("acpi/virt/memhp", test_acpi_virt_tcg_memhp);
> -            qtest_add_func("acpi/virt/pxb", test_acpi_virt_tcg_pxb);
> -            qtest_add_func("acpi/virt/oem-fields", test_acpi_virt_oem_fields);
> +                           test_acpi_aarch64_virt_tcg_acpi_hmat);
> +            qtest_add_func("acpi/virt/topology",
> +                           test_acpi_aarch64_virt_tcg_topology);
> +            qtest_add_func("acpi/virt/numamem",
> +                           test_acpi_aarch64_virt_tcg_numamem);
> +            qtest_add_func("acpi/virt/memhp", test_acpi_aarch64_virt_tcg_memhp);
> +            qtest_add_func("acpi/virt/pxb", test_acpi_aarch64_virt_tcg_pxb);
> +            qtest_add_func("acpi/virt/oem-fields",
> +                           test_acpi_aarch64_virt_oem_fields);
>              if (qtest_has_device("virtio-iommu-pci")) {
> -                qtest_add_func("acpi/virt/viot", test_acpi_virt_viot);
> +                qtest_add_func("acpi/virt/viot", test_acpi_aarch64_virt_viot);
>              }
>          }
>      }

[PATCH v2 05/12] tests/qtest/bios-tables-test.c: Add support for arch in path

[Sunil V L]

Since virt machine is common for multiple architectures, add "arch" in
the path to search expected AML files. Since the AML files are still
under old path, support both by searching with and without arch in the
path.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 tests/qtest/bios-tables-test.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index c4a4d1c7bf..c73174ad00 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -78,6 +78,7 @@
 typedef struct {
     bool tcg_only;
     const char *machine;
+    const char *arch;
     const char *machine_param;
     const char *variant;
     const char *uefi_fl1;
@@ -262,8 +263,19 @@ static void dump_aml_files(test_data *data, bool rebuild)
         g_assert(exp_sdt->aml);
 
         if (rebuild) {
-            aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
+            aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir,
+                                       data->machine, data->arch,
                                        sdt->aml, ext);
+
+            /*
+             * To keep test cases not failing when the DATA files are moved to
+             * ARCH under virt folder, add this check as well.
+             */
+            if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
+                aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir,
+                                           data->machine, sdt->aml, ext);
+            }
+
             if (!g_file_test(aml_file, G_FILE_TEST_EXISTS) &&
                 sdt->aml_len == exp_sdt->aml_len &&
                 !memcmp(sdt->aml, exp_sdt->aml, sdt->aml_len)) {
@@ -398,8 +410,13 @@ static GArray *load_expected_aml(test_data *data)
         memset(&exp_sdt, 0, sizeof(exp_sdt));
 
 try_again:
-        aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
-                                   sdt->aml, ext);
+        aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir, data->machine,
+                                   data->arch, sdt->aml, ext);
+        if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
+            aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
+                                       sdt->aml, ext);
+        }
+
         if (verbosity_level >= 2) {
             fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
         }
@@ -1574,6 +1591,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
@@ -1667,6 +1685,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
@@ -1689,6 +1708,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
@@ -1762,6 +1782,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
@@ -1918,6 +1939,7 @@ static void test_acpi_aarch64_virt_tcg(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
@@ -1937,6 +1959,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .variant = ".topology",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
@@ -2020,6 +2043,7 @@ static void test_acpi_aarch64_virt_viot(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
@@ -2196,6 +2220,7 @@ static void test_acpi_aarch64_virt_oem_fields(void)
 {
     test_data data = {
         .machine = "virt",
+        .arch = "aarch64",
         .tcg_only = true,
         .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
         .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
-- 
2.40.1

Re: [PATCH v2 05/12] tests/qtest/bios-tables-test.c: Add support for arch in path

[Igor Mammedov]

On Fri, 24 May 2024 11:44:04 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> Since virt machine is common for multiple architectures, add "arch" in
> the path to search expected AML files. Since the AML files are still
> under old path, support both by searching with and without arch in the
> path.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

other than need to swap machine/arch order mentioned in
the next patch look good to me

> ---
>  tests/qtest/bios-tables-test.c | 31 ++++++++++++++++++++++++++++---
>  1 file changed, 28 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index c4a4d1c7bf..c73174ad00 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -78,6 +78,7 @@
>  typedef struct {
>      bool tcg_only;
>      const char *machine;
> +    const char *arch;
>      const char *machine_param;
>      const char *variant;
>      const char *uefi_fl1;
> @@ -262,8 +263,19 @@ static void dump_aml_files(test_data *data, bool rebuild)
>          g_assert(exp_sdt->aml);
>  
>          if (rebuild) {
> -            aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
> +            aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir,
> +                                       data->machine, data->arch,
>                                         sdt->aml, ext);
> +
> +            /*
> +             * To keep test cases not failing when the DATA files are moved to
> +             * ARCH under virt folder, add this check as well.
> +             */
> +            if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
> +                aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir,
> +                                           data->machine, sdt->aml, ext);
> +            }
> +
>              if (!g_file_test(aml_file, G_FILE_TEST_EXISTS) &&
>                  sdt->aml_len == exp_sdt->aml_len &&
>                  !memcmp(sdt->aml, exp_sdt->aml, sdt->aml_len)) {
> @@ -398,8 +410,13 @@ static GArray *load_expected_aml(test_data *data)
>          memset(&exp_sdt, 0, sizeof(exp_sdt));
>  
>  try_again:
> -        aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
> -                                   sdt->aml, ext);
> +        aml_file = g_strdup_printf("%s/%s/%s/%.4s%s", data_dir, data->machine,
> +                                   data->arch, sdt->aml, ext);
> +        if (!g_file_test(aml_file, G_FILE_TEST_EXISTS)) {
> +            aml_file = g_strdup_printf("%s/%s/%.4s%s", data_dir, data->machine,
> +                                       sdt->aml, ext);
> +        }
> +
>          if (verbosity_level >= 2) {
>              fprintf(stderr, "Looking for expected file '%s'\n", aml_file);
>          }
> @@ -1574,6 +1591,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> @@ -1667,6 +1685,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> @@ -1689,6 +1708,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> @@ -1762,6 +1782,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> @@ -1918,6 +1939,7 @@ static void test_acpi_aarch64_virt_tcg(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> @@ -1937,6 +1959,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .variant = ".topology",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
> @@ -2020,6 +2043,7 @@ static void test_acpi_aarch64_virt_viot(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
> @@ -2196,6 +2220,7 @@ static void test_acpi_aarch64_virt_oem_fields(void)
>  {
>      test_data data = {
>          .machine = "virt",
> +        .arch = "aarch64",
>          .tcg_only = true,
>          .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
>          .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",

[PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Sunil V L]

Since virt is a common machine name across architectures like ARM64 and
RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
RISC-V tables can be added under riscv64 folder in future.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 tests/data/acpi/virt/{ => aarch64}/APIC             | Bin
 .../data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt  | Bin
 tests/data/acpi/virt/{ => aarch64}/APIC.topology    | Bin
 tests/data/acpi/virt/{ => aarch64}/DBG2             | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT             | Bin
 .../data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt  | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT.memhp       | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT.pxb         | Bin
 tests/data/acpi/virt/{ => aarch64}/DSDT.topology    | Bin
 tests/data/acpi/virt/{ => aarch64}/FACP             | Bin
 tests/data/acpi/virt/{ => aarch64}/GTDT             | Bin
 .../data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt  | Bin
 tests/data/acpi/virt/{ => aarch64}/IORT             | Bin
 tests/data/acpi/virt/{ => aarch64}/MCFG             | Bin
 tests/data/acpi/virt/{ => aarch64}/NFIT.memhp       | Bin
 tests/data/acpi/virt/{ => aarch64}/PPTT             | Bin
 .../data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt  | Bin
 tests/data/acpi/virt/{ => aarch64}/PPTT.topology    | Bin
 tests/data/acpi/virt/{ => aarch64}/SLIT.memhp       | Bin
 tests/data/acpi/virt/{ => aarch64}/SPCR             | Bin
 .../data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt  | Bin
 tests/data/acpi/virt/{ => aarch64}/SRAT.memhp       | Bin
 tests/data/acpi/virt/{ => aarch64}/SRAT.numamem     | Bin
 tests/data/acpi/virt/{ => aarch64}/SSDT.memhp       | Bin
 tests/data/acpi/virt/{ => aarch64}/VIOT             | Bin
 25 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/data/acpi/virt/{ => aarch64}/APIC (100%)
 rename tests/data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/APIC.topology (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DBG2 (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.pxb (100%)
 rename tests/data/acpi/virt/{ => aarch64}/DSDT.topology (100%)
 rename tests/data/acpi/virt/{ => aarch64}/FACP (100%)
 rename tests/data/acpi/virt/{ => aarch64}/GTDT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/IORT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/MCFG (100%)
 rename tests/data/acpi/virt/{ => aarch64}/NFIT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/PPTT (100%)
 rename tests/data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/PPTT.topology (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SLIT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SPCR (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SRAT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SRAT.numamem (100%)
 rename tests/data/acpi/virt/{ => aarch64}/SSDT.memhp (100%)
 rename tests/data/acpi/virt/{ => aarch64}/VIOT (100%)

diff --git a/tests/data/acpi/virt/APIC b/tests/data/acpi/virt/aarch64/APIC
similarity index 100%
rename from tests/data/acpi/virt/APIC
rename to tests/data/acpi/virt/aarch64/APIC
diff --git a/tests/data/acpi/virt/APIC.acpihmatvirt b/tests/data/acpi/virt/aarch64/APIC.acpihmatvirt
similarity index 100%
rename from tests/data/acpi/virt/APIC.acpihmatvirt
rename to tests/data/acpi/virt/aarch64/APIC.acpihmatvirt
diff --git a/tests/data/acpi/virt/APIC.topology b/tests/data/acpi/virt/aarch64/APIC.topology
similarity index 100%
rename from tests/data/acpi/virt/APIC.topology
rename to tests/data/acpi/virt/aarch64/APIC.topology
diff --git a/tests/data/acpi/virt/DBG2 b/tests/data/acpi/virt/aarch64/DBG2
similarity index 100%
rename from tests/data/acpi/virt/DBG2
rename to tests/data/acpi/virt/aarch64/DBG2
diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/aarch64/DSDT
similarity index 100%
rename from tests/data/acpi/virt/DSDT
rename to tests/data/acpi/virt/aarch64/DSDT
diff --git a/tests/data/acpi/virt/DSDT.acpihmatvirt b/tests/data/acpi/virt/aarch64/DSDT.acpihmatvirt
similarity index 100%
rename from tests/data/acpi/virt/DSDT.acpihmatvirt
rename to tests/data/acpi/virt/aarch64/DSDT.acpihmatvirt
diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/aarch64/DSDT.memhp
similarity index 100%
rename from tests/data/acpi/virt/DSDT.memhp
rename to tests/data/acpi/virt/aarch64/DSDT.memhp
diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/aarch64/DSDT.pxb
similarity index 100%
rename from tests/data/acpi/virt/DSDT.pxb
rename to tests/data/acpi/virt/aarch64/DSDT.pxb
diff --git a/tests/data/acpi/virt/DSDT.topology b/tests/data/acpi/virt/aarch64/DSDT.topology
similarity index 100%
rename from tests/data/acpi/virt/DSDT.topology
rename to tests/data/acpi/virt/aarch64/DSDT.topology
diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/aarch64/FACP
similarity index 100%
rename from tests/data/acpi/virt/FACP
rename to tests/data/acpi/virt/aarch64/FACP
diff --git a/tests/data/acpi/virt/GTDT b/tests/data/acpi/virt/aarch64/GTDT
similarity index 100%
rename from tests/data/acpi/virt/GTDT
rename to tests/data/acpi/virt/aarch64/GTDT
diff --git a/tests/data/acpi/virt/HMAT.acpihmatvirt b/tests/data/acpi/virt/aarch64/HMAT.acpihmatvirt
similarity index 100%
rename from tests/data/acpi/virt/HMAT.acpihmatvirt
rename to tests/data/acpi/virt/aarch64/HMAT.acpihmatvirt
diff --git a/tests/data/acpi/virt/IORT b/tests/data/acpi/virt/aarch64/IORT
similarity index 100%
rename from tests/data/acpi/virt/IORT
rename to tests/data/acpi/virt/aarch64/IORT
diff --git a/tests/data/acpi/virt/MCFG b/tests/data/acpi/virt/aarch64/MCFG
similarity index 100%
rename from tests/data/acpi/virt/MCFG
rename to tests/data/acpi/virt/aarch64/MCFG
diff --git a/tests/data/acpi/virt/NFIT.memhp b/tests/data/acpi/virt/aarch64/NFIT.memhp
similarity index 100%
rename from tests/data/acpi/virt/NFIT.memhp
rename to tests/data/acpi/virt/aarch64/NFIT.memhp
diff --git a/tests/data/acpi/virt/PPTT b/tests/data/acpi/virt/aarch64/PPTT
similarity index 100%
rename from tests/data/acpi/virt/PPTT
rename to tests/data/acpi/virt/aarch64/PPTT
diff --git a/tests/data/acpi/virt/PPTT.acpihmatvirt b/tests/data/acpi/virt/aarch64/PPTT.acpihmatvirt
similarity index 100%
rename from tests/data/acpi/virt/PPTT.acpihmatvirt
rename to tests/data/acpi/virt/aarch64/PPTT.acpihmatvirt
diff --git a/tests/data/acpi/virt/PPTT.topology b/tests/data/acpi/virt/aarch64/PPTT.topology
similarity index 100%
rename from tests/data/acpi/virt/PPTT.topology
rename to tests/data/acpi/virt/aarch64/PPTT.topology
diff --git a/tests/data/acpi/virt/SLIT.memhp b/tests/data/acpi/virt/aarch64/SLIT.memhp
similarity index 100%
rename from tests/data/acpi/virt/SLIT.memhp
rename to tests/data/acpi/virt/aarch64/SLIT.memhp
diff --git a/tests/data/acpi/virt/SPCR b/tests/data/acpi/virt/aarch64/SPCR
similarity index 100%
rename from tests/data/acpi/virt/SPCR
rename to tests/data/acpi/virt/aarch64/SPCR
diff --git a/tests/data/acpi/virt/SRAT.acpihmatvirt b/tests/data/acpi/virt/aarch64/SRAT.acpihmatvirt
similarity index 100%
rename from tests/data/acpi/virt/SRAT.acpihmatvirt
rename to tests/data/acpi/virt/aarch64/SRAT.acpihmatvirt
diff --git a/tests/data/acpi/virt/SRAT.memhp b/tests/data/acpi/virt/aarch64/SRAT.memhp
similarity index 100%
rename from tests/data/acpi/virt/SRAT.memhp
rename to tests/data/acpi/virt/aarch64/SRAT.memhp
diff --git a/tests/data/acpi/virt/SRAT.numamem b/tests/data/acpi/virt/aarch64/SRAT.numamem
similarity index 100%
rename from tests/data/acpi/virt/SRAT.numamem
rename to tests/data/acpi/virt/aarch64/SRAT.numamem
diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/aarch64/SSDT.memhp
similarity index 100%
rename from tests/data/acpi/virt/SSDT.memhp
rename to tests/data/acpi/virt/aarch64/SSDT.memhp
diff --git a/tests/data/acpi/virt/VIOT b/tests/data/acpi/virt/aarch64/VIOT
similarity index 100%
rename from tests/data/acpi/virt/VIOT
rename to tests/data/acpi/virt/aarch64/VIOT
-- 
2.40.1

Re: [PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Philippe Mathieu-Daudé]

Hi Sunil,

On 24/5/24 08:14, Sunil V L wrote:
> Since virt is a common machine name across architectures like ARM64 and
> RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
> RISC-V tables can be added under riscv64 folder in future.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>   tests/data/acpi/virt/{ => aarch64}/APIC             | Bin

The usual pattern is {target}/{machine}, so instead of:

   microvm/
   pc/
   q35/
   virt/aarch64/
   virt/riscv64/

(which is odd because q35 is the x86 'virt'), I'd rather see:

   x86/microvm/
   x86/pc/
   x86/q35/
   aarch64/virt/
   riscv64/virt/

Anyhow just my 2 cents, up to the ACPI maintainers :)

Regards,

Phil.

Re: [PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Sunil V L]

On Mon, May 27, 2024 at 12:12:10PM +0200, Philippe Mathieu-Daudé wrote:
> Hi Sunil,
> 
> On 24/5/24 08:14, Sunil V L wrote:
> > Since virt is a common machine name across architectures like ARM64 and
> > RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
> > RISC-V tables can be added under riscv64 folder in future.
> > 
> > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> >   tests/data/acpi/virt/{ => aarch64}/APIC             | Bin
> 
> The usual pattern is {target}/{machine}, so instead of:
> 
>   microvm/
>   pc/
>   q35/
>   virt/aarch64/
>   virt/riscv64/
> 
> (which is odd because q35 is the x86 'virt'), I'd rather see:
> 
>   x86/microvm/
>   x86/pc/
>   x86/q35/
>   aarch64/virt/
>   riscv64/virt/
> 
> Anyhow just my 2 cents, up to the ACPI maintainers :)
> 
Hi Phil,

Your suggestion does make sense to me. Let me wait for feedback from
ARM/ACPI maintainers.

Thanks,
Sunil

Re: [PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Igor Mammedov]

On Mon, 27 May 2024 20:46:29 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> On Mon, May 27, 2024 at 12:12:10PM +0200, Philippe Mathieu-Daudé wrote:
> > Hi Sunil,
> > 
> > On 24/5/24 08:14, Sunil V L wrote:  
> > > Since virt is a common machine name across architectures like ARM64 and
> > > RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
> > > RISC-V tables can be added under riscv64 folder in future.
> > > 
> > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > > ---
> > >   tests/data/acpi/virt/{ => aarch64}/APIC             | Bin  
> > 
> > The usual pattern is {target}/{machine}, so instead of:
> > 
> >   microvm/
> >   pc/
> >   q35/
> >   virt/aarch64/
> >   virt/riscv64/
> > 
> > (which is odd because q35 is the x86 'virt'), I'd rather see:
> > 
> >   x86/microvm/
> >   x86/pc/
> >   x86/q35/
> >   aarch64/virt/
> >   riscv64/virt/
> > 
> > Anyhow just my 2 cents, up to the ACPI maintainers :)
> >   
> Hi Phil,
> 
> Your suggestion does make sense to me. Let me wait for feedback from
> ARM/ACPI maintainers.

I'd prefer  {target}/{machine} hierarchy like Philippe suggests

> Thanks,
> Sunil
> 

Re: [PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Michael S. Tsirkin]

On Wed, Jun 19, 2024 at 11:17:43AM +0200, Igor Mammedov wrote:
> On Mon, 27 May 2024 20:46:29 +0530
> Sunil V L <sunilvl@ventanamicro.com> wrote:
> 
> > On Mon, May 27, 2024 at 12:12:10PM +0200, Philippe Mathieu-Daudé wrote:
> > > Hi Sunil,
> > > 
> > > On 24/5/24 08:14, Sunil V L wrote:  
> > > > Since virt is a common machine name across architectures like ARM64 and
> > > > RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
> > > > RISC-V tables can be added under riscv64 folder in future.
> > > > 
> > > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > > > ---
> > > >   tests/data/acpi/virt/{ => aarch64}/APIC             | Bin  
> > > 
> > > The usual pattern is {target}/{machine}, so instead of:
> > > 
> > >   microvm/
> > >   pc/
> > >   q35/
> > >   virt/aarch64/
> > >   virt/riscv64/
> > > 
> > > (which is odd because q35 is the x86 'virt'), I'd rather see:
> > > 
> > >   x86/microvm/
> > >   x86/pc/
> > >   x86/q35/
> > >   aarch64/virt/
> > >   riscv64/virt/
> > > 
> > > Anyhow just my 2 cents, up to the ACPI maintainers :)
> > >   
> > Hi Phil,
> > 
> > Your suggestion does make sense to me. Let me wait for feedback from
> > ARM/ACPI maintainers.
> 
> I'd prefer  {target}/{machine} hierarchy like Philippe suggests

Agreed.

> > Thanks,
> > Sunil
> > 

Re: [PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Sunil V L]

On Wed, Jun 19, 2024 at 05:20:50AM -0400, Michael S. Tsirkin wrote:
> On Wed, Jun 19, 2024 at 11:17:43AM +0200, Igor Mammedov wrote:
> > On Mon, 27 May 2024 20:46:29 +0530
> > Sunil V L <sunilvl@ventanamicro.com> wrote:
> > 
> > > On Mon, May 27, 2024 at 12:12:10PM +0200, Philippe Mathieu-Daudé wrote:
> > > > Hi Sunil,
> > > > 
> > > > On 24/5/24 08:14, Sunil V L wrote:  
> > > > > Since virt is a common machine name across architectures like ARM64 and
> > > > > RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
> > > > > RISC-V tables can be added under riscv64 folder in future.
> > > > > 
> > > > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > > > > ---
> > > > >   tests/data/acpi/virt/{ => aarch64}/APIC             | Bin  
> > > > 
> > > > The usual pattern is {target}/{machine}, so instead of:
> > > > 
> > > >   microvm/
> > > >   pc/
> > > >   q35/
> > > >   virt/aarch64/
> > > >   virt/riscv64/
> > > > 
> > > > (which is odd because q35 is the x86 'virt'), I'd rather see:
> > > > 
> > > >   x86/microvm/
> > > >   x86/pc/
> > > >   x86/q35/
> > > >   aarch64/virt/
> > > >   riscv64/virt/
> > > > 
> > > > Anyhow just my 2 cents, up to the ACPI maintainers :)
> > > >   
> > > Hi Phil,
> > > 
> > > Your suggestion does make sense to me. Let me wait for feedback from
> > > ARM/ACPI maintainers.
> > 
> > I'd prefer  {target}/{machine} hierarchy like Philippe suggests
> 
> Agreed.
> 
Thanks for the confirmation!. Let me send the updated version soon.

Moving pc/q35/microvm also under new x86 would need many changes in
bios-table-test.c. So, the question is, are you ok to combine x86
changes as well in this series or prefer to it later in separate series?

Thanks,
Sunil

Re: [PATCH v2 06/12] tests/data/acpi/virt: Move ACPI tables under aarch64

[Igor Mammedov]

On Wed, 19 Jun 2024 23:30:35 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> On Wed, Jun 19, 2024 at 05:20:50AM -0400, Michael S. Tsirkin wrote:
> > On Wed, Jun 19, 2024 at 11:17:43AM +0200, Igor Mammedov wrote:  
> > > On Mon, 27 May 2024 20:46:29 +0530
> > > Sunil V L <sunilvl@ventanamicro.com> wrote:
> > >   
> > > > On Mon, May 27, 2024 at 12:12:10PM +0200, Philippe Mathieu-Daudé wrote:  
> > > > > Hi Sunil,
> > > > > 
> > > > > On 24/5/24 08:14, Sunil V L wrote:    
> > > > > > Since virt is a common machine name across architectures like ARM64 and
> > > > > > RISC-V, move existing ARM64 ACPI tables under aarch64 folder so that
> > > > > > RISC-V tables can be added under riscv64 folder in future.
> > > > > > 
> > > > > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> > > > > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > > > > > ---
> > > > > >   tests/data/acpi/virt/{ => aarch64}/APIC             | Bin    
> > > > > 
> > > > > The usual pattern is {target}/{machine}, so instead of:
> > > > > 
> > > > >   microvm/
> > > > >   pc/
> > > > >   q35/
> > > > >   virt/aarch64/
> > > > >   virt/riscv64/
> > > > > 
> > > > > (which is odd because q35 is the x86 'virt'), I'd rather see:
> > > > > 
> > > > >   x86/microvm/
> > > > >   x86/pc/
> > > > >   x86/q35/
> > > > >   aarch64/virt/
> > > > >   riscv64/virt/
> > > > > 
> > > > > Anyhow just my 2 cents, up to the ACPI maintainers :)
> > > > >     
> > > > Hi Phil,
> > > > 
> > > > Your suggestion does make sense to me. Let me wait for feedback from
> > > > ARM/ACPI maintainers.  
> > > 
> > > I'd prefer  {target}/{machine} hierarchy like Philippe suggests  
> > 
> > Agreed.
> >   
> Thanks for the confirmation!. Let me send the updated version soon.
> 
> Moving pc/q35/microvm also under new x86 would need many changes in
> bios-table-test.c. So, the question is, are you ok to combine x86
> changes as well in this series or prefer to it later in separate series?

it should be fine ok to include x86 changes here as well.

I'd basically split previous patch on path altering part and a 2nd adding
 .arch = "aarch64"

then 3rd doing the same for x86

as for this patch, I'd include all blobs movement here.

> 
> Thanks,
> Sunil
> 

[PATCH v2 07/12] meson.build: Add RISC-V to the edk2-target list

[Sunil V L]

so that ACPI table test can be supported.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index a9de71d450..576c803a8a 100644
--- a/meson.build
+++ b/meson.build
@@ -93,7 +93,7 @@ else
   iasl = find_program(get_option('iasl'), required: true)
 endif
 
-edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ]
+edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu', 'riscv64-softmmu' ]
 unpack_edk2_blobs = false
 foreach target : edk2_targets
   if target in target_dirs
-- 
2.40.1

Re: [PATCH v2 07/12] meson.build: Add RISC-V to the edk2-target list

[Igor Mammedov]

On Fri, 24 May 2024 11:44:06 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> so that ACPI table test can be supported.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index a9de71d450..576c803a8a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -93,7 +93,7 @@ else
>    iasl = find_program(get_option('iasl'), required: true)
>  endif
>  
> -edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ]
> +edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu', 'riscv64-softmmu' ]
>  unpack_edk2_blobs = false
>  foreach target : edk2_targets
>    if target in target_dirs

[PATCH v2 08/12] pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs

[Sunil V L]

Update list of images supported in unpack_edk2_blobs to enable RISC-V
ACPI table testing.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 pc-bios/meson.build     | 2 ++
 tests/qtest/meson.build | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 0760612bea..8602b45b9b 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -4,6 +4,8 @@ if unpack_edk2_blobs
     'edk2-aarch64-code.fd',
     'edk2-arm-code.fd',
     'edk2-arm-vars.fd',
+    'edk2-riscv-code.fd',
+    'edk2-riscv-vars.fd',
     'edk2-i386-code.fd',
     'edk2-i386-secure-code.fd',
     'edk2-i386-vars.fd',
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 86293051dc..2f60f6aed8 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -259,6 +259,9 @@ qtests_s390x = \
 qtests_riscv32 = \
   (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
 
+qtests_riscv64 = \
+  (unpack_edk2_blobs ? ['bios-tables-test'] : [])
+
 qos_test_ss = ss.source_set()
 qos_test_ss.add(
   'ac97-test.c',
-- 
2.40.1

Re: [PATCH v2 08/12] pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs

[Igor Mammedov]

On Fri, 24 May 2024 11:44:07 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> Update list of images supported in unpack_edk2_blobs to enable RISC-V
> ACPI table testing.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  pc-bios/meson.build     | 2 ++
>  tests/qtest/meson.build | 3 +++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/pc-bios/meson.build b/pc-bios/meson.build
> index 0760612bea..8602b45b9b 100644
> --- a/pc-bios/meson.build
> +++ b/pc-bios/meson.build
> @@ -4,6 +4,8 @@ if unpack_edk2_blobs
>      'edk2-aarch64-code.fd',
>      'edk2-arm-code.fd',
>      'edk2-arm-vars.fd',
> +    'edk2-riscv-code.fd',
> +    'edk2-riscv-vars.fd',
>      'edk2-i386-code.fd',
>      'edk2-i386-secure-code.fd',
>      'edk2-i386-vars.fd',
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 86293051dc..2f60f6aed8 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -259,6 +259,9 @@ qtests_s390x = \
>  qtests_riscv32 = \
>    (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : [])
>  
> +qtests_riscv64 = \
> +  (unpack_edk2_blobs ? ['bios-tables-test'] : [])
> +
>  qos_test_ss = ss.source_set()
>  qos_test_ss.add(
>    'ac97-test.c',

[PATCH v2 09/12] tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V

[Sunil V L]

Update the list of supported architectures to include RISC-V.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 tests/data/acpi/rebuild-expected-aml.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
index dcf2e2f221..c1092fb8ba 100755
--- a/tests/data/acpi/rebuild-expected-aml.sh
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -12,7 +12,7 @@
 # This work is licensed under the terms of the GNU GPLv2.
 # See the COPYING.LIB file in the top-level directory.
 
-qemu_arches="x86_64 aarch64"
+qemu_arches="x86_64 aarch64 riscv64"
 
 if [ ! -e "tests/qtest/bios-tables-test" ]; then
     echo "Test: bios-tables-test is required! Run make check before this script."
@@ -36,7 +36,8 @@ fi
 if [ -z "$qemu_bins" ]; then
     echo "Only the following architectures are currently supported: $qemu_arches"
     echo "None of these configured!"
-    echo "To fix, run configure --target-list=x86_64-softmmu,aarch64-softmmu"
+    echo "To fix, run configure \
+         --target-list=x86_64-softmmu,aarch64-softmmu,riscv64-softmmu"
     exit 1;
 fi
 
-- 
2.40.1

Re: [PATCH v2 09/12] tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V

[Igor Mammedov]

On Fri, 24 May 2024 11:44:08 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> Update the list of supported architectures to include RISC-V.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/data/acpi/rebuild-expected-aml.sh | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
> index dcf2e2f221..c1092fb8ba 100755
> --- a/tests/data/acpi/rebuild-expected-aml.sh
> +++ b/tests/data/acpi/rebuild-expected-aml.sh
> @@ -12,7 +12,7 @@
>  # This work is licensed under the terms of the GNU GPLv2.
>  # See the COPYING.LIB file in the top-level directory.
>  
> -qemu_arches="x86_64 aarch64"
> +qemu_arches="x86_64 aarch64 riscv64"
>  
>  if [ ! -e "tests/qtest/bios-tables-test" ]; then
>      echo "Test: bios-tables-test is required! Run make check before this script."
> @@ -36,7 +36,8 @@ fi
>  if [ -z "$qemu_bins" ]; then
>      echo "Only the following architectures are currently supported: $qemu_arches"
>      echo "None of these configured!"
> -    echo "To fix, run configure --target-list=x86_64-softmmu,aarch64-softmmu"
> +    echo "To fix, run configure \
> +         --target-list=x86_64-softmmu,aarch64-softmmu,riscv64-softmmu"
>      exit 1;
>  fi
>  

[PATCH v2 10/12] tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V

[Sunil V L]

As per process documented (steps 1-3) in bios-tables-test.c, add empty
AML data files for RISC-V ACPI tables and add the entries in
bios-tables-test-allowed-diff.h.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 tests/data/acpi/virt/riscv64/APIC           | 0
 tests/data/acpi/virt/riscv64/DSDT           | 0
 tests/data/acpi/virt/riscv64/FACP           | 0
 tests/data/acpi/virt/riscv64/MCFG           | 0
 tests/data/acpi/virt/riscv64/RHCT           | 0
 tests/data/acpi/virt/riscv64/SPCR           | 0
 tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++
 7 files changed, 6 insertions(+)
 create mode 100644 tests/data/acpi/virt/riscv64/APIC
 create mode 100644 tests/data/acpi/virt/riscv64/DSDT
 create mode 100644 tests/data/acpi/virt/riscv64/FACP
 create mode 100644 tests/data/acpi/virt/riscv64/MCFG
 create mode 100644 tests/data/acpi/virt/riscv64/RHCT
 create mode 100644 tests/data/acpi/virt/riscv64/SPCR

diff --git a/tests/data/acpi/virt/riscv64/APIC b/tests/data/acpi/virt/riscv64/APIC
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/riscv64/MCFG b/tests/data/acpi/virt/riscv64/MCFG
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/riscv64/RHCT b/tests/data/acpi/virt/riscv64/RHCT
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/data/acpi/virt/riscv64/SPCR b/tests/data/acpi/virt/riscv64/SPCR
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..d8610c8d72 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,7 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/virt/riscv64/APIC",
+"tests/data/acpi/virt/riscv64/DSDT",
+"tests/data/acpi/virt/riscv64/FACP",
+"tests/data/acpi/virt/riscv64/MCFG",
+"tests/data/acpi/virt/riscv64/RHCT",
+"tests/data/acpi/virt/riscv64/SPCR",
-- 
2.40.1

Re: [PATCH v2 10/12] tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V

[Alistair Francis]

On Fri, May 24, 2024 at 4:15 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> As per process documented (steps 1-3) in bios-tables-test.c, add empty
> AML data files for RISC-V ACPI tables and add the entries in
> bios-tables-test-allowed-diff.h.
>
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  tests/data/acpi/virt/riscv64/APIC           | 0
>  tests/data/acpi/virt/riscv64/DSDT           | 0
>  tests/data/acpi/virt/riscv64/FACP           | 0
>  tests/data/acpi/virt/riscv64/MCFG           | 0
>  tests/data/acpi/virt/riscv64/RHCT           | 0
>  tests/data/acpi/virt/riscv64/SPCR           | 0
>  tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++
>  7 files changed, 6 insertions(+)
>  create mode 100644 tests/data/acpi/virt/riscv64/APIC
>  create mode 100644 tests/data/acpi/virt/riscv64/DSDT
>  create mode 100644 tests/data/acpi/virt/riscv64/FACP
>  create mode 100644 tests/data/acpi/virt/riscv64/MCFG
>  create mode 100644 tests/data/acpi/virt/riscv64/RHCT
>  create mode 100644 tests/data/acpi/virt/riscv64/SPCR
>
> diff --git a/tests/data/acpi/virt/riscv64/APIC b/tests/data/acpi/virt/riscv64/APIC
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/MCFG b/tests/data/acpi/virt/riscv64/MCFG
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/RHCT b/tests/data/acpi/virt/riscv64/RHCT
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/SPCR b/tests/data/acpi/virt/riscv64/SPCR
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..d8610c8d72 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,7 @@
>  /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/virt/riscv64/APIC",
> +"tests/data/acpi/virt/riscv64/DSDT",
> +"tests/data/acpi/virt/riscv64/FACP",
> +"tests/data/acpi/virt/riscv64/MCFG",
> +"tests/data/acpi/virt/riscv64/RHCT",
> +"tests/data/acpi/virt/riscv64/SPCR",
> --
> 2.40.1
>

Re: [PATCH v2 10/12] tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V

[Igor Mammedov]

On Fri, 24 May 2024 11:44:09 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> As per process documented (steps 1-3) in bios-tables-test.c, add empty
> AML data files for RISC-V ACPI tables and add the entries in
> bios-tables-test-allowed-diff.h.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/data/acpi/virt/riscv64/APIC           | 0
>  tests/data/acpi/virt/riscv64/DSDT           | 0
>  tests/data/acpi/virt/riscv64/FACP           | 0
>  tests/data/acpi/virt/riscv64/MCFG           | 0
>  tests/data/acpi/virt/riscv64/RHCT           | 0
>  tests/data/acpi/virt/riscv64/SPCR           | 0
>  tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++
>  7 files changed, 6 insertions(+)
>  create mode 100644 tests/data/acpi/virt/riscv64/APIC
>  create mode 100644 tests/data/acpi/virt/riscv64/DSDT
>  create mode 100644 tests/data/acpi/virt/riscv64/FACP
>  create mode 100644 tests/data/acpi/virt/riscv64/MCFG
>  create mode 100644 tests/data/acpi/virt/riscv64/RHCT
>  create mode 100644 tests/data/acpi/virt/riscv64/SPCR
> 
> diff --git a/tests/data/acpi/virt/riscv64/APIC b/tests/data/acpi/virt/riscv64/APIC
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/MCFG b/tests/data/acpi/virt/riscv64/MCFG
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/RHCT b/tests/data/acpi/virt/riscv64/RHCT
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/data/acpi/virt/riscv64/SPCR b/tests/data/acpi/virt/riscv64/SPCR
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index dfb8523c8b..d8610c8d72 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1 +1,7 @@
>  /* List of comma-separated changed AML files to ignore */
> +"tests/data/acpi/virt/riscv64/APIC",
> +"tests/data/acpi/virt/riscv64/DSDT",
> +"tests/data/acpi/virt/riscv64/FACP",
> +"tests/data/acpi/virt/riscv64/MCFG",
> +"tests/data/acpi/virt/riscv64/RHCT",
> +"tests/data/acpi/virt/riscv64/SPCR",

[PATCH v2 11/12] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V

[Sunil V L]

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)
+{
+    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

Re: [PATCH v2 11/12] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V

[Alistair Francis]

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
>

Re: [PATCH v2 11/12] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V

[Igor Mammedov]

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);

Re: [PATCH v2 11/12] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V

[Sunil V L]

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

[PATCH v2 12/12] tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V

[Sunil V L]

As per the step 5 in the process documented in bios-tables-test.c,
generate the expected ACPI AML data files for RISC-V using the
rebuild-expected-aml.sh script and update the
bios-tables-test-allowed-diff.h.

These are all new files being added for the first time. Hence, iASL diff
output is not added.

Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 tests/data/acpi/virt/riscv64/APIC           | Bin 0 -> 116 bytes
 tests/data/acpi/virt/riscv64/DSDT           | Bin 0 -> 3518 bytes
 tests/data/acpi/virt/riscv64/FACP           | Bin 0 -> 276 bytes
 tests/data/acpi/virt/riscv64/MCFG           | Bin 0 -> 60 bytes
 tests/data/acpi/virt/riscv64/RHCT           | Bin 0 -> 314 bytes
 tests/data/acpi/virt/riscv64/SPCR           | Bin 0 -> 80 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   6 ------
 7 files changed, 6 deletions(-)

diff --git a/tests/data/acpi/virt/riscv64/APIC b/tests/data/acpi/virt/riscv64/APIC
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..66a25dfd2d6ea2b607c024722b2eab95873a01e9 100644
GIT binary patch
literal 116
zcmZ<^@N_O=U|?X|;^gn_5v<@85#X!<1dKp25F13pfP@Mo12P{Zj?R|`s)2!c7=s}J
I#NvT*0o0BN0RR91

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0fb2d5e0e389541209b765d5092d0706f40298f6 100644
GIT binary patch
literal 3518
zcmZvf%WvaU6vnR;w@IBxlQexl(t(j!ppl%0(ryq<oOYV3X-%9`q=14{b;M9K6c~^O
zgcx<fqhd2ti4B_~D)B!c1W2sdvE#L7!#}_>eCJ*}oI`D?w!iChKA+$9t$orAn%(bn
zN+n)t?0eh6a^of6TgGN7rRbcFh1Tyc_k%{iceZVNuIr}z+pT7<?)fc<HI?okw3^tr
z>)qm0&dr&dmZB`a{a^Ra*0&D5Eo1b;X8Qm}E3gQ<btjYVdtTkbz7rISPX6ODvMUs3
zVE91w&KfCiza7@#@A>YkTOF1_DRa)WNl^t#{A^TNmZNji{btZCtt5&QPNDqU;E!+b
zecnEQ^xc;~?0jvN=B?69B6sx0n@1<N?!0~c*1N~|jvlD2+E~Xu>-LMCh<kUhvyXCD
z|GVk1+UV8=+`16nn$W3iZBaGE(t=R0Su8V)L_|(iti)M3i8v3Jc_g_<E!HC$=dr;&
zZ0_+)tcM-v;WLjB?y(x{F%swTD)SiS9?!;ljK+DKGLIDZSc~;Y#d$nr9_i3y=NsQ^
zu@zZ&*ReP}{EyK3th+T@*_*eqZ#4FX%O>b{iWO(USDtFAW3{YY{55g*p1P}!a8zWX
z7lz;IPVBzpJS=7G%wV8y2Q62ba|`EHRm#%1lYm%>L=vK=N;x|_7+?*WxKL3R0`umY
z&O>M<DHHxW7E8~>hKe$y(1g;N2-TU8l!<C|EEb%J4HacZp-Gd8P@M@$nW#v|VwsuP
zP=$;-)Haz>@sOMoiwl`i1tW@cj+o4-cu3BPCB-VhD+4MD9hIDroD&Pl#Oi8OIy2%-
zNlr-4iRFXLXr|LTGn$gL<b>p$V}cX!M^n3=p)tt`$vN>NG_kr`M{qil6Owag1ZPHY
zW+W#h=gbPutl-Q_PDsv)?-Htwo@Y*Q<|HR1=gbSvyx`1BPDsu<E;z>p=eXpA<eYfp
zv*(GAkEvZhm4f7i<eWvpSrnW_$qC6hOM<f`I7^Zfl5<W7&I!ReAvqyAXIXHT1!q}u
zLUPVY!8s{7CnYB&=bRFpQ-X6!azb*>X~8)yIHx5iB<DoK!Jg-g;GB`1keqW?aLx+O
zS;+~>Ip+lDoZy_3oRFMzUU1F}&UwiR$vGDU=Yrr|kera5b5U?E3eH8z3CTH^1m}|A
zT#}rSoU<Z0D}u8kIUx;a@2q9hqcop+`Y3zu*6>5@qiM`L8Qmx@>rXnqyVu6bqy3;0
zSfN$e$O$X-aop-gjFlN1TJ2C(VM8aZsGs9rPsDhcG3gaHcG3%d9rt=N#><R_Ugd1x
zYt+>h-rEXOMpLn!a_)bcQwbVUYCt>d6Z~go(OKwiV=x$e6rJOWm8FJLZ)jL(gSOQ9
z(=101Q%{N90rg{iGreXyIPiUy_PU*2Ro)uw?+2cJexkhQVfAu5b@3W?^1b$-wSOuL
z8($pWumAYmuXoN*92)^EIHqx|osu9QI;oM>2efl4w7)DozPM|Bh$~ecUA>%od=bT&
z;R0PerC=JrI{7MZ#_1;2tCR9A{Hkc%mp4o`zpVZISFrki`_c5@?b)Ba_T|{c>*}hQ
pv@F`;cR<_jYzAT_(hnb+<eKANn;)0v1k>|8pBtRxTSGr9{slF`>K_0A

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a5276b65ea8ce46cc9b40d96d98f0669c9089ed4 100644
GIT binary patch
literal 276
zcmZ>BbPf<<WME(ucJg=j2v%^42yj*a0-z8Bhz+8t3k1-OV?`GjD1M-;Zz#xa0OIBc
A0RR91

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/riscv64/MCFG b/tests/data/acpi/virt/riscv64/MCFG
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..37eb923a9320f5573c0c2cdb90bd98409cc7eb6f 100644
GIT binary patch
literal 60
rcmeZuc5}C3U|?Y6aq@Te2v%^42yj*a0!E-1hz+8VfB}^KA4CHH3`GY4

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/riscv64/RHCT b/tests/data/acpi/virt/riscv64/RHCT
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..beaa961bbf0f0486c0dee25f543377c928354f84 100644
GIT binary patch
literal 314
zcmXAlu}%Xq42FGxD#XNyI`tt=C&buWx`A2-wkXNvbP-K1O46&8iKjrk6)SI3ey5h~
z@3-SPa`wCa{iPvl)b_RC9X8vKw|)adiC8n)zP^7d?+~A>`lE(^DK1@Wog4=(iq&1K
z7;1J`gewX|OE=3Z>{xM3wM)ljIQKa+635YaZ7jrOeGc+eJEnks*|jl=GEUBVQ8WhX
zK@<flJgso_nMF!k2aE&flg}m^e@2oQd6bm~m(n5!gJ?a<U{EgOALs#2D_Y&qJuA9g
Pp1|9>GjINg;u`)Bd);9H

literal 0
HcmV?d00001

diff --git a/tests/data/acpi/virt/riscv64/SPCR b/tests/data/acpi/virt/riscv64/SPCR
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4da9daf65f71a13ac2b488d4e9728f194b569a43 100644
GIT binary patch
literal 80
zcmWFza1IJ!U|?X{>E!S15v<@85#X!<1dKp25F12;fdT`FDF9*%FmM4$c8~z`e;@#f
G!2kgKJqrN<

literal 0
HcmV?d00001

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index d8610c8d72..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,7 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/riscv64/APIC",
-"tests/data/acpi/virt/riscv64/DSDT",
-"tests/data/acpi/virt/riscv64/FACP",
-"tests/data/acpi/virt/riscv64/MCFG",
-"tests/data/acpi/virt/riscv64/RHCT",
-"tests/data/acpi/virt/riscv64/SPCR",
-- 
2.40.1

Re: [PATCH v2 12/12] tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V

[Alistair Francis]

On Fri, May 24, 2024 at 4:15 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> As per the step 5 in the process documented in bios-tables-test.c,
> generate the expected ACPI AML data files for RISC-V using the
> rebuild-expected-aml.sh script and update the
> bios-tables-test-allowed-diff.h.
>
> These are all new files being added for the first time. Hence, iASL diff
> output is not added.
>
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>

Acked-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  tests/data/acpi/virt/riscv64/APIC           | Bin 0 -> 116 bytes
>  tests/data/acpi/virt/riscv64/DSDT           | Bin 0 -> 3518 bytes
>  tests/data/acpi/virt/riscv64/FACP           | Bin 0 -> 276 bytes
>  tests/data/acpi/virt/riscv64/MCFG           | Bin 0 -> 60 bytes
>  tests/data/acpi/virt/riscv64/RHCT           | Bin 0 -> 314 bytes
>  tests/data/acpi/virt/riscv64/SPCR           | Bin 0 -> 80 bytes
>  tests/qtest/bios-tables-test-allowed-diff.h |   6 ------
>  7 files changed, 6 deletions(-)
>
> diff --git a/tests/data/acpi/virt/riscv64/APIC b/tests/data/acpi/virt/riscv64/APIC
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..66a25dfd2d6ea2b607c024722b2eab95873a01e9 100644
> GIT binary patch
> literal 116
> zcmZ<^@N_O=U|?X|;^gn_5v<@85#X!<1dKp25F13pfP@Mo12P{Zj?R|`s)2!c7=s}J
> I#NvT*0o0BN0RR91
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0fb2d5e0e389541209b765d5092d0706f40298f6 100644
> GIT binary patch
> literal 3518
> zcmZvf%WvaU6vnR;w@IBxlQexl(t(j!ppl%0(ryq<oOYV3X-%9`q=14{b;M9K6c~^O
> zgcx<fqhd2ti4B_~D)B!c1W2sdvE#L7!#}_>eCJ*}oI`D?w!iChKA+$9t$orAn%(bn
> zN+n)t?0eh6a^of6TgGN7rRbcFh1Tyc_k%{iceZVNuIr}z+pT7<?)fc<HI?okw3^tr
> z>)qm0&dr&dmZB`a{a^Ra*0&D5Eo1b;X8Qm}E3gQ<btjYVdtTkbz7rISPX6ODvMUs3
> zVE91w&KfCiza7@#@A>YkTOF1_DRa)WNl^t#{A^TNmZNji{btZCtt5&QPNDqU;E!+b
> zecnEQ^xc;~?0jvN=B?69B6sx0n@1<N?!0~c*1N~|jvlD2+E~Xu>-LMCh<kUhvyXCD
> z|GVk1+UV8=+`16nn$W3iZBaGE(t=R0Su8V)L_|(iti)M3i8v3Jc_g_<E!HC$=dr;&
> zZ0_+)tcM-v;WLjB?y(x{F%swTD)SiS9?!;ljK+DKGLIDZSc~;Y#d$nr9_i3y=NsQ^
> zu@zZ&*ReP}{EyK3th+T@*_*eqZ#4FX%O>b{iWO(USDtFAW3{YY{55g*p1P}!a8zWX
> z7lz;IPVBzpJS=7G%wV8y2Q62ba|`EHRm#%1lYm%>L=vK=N;x|_7+?*WxKL3R0`umY
> z&O>M<DHHxW7E8~>hKe$y(1g;N2-TU8l!<C|EEb%J4HacZp-Gd8P@M@$nW#v|VwsuP
> zP=$;-)Haz>@sOMoiwl`i1tW@cj+o4-cu3BPCB-VhD+4MD9hIDroD&Pl#Oi8OIy2%-
> zNlr-4iRFXLXr|LTGn$gL<b>p$V}cX!M^n3=p)tt`$vN>NG_kr`M{qil6Owag1ZPHY
> zW+W#h=gbPutl-Q_PDsv)?-Htwo@Y*Q<|HR1=gbSvyx`1BPDsu<E;z>p=eXpA<eYfp
> zv*(GAkEvZhm4f7i<eWvpSrnW_$qC6hOM<f`I7^Zfl5<W7&I!ReAvqyAXIXHT1!q}u
> zLUPVY!8s{7CnYB&=bRFpQ-X6!azb*>X~8)yIHx5iB<DoK!Jg-g;GB`1keqW?aLx+O
> zS;+~>Ip+lDoZy_3oRFMzUU1F}&UwiR$vGDU=Yrr|kera5b5U?E3eH8z3CTH^1m}|A
> zT#}rSoU<Z0D}u8kIUx;a@2q9hqcop+`Y3zu*6>5@qiM`L8Qmx@>rXnqyVu6bqy3;0
> zSfN$e$O$X-aop-gjFlN1TJ2C(VM8aZsGs9rPsDhcG3gaHcG3%d9rt=N#><R_Ugd1x
> zYt+>h-rEXOMpLn!a_)bcQwbVUYCt>d6Z~go(OKwiV=x$e6rJOWm8FJLZ)jL(gSOQ9
> z(=101Q%{N90rg{iGreXyIPiUy_PU*2Ro)uw?+2cJexkhQVfAu5b@3W?^1b$-wSOuL
> z8($pWumAYmuXoN*92)^EIHqx|osu9QI;oM>2efl4w7)DozPM|Bh$~ecUA>%od=bT&
> z;R0PerC=JrI{7MZ#_1;2tCR9A{Hkc%mp4o`zpVZISFrki`_c5@?b)Ba_T|{c>*}hQ
> pv@F`;cR<_jYzAT_(hnb+<eKANn;)0v1k>|8pBtRxTSGr9{slF`>K_0A
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a5276b65ea8ce46cc9b40d96d98f0669c9089ed4 100644
> GIT binary patch
> literal 276
> zcmZ>BbPf<<WME(ucJg=j2v%^42yj*a0-z8Bhz+8t3k1-OV?`GjD1M-;Zz#xa0OIBc
> A0RR91
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/riscv64/MCFG b/tests/data/acpi/virt/riscv64/MCFG
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..37eb923a9320f5573c0c2cdb90bd98409cc7eb6f 100644
> GIT binary patch
> literal 60
> rcmeZuc5}C3U|?Y6aq@Te2v%^42yj*a0!E-1hz+8VfB}^KA4CHH3`GY4
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/riscv64/RHCT b/tests/data/acpi/virt/riscv64/RHCT
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..beaa961bbf0f0486c0dee25f543377c928354f84 100644
> GIT binary patch
> literal 314
> zcmXAlu}%Xq42FGxD#XNyI`tt=C&buWx`A2-wkXNvbP-K1O46&8iKjrk6)SI3ey5h~
> z@3-SPa`wCa{iPvl)b_RC9X8vKw|)adiC8n)zP^7d?+~A>`lE(^DK1@Wog4=(iq&1K
> z7;1J`gewX|OE=3Z>{xM3wM)ljIQKa+635YaZ7jrOeGc+eJEnks*|jl=GEUBVQ8WhX
> zK@<flJgso_nMF!k2aE&flg}m^e@2oQd6bm~m(n5!gJ?a<U{EgOALs#2D_Y&qJuA9g
> Pp1|9>GjINg;u`)Bd);9H
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/data/acpi/virt/riscv64/SPCR b/tests/data/acpi/virt/riscv64/SPCR
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4da9daf65f71a13ac2b488d4e9728f194b569a43 100644
> GIT binary patch
> literal 80
> zcmWFza1IJ!U|?X{>E!S15v<@85#X!<1dKp25F12;fdT`FDF9*%FmM4$c8~z`e;@#f
> G!2kgKJqrN<
>
> literal 0
> HcmV?d00001
>
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index d8610c8d72..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,7 +1 @@
>  /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/virt/riscv64/APIC",
> -"tests/data/acpi/virt/riscv64/DSDT",
> -"tests/data/acpi/virt/riscv64/FACP",
> -"tests/data/acpi/virt/riscv64/MCFG",
> -"tests/data/acpi/virt/riscv64/RHCT",
> -"tests/data/acpi/virt/riscv64/SPCR",
> --
> 2.40.1
>

Re: [PATCH v2 12/12] tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V

[Igor Mammedov]

On Fri, 24 May 2024 11:44:11 +0530
Sunil V L <sunilvl@ventanamicro.com> wrote:

> As per the step 5 in the process documented in bios-tables-test.c,
> generate the expected ACPI AML data files for RISC-V using the
> rebuild-expected-aml.sh script and update the
> bios-tables-test-allowed-diff.h.
> 
> These are all new files being added for the first time. Hence, iASL diff
> output is not added.
> 
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>

Acked-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/data/acpi/virt/riscv64/APIC           | Bin 0 -> 116 bytes
>  tests/data/acpi/virt/riscv64/DSDT           | Bin 0 -> 3518 bytes
>  tests/data/acpi/virt/riscv64/FACP           | Bin 0 -> 276 bytes
>  tests/data/acpi/virt/riscv64/MCFG           | Bin 0 -> 60 bytes
>  tests/data/acpi/virt/riscv64/RHCT           | Bin 0 -> 314 bytes
>  tests/data/acpi/virt/riscv64/SPCR           | Bin 0 -> 80 bytes
>  tests/qtest/bios-tables-test-allowed-diff.h |   6 ------
>  7 files changed, 6 deletions(-)
> 
> diff --git a/tests/data/acpi/virt/riscv64/APIC b/tests/data/acpi/virt/riscv64/APIC
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..66a25dfd2d6ea2b607c024722b2eab95873a01e9 100644
> GIT binary patch
> literal 116
> zcmZ<^@N_O=U|?X|;^gn_5v<@85#X!<1dKp25F13pfP@Mo12P{Zj?R|`s)2!c7=s}J
> I#NvT*0o0BN0RR91
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/virt/riscv64/DSDT b/tests/data/acpi/virt/riscv64/DSDT
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0fb2d5e0e389541209b765d5092d0706f40298f6 100644
> GIT binary patch
> literal 3518
> zcmZvf%WvaU6vnR;w@IBxlQexl(t(j!ppl%0(ryq<oOYV3X-%9`q=14{b;M9K6c~^O
> zgcx<fqhd2ti4B_~D)B!c1W2sdvE#L7!#}_>eCJ*}oI`D?w!iChKA+$9t$orAn%(bn
> zN+n)t?0eh6a^of6TgGN7rRbcFh1Tyc_k%{iceZVNuIr}z+pT7<?)fc<HI?okw3^tr
> z>)qm0&dr&dmZB`a{a^Ra*0&D5Eo1b;X8Qm}E3gQ<btjYVdtTkbz7rISPX6ODvMUs3
> zVE91w&KfCiza7@#@A>YkTOF1_DRa)WNl^t#{A^TNmZNji{btZCtt5&QPNDqU;E!+b  
> zecnEQ^xc;~?0jvN=B?69B6sx0n@1<N?!0~c*1N~|jvlD2+E~Xu>-LMCh<kUhvyXCD
> z|GVk1+UV8=+`16nn$W3iZBaGE(t=R0Su8V)L_|(iti)M3i8v3Jc_g_<E!HC$=dr;&
> zZ0_+)tcM-v;WLjB?y(x{F%swTD)SiS9?!;ljK+DKGLIDZSc~;Y#d$nr9_i3y=NsQ^
> zu@zZ&*ReP}{EyK3th+T@*_*eqZ#4FX%O>b{iWO(USDtFAW3{YY{55g*p1P}!a8zWX
> z7lz;IPVBzpJS=7G%wV8y2Q62ba|`EHRm#%1lYm%>L=vK=N;x|_7+?*WxKL3R0`umY
> z&O>M<DHHxW7E8~>hKe$y(1g;N2-TU8l!<C|EEb%J4HacZp-Gd8P@M@$nW#v|VwsuP  
> zP=$;-)Haz>@sOMoiwl`i1tW@cj+o4-cu3BPCB-VhD+4MD9hIDroD&Pl#Oi8OIy2%-
> zNlr-4iRFXLXr|LTGn$gL<b>p$V}cX!M^n3=p)tt`$vN>NG_kr`M{qil6Owag1ZPHY
> zW+W#h=gbPutl-Q_PDsv)?-Htwo@Y*Q<|HR1=gbSvyx`1BPDsu<E;z>p=eXpA<eYfp
> zv*(GAkEvZhm4f7i<eWvpSrnW_$qC6hOM<f`I7^Zfl5<W7&I!ReAvqyAXIXHT1!q}u
> zLUPVY!8s{7CnYB&=bRFpQ-X6!azb*>X~8)yIHx5iB<DoK!Jg-g;GB`1keqW?aLx+O
> zS;+~>Ip+lDoZy_3oRFMzUU1F}&UwiR$vGDU=Yrr|kera5b5U?E3eH8z3CTH^1m}|A  
> zT#}rSoU<Z0D}u8kIUx;a@2q9hqcop+`Y3zu*6>5@qiM`L8Qmx@>rXnqyVu6bqy3;0
> zSfN$e$O$X-aop-gjFlN1TJ2C(VM8aZsGs9rPsDhcG3gaHcG3%d9rt=N#><R_Ugd1x
> zYt+>h-rEXOMpLn!a_)bcQwbVUYCt>d6Z~go(OKwiV=x$e6rJOWm8FJLZ)jL(gSOQ9  
> z(=101Q%{N90rg{iGreXyIPiUy_PU*2Ro)uw?+2cJexkhQVfAu5b@3W?^1b$-wSOuL
> z8($pWumAYmuXoN*92)^EIHqx|osu9QI;oM>2efl4w7)DozPM|Bh$~ecUA>%od=bT&  
> z;R0PerC=JrI{7MZ#_1;2tCR9A{Hkc%mp4o`zpVZISFrki`_c5@?b)Ba_T|{c>*}hQ  
> pv@F`;cR<_jYzAT_(hnb+<eKANn;)0v1k>|8pBtRxTSGr9{slF`>K_0A
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/virt/riscv64/FACP b/tests/data/acpi/virt/riscv64/FACP
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a5276b65ea8ce46cc9b40d96d98f0669c9089ed4 100644
> GIT binary patch
> literal 276
> zcmZ>BbPf<<WME(ucJg=j2v%^42yj*a0-z8Bhz+8t3k1-OV?`GjD1M-;Zz#xa0OIBc  
> A0RR91
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/virt/riscv64/MCFG b/tests/data/acpi/virt/riscv64/MCFG
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..37eb923a9320f5573c0c2cdb90bd98409cc7eb6f 100644
> GIT binary patch
> literal 60
> rcmeZuc5}C3U|?Y6aq@Te2v%^42yj*a0!E-1hz+8VfB}^KA4CHH3`GY4
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/virt/riscv64/RHCT b/tests/data/acpi/virt/riscv64/RHCT
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..beaa961bbf0f0486c0dee25f543377c928354f84 100644
> GIT binary patch
> literal 314
> zcmXAlu}%Xq42FGxD#XNyI`tt=C&buWx`A2-wkXNvbP-K1O46&8iKjrk6)SI3ey5h~
> z@3-SPa`wCa{iPvl)b_RC9X8vKw|)adiC8n)zP^7d?+~A>`lE(^DK1@Wog4=(iq&1K
> z7;1J`gewX|OE=3Z>{xM3wM)ljIQKa+635YaZ7jrOeGc+eJEnks*|jl=GEUBVQ8WhX  
> zK@<flJgso_nMF!k2aE&flg}m^e@2oQd6bm~m(n5!gJ?a<U{EgOALs#2D_Y&qJuA9g
> Pp1|9>GjINg;u`)Bd);9H  
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/data/acpi/virt/riscv64/SPCR b/tests/data/acpi/virt/riscv64/SPCR
> index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4da9daf65f71a13ac2b488d4e9728f194b569a43 100644
> GIT binary patch
> literal 80
> zcmWFza1IJ!U|?X{>E!S15v<@85#X!<1dKp25F12;fdT`FDF9*%FmM4$c8~z`e;@#f  
> G!2kgKJqrN<
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
> index d8610c8d72..dfb8523c8b 100644
> --- a/tests/qtest/bios-tables-test-allowed-diff.h
> +++ b/tests/qtest/bios-tables-test-allowed-diff.h
> @@ -1,7 +1 @@
>  /* List of comma-separated changed AML files to ignore */
> -"tests/data/acpi/virt/riscv64/APIC",
> -"tests/data/acpi/virt/riscv64/DSDT",
> -"tests/data/acpi/virt/riscv64/FACP",
> -"tests/data/acpi/virt/riscv64/MCFG",
> -"tests/data/acpi/virt/riscv64/RHCT",
> -"tests/data/acpi/virt/riscv64/SPCR",

Re: [PATCH v2 00/12] Add support for RISC-V ACPI tests

[Alistair Francis]

On Fri, May 24, 2024 at 4:14 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> Currently, bios-table-test doesn't support RISC-V. This series enables
> the framework changes required and basic testing. Things like NUMA
> related test cases will be added later.
>
> This needs refactoring/renaming of ARM64 bios table tests. Importantly,
> the test cases now look for the expected AML files under
> tests/data/acpi/virt/aarch64 path instead of directly under
> tests/data/acpi/virt. To keep test cases not to fail because of this
> movement, they are updated to look for both paths first.
>
> As part of this effort, it is found that uefi-test-tools is currently
> broken to build. So, updated its Makefile as well to use python based
> edk2 build script.

It would be great to get someone who knows the UEFI world better than I
do to ack these changes, especially the first few patches


Alistair

>
> The changes are also available at branch
> https://gitlab.com/vlsunil/qemu/-/tree/riscv_bios_table_test_v2
>
> Changes since v1:
>         1) Addressed feedback from Gerd and Alistair
>         2) Rebased and added tags received
>
> Sunil V L (12):
>   uefi-test-tools/UefiTestToolsPkg: Add RISC-V support
>   uefi-test-tools: Add support for python based build script
>   tests/data/uefi-boot-images: Add RISC-V ISO image
>   qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them
>   tests/qtest/bios-tables-test.c: Add support for arch in path
>   tests/data/acpi/virt: Move ACPI tables under aarch64
>   meson.build: Add RISC-V to the edk2-target list
>   pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs
>   tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V
>   tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V
>   tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
>   tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V
>
>  meson.build                                   |   2 +-
>  pc-bios/meson.build                           |   2 +
>  tests/data/acpi/rebuild-expected-aml.sh       |   5 +-
>  tests/data/acpi/virt/{ => aarch64}/APIC       | Bin
>  .../acpi/virt/{ => aarch64}/APIC.acpihmatvirt | Bin
>  .../acpi/virt/{ => aarch64}/APIC.topology     | Bin
>  tests/data/acpi/virt/{ => aarch64}/DBG2       | Bin
>  tests/data/acpi/virt/{ => aarch64}/DSDT       | Bin
>  .../acpi/virt/{ => aarch64}/DSDT.acpihmatvirt | Bin
>  tests/data/acpi/virt/{ => aarch64}/DSDT.memhp | Bin
>  tests/data/acpi/virt/{ => aarch64}/DSDT.pxb   | Bin
>  .../acpi/virt/{ => aarch64}/DSDT.topology     | Bin
>  tests/data/acpi/virt/{ => aarch64}/FACP       | Bin
>  tests/data/acpi/virt/{ => aarch64}/GTDT       | Bin
>  .../acpi/virt/{ => aarch64}/HMAT.acpihmatvirt | Bin
>  tests/data/acpi/virt/{ => aarch64}/IORT       | Bin
>  tests/data/acpi/virt/{ => aarch64}/MCFG       | Bin
>  tests/data/acpi/virt/{ => aarch64}/NFIT.memhp | Bin
>  tests/data/acpi/virt/{ => aarch64}/PPTT       | Bin
>  .../acpi/virt/{ => aarch64}/PPTT.acpihmatvirt | Bin
>  .../acpi/virt/{ => aarch64}/PPTT.topology     | Bin
>  tests/data/acpi/virt/{ => aarch64}/SLIT.memhp | Bin
>  tests/data/acpi/virt/{ => aarch64}/SPCR       | Bin
>  .../acpi/virt/{ => aarch64}/SRAT.acpihmatvirt | Bin
>  tests/data/acpi/virt/{ => aarch64}/SRAT.memhp | Bin
>  .../data/acpi/virt/{ => aarch64}/SRAT.numamem | Bin
>  tests/data/acpi/virt/{ => aarch64}/SSDT.memhp | Bin
>  tests/data/acpi/virt/{ => aarch64}/VIOT       | Bin
>  tests/data/acpi/virt/riscv64/APIC             | Bin 0 -> 116 bytes
>  tests/data/acpi/virt/riscv64/DSDT             | Bin 0 -> 3518 bytes
>  tests/data/acpi/virt/riscv64/FACP             | Bin 0 -> 276 bytes
>  tests/data/acpi/virt/riscv64/MCFG             | Bin 0 -> 60 bytes
>  tests/data/acpi/virt/riscv64/RHCT             | Bin 0 -> 314 bytes
>  tests/data/acpi/virt/riscv64/SPCR             | Bin 0 -> 80 bytes
>  .../bios-tables-test.riscv64.iso.qcow2        | Bin 0 -> 16896 bytes
>  tests/qtest/bios-tables-test.c                |  93 ++++++++++++++----
>  tests/qtest/meson.build                       |   3 +
>  tests/uefi-test-tools/Makefile                |  19 ++--
>  .../UefiTestToolsPkg/UefiTestToolsPkg.dsc     |   6 +-
>  tests/uefi-test-tools/uefi-test-build.config  |  52 ++++++++++
>  40 files changed, 147 insertions(+), 35 deletions(-)
>  rename tests/data/acpi/virt/{ => aarch64}/APIC (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/APIC.topology (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/DBG2 (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/DSDT (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/DSDT.memhp (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/DSDT.pxb (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/DSDT.topology (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/FACP (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/GTDT (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/IORT (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/MCFG (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/NFIT.memhp (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/PPTT (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/PPTT.topology (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/SLIT.memhp (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/SPCR (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/SRAT.memhp (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/SRAT.numamem (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/SSDT.memhp (100%)
>  rename tests/data/acpi/virt/{ => aarch64}/VIOT (100%)
>  create mode 100644 tests/data/acpi/virt/riscv64/APIC
>  create mode 100644 tests/data/acpi/virt/riscv64/DSDT
>  create mode 100644 tests/data/acpi/virt/riscv64/FACP
>  create mode 100644 tests/data/acpi/virt/riscv64/MCFG
>  create mode 100644 tests/data/acpi/virt/riscv64/RHCT
>  create mode 100644 tests/data/acpi/virt/riscv64/SPCR
>  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2
>  create mode 100644 tests/uefi-test-tools/uefi-test-build.config
>
> --
> 2.40.1
>

Re: [PATCH v2 00/12] Add support for RISC-V ACPI tests

[Michael S. Tsirkin]

On Tue, Jun 04, 2024 at 01:29:28PM +1000, Alistair Francis wrote:
> On Fri, May 24, 2024 at 4:14 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> >
> > Currently, bios-table-test doesn't support RISC-V. This series enables
> > the framework changes required and basic testing. Things like NUMA
> > related test cases will be added later.
> >
> > This needs refactoring/renaming of ARM64 bios table tests. Importantly,
> > the test cases now look for the expected AML files under
> > tests/data/acpi/virt/aarch64 path instead of directly under
> > tests/data/acpi/virt. To keep test cases not to fail because of this
> > movement, they are updated to look for both paths first.
> >
> > As part of this effort, it is found that uefi-test-tools is currently
> > broken to build. So, updated its Makefile as well to use python based
> > edk2 build script.
> 
> It would be great to get someone who knows the UEFI world better than I
> do to ack these changes, especially the first few patches
> 
> 
> Alistair


ACPI things look ok. I can merge this but will wait a week or so
more for more acks.

> >
> > The changes are also available at branch
> > https://gitlab.com/vlsunil/qemu/-/tree/riscv_bios_table_test_v2
> >
> > Changes since v1:
> >         1) Addressed feedback from Gerd and Alistair
> >         2) Rebased and added tags received
> >
> > Sunil V L (12):
> >   uefi-test-tools/UefiTestToolsPkg: Add RISC-V support
> >   uefi-test-tools: Add support for python based build script
> >   tests/data/uefi-boot-images: Add RISC-V ISO image
> >   qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them
> >   tests/qtest/bios-tables-test.c: Add support for arch in path
> >   tests/data/acpi/virt: Move ACPI tables under aarch64
> >   meson.build: Add RISC-V to the edk2-target list
> >   pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs
> >   tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V
> >   tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V
> >   tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
> >   tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V
> >
> >  meson.build                                   |   2 +-
> >  pc-bios/meson.build                           |   2 +
> >  tests/data/acpi/rebuild-expected-aml.sh       |   5 +-
> >  tests/data/acpi/virt/{ => aarch64}/APIC       | Bin
> >  .../acpi/virt/{ => aarch64}/APIC.acpihmatvirt | Bin
> >  .../acpi/virt/{ => aarch64}/APIC.topology     | Bin
> >  tests/data/acpi/virt/{ => aarch64}/DBG2       | Bin
> >  tests/data/acpi/virt/{ => aarch64}/DSDT       | Bin
> >  .../acpi/virt/{ => aarch64}/DSDT.acpihmatvirt | Bin
> >  tests/data/acpi/virt/{ => aarch64}/DSDT.memhp | Bin
> >  tests/data/acpi/virt/{ => aarch64}/DSDT.pxb   | Bin
> >  .../acpi/virt/{ => aarch64}/DSDT.topology     | Bin
> >  tests/data/acpi/virt/{ => aarch64}/FACP       | Bin
> >  tests/data/acpi/virt/{ => aarch64}/GTDT       | Bin
> >  .../acpi/virt/{ => aarch64}/HMAT.acpihmatvirt | Bin
> >  tests/data/acpi/virt/{ => aarch64}/IORT       | Bin
> >  tests/data/acpi/virt/{ => aarch64}/MCFG       | Bin
> >  tests/data/acpi/virt/{ => aarch64}/NFIT.memhp | Bin
> >  tests/data/acpi/virt/{ => aarch64}/PPTT       | Bin
> >  .../acpi/virt/{ => aarch64}/PPTT.acpihmatvirt | Bin
> >  .../acpi/virt/{ => aarch64}/PPTT.topology     | Bin
> >  tests/data/acpi/virt/{ => aarch64}/SLIT.memhp | Bin
> >  tests/data/acpi/virt/{ => aarch64}/SPCR       | Bin
> >  .../acpi/virt/{ => aarch64}/SRAT.acpihmatvirt | Bin
> >  tests/data/acpi/virt/{ => aarch64}/SRAT.memhp | Bin
> >  .../data/acpi/virt/{ => aarch64}/SRAT.numamem | Bin
> >  tests/data/acpi/virt/{ => aarch64}/SSDT.memhp | Bin
> >  tests/data/acpi/virt/{ => aarch64}/VIOT       | Bin
> >  tests/data/acpi/virt/riscv64/APIC             | Bin 0 -> 116 bytes
> >  tests/data/acpi/virt/riscv64/DSDT             | Bin 0 -> 3518 bytes
> >  tests/data/acpi/virt/riscv64/FACP             | Bin 0 -> 276 bytes
> >  tests/data/acpi/virt/riscv64/MCFG             | Bin 0 -> 60 bytes
> >  tests/data/acpi/virt/riscv64/RHCT             | Bin 0 -> 314 bytes
> >  tests/data/acpi/virt/riscv64/SPCR             | Bin 0 -> 80 bytes
> >  .../bios-tables-test.riscv64.iso.qcow2        | Bin 0 -> 16896 bytes
> >  tests/qtest/bios-tables-test.c                |  93 ++++++++++++++----
> >  tests/qtest/meson.build                       |   3 +
> >  tests/uefi-test-tools/Makefile                |  19 ++--
> >  .../UefiTestToolsPkg/UefiTestToolsPkg.dsc     |   6 +-
> >  tests/uefi-test-tools/uefi-test-build.config  |  52 ++++++++++
> >  40 files changed, 147 insertions(+), 35 deletions(-)
> >  rename tests/data/acpi/virt/{ => aarch64}/APIC (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/APIC.acpihmatvirt (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/APIC.topology (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/DBG2 (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/DSDT (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/DSDT.acpihmatvirt (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/DSDT.memhp (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/DSDT.pxb (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/DSDT.topology (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/FACP (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/GTDT (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/HMAT.acpihmatvirt (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/IORT (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/MCFG (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/NFIT.memhp (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/PPTT (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/PPTT.acpihmatvirt (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/PPTT.topology (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/SLIT.memhp (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/SPCR (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/SRAT.acpihmatvirt (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/SRAT.memhp (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/SRAT.numamem (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/SSDT.memhp (100%)
> >  rename tests/data/acpi/virt/{ => aarch64}/VIOT (100%)
> >  create mode 100644 tests/data/acpi/virt/riscv64/APIC
> >  create mode 100644 tests/data/acpi/virt/riscv64/DSDT
> >  create mode 100644 tests/data/acpi/virt/riscv64/FACP
> >  create mode 100644 tests/data/acpi/virt/riscv64/MCFG
> >  create mode 100644 tests/data/acpi/virt/riscv64/RHCT
> >  create mode 100644 tests/data/acpi/virt/riscv64/SPCR
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2
> >  create mode 100644 tests/uefi-test-tools/uefi-test-build.config
> >
> > --
> > 2.40.1
> >