From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH 4/6] acpi: allow using acpi named offset for OperationRegion Date: Tue, 5 Jan 2016 02:52:06 +0800 [thread overview] Message-ID: <1451933528-133684-5-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1451933528-133684-1-git-send-email-guangrong.xiao@linux.intel.com> Extend aml_operation_region() to use named object Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/aml-build.c | 4 ++-- hw/i386/acpi-build.c | 7 ++++--- include/hw/acpi/aml-build.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 83eadb3..677c1a6 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -958,14 +958,14 @@ Aml *aml_package(uint8_t num_elements) /* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: DefOpRegion */ Aml *aml_operation_region(const char *name, AmlRegionSpace rs, - uint32_t offset, uint32_t len) + Aml *offset, uint32_t len) { Aml *var = aml_alloc(); build_append_byte(var->buf, 0x5B); /* ExtOpPrefix */ build_append_byte(var->buf, 0x80); /* OpRegionOp */ build_append_namestring(var->buf, "%s", name); build_append_byte(var->buf, rs); - build_append_int(var->buf, offset); + aml_append(var, offset); build_append_int(var->buf, len); return var; } diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 0836119..ad10c48 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1139,7 +1139,7 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO, - misc->pvpanic_port, 1)); + aml_int(misc->pvpanic_port), 1)); field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); aml_append(field, aml_named_field("PEPT", 8)); aml_append(dev, field); @@ -1179,7 +1179,8 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(sb_scope, dev); /* declare CPU hotplug MMIO region and PRS field to access it */ aml_append(sb_scope, aml_operation_region( - "PRST", AML_SYSTEM_IO, pm->cpu_hp_io_base, pm->cpu_hp_io_len)); + "PRST", AML_SYSTEM_IO, aml_int(pm->cpu_hp_io_base), + pm->cpu_hp_io_len)); field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); aml_append(field, aml_named_field("PRS", 256)); aml_append(sb_scope, field); @@ -1251,7 +1252,7 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(scope, aml_operation_region( stringify(MEMORY_HOTPLUG_IO_REGION), AML_SYSTEM_IO, - pm->mem_hp_io_base, pm->mem_hp_io_len) + aml_int(pm->mem_hp_io_base), pm->mem_hp_io_len) ); field = aml_field(stringify(MEMORY_HOTPLUG_IO_REGION), AML_DWORD_ACC, diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index b4726a4..a8d8f3b 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -285,7 +285,7 @@ Aml *aml_interrupt(AmlConsumerAndProducer con_and_pro, Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base, uint8_t aln, uint8_t len); Aml *aml_operation_region(const char *name, AmlRegionSpace rs, - uint32_t offset, uint32_t len); + Aml *offset, uint32_t len); Aml *aml_irq_no_flags(uint8_t irq); Aml *aml_named_field(const char *name, unsigned length); Aml *aml_reserved_field(unsigned length); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>, ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 4/6] acpi: allow using acpi named offset for OperationRegion Date: Tue, 5 Jan 2016 02:52:06 +0800 [thread overview] Message-ID: <1451933528-133684-5-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1451933528-133684-1-git-send-email-guangrong.xiao@linux.intel.com> Extend aml_operation_region() to use named object Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/aml-build.c | 4 ++-- hw/i386/acpi-build.c | 7 ++++--- include/hw/acpi/aml-build.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 83eadb3..677c1a6 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -958,14 +958,14 @@ Aml *aml_package(uint8_t num_elements) /* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: DefOpRegion */ Aml *aml_operation_region(const char *name, AmlRegionSpace rs, - uint32_t offset, uint32_t len) + Aml *offset, uint32_t len) { Aml *var = aml_alloc(); build_append_byte(var->buf, 0x5B); /* ExtOpPrefix */ build_append_byte(var->buf, 0x80); /* OpRegionOp */ build_append_namestring(var->buf, "%s", name); build_append_byte(var->buf, rs); - build_append_int(var->buf, offset); + aml_append(var, offset); build_append_int(var->buf, len); return var; } diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 0836119..ad10c48 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1139,7 +1139,7 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(dev, aml_operation_region("PEOR", AML_SYSTEM_IO, - misc->pvpanic_port, 1)); + aml_int(misc->pvpanic_port), 1)); field = aml_field("PEOR", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); aml_append(field, aml_named_field("PEPT", 8)); aml_append(dev, field); @@ -1179,7 +1179,8 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(sb_scope, dev); /* declare CPU hotplug MMIO region and PRS field to access it */ aml_append(sb_scope, aml_operation_region( - "PRST", AML_SYSTEM_IO, pm->cpu_hp_io_base, pm->cpu_hp_io_len)); + "PRST", AML_SYSTEM_IO, aml_int(pm->cpu_hp_io_base), + pm->cpu_hp_io_len)); field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); aml_append(field, aml_named_field("PRS", 256)); aml_append(sb_scope, field); @@ -1251,7 +1252,7 @@ build_ssdt(GArray *table_data, GArray *linker, aml_append(scope, aml_operation_region( stringify(MEMORY_HOTPLUG_IO_REGION), AML_SYSTEM_IO, - pm->mem_hp_io_base, pm->mem_hp_io_len) + aml_int(pm->mem_hp_io_base), pm->mem_hp_io_len) ); field = aml_field(stringify(MEMORY_HOTPLUG_IO_REGION), AML_DWORD_ACC, diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index b4726a4..a8d8f3b 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -285,7 +285,7 @@ Aml *aml_interrupt(AmlConsumerAndProducer con_and_pro, Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base, uint8_t aln, uint8_t len); Aml *aml_operation_region(const char *name, AmlRegionSpace rs, - uint32_t offset, uint32_t len); + Aml *offset, uint32_t len); Aml *aml_irq_no_flags(uint8_t irq); Aml *aml_named_field(const char *name, unsigned length); Aml *aml_reserved_field(unsigned length); -- 1.8.3.1
next prev parent reply other threads:[~2016-01-04 18:59 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-04 18:52 [PATCH 0/6] NVDIMM ACPI: introduce the framework of QEMU emulated DSM Xiao Guangrong 2016-01-04 18:52 ` [Qemu-devel] " Xiao Guangrong 2016-01-04 18:52 ` [PATCH 1/6] pc: acpi: bump DSDT/SSDT compliance revision to v2 Xiao Guangrong 2016-01-04 18:52 ` [Qemu-devel] " Xiao Guangrong 2016-01-04 18:52 ` [PATCH 2/6] nvdimm acpi: initialize the resource used by NVDIMM ACPI Xiao Guangrong 2016-01-04 18:52 ` [Qemu-devel] " Xiao Guangrong 2016-01-04 18:52 ` [PATCH 3/6] nvdimm acpi: introduce patched dsm memory Xiao Guangrong 2016-01-04 18:52 ` [Qemu-devel] " Xiao Guangrong 2016-01-06 15:23 ` Igor Mammedov 2016-01-06 15:23 ` [Qemu-devel] " Igor Mammedov 2016-01-06 15:39 ` Xiao Guangrong 2016-01-06 15:39 ` [Qemu-devel] " Xiao Guangrong 2016-01-07 11:04 ` Igor Mammedov 2016-01-07 11:04 ` [Qemu-devel] " Igor Mammedov 2016-01-08 3:40 ` Xiao Guangrong 2016-01-08 3:40 ` [Qemu-devel] " Xiao Guangrong 2016-01-08 17:06 ` Igor Mammedov 2016-01-08 17:06 ` [Qemu-devel] " Igor Mammedov 2016-01-04 18:52 ` Xiao Guangrong [this message] 2016-01-04 18:52 ` [Qemu-devel] [PATCH 4/6] acpi: allow using acpi named offset for OperationRegion Xiao Guangrong 2016-01-04 18:52 ` [PATCH 5/6] nvdimm acpi: let qemu handle _DSM method Xiao Guangrong 2016-01-04 18:52 ` [Qemu-devel] " Xiao Guangrong 2016-01-07 14:22 ` Igor Mammedov 2016-01-07 14:22 ` [Qemu-devel] " Igor Mammedov 2016-01-08 4:01 ` Xiao Guangrong 2016-01-08 4:01 ` [Qemu-devel] " Xiao Guangrong 2016-01-08 16:08 ` Igor Mammedov 2016-01-08 16:08 ` [Qemu-devel] " Igor Mammedov 2016-01-04 18:52 ` [PATCH 6/6] nvdimm acpi: emulate dsm method Xiao Guangrong 2016-01-04 18:52 ` [Qemu-devel] " Xiao Guangrong 2016-01-07 14:13 ` [Qemu-devel] [PATCH 0/6] NVDIMM ACPI: introduce the framework of QEMU emulated DSM Igor Mammedov 2016-01-07 14:13 ` Igor Mammedov 2016-01-12 19:02 ` Xiao Guangrong 2016-01-12 19:02 ` Xiao Guangrong
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=1451933528-133684-5-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.intel.com \ --cc=dan.j.williams@intel.com \ --cc=ehabkost@redhat.com \ --cc=gleb@kernel.org \ --cc=imammedo@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.