[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 43/51] pc: acpi: q35: move _PRT() into SSDT
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 43/51] pc: acpi: q35: move _PRT() into SSDT |
Date: |
Mon, 28 Dec 2015 18:02:50 +0100 |
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/acpi-build.c | 21 +++++++++++++++++++++
hw/i386/q35-acpi-dsdt.dsl | 12 ------------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 4fdab96..0174e80 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1632,7 +1632,28 @@ static void build_piix4_pci0_int(Aml *table)
static void build_q35_pci0_int(Aml *table)
{
Aml *field;
+ Aml *method;
Aml *sb_scope = aml_scope("_SB");
+ Aml *pci0_scope = aml_scope("PCI0");
+
+ method = aml_method("_PRT", 0, AML_NOTSERIALIZED);
+ {
+ Aml *if_ctx;
+ Aml *else_ctx;
+
+ /* PCI IRQ routing table, example from ACPI 2.0a specification,
+ section 6.2.8.1 */
+ /* Note: we provide the same info as the PCI routing
+ table of the Bochs BIOS */
+ if_ctx = aml_if(aml_equal(aml_name("PICF"), aml_int(0)));
+ aml_append(if_ctx, aml_return(aml_name("PRTP")));
+ aml_append(method, if_ctx);
+ else_ctx = aml_else();
+ aml_append(else_ctx, aml_return(aml_name("PRTA")));
+ aml_append(method, else_ctx);
+ }
+ aml_append(pci0_scope, method);
+ aml_append(sb_scope, pci0_scope);
field = aml_field("PCI0.ISA.PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
aml_append(field, aml_named_field("PRQA", 8));
diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
index b01d4de..f265583 100644
--- a/hw/i386/q35-acpi-dsdt.dsl
+++ b/hw/i386/q35-acpi-dsdt.dsl
@@ -238,18 +238,6 @@ DefinitionBlock (
prt_slot_gsiA(0x001f)
})
-
- Method(_PRT, 0, NotSerialized) {
- /* PCI IRQ routing table, example from ACPI 2.0a specification,
- section 6.2.8.1 */
- /* Note: we provide the same info as the PCI routing
- table of the Bochs BIOS */
- If (LEqual(\PICF, Zero)) {
- Return (PRTP)
- } Else {
- Return (PRTA)
- }
- }
}
External(LNKA, DeviceObj)
--
1.8.3.1
- [Qemu-devel] [PATCH v2 31/51] pc: acpi: move remaining GPE handlers into SSDT, (continued)
- [Qemu-devel] [PATCH v2 31/51] pc: acpi: move remaining GPE handlers into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 32/51] pc: acpi: pci: move link devices into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 33/51] pc: acpi: piix4: move IQCR() into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 40/51] pc: acpi: q35: move IQCR() into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 42/51] pc: acpi: q35: move ISA bridge into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 45/51] pc: acpi: q35: move PRTP routing table into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 35/51] pc: acpi: piix4: move PCI0._PRT() into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 38/51] pc: acpi: q35: move GSI links to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 39/51] pc: acpi: q35: move link devices to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 41/51] pc: acpi: q35: move IQST() into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 43/51] pc: acpi: q35: move _PRT() into SSDT,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 44/51] pc: acpi: q35: move PRTA routing table into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 46/51] pc: acpi: q35: move _PIC() method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 47/51] pc: acpi: q35: move PCI0._OSC() method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 48/51] pc: acpi: q35: move PCI0 device definition into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 49/51] pc: acpi: q35: PCST, PCSB opregions and PCIB field into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 50/51] pc: acpi: switch to AML API composed DSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 51/51] pc: acpi: remove unused ASL templates and related blobs/utils, Igor Mammedov, 2015/12/28