qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Xiao Guangrong <guangrong.xiao@linux.intel.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>
Subject: [Qemu-devel] [PULL v2 23/51] nvdimm acpi: introduce patched dsm memory
Date: Tue, 15 Mar 2016 17:01:36 +0200	[thread overview]
Message-ID: <1458053975-2410-24-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1458053975-2410-1-git-send-email-mst@redhat.com>

From: Xiao Guangrong <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>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.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();
 }
 
-- 
MST

  parent reply	other threads:[~2016-03-15 15:01 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-15 15:00 [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 01/51] acpi: add aml_create_field() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 02/51] acpi: add aml_concatenate() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 03/51] acpi: allow using object as offset for OperationRegion Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 04/51] acpi: add build_append_named_dword, returning an offset in buffer Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 05/51] balloon: fix segfault and harden the stats queue Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 08/51] virtio-balloon: add 'available' counter Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 10/51] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 11/51] i386/acpi: make floppy controller object dynamic Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 13/51] fdc: add function to determine drive chs limits Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 14/51] i386: populate floppy drive information in DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 15/51] i386: update expected DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 16/51] virtio-pci: call pci reset variant when guest requests reset Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 17/51] msi_supported -> msi_nonbroken Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 18/51] ich9lpc: fix typo Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 19/51] hw/acpi: fix Q35 support for legacy Windows OS Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 20/51] acpi-test-data: add _DIS methods Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 21/51] pci-ids: add virtio 1.0 ids to spec Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 22/51] nvdimm acpi: initialize the resource used by NVDIMM ACPI Michael S. Tsirkin
2016-03-15 15:01 ` Michael S. Tsirkin [this message]
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 24/51] nvdimm acpi: let qemu handle _DSM method Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 25/51] nvdimm acpi: emulate dsm method Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 26/51] vhost-user: fix use after free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 27/51] vhost-user: remove useless is_server field Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 28/51] qemu-char: avoid potential double-free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 29/51] qemu-char: remove all msgfds on disconnect Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 30/51] qemu-char: make tcp_chr_disconnect() reentrant-safe Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 31/51] pxb: cleanup Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 32/51] pc: acpi: remove NOP assignment Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 33/51] pc: init pcms->apic_id_limit once and use it throughout pc.c Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 34/51] machine: introduce MachineClass.possible_cpu_arch_ids() hook Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 35/51] pc: acpi: cleanup qdev_get_machine() calls Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 36/51] pc: acpi: SRAT: create only valid processor lapic entries Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 37/51] pc: acpi: create MADT.lapic entries only for valid lapics Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 38/51] pc: acpi: create Processor and Notify objects " Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 39/51] pc: acpi: drop cpu->found_cpus bitmap Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 40/51] pc: acpi: clarify why possible LAPIC entries must be present in MADT Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 41/51] MAINTAINERS: Add an entry for virtio header files Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 42/51] MAINTAINERS: machine core Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 43/51] ipmi: remove IPMI_CHECK_CMD_LEN() macro Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 44/51] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 45/51] ipmi: remove IPMI_CHECK_RESERVATION() macro Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 46/51] ipmi: add rsp_buffer_set_error() helper Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 47/51] ipmi: add a realize function to the device class Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 48/51] ipmi: use a function to initialize the SDR table Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 49/51] ipmi: remove the need of an ending record in " Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 51/51] hw/acpi: fix GSI links UID Michael S. Tsirkin
2016-03-15 17:09 ` [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Peter Maydell

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=1458053975-2410-24-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=guangrong.xiao@linux.intel.com \
    --cc=imammedo@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).