Skip to content

Commit 20350e8

Browse files
committed
virt: Remove PCI declaration in ACPI
Windows RT will BSoD with SYSTEM_THREAD_EXCEPTION_NOT_HANDLED if PCI is exposed in ACPI, remove it for now.
1 parent dfcf594 commit 20350e8

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

hw/arm/virt-acpi-build.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,25 +156,25 @@ static void acpi_dsdt_add_virtio(Aml *scope,
156156
}
157157
}
158158

159-
static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,
160-
uint32_t irq, bool use_highmem, bool highmem_ecam,
161-
VirtMachineState *vms)
162-
{
163-
int ecam_id = VIRT_ECAM_ID(highmem_ecam);
164-
struct GPEXConfig cfg = {
165-
.mmio32 = memmap[VIRT_PCIE_MMIO],
166-
.pio = memmap[VIRT_PCIE_PIO],
167-
.ecam = memmap[ecam_id],
168-
.irq = irq,
169-
.bus = vms->bus,
170-
};
171-
172-
if (use_highmem) {
173-
cfg.mmio64 = memmap[VIRT_HIGH_PCIE_MMIO];
174-
}
175-
176-
acpi_dsdt_add_gpex(scope, &cfg);
177-
}
159+
// static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,
160+
// uint32_t irq, bool use_highmem, bool highmem_ecam,
161+
// VirtMachineState *vms)
162+
// {
163+
// int ecam_id = VIRT_ECAM_ID(highmem_ecam);
164+
// struct GPEXConfig cfg = {
165+
// .mmio32 = memmap[VIRT_PCIE_MMIO],
166+
// .pio = memmap[VIRT_PCIE_PIO],
167+
// .ecam = memmap[ecam_id],
168+
// .irq = irq,
169+
// .bus = vms->bus,
170+
// };
171+
172+
// if (use_highmem) {
173+
// cfg.mmio64 = memmap[VIRT_HIGH_PCIE_MMIO];
174+
// }
175+
176+
// acpi_dsdt_add_gpex(scope, &cfg);
177+
// }
178178

179179
static void acpi_dsdt_add_gpio(Aml *scope, const MemMapEntry *gpio_memmap,
180180
uint32_t gpio_irq)
@@ -867,8 +867,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
867867
acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]);
868868
acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],
869869
(irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);
870-
acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
871-
vms->highmem, vms->highmem_ecam, vms);
870+
// acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
871+
// vms->highmem, vms->highmem_ecam, vms);
872872
if (vms->acpi_dev) {
873873
build_ged_aml(scope, "\\_SB."GED_DEVICE,
874874
HOTPLUG_HANDLER(vms->acpi_dev),

0 commit comments

Comments
 (0)