[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/7] arm/acpi: fix PCI _PRT definition
From: |
Heyi Guo |
Subject: |
[PATCH v2 4/7] arm/acpi: fix PCI _PRT definition |
Date: |
Mon, 3 Feb 2020 08:15:02 +0800 |
The address field in each _PRT mapping package should be constructed
with high word for device# and low word for function#, so it is wrong
to use bus_no as the high word. Enumerate all possible slots
(i.e. PCI_SLOT_MAX) instead.
Signed-off-by: Heyi Guo <address@hidden>
---
Cc: Peter Maydell <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Igor Mammedov <address@hidden>
Cc: Shannon Zhao <address@hidden>
Cc: address@hidden
Cc: address@hidden
---
hw/arm/virt-acpi-build.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index be752c0ad8..5d157a9dd5 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -151,7 +151,7 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry
*memmap,
{
int ecam_id = VIRT_ECAM_ID(highmem_ecam);
Aml *method, *crs, *ifctx, *UUID, *ifctx1, *elsectx, *buf;
- int i, bus_no;
+ 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;
@@ -170,12 +170,12 @@ static void acpi_dsdt_add_pci(Aml *scope, const
MemMapEntry *memmap,
aml_append(dev, aml_name_decl("_CCA", aml_int(1)));
/* Declare the PCI Routing Table. */
- Aml *rt_pkg = aml_varpackage(nr_pcie_buses * PCI_NUM_PINS);
- for (bus_no = 0; bus_no < nr_pcie_buses; bus_no++) {
+ 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 + bus_no) % PCI_NUM_PINS;
+ int gsi = (i + slot_no) % PCI_NUM_PINS;
Aml *pkg = aml_package(4);
- aml_append(pkg, aml_int((bus_no << 16) | 0xFFFF));
+ 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));
--
2.19.1
- [PATCH v2 0/7] Some cleanup in arm/virt/acpi, Heyi Guo, 2020/02/02
- [PATCH v2 2/7] arm/virt/acpi: remove meaningless sub device "RP0" from PCI0, Heyi Guo, 2020/02/02
- [PATCH v2 1/7] bios-tables-test: prepare to change ARM virt ACPI DSDT, Heyi Guo, 2020/02/02
- [PATCH v2 3/7] arm/virt/acpi: remove _ADR from devices identified by _HID, Heyi Guo, 2020/02/02
- [PATCH v2 4/7] arm/acpi: fix PCI _PRT definition,
Heyi Guo <=
- [PATCH v2 5/7] arm/acpi: fix duplicated _UID of PCI interrupt link devices, Heyi Guo, 2020/02/02
- [PATCH v2 6/7] arm/acpi: simplify the description of PCI _CRS, Heyi Guo, 2020/02/02
- [PATCH v2 7/7] virt/acpi: update golden masters for DSDT update, Heyi Guo, 2020/02/02
- Re: [PATCH v2 0/7] Some cleanup in arm/virt/acpi, Michael S. Tsirkin, 2020/02/03