qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: drjones@redhat.com, mst@redhat.com, zhaoshenglong@huawei.com,
	marcel.a@redhat.com
Subject: [Qemu-devel] [PATCH v4 37/42] pc: acpi-build: reserve PCIHP MMIO resources
Date: Wed, 18 Feb 2015 19:14:50 +0000	[thread overview]
Message-ID: <1424286895-21611-38-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1424286895-21611-1-git-send-email-imammedo@redhat.com>

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 98553f8..4d5d7e3 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -105,6 +105,8 @@ typedef struct AcpiPmInfo {
     uint16_t cpu_hp_io_len;
     uint16_t mem_hp_io_base;
     uint16_t mem_hp_io_len;
+    uint16_t pcihp_io_base;
+    uint16_t pcihp_io_len;
 } AcpiPmInfo;
 
 typedef struct AcpiMiscInfo {
@@ -178,9 +180,15 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
     Object *obj = NULL;
     QObject *o;
 
+    pm->pcihp_io_base = 0;
+    pm->pcihp_io_len = 0;
     if (piix) {
         obj = piix;
         pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE;
+        pm->pcihp_io_base =
+            object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL);
+        pm->pcihp_io_len =
+            object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL);
     }
     if (lpc) {
         obj = lpc;
@@ -892,6 +900,25 @@ build_ssdt(GArray *table_data, GArray *linker,
 
     patch_pci_windows(pci, ssdt_ptr, sizeof(ssdp_misc_aml));
 
+    scope = aml_scope("\\_SB.PCI0");
+    /* reserve PCIHP resources */
+    if (pm->pcihp_io_len) {
+        dev = aml_device("PHPR");
+        aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06")));
+        aml_append(dev,
+            aml_name_decl("_UID", aml_string("PCI Hotplug resources")));
+        /* device present, functioning, decoding, not shown in UI */
+        aml_append(dev, aml_name_decl("_STA", aml_int(0xB)));
+        crs = aml_resource_template();
+        aml_append(crs,
+            aml_io(aml_decode16, pm->pcihp_io_base, pm->pcihp_io_base, 1,
+                   pm->pcihp_io_len)
+        );
+        aml_append(dev, aml_name_decl("_CRS", crs));
+        aml_append(scope, dev);
+    }
+    aml_append(ssdt, scope);
+
     /*  create S3_ / S4_ / S5_ packages if necessary */
     scope = aml_scope("\\");
     if (!pm->s3_disabled) {
-- 
1.8.3.1

  parent reply	other threads:[~2015-02-18 19:16 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-18 19:14 [Qemu-devel] [PATCH v4 00/42] ACPI refactoring: replace template patching with C AML API Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 01/42] acpi: introduce AML composer aml_append() Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 02/42] acpi: add aml_scope() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 03/42] pc: acpi-build: use aml_scope() for \_SB scope Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 04/42] acpi: add aml_device() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 05/42] acpi: add aml_method() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 06/42] acpi: add aml_if() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 07/42] acpi: add aml_name() & aml_name_decl() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 08/42] acpi: add aml_int() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 09/42] acpi: add aml_return() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 10/42] acpi: add aml_arg() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 11/42] acpi: add aml_store() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 12/42] acpi: add aml_and() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 13/42] acpi: add aml_notify() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 14/42] acpi: add aml_call1(), aml_call2(), aml_call3(), aml_call4() helpers Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 15/42] acpi: add aml_package() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 16/42] pc: acpi-build: generate _S[345] packages dynamically Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 17/42] acpi: add aml_buffer() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 18/42] acpi: add aml_resource_template() helper Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 19/42] acpi: add aml_io() helper Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 20/42] acpi: include PkgLength size only when requested Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 21/42] acpi: add aml_operation_region() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 22/42] acpi: add aml_field() & aml_named_field() terms Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 23/42] acpi: add aml_local() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 24/42] acpi: add aml_string() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 25/42] pc: acpi-build: generate pvpanic device description dynamically Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 26/42] acpi: add aml_varpackage() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 27/42] acpi: add aml_equal() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 28/42] acpi: add aml_processor() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 29/42] acpi: add aml_eisaid() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 30/42] pc: acpi-build: drop template patching and CPU hotplug objects dynamically Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 31/42] pc: acpi-build: create CPU hotplug IO region dynamically Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 32/42] acpi: add aml_reserved_field() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 33/42] pc: acpi-build: drop template patching and memory hotplug objects dynamically Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 34/42] pc: acpi-build: create memory hotplug IO region dynamically Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 35/42] acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 36/42] pc: pcihp: expose MMIO base and len as properties Igor Mammedov
2015-02-18 19:14 ` Igor Mammedov [this message]
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 38/42] pc: acpi-build: create PCI0._CRS dynamically Igor Mammedov
2015-02-18 20:25   ` Michael S. Tsirkin
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 39/42] pc: acpi-build: drop remaining ssdt_misc template Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 40/42] acpi: add acpi_irq_no_flags() term Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 41/42] pc: export applesmc IO port/len Igor Mammedov
2015-02-18 19:14 ` [Qemu-devel] [PATCH v4 42/42] pc: acpi-build: drop template patching and create Device(SMC) dynamically Igor Mammedov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424286895-21611-38-git-send-email-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=drjones@redhat.com \
    --cc=marcel.a@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=zhaoshenglong@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).