microvm: add pcie support
v3 cover microvm: add pcie support
v2:
- move aml generator to gpex and have arm virt + microvm share it.
- add 64bit window.
- add testcase.
v3:
- fix testcase: force tcg, disable on i386.
Gerd Hoffmann (12):
move MemMapEntry
acpi: add acpi_dsdt_add_gpex
arm: use acpi_dsdt_add_gpex
microvm: add irq table
microvm: add pcie support
microvm/pcie: add 64bit mmio window
tests/acpi: allow updates for expected data files tests/acpi: add empty tests/data/acpi/microvm/DSDT.pcie file tests/acpi: factor out common microvm test setup tests/acpi: add microvm pcie test
acpi/gpex: no reason to use a method for _CRS tests/acpi: update expected data files
include/exec/hwaddr.h | 5 + include/hw/arm/virt.h | 5 - include/hw/i386/microvm.h | 32 ++++++ include/hw/pci-host/gpex.h | 11 ++ hw/arm/sbsa-ref.c | 5 - hw/arm/virt-acpi-build.c | 175 ++--------------------------- hw/i386/acpi-microvm.c | 12 ++ hw/i386/microvm.c | 93 ++++++++++++++++ hw/pci-host/gpex-acpi.c | 177 ++++++++++++++++++++++++++++++ tests/qtest/bios-tables-test.c | 30 ++++- hw/i386/Kconfig | 1 + hw/pci-host/meson.build | 1 + tests/data/acpi/microvm/DSDT.pcie | Bin 0 -> 3023 bytes tests/data/acpi/virt/DSDT | Bin 5200 -> 5196 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6561 -> 6557 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5200 -> 5196 bytes 16 files changed, 366 insertions(+), 181 deletions(-) create mode 100644 hw/pci-host/gpex-acpi.c create mode 100644 tests/data/acpi/microvm/DSDT.pcie
Signature · 1 line
2.27.0
PATCH v3 1/12 move MemMapEntry
It is defined twice already. Move to a common header file to remove duplication and make it available to everybody.
--- include/exec/hwaddr.h | 5 +++++ include/hw/arm/virt.h | 5 ----- hw/arm/sbsa-ref.c | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-)
include/exec/hwaddr.h +5 -0
@@ -18,4 +18,9 @@ typedef uint64_t hwaddr;#define HWADDR_PRIx PRIx64#define HWADDR_PRIX PRIX64 +typedef struct MemMapEntry { +hwaddr base; +hwaddr size; +}MemMapEntry ; +#endif
include/hw/arm/virt.h +0 -5
@@ -111,11 +111,6 @@ typedef enum VirtGICType {VIRT_GIC_VERSION_NOSEL , } VirtGICType; -typedef struct MemMapEntry { -hwaddr base; -hwaddr size; -}MemMapEntry ; -struct VirtMachineClass {MachineClass parent;bool disallow_affinity_adjustment;
hw/arm/sbsa-ref.c +0 -5
@@ -80,11 +80,6 @@ enum { SBSA_EHCI, }; -typedef struct MemMapEntry { -hwaddr base; -hwaddr size; -}MemMapEntry ; -struct SBSAMachineState {MachineState parent;struct arm_boot_info bootinfo;
Signature · 1 line
2.27.0
PATCH v3 2/12 acpi: add acpi_dsdt_add_gpex
In reply to Gerd HoffmannAdd helper function to generate dsdt aml code for the gpex pci host. Largely copied from arm/virt. Configuration is handled by passing a config struct instead of looked up from memory map.
--- include/hw/pci-host/gpex.h | 11 +++ hw/pci-host/gpex-acpi.c | 179 +++++++++++++++++++++++++++++++++++++ hw/pci-host/meson.build | 1 + 3 files changed, 191 insertions(+) create mode 100644 hw/pci-host/gpex-acpi.c
include/hw/pci-host/gpex.h +11 -0
@@ -20,6 +20,7 @@#ifndef HW_GPEX_H #define HW_GPEX_H +#include "exec/hwaddr.h" #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h"
@@ -52,6 +53,16 @@ struct GPEXHost { int irq_num[GPEX_NUM_IRQS]; }; +struct GPEXConfig { +MemMapEntry ecam; +MemMapEntry mmio32; +MemMapEntry mmio64; +MemMapEntry pio; +int irq; +}; +int gpex_set_irq_num (GPEXHost *s,int index,int gsi); +void acpi_dsdt_add_gpex (Aml *scope,struct GPEXConfig *cfg); +#endif /* HW_GPEX_H */
hw/pci-host/gpex-acpi.c new file +179 -0
179 lines not on this page · raw message
hw/pci-host/meson.build +1 -0
@@ -3,6 +3,7 @@ pci_ss.add(when: 'CONFIG_PAM', if_true: files('pam.c')) pci_ss.add(when: 'CONFIG_PCI_BONITO', if_true: files('bonito.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_DESIGNWARE', if_true: files('designware.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_GENERIC_BRIDGE', if_true: files('gpex.c')) +pci_ss.add(when: 'CONFIG_ACPI', if_true: files('gpex-acpi.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_Q35', if_true: files('q35.c')) pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c')) pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))
Signature · 1 line
2.27.0
PATCH v3 3/12 arm: use acpi_dsdt_add_gpex
In reply to Gerd HoffmannFill gpex config struct from memory map, then call the new acpi_dsdt_add_gpex helper function. No functional change.
--- hw/arm/virt-acpi-build.c | 175 ++------------------------------------- 1 file changed, 9 insertions(+), 166 deletions(-)
hw/arm/virt-acpi-build.c +9 -166
@@ -44,6 +44,7 @@#include "hw/acpi/tpm.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci.h" +#include "hw/pci-host/gpex.h" #include "hw/arm/virt.h" #include "hw/mem/nvdimm.h" #include "hw/platform-bus.h"
@@ -155,176 +156,18 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, uint32_t irq, bool use_highmem, bool highmem_ecam) { int ecam_id = VIRT_ECAM_ID(highmem_ecam); -Aml *method, *crs, *ifctx, *UUID , *ifctx1, *elsectx, *buf; -int i, slot_no; -hwaddr base_mmio = memmap[VIRT_PCIE_MMIO ].base; -hwaddr size_mmio = memmap[VIRT_PCIE_MMIO ].size; -hwaddr base_pio = memmap[VIRT_PCIE_PIO ].base; -hwaddr size_pio = memmap[VIRT_PCIE_PIO ].size; -hwaddr base_ecam = memmap[ecam_id].base; -hwaddr size_ecam = memmap[ecam_id].size; -int nr_pcie_buses = size_ecam /PCIE_MMCFG_SIZE_MIN ; - -Aml *dev =aml_device ("%s" ,"PCI0" ); -aml_append (dev,aml_name_decl ("_HID" ,aml_string ("PNP0A08" ))); -aml_append (dev,aml_name_decl ("_CID" ,aml_string ("PNP0A03" ))); -aml_append (dev,aml_name_decl ("_SEG" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("_BBN" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("_STR" ,aml_unicode ("PCIe 0 Device" ))); -aml_append (dev,aml_name_decl ("_CCA" ,aml_int (1 ))); - -/* Declare the PCI Routing Table. */ -Aml *rt_pkg =aml_varpackage (PCI_SLOT_MAX *PCI_NUM_PINS ); -for (slot_no =0 ; slot_no <PCI_SLOT_MAX ; slot_no++) { -for (i =0 ; i <PCI_NUM_PINS ; i++) { -int gsi = (i + slot_no) %PCI_NUM_PINS ; -Aml *pkg =aml_package (4 ); -aml_append (pkg,aml_int ((slot_no <<16 ) |0xFFFF )); -aml_append (pkg,aml_int (i)); -aml_append (pkg,aml_name ("GSI%d" , gsi)); -aml_append (pkg,aml_int (0 )); -aml_append (rt_pkg, pkg); - } - } -aml_append (dev,aml_name_decl ("_PRT" , rt_pkg)); - -/* Create GSI link device */ -for (i =0 ; i <PCI_NUM_PINS ; i++) { -uint32_t irqs = irq + i; -Aml *dev_gsi =aml_device ("GSI%d" , i); -aml_append (dev_gsi,aml_name_decl ("_HID" ,aml_string ("PNP0C0F" ))); -aml_append (dev_gsi,aml_name_decl ("_UID" ,aml_int (i))); - crs =aml_resource_template (); -aml_append (crs, -aml_interrupt (AML_CONSUMER ,AML_LEVEL ,AML_ACTIVE_HIGH , -AML_EXCLUSIVE , &irqs,1 )); -aml_append (dev_gsi,aml_name_decl ("_PRS" , crs)); - crs =aml_resource_template (); -aml_append (crs, -aml_interrupt (AML_CONSUMER ,AML_LEVEL ,AML_ACTIVE_HIGH , -AML_EXCLUSIVE , &irqs,1 )); -aml_append (dev_gsi,aml_name_decl ("_CRS" , crs)); - method =aml_method ("_SRS" ,1 ,AML_NOTSERIALIZED ); -aml_append (dev_gsi, method); -aml_append (dev, dev_gsi); - } - - method =aml_method ("_CBA" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_return (aml_int (base_ecam))); -aml_append (dev, method); - - method =aml_method ("_CRS" ,0 ,AML_NOTSERIALIZED ); -Aml *rbuf =aml_resource_template (); -aml_append (rbuf, -aml_word_bus_number (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , -0x0000 ,0x0000 , nr_pcie_buses -1 ,0x0000 , - nr_pcie_buses)); -aml_append (rbuf, -aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , -AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , base_mmio, - base_mmio + size_mmio -1 ,0x0000 , size_mmio)); -aml_append (rbuf, -aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED ,AML_POS_DECODE , -AML_ENTIRE_RANGE ,0x0000 ,0x0000 , size_pio -1 , base_pio, - size_pio)); +struct GPEXConfig cfg = { + .mmio32 = memmap[VIRT_PCIE_MMIO ], + .pio = memmap[VIRT_PCIE_PIO ], + .ecam = memmap[ecam_id], + .irq = irq, + };if (use_highmem) { -hwaddr base_mmio_high = memmap[VIRT_HIGH_PCIE_MMIO ].base; -hwaddr size_mmio_high = memmap[VIRT_HIGH_PCIE_MMIO ].size; - -aml_append (rbuf, -aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , -AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , - base_mmio_high, - base_mmio_high + size_mmio_high -1 ,0x0000 , - size_mmio_high)); + cfg.mmio64 = memmap[VIRT_HIGH_PCIE_MMIO ]; } -aml_append (method,aml_return (rbuf)); -aml_append (dev, method); - -/* Declare an _OSC (OS Control Handoff) method */ -aml_append (dev,aml_name_decl ("SUPP" ,aml_int (0 ))); -aml_append (dev,aml_name_decl ("CTRL" ,aml_int (0 ))); - method =aml_method ("_OSC" ,4 ,AML_NOTSERIALIZED ); -aml_append (method, -aml_create_dword_field (aml_arg (3 ),aml_int (0 ),"CDW1" )); - -/* PCI Firmware Specification 3.0 -* 4.5.1. _OSC Interface for PCI Host Bridge Devices -* The _OSC interface for a PCI/PCI-X/PCI Express hierarchy is -* identified by the Universal Unique IDentifier (UUID) -* 33DB4D5B-1FF7-401C-9657-7441C03DD766 -*/ -UUID =aml_touuid ("33DB4D5B-1FF7-401C-9657-7441C03DD766" ); - ifctx =aml_if (aml_equal (aml_arg (0 ),UUID )); -aml_append (ifctx, -aml_create_dword_field (aml_arg (3 ),aml_int (4 ),"CDW2" )); -aml_append (ifctx, -aml_create_dword_field (aml_arg (3 ),aml_int (8 ),"CDW3" )); -aml_append (ifctx,aml_store (aml_name ("CDW2" ),aml_name ("SUPP" ))); -aml_append (ifctx,aml_store (aml_name ("CDW3" ),aml_name ("CTRL" ))); - -/* -* Allow OS control for all 5 features: -* PCIeHotplug SHPCHotplug PME AER PCIeCapability. -*/ -aml_append (ifctx,aml_and (aml_name ("CTRL" ),aml_int (0x1F ), -aml_name ("CTRL" ))); - - ifctx1 =aml_if (aml_lnot (aml_equal (aml_arg (1 ),aml_int (0x1 )))); -aml_append (ifctx1,aml_or (aml_name ("CDW1" ),aml_int (0x08 ), -aml_name ("CDW1" ))); -aml_append (ifctx, ifctx1); - - ifctx1 =aml_if (aml_lnot (aml_equal (aml_name ("CDW3" ),aml_name ("CTRL" )))); -aml_append (ifctx1,aml_or (aml_name ("CDW1" ),aml_int (0x10 ), -aml_name ("CDW1" ))); -aml_append (ifctx, ifctx1); - -aml_append (ifctx,aml_store (aml_name ("CTRL" ),aml_name ("CDW3" ))); -aml_append (ifctx,aml_return (aml_arg (3 ))); -aml_append (method, ifctx); - - elsectx =aml_else (); -aml_append (elsectx,aml_or (aml_name ("CDW1" ),aml_int (4 ), -aml_name ("CDW1" ))); -aml_append (elsectx,aml_return (aml_arg (3 ))); -aml_append (method, elsectx); -aml_append (dev, method); - - method =aml_method ("_DSM" ,4 ,AML_NOTSERIALIZED ); - -/* PCI Firmware Specification 3.0 -* 4.6.1. _DSM for PCI Express Slot Information -* The UUID in _DSM in this context is -* {E5C937D0-3553-4D7A-9117-EA4D19C3434D} -*/ -UUID =aml_touuid ("E5C937D0-3553-4D7A-9117-EA4D19C3434D" ); - ifctx =aml_if (aml_equal (aml_arg (0 ),UUID )); - ifctx1 =aml_if (aml_equal (aml_arg (2 ),aml_int (0 ))); -uint8_t byte_list[1 ] = {1 }; - buf =aml_buffer (1 , byte_list); -aml_append (ifctx1,aml_return (buf)); -aml_append (ifctx, ifctx1); -aml_append (method, ifctx); - - byte_list[0 ] =0 ; - buf =aml_buffer (1 , byte_list); -aml_append (method,aml_return (buf)); -aml_append (dev, method); - -Aml *dev_res0 =aml_device ("%s" ,"RES0" ); -aml_append (dev_res0,aml_name_decl ("_HID" ,aml_string ("PNP0C02" ))); - crs =aml_resource_template (); -aml_append (crs, -aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED , -AML_NON_CACHEABLE ,AML_READ_WRITE ,0x0000 , base_ecam, - base_ecam + size_ecam -1 ,0x0000 , size_ecam)); -aml_append (dev_res0,aml_name_decl ("_CRS" , crs)); -aml_append (dev, dev_res0); -aml_append (scope, dev); +acpi_dsdt_add_gpex (scope, &cfg); } static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,
Signature · 1 line
2.27.0
PATCH v3 4/12 microvm: add irq table
In reply to Gerd HoffmannAdd a comment with a table listing the IRQs,
both legacy pc and microvm side-by-side.
--- include/hw/i386/microvm.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
include/hw/i386/microvm.h +22 -0
@@ -27,6 +27,28 @@#include "hw/acpi/acpi_dev_interface.h" #include "qom/object.h" +/* +* IRQ | pc | microvm (acpi=on) +* --------+------------+------------------ +* 0 | pit | +* 1 | kbd | +* 2 | cascade | +* 3 | serial 1 | +* 4 | serial 0 | serial +* 5 | - | +* 6 | floppy | +* 7 | parallel | +* 8 | rtc | rtc (rtc=on) +* 9 | acpi | acpi (ged) +* 10 | pci lnk | +* 11 | pci lnk | +* 12 | ps2 | +* 13 | fpu | +* 14 | ide 0 | +* 15 | ide 1 | +* 16-23 | pci gsi | virtio +*/ +/* Platform virtio definitions */ #define VIRTIO_MMIO_BASE 0xfeb00000#define VIRTIO_NUM_TRANSPORTS 8
Signature · 1 line
2.27.0
PATCH v3 5/12 microvm: add pcie support
In reply to Gerd HoffmannUses the existing gpex device which is also used as pcie host bridge on arm/aarch64. For now only a 32bit mmio window and no ioport support.
It is disabled by default, use "-machine microvm,pcie=on" to enable. ACPI support must be enabled too because the bus is declared in the DSDT table.
--- include/hw/i386/microvm.h | 18 +++++++-- hw/i386/acpi-microvm.c | 12 ++++++ hw/i386/microvm.c | 84 +++++++++++++++++++++++++++++++++++++++ hw/i386/Kconfig | 1 + 4 files changed, 111 insertions(+), 4 deletions(-)
include/hw/i386/microvm.h +14 -4
@@ -25,6 +25,7 @@#include "hw/boards.h" #include "hw/i386/x86.h" #include "hw/acpi/acpi_dev_interface.h" +#include "hw/pci-host/gpex.h" #include "qom/object.h" /*
@@ -42,10 +43,10 @@* 9 | acpi | acpi (ged) * 10 | pci lnk | * 11 | pci lnk | -* 12 | ps2 | -* 13 | fpu | -* 14 | ide 0 | -* 15 | ide 1 | +* 12 | ps2 | pcie +* 13 | fpu | pcie +* 14 | ide 0 | pcie +* 15 | ide 1 | pcie * 16-23 | pci gsi | virtio */
@@ -59,10 +60,17 @@#define GED_MMIO_BASE_REGS (GED_MMIO_BASE + 0x200)#define GED_MMIO_IRQ 9 +#define PCIE_MMIO_BASE 0xc0000000 +#define PCIE_MMIO_SIZE 0x20000000 +#define PCIE_ECAM_BASE 0xe0000000 +#define PCIE_ECAM_SIZE 0x10000000 +#define PCIE_IRQ_BASE 12 +/* Machine type options */ #define MICROVM_MACHINE_PIT "pit"#define MICROVM_MACHINE_PIC "pic"#define MICROVM_MACHINE_RTC "rtc" +#define MICROVM_MACHINE_PCIE "pcie"#define MICROVM_MACHINE_ISA_SERIAL "isa-serial"#define MICROVM_MACHINE_OPTION_ROMS "x-option-roms"#define MICROVM_MACHINE_AUTO_KERNEL_CMDLINE "auto-kernel-cmdline"
@@ -80,6 +88,7 @@ struct MicrovmMachineState {OnOffAuto pic;OnOffAuto pit;OnOffAuto rtc; +OnOffAuto pcie;bool isa_serial;bool option_roms;bool auto_kernel_cmdline;
@@ -89,6 +98,7 @@ struct MicrovmMachineState {bool kernel_cmdline_fixed;Notifier machine_done;Notifier powerdown_req; +struct GPEXConfig gpex; };#define TYPE_MICROVM_MACHINE MACHINE_TYPE_NAME("microvm")
hw/i386/acpi-microvm.c +12 -0
@@ -33,6 +33,8 @@#include "hw/boards.h" #include "hw/i386/fw_cfg.h" #include "hw/i386/microvm.h" +#include "hw/pci/pci.h" +#include "hw/pci/pcie_host.h" #include "hw/virtio/virtio-mmio.h" #include "acpi-common.h"
@@ -87,6 +89,15 @@ static void acpi_dsdt_add_virtio(Aml *scope, } } +static void acpi_dsdt_add_pci (Aml *scope,MicrovmMachineState *mms) +{ +if (mms->pcie !=ON_OFF_AUTO_ON ) { +return ; + } + +acpi_dsdt_add_gpex (scope, &mms->gpex); +} +static void build_dsdt_microvm (GArray *table_data,BIOSLinker *linker,MicrovmMachineState *mms)
@@ -112,6 +123,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker, GED_MMIO_IRQ, AML_SYSTEM_MEMORY, GED_MMIO_BASE);acpi_dsdt_add_power_button (sb_scope);acpi_dsdt_add_virtio (sb_scope, mms); +acpi_dsdt_add_pci (sb_scope, mms);aml_append (dsdt, sb_scope);/* ACPI 5.0: Table 7-209 System State Package */
hw/i386/microvm.c +84 -0
120 lines not on this page · raw message
hw/i386/Kconfig +1 -0
@@ -104,6 +104,7 @@ config MICROVM select MC146818RTC select VIRTIO_MMIO select ACPI_HW_REDUCED + select PCI_EXPRESS_GENERIC_BRIDGE config X86_IOMMU bool
Signature · 1 line
2.27.0
PATCH v3 6/12 microvm/pcie: add 64bit mmio window
In reply to Gerd HoffmannPlace the 64bit window at the top of the physical address space, assign 25% of the avaiable address space. Force cpu.host-phys-bits=on for microvm machine typs so this actually works reliable.
--- hw/i386/microvm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
hw/i386/microvm.c +9 -0
@@ -198,6 +198,12 @@ static void microvm_devices_init(MicrovmMachineState *mms) }if (x86_machine_is_acpi_enabled (x86ms) && mms->pcie ==ON_OFF_AUTO_ON ) { +/* use topmost 25% of the address space available */ +hwaddr phys_size = (hwaddr )1 <<X86_CPU (first_cpu)->phys_bits; +if (phys_size >0x1000000ll ) { + mms->gpex.mmio64.size = phys_size /4 ; + mms->gpex.mmio64.base = phys_size - mms->gpex.mmio64.size; + } mms->gpex.mmio32.base =PCIE_MMIO_BASE ; mms->gpex.mmio32.size =PCIE_MMIO_SIZE ; mms->gpex.ecam.base =PCIE_ECAM_BASE ;
@@ -383,6 +389,9 @@ static void microvm_fix_kernel_cmdline(MachineState *machine)static void microvm_device_pre_plug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp) { +X86CPU *cpu =X86_CPU (dev); + + cpu->host_phys_bits = true;/* need reliable phys-bits */ x86_cpu_pre_plug (hotplug_dev, dev, errp); }
Signature · 1 line
2.27.0
PATCH v3 7/12 tests/acpi: allow updates for expected data files
In reply to Gerd Hoffmann--- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ 1 file changed, 5 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +5 -0
@@ -1 +1,6 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/microvm/DSDT.pcie32" , +"tests/data/acpi/microvm/DSDT.pcie64" , +"tests/data/acpi/virt/DSDT" , +"tests/data/acpi/virt/DSDT.numamem" , +"tests/data/acpi/virt/DSDT.memhp",
Signature · 1 line
2.27.0
PATCH v3 8/12 tests/acpi: add empty tests/data/acpi/microvm/DSDT.pcie file
In reply to Gerd Hoffmann--- tests/data/acpi/microvm/DSDT.pcie | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/microvm/DSDT.pcie
tests/data/acpi/microvm/DSDT.pcie new file +0 -0
Signature · 1 line
2.27.0
PATCH v3 9/12 tests/acpi: factor out common microvm test setup
In reply to Gerd Hoffmann... into new test_acpi_microvm_prepare helper
--- tests/qtest/bios-tables-test.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
tests/qtest/bios-tables-test.c +10 -5
@@ -1044,15 +1044,20 @@ static void test_acpi_virt_tcg_memhp(void) } +static void test_acpi_microvm_prepare (test_data *data) +{ +memset (data,0 ,sizeof (*data)); + data->machine ="microvm" ; + data->required_struct_types =NULL ;/* no smbios */ + data->required_struct_types_len =0 ; + data->blkdev ="virtio-blk-device" ; +} +static void test_acpi_microvm_tcg (void ) {test_data data; -memset (&data,0 ,sizeof (data)); - data.machine ="microvm" ; - data.required_struct_types =NULL ;/* no smbios */ - data.required_struct_types_len =0 ; - data.blkdev ="virtio-blk-device" ; +test_acpi_microvm_prepare (&data);test_acpi_one (" -machine microvm,acpi=on,rtc=off" , &data);free_test_data (&data);
Signature · 1 line
2.27.0
PATCH v3 10/12 tests/acpi: add microvm pcie test
In reply to Gerd Hoffmann--- tests/qtest/bios-tables-test.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
tests/qtest/bios-tables-test.c +15 -0
@@ -1063,6 +1063,18 @@ static void test_acpi_microvm_tcg(void)free_test_data (&data); } +static void test_acpi_microvm_pcie_tcg (void ) +{ +test_data data; + +test_acpi_microvm_prepare (&data); + data.variant =".pcie" ; + data.tcg_only = true;/* need constant host-phys-bits */ +test_acpi_one (" -machine microvm,acpi=on,rtc=off,pcie=on" , + &data); +free_test_data (&data); +} +static void test_acpi_virt_tcg_numamem (void ) {test_data data = {
@@ -1181,6 +1193,9 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/piix4/acpihmat" , test_acpi_piix4_tcg_acpi_hmat);qtest_add_func ("acpi/q35/acpihmat" , test_acpi_q35_tcg_acpi_hmat);qtest_add_func ("acpi/microvm" , test_acpi_microvm_tcg); +if (strcmp (arch,"x86_64" ) ==0 ) { +qtest_add_func ("acpi/microvm/pcie" , test_acpi_microvm_pcie_tcg); + } }else if (strcmp (arch,"aarch64" ) ==0 ) {qtest_add_func ("acpi/virt" , test_acpi_virt_tcg);qtest_add_func ("acpi/virt/numamem" , test_acpi_virt_tcg_numamem);
Signature · 1 line
2.27.0
PATCH v3 11/12 acpi/gpex: no reason to use a method for _CRS
In reply to Gerd Hoffmann... just to return something which is constant anyway.
- Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Settings
- {
- Return (ResourceTemplate ()
- {
- WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
[ ... ]
+ Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
+ {
+ WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
[ ... ]
--- hw/pci-host/gpex-acpi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/pci-host/gpex-acpi.c +1 -3
@@ -57,7 +57,6 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)aml_append (method,aml_return (aml_int (cfg->ecam.base)));aml_append (dev, method); - method =aml_method ("_CRS" ,0 ,AML_NOTSERIALIZED );Aml *rbuf =aml_resource_template (); aml_append(rbuf, aml_word_bus_number(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE,
@@ -89,8 +88,7 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)0x0000 , cfg->mmio64.size)); } -aml_append (method,aml_return (rbuf)); -aml_append (dev, method); +aml_append (dev,aml_name_decl ("_CRS" , rbuf));/* Declare an _OSC (OS Control Handoff) method */ aml_append (dev,aml_name_decl ("SUPP" ,aml_int (0 )));
Signature · 1 line
2.27.0
PATCH v3 12/12 tests/acpi: update expected data files
In reply to Gerd Hoffmann--- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/microvm/DSDT.pcie | Bin 0 -> 3023 bytes tests/data/acpi/virt/DSDT | Bin 5200 -> 5196 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6561 -> 6557 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5200 -> 5196 bytes 5 files changed, 5 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -5
@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/microvm/DSDT.pcie32" , -"tests/data/acpi/microvm/DSDT.pcie64" , -"tests/data/acpi/virt/DSDT" , -"tests/data/acpi/virt/DSDT.numamem" , -"tests/data/acpi/virt/DSDT.memhp",
tests/data/acpi/microvm/DSDT.pcie binary +0 -0
tests/data/acpi/virt/DSDT binary +0 -0
tests/data/acpi/virt/DSDT.memhp binary +0 -0
tests/data/acpi/virt/DSDT.numamem binary +0 -0
Signature · 1 line
2.27.0