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 v2 07/11] nvdimm acpi: introduce patched dsm memory Date: Wed, 13 Jan 2016 02:50:06 +0800 [thread overview] Message-ID: <1452624610-46945-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1452624610-46945-1-git-send-email-guangrong.xiao@linux.intel.com> The dsm memory is used to save the input parameters and store the dsm result which is filled by QEMU. The address of dsm memory is decided by bios and patched into int32 object named "MEMA" Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 256cedd..e7acc98 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -28,6 +28,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" +#include "hw/acpi/bios-linker-loader.h" #include "hw/nvram/fw_cfg.h" #include "hw/mem/nvdimm.h" @@ -405,6 +406,7 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, } #define NVDIMM_COMMON_DSM "NCAL" +#define NVDIMM_ACPI_MEM_ADDR "MEMA" static void nvdimm_build_common_dsm(Aml *dev) { @@ -469,7 +471,9 @@ static void nvdimm_build_nvdimm_devices(GSList *device_list, Aml *root_dev) static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets, GArray *table_data, GArray *linker) { - Aml *ssdt, *sb_scope, *dev; + Aml *ssdt, *sb_scope, *dev, *mem_addr; + uint32_t zero_offset = 0; + int offset; acpi_add_table(table_offsets, table_data); @@ -500,9 +504,37 @@ static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets, aml_append(sb_scope, dev); + /* + * leave it at the end of ssdt so that we can conveniently get the + * offset of int32 object which will be patched with the real address + * of the dsm memory by BIOS. + * + * 0x32000000 is the magic number to let aml_int() create int32 object. + * It will be zeroed later to make bios_linker_loader_add_pointer() + * happy. + */ + mem_addr = aml_name_decl(NVDIMM_ACPI_MEM_ADDR, aml_int(0x32000000)); + + aml_append(sb_scope, mem_addr); aml_append(ssdt, sb_scope); /* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals(table_data, ssdt->buf->data, ssdt->buf->len); + + offset = table_data->len - 4; + + /* + * zero the last 4 bytes, i.e, it is the offset of + * NVDIMM_ACPI_MEM_ADDR object. + */ + g_array_remove_range(table_data, offset, 4); + g_array_append_vals(table_data, &zero_offset, 4); + + bios_linker_loader_alloc(linker, NVDIMM_DSM_MEM_FILE, TARGET_PAGE_SIZE, + false /* high memory */); + bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, + NVDIMM_DSM_MEM_FILE, table_data, + table_data->data + offset, + sizeof(uint32_t)); build_header(linker, table_data, (void *)(table_data->data + table_data->len - ssdt->buf->len), "SSDT", ssdt->buf->len, 1, "NVDIMM"); -- 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 v2 07/11] nvdimm acpi: introduce patched dsm memory Date: Wed, 13 Jan 2016 02:50:06 +0800 [thread overview] Message-ID: <1452624610-46945-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1452624610-46945-1-git-send-email-guangrong.xiao@linux.intel.com> The dsm memory is used to save the input parameters and store the dsm result which is filled by QEMU. The address of dsm memory is decided by bios and patched into int32 object named "MEMA" Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- hw/acpi/nvdimm.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 256cedd..e7acc98 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -28,6 +28,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" +#include "hw/acpi/bios-linker-loader.h" #include "hw/nvram/fw_cfg.h" #include "hw/mem/nvdimm.h" @@ -405,6 +406,7 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io, } #define NVDIMM_COMMON_DSM "NCAL" +#define NVDIMM_ACPI_MEM_ADDR "MEMA" static void nvdimm_build_common_dsm(Aml *dev) { @@ -469,7 +471,9 @@ static void nvdimm_build_nvdimm_devices(GSList *device_list, Aml *root_dev) static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets, GArray *table_data, GArray *linker) { - Aml *ssdt, *sb_scope, *dev; + Aml *ssdt, *sb_scope, *dev, *mem_addr; + uint32_t zero_offset = 0; + int offset; acpi_add_table(table_offsets, table_data); @@ -500,9 +504,37 @@ static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets, aml_append(sb_scope, dev); + /* + * leave it at the end of ssdt so that we can conveniently get the + * offset of int32 object which will be patched with the real address + * of the dsm memory by BIOS. + * + * 0x32000000 is the magic number to let aml_int() create int32 object. + * It will be zeroed later to make bios_linker_loader_add_pointer() + * happy. + */ + mem_addr = aml_name_decl(NVDIMM_ACPI_MEM_ADDR, aml_int(0x32000000)); + + aml_append(sb_scope, mem_addr); aml_append(ssdt, sb_scope); /* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals(table_data, ssdt->buf->data, ssdt->buf->len); + + offset = table_data->len - 4; + + /* + * zero the last 4 bytes, i.e, it is the offset of + * NVDIMM_ACPI_MEM_ADDR object. + */ + g_array_remove_range(table_data, offset, 4); + g_array_append_vals(table_data, &zero_offset, 4); + + bios_linker_loader_alloc(linker, NVDIMM_DSM_MEM_FILE, TARGET_PAGE_SIZE, + false /* high memory */); + bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, + NVDIMM_DSM_MEM_FILE, table_data, + table_data->data + offset, + sizeof(uint32_t)); build_header(linker, table_data, (void *)(table_data->data + table_data->len - ssdt->buf->len), "SSDT", ssdt->buf->len, 1, "NVDIMM"); -- 1.8.3.1
next prev parent reply other threads:[~2016-01-12 18:57 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-12 18:49 [PATCH v2 00/11] NVDIMM ACPI: introduce the framework of QEMU emulated Xiao Guangrong 2016-01-12 18:49 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 01/11] tests: acpi: test multiple SSDT tables Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 02/11] tests: acpi: test NVDIMM tables Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-02-04 16:20 ` Michael S. Tsirkin 2016-02-04 16:20 ` [Qemu-devel] " Michael S. Tsirkin 2016-02-14 5:36 ` Xiao Guangrong 2016-02-14 5:36 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 03/11] acpi: add aml_create_field() Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-02-08 10:47 ` Igor Mammedov 2016-02-08 10:47 ` [Qemu-devel] " Igor Mammedov 2016-02-14 5:41 ` Xiao Guangrong 2016-02-14 5:41 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 04/11] acpi: add aml_concatenate() Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-02-08 10:51 ` Igor Mammedov 2016-02-08 10:51 ` [Qemu-devel] " Igor Mammedov 2016-02-14 5:52 ` Xiao Guangrong 2016-02-14 5:52 ` [Qemu-devel] " Xiao Guangrong 2016-02-14 5:55 ` Xiao Guangrong 2016-02-14 5:55 ` [Qemu-devel] " Xiao Guangrong 2016-02-15 9:02 ` Igor Mammedov 2016-02-15 9:02 ` [Qemu-devel] " Igor Mammedov 2016-02-15 10:32 ` Xiao Guangrong 2016-02-15 10:32 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 05/11] acpi: allow using object as offset for OperationRegion Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-02-08 10:57 ` Igor Mammedov 2016-02-08 10:57 ` [Qemu-devel] " Igor Mammedov 2016-01-12 18:50 ` [PATCH v2 06/11] nvdimm acpi: initialize the resource used by NVDIMM ACPI Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-02-04 16:22 ` Michael S. Tsirkin 2016-02-04 16:22 ` [Qemu-devel] " Michael S. Tsirkin 2016-02-08 11:03 ` Igor Mammedov 2016-02-08 11:03 ` [Qemu-devel] " Igor Mammedov 2016-02-14 5:57 ` Xiao Guangrong 2016-02-14 5:57 ` [Qemu-devel] " Xiao Guangrong 2016-02-15 9:11 ` Igor Mammedov 2016-02-15 9:18 ` Michael S. Tsirkin 2016-02-15 10:13 ` Xiao Guangrong 2016-02-15 10:30 ` Michael S. Tsirkin 2016-02-15 10:30 ` Michael S. Tsirkin 2016-02-15 10:47 ` Igor Mammedov 2016-02-15 10:47 ` Igor Mammedov 2016-02-15 11:22 ` Xiao Guangrong 2016-02-15 11:22 ` Xiao Guangrong 2016-02-15 11:45 ` Michael S. Tsirkin 2016-02-15 13:32 ` Igor Mammedov 2016-02-15 15:53 ` Xiao Guangrong 2016-02-15 17:24 ` Igor Mammedov 2016-02-15 17:24 ` Igor Mammedov 2016-02-15 18:35 ` Xiao Guangrong 2016-02-15 18:35 ` Xiao Guangrong 2016-02-16 11:00 ` Igor Mammedov 2016-02-17 2:04 ` Xiao Guangrong 2016-02-17 17:26 ` Michael S. Tsirkin 2016-02-17 17:26 ` Michael S. Tsirkin 2016-02-18 4:03 ` Xiao Guangrong 2016-02-18 4:03 ` Xiao Guangrong 2016-02-18 10:05 ` Igor Mammedov 2016-02-18 10:05 ` [Qemu-devel] " Igor Mammedov 2016-02-19 8:08 ` Michael S. Tsirkin 2016-02-19 8:43 ` Dan Williams 2016-02-19 8:43 ` Dan Williams 2016-02-22 10:30 ` Xiao Guangrong 2016-02-22 10:30 ` Xiao Guangrong 2016-02-22 10:34 ` Xiao Guangrong 2016-02-18 10:20 ` Michael S. Tsirkin 2016-02-18 10:20 ` Michael S. Tsirkin 2016-02-15 11:36 ` Michael S. Tsirkin 2016-02-15 11:36 ` Michael S. Tsirkin 2016-01-12 18:50 ` Xiao Guangrong [this message] 2016-01-12 18:50 ` [Qemu-devel] [PATCH v2 07/11] nvdimm acpi: introduce patched dsm memory Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 08/11] nvdimm acpi: let qemu handle _DSM method Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 09/11] nvdimm acpi: emulate dsm method Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 10/11] nvdimm acpi: add _CRS Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-01-12 18:50 ` [PATCH v2 11/11] tests: acpi: update nvdimm ssdt table Xiao Guangrong 2016-01-12 18:50 ` [Qemu-devel] " Xiao Guangrong 2016-01-20 2:21 ` [PATCH v2 00/11] NVDIMM ACPI: introduce the framework of QEMU emulated Xiao Guangrong 2016-01-20 2:21 ` [Qemu-devel] " Xiao Guangrong 2016-01-28 4:42 ` Xiao Guangrong 2016-01-28 4:42 ` [Qemu-devel] " Xiao Guangrong 2016-02-04 16:24 ` Michael S. Tsirkin 2016-02-04 16:24 ` [Qemu-devel] " Michael S. Tsirkin 2016-02-14 5:38 ` Xiao Guangrong 2016-02-14 5:38 ` 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=1452624610-46945-8-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.