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 v5 2/5] nvdimm acpi: introduce patched dsm memory
Date: Wed, 2 Mar 2016 19:50:38 +0800 [thread overview]
Message-ID: <1456919441-101204-3-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1456919441-101204-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 | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 8568b20..90032e5 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -29,6 +29,7 @@
#include "qemu/osdep.h"
#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"
@@ -406,6 +407,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)
{
@@ -471,6 +473,7 @@ static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets,
GArray *table_data, GArray *linker)
{
Aml *ssdt, *sb_scope, *dev;
+ int mem_addr_offset, nvdimm_ssdt;
acpi_add_table(table_offsets, table_data);
@@ -500,13 +503,24 @@ static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets,
nvdimm_build_nvdimm_devices(device_list, dev);
aml_append(sb_scope, dev);
-
aml_append(ssdt, sb_scope);
+
+ nvdimm_ssdt = table_data->len;
+
/* copy AML table into ACPI tables blob and patch header there */
g_array_append_vals(table_data, ssdt->buf->data, ssdt->buf->len);
+ mem_addr_offset = build_append_named_dword(table_data,
+ NVDIMM_ACPI_MEM_ADDR);
+
+ 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 + mem_addr_offset,
+ sizeof(uint32_t));
build_header(linker, table_data,
- (void *)(table_data->data + table_data->len - ssdt->buf->len),
- "SSDT", ssdt->buf->len, 1, NULL, "NVDIMM");
+ (void *)(table_data->data + nvdimm_ssdt),
+ "SSDT", table_data->len - nvdimm_ssdt, 1, NULL, "NVDIMM");
free_aml_allocator();
}
--
1.8.3.1
next prev parent reply other threads:[~2016-03-02 11:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 11:50 [Qemu-devel] [PATCH v5 0/5] NVDIMM ACPI: introduce the framework of QEMU emulated DSM Xiao Guangrong
2016-03-02 11:50 ` [Qemu-devel] [PATCH v5 1/5] nvdimm acpi: initialize the resource used by NVDIMM ACPI Xiao Guangrong
2016-03-02 11:58 ` Michael S. Tsirkin
2016-03-02 16:10 ` Xiao Guangrong
2016-03-02 11:50 ` Xiao Guangrong [this message]
2016-03-03 13:12 ` [Qemu-devel] [PATCH v5 2/5] nvdimm acpi: introduce patched dsm memory Michael S. Tsirkin
2016-03-03 13:35 ` Xiao Guangrong
2016-03-04 15:32 ` Xiao Guangrong
2016-03-02 11:50 ` [Qemu-devel] [PATCH v5 3/5] nvdimm acpi: let qemu handle _DSM method Xiao Guangrong
2016-03-03 13:23 ` Michael S. Tsirkin
2016-03-03 14:00 ` Xiao Guangrong
2016-03-04 15:03 ` Xiao Guangrong
2016-03-02 11:50 ` [Qemu-devel] [PATCH v5 4/5] nvdimm acpi: emulate dsm method Xiao Guangrong
2016-03-03 13:25 ` Michael S. Tsirkin
2016-03-03 14:01 ` Xiao Guangrong
2016-03-02 11:50 ` [Qemu-devel] [PATCH v5 5/5] nvdimm acpi: add _CRS Xiao Guangrong
2016-03-03 13:29 ` Michael S. Tsirkin
2016-03-03 14:05 ` Xiao Guangrong
2016-03-03 14:48 ` Michael S. Tsirkin
2016-03-07 12:16 ` Igor Mammedov
2016-03-07 12:22 ` Michael S. Tsirkin
2016-03-07 14:49 ` Igor Mammedov
2016-03-07 15:09 ` Michael S. Tsirkin
2016-03-07 16:17 ` Igor Mammedov
2016-03-07 16:19 ` Michael S. Tsirkin
2016-03-08 9:06 ` Igor Mammedov
2016-03-03 13:43 ` [Qemu-devel] [PATCH v5 0/5] NVDIMM ACPI: introduce the framework of QEMU emulated DSM Michael S. Tsirkin
2016-03-03 14:07 ` 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=1456919441-101204-3-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: 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).