acpi: Some fixes for pxb support for ARM virt machine
v2 cover acpi: Some fixes for pxb support for ARM virt machine
This patch series add some fixes for ARM virt machine pxb support.
1. Pass addr offset for IO, MMIO and bus number when builing crs, because the addr_trans is needed to describe an addr resource.
2. Inform guest os not to ignore the resource map generated by firmware as the x86 default way.
3. Enable pxb for ARM virt machine by default.
4. Update expected DSDT files with the above changes and enable the pxb unit-test.
v1->v2:
* Update expected DSDT files.
* Quote PCI Firmware spec as comments.
REF: https://lore.kernel.org/qemu-devel/[email protected]/
REF: https://lore.kernel.org/qemu-devel/[email protected]/
Jiahui Cen (6):
acpi: Allow DSDT acpi table changes
acpi: Add addr offset in build_crs acpi/gpex: Inform os to keep firmware resource map
Kconfig: Enable PXB for ARM_VIRT by default
acpi: Enable pxb unit-test for ARM virt machine
acpi: Update addr_trans and _DSM in expected files
hw/acpi/aml-build.c | 18 +++++++++-------- hw/i386/acpi-build.c | 3 ++- hw/pci-bridge/Kconfig | 2 +- hw/pci-host/gpex-acpi.c | 21 +++++++++++++++++--- include/hw/acpi/aml-build.h | 4 +++- tests/data/acpi/microvm/DSDT.pcie | Bin 3023 -> 3031 bytes tests/data/acpi/virt/DSDT | Bin 5196 -> 5204 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6557 -> 6565 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 5204 bytes tests/data/acpi/virt/DSDT.pxb | Bin 7802 -> 7689 bytes tests/qtest/bios-tables-test.c | 4 ---- 11 files changed, 34 insertions(+), 18 deletions(-)
Signature · 1 line
2.28.0
PATCH v2 1/6 acpi: Allow DSDT acpi table changes
--- 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.pcie" , +"tests/data/acpi/virt/DSDT" , +"tests/data/acpi/virt/DSDT.memhp" , +"tests/data/acpi/virt/DSDT.numamem" , +"tests/data/acpi/virt/DSDT.pxb",
Signature · 1 line
2.28.0
PATCH v2 2/6 acpi: Add addr offset in build_crs
In reply to Jiahui CenAML needs Address Translation offset to describe how a bridge translates addresses accross the bridge when using an address descriptor, and especially on ARM, the translation offset of pio resource is usually non zero.
Therefore, it's necessary to pass offset for pio, mmio32, mmio64 and bus number into build_crs.
--- hw/acpi/aml-build.c | 18 ++++++++++-------- hw/i386/acpi-build.c | 3 ++- hw/pci-host/gpex-acpi.c | 3 ++- include/hw/acpi/aml-build.h | 4 +++- 4 files changed, 17 insertions(+), 11 deletions(-)
hw/acpi/aml-build.c +10 -8
@@ -2076,7 +2076,9 @@ void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog) tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL); } -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set) +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set,uint32_t io_offset, +uint32_t mmio32_offset,uint64_t mmio64_offset, +uint16_t bus_nr_offset) {Aml *crs =aml_resource_template ();CrsRangeSet temp_range_set;
@@ -2189,10 +2191,10 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)for (i =0 ; i < temp_range_set.io_ranges->len; i++) { entry =g_ptr_array_index (temp_range_set.io_ranges, i);aml_append (crs, -aml_word_io (AML_MIN_FIXED ,AML_MAX_FIXED , -AML_POS_DECODE ,AML_ENTIRE_RANGE , -0 , entry->base, entry->limit,0 , - entry->limit - entry->base +1 )); +aml_dword_io (AML_MIN_FIXED ,AML_MAX_FIXED , +AML_POS_DECODE ,AML_ENTIRE_RANGE , +0 , entry->base, entry->limit, io_offset, + entry->limit - entry->base +1 ));crs_range_insert (range_set->io_ranges, entry->base, entry->limit); }
@@ -2205,7 +2207,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_dword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio32_offset, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_ranges, entry->base, entry->limit); }
@@ -2217,7 +2219,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)aml_qword_memory (AML_POS_DECODE ,AML_MIN_FIXED ,AML_MAX_FIXED ,AML_NON_CACHEABLE ,AML_READ_WRITE , -0 , entry->base, entry->limit,0 , +0 , entry->base, entry->limit, mmio64_offset, entry->limit - entry->base + 1));crs_range_insert (range_set->mem_64bit_ranges, entry->base, entry->limit);
@@ -2230,7 +2232,7 @@ Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)0 ,pci_bus_num (host->bus), max_bus, -0 , + bus_nr_offset, max_bus - pci_bus_num(host->bus) + 1));return crs;
hw/i386/acpi-build.c +2 -1
@@ -1360,7 +1360,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dev,build_prt (false)); - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, +0 ,0 ,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));aml_append (scope, dev);aml_append (dsdt, scope);
hw/pci-host/gpex-acpi.c +2 -1
@@ -168,7 +168,8 @@ void acpi_dsdt_add_gpex(Aml *scope, struct GPEXConfig *cfg)* 1. The resources the pci-brige/pcie-root-port need. * 2. The resources the devices behind pxb need. */ - crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set); + crs =build_crs (PCI_HOST_BRIDGE (BUS (bus)->parent), &crs_range_set, + cfg->pio.base,0 ,0 ,0 );aml_append (dev,aml_name_decl ("_CRS" , crs));acpi_dsdt_add_pci_osc (dev);
include/hw/acpi/aml-build.h +3 -1
@@ -452,7 +452,9 @@ void crs_replace_with_free_ranges(GPtrArray *ranges,void crs_range_set_init (CrsRangeSet *range_set);void crs_range_set_free (CrsRangeSet *range_set); -Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set); +Aml *build_crs (PCIHostState *host,CrsRangeSet *range_set,uint32_t io_offset, +uint32_t mmio32_offset,uint64_t mmio64_offset, +uint16_t bus_nr_offset);void build_srat_memory (AcpiSratMemoryAffinity *numamem,uint64_t base,uint64_t len,int node,MemoryAffinityFlags flags);
Signature · 1 line
2.28.0
PATCH v2 3/6 acpi/gpex: Inform os to keep firmware resource map
In reply to Jiahui CenThere may be some differences in pci resource assignment between guest os and firmware.
Eg. A Bridge with Bus [d2]
-+-[0000:d2]---01.0-[d3]----01.0
where [d2:01.00] is a pcie-pci-bridge with BAR0 (mem, 64-bit, non-pref) [size=256]
[d3:01.00] is a PCI Device with BAR0 (mem, 64-bit, pref) [size=128K]
BAR4 (mem, 64-bit, pref) [size=64M]
In EDK2, the Resource Map would be:
PciBus: Resource Map for Bridge [D2|01|00]
Type = PMem64; Base = 0x8004000000; Length = 0x4100000; Alignment = 0x3FFFFFF
Base = 0x8004000000; Length = 0x4000000; Alignment = 0x3FFFFFF; Owner = PCI [D3|01|00:20]
Base = 0x8008000000; Length = 0x20000; Alignment = 0x1FFFF; Owner = PCI [D3|01|00:10]
Type = Mem64; Base = 0x8008100000; Length = 0x100; Alignment = 0xFFF
It would use 0x4100000 to calculate the root bus's PMem64 resource window.
While in Linux, kernel will use 0x1FFFFFF as the alignment to calculate
the PMem64 size, which would be 0x6000000. So kernel would try to
allocate 0x6000000 from the PMem64 resource window, but since the window
size is 0x4100000 as assigned by EDK2, the allocation would fail.The diffences could result in resource assignment failure.
Using _DSM #5 method to inform guest os not to ignore the PCI configuration that firmware has done at boot time could handle the differences.
--- hw/pci-host/gpex-acpi.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
hw/pci-host/gpex-acpi.c +16 -2
@@ -112,10 +112,24 @@ static void acpi_dsdt_add_pci_osc(Aml *dev)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); +uint8_t byte_list[] = { +0x1 <<0 /* support for functions other than function 0 */ | +0x1 <<5 /* support for function 5 */ + }; + buf =aml_buffer (ARRAY_SIZE (byte_list), byte_list);aml_append (ifctx1,aml_return (buf));aml_append (ifctx, ifctx1); + +/* PCI Firmware Specification 3.1 +* 4.6.5. _DSM for Ignoring PCI Boot Configurations +*/ +/* Arg2: Function Index: 5 */ + ifctx1 =aml_if (aml_equal (aml_arg (2 ),aml_int (5 ))); +/* 0 - The operating system must not ignore the PCI configuration that +* firmware has done at boot time. +*/ +aml_append (ifctx1,aml_return (aml_int (0 ))); +aml_append (ifctx, ifctx1);aml_append (method, ifctx); byte_list[0 ] =0 ;
Signature · 1 line
2.28.0
PATCH v2 4/6 Kconfig: Enable PXB for ARM_VIRT by default
In reply to Jiahui CenPXB is now supported on ARM, so let's enable it by default.
--- hw/pci-bridge/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/pci-bridge/Kconfig +1 -1
@@ -5,7 +5,7 @@ config PCIE_PORT config PXB bool - default y if Q35 + default y if Q35 || ARM_VIRT config XIO3130 bool
Signature · 1 line
2.28.0
PATCH v2 5/6 acpi: Enable pxb unit-test for ARM virt machine
In reply to Jiahui CenNo matter whether the pxb is enabled or not, the CONFIG_PXB macro in test would keep undefined. And since pxb is now enabled for ARM Virt machine by default, let's enable pxb unit-test by removing the CONFIG_PXB.
--- tests/qtest/bios-tables-test.c | 4 ---- 1 file changed, 4 deletions(-)
tests/qtest/bios-tables-test.c +0 -4
@@ -1196,7 +1196,6 @@ static void test_acpi_virt_tcg_numamem(void) } -#ifdef CONFIG_PXBstatic void test_acpi_virt_tcg_pxb (void ) {test_data data = {
@@ -1228,7 +1227,6 @@ static void test_acpi_virt_tcg_pxb(void)free_test_data (&data); } -#endif static void test_acpi_tcg_acpi_hmat (const char *machine) {
@@ -1342,9 +1340,7 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt" , test_acpi_virt_tcg);qtest_add_func ("acpi/virt/numamem" , test_acpi_virt_tcg_numamem);qtest_add_func ("acpi/virt/memhp" , test_acpi_virt_tcg_memhp); -#ifdef CONFIG_PXB qtest_add_func ("acpi/virt/pxb" , test_acpi_virt_tcg_pxb); -#endif } ret =g_test_run ();boot_sector_cleanup (disk);
Signature · 1 line
2.28.0
PATCH v2 6/6 acpi: Update addr_trans and _DSM in expected files
In reply to Jiahui CenAddr_trans in _CRS is changed and a new _DSM #5 method is added. Also the expected file for pxb for ARM virt does not match the source code.
Update expected DSDT files accordingly, and re-enable their testing.
Full diff of changed files disassembly:
tmp/new/tests/data/acpi/microvm/DSDT.pcie.dsl 2020-12-21 18:29:14.392000000 +0800 renamed from tmp/old/tests/data/acpi/microvm/DSDT.pcie.dsl 2020-12-21 18:24:33.560000000 +0800 +8 -3
@@ -9,9 +9,9 @@ * * Original Table Header: * Signature "DSDT" - * Length 0x00000BCF (3023) + * Length 0x00000BD7 (3031) * Revision 0x02 - * Checksum 0x29 + * Checksum 0x99 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1)
@@ -1302,9 +1302,14 @@ { Return (Buffer (One) { - 0x01 /* . */ + 0x21 /* ! */ }) } + + If (Arg2 == 0x05) + { + Return (Zero) + } } Return (Buffer (One)
tmp/new/tests/data/acpi/virt/DSDT.dsl 2020-12-21 18:29:14.736000000 +0800 renamed from tmp/old/tests/data/acpi/virt/DSDT.dsl 2020-12-21 18:24:33.772000000 +0800 +8 -3
@@ -9,9 +9,9 @@ * * Original Table Header: * Signature "DSDT" - * Length 0x0000144C (5196) + * Length 0x00001454 (5204) * Revision 0x02 - * Checksum 0xF0 + * Checksum 0x60 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1)
@@ -1838,9 +1838,14 @@ { Return (Buffer (One) { - 0x01 /* . */ + 0x21 /* ! */ }) } + + If (Arg2 == 0x05) + { + Return (Zero) + } } Return (Buffer (One)
tmp/new/tests/data/acpi/virt/DSDT.memhp.dsl 2020-12-21 18:29:14.740000000 +0800 renamed from tmp/old/tests/data/acpi/virt/DSDT.memhp.dsl 2020-12-21 18:24:33.780000000 +0800 +8 -3
@@ -9,9 +9,9 @@ * * Original Table Header: * Signature "DSDT" - * Length 0x0000199D (6557) + * Length 0x000019A5 (6565) * Revision 0x02 - * Checksum 0x11 + * Checksum 0x90 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1)
@@ -1840,9 +1840,14 @@ { Return (Buffer (One) { - 0x01 /* . */ + 0x21 /* ! */ }) } + + If (Arg2 == 0x05) + { + Return (Zero) + } } Return (Buffer (One)
tmp/new/tests/data/acpi/virt/DSDT.numamem.dsl 2020-12-21 18:29:14.744000000 +0800 renamed from tmp/old/tests/data/acpi/virt/DSDT.numamem.dsl 2020-12-21 18:24:33.784000000 +0800 +8 -3
@@ -9,9 +9,9 @@ * * Original Table Header: * Signature "DSDT" - * Length 0x0000144C (5196) + * Length 0x00001454 (5204) * Revision 0x02 - * Checksum 0xF0 + * Checksum 0x60 * OEM ID "BOCHS " * OEM Table ID "BXPCDSDT" * OEM Revision 0x00000001 (1)
@@ -1838,9 +1838,14 @@ { Return (Buffer (One) { - 0x01 /* . */ + 0x21 /* ! */ }) } + + If (Arg2 == 0x05) + { + Return (Zero) + } } Return (Buffer (One)
tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl 2020-12-21 18:29:14.752000000 +0800 renamed from tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl 2020-12-21 18:24:33.792000000 +0800 +45 -68
161 lines not on this page · raw message
--- tests/data/acpi/microvm/DSDT.pcie | Bin 3023 -> 3031 bytes tests/data/acpi/virt/DSDT | Bin 5196 -> 5204 bytes tests/data/acpi/virt/DSDT.memhp | Bin 6557 -> 6565 bytes tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 5204 bytes tests/data/acpi/virt/DSDT.pxb | Bin 7802 -> 7689 bytes tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- 6 files changed, 5 deletions(-)
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
tests/data/acpi/virt/DSDT.pxb binary +0 -0
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.pcie" , -"tests/data/acpi/virt/DSDT" , -"tests/data/acpi/virt/DSDT.memhp" , -"tests/data/acpi/virt/DSDT.numamem" , -"tests/data/acpi/virt/DSDT.pxb",
Signature · 1 line
2.28.0