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 24/53] nvdimm acpi: let qemu handle _DSM method
Date: Fri, 11 Mar 2016 17:08:56 +0200	[thread overview]
Message-ID: <1457708548-14093-25-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1457708548-14093-1-git-send-email-mst@redhat.com>

From: Xiao Guangrong <guangrong.xiao@linux.intel.com>

If dsm memory is successfully patched, we let qemu fully emulate
the dsm method

This patch saves _DSM input parameters into dsm memory, tell dsm
memory address to QEMU, then fetch the result from the dsm memory

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 | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 115 insertions(+), 5 deletions(-)

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 90032e5..19c2642 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -372,6 +372,24 @@ static void nvdimm_build_nfit(GSList *device_list, GArray *table_offsets,
     g_array_free(structures, true);
 }
 
+struct NvdimmDsmIn {
+    uint32_t handle;
+    uint32_t revision;
+    uint32_t function;
+    /* the remaining size in the page is used by arg3. */
+    union {
+        uint8_t arg3[0];
+    };
+} QEMU_PACKED;
+typedef struct NvdimmDsmIn NvdimmDsmIn;
+
+struct NvdimmDsmOut {
+    /* the size of buffer filled by QEMU. */
+    uint32_t len;
+    uint8_t data[0];
+} QEMU_PACKED;
+typedef struct NvdimmDsmOut NvdimmDsmOut;
+
 static uint64_t
 nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
 {
@@ -411,11 +429,18 @@ void nvdimm_init_acpi_state(AcpiNVDIMMState *state, MemoryRegion *io,
 
 static void nvdimm_build_common_dsm(Aml *dev)
 {
-    Aml *method, *ifctx, *function;
+    Aml *method, *ifctx, *function, *dsm_mem, *unpatched, *result_size;
     uint8_t byte_list[1];
 
-    method = aml_method(NVDIMM_COMMON_DSM, 4, AML_NOTSERIALIZED);
+    method = aml_method(NVDIMM_COMMON_DSM, 4, AML_SERIALIZED);
     function = aml_arg(2);
+    dsm_mem = aml_name(NVDIMM_ACPI_MEM_ADDR);
+
+    /*
+     * do not support any method if DSM memory address has not been
+     * patched.
+     */
+    unpatched = aml_if(aml_equal(dsm_mem, aml_int(0x0)));
 
     /*
      * function 0 is called to inquire what functions are supported by
@@ -424,12 +449,38 @@ static void nvdimm_build_common_dsm(Aml *dev)
     ifctx = aml_if(aml_equal(function, aml_int(0)));
     byte_list[0] = 0 /* No function Supported */;
     aml_append(ifctx, aml_return(aml_buffer(1, byte_list)));
-    aml_append(method, ifctx);
+    aml_append(unpatched, ifctx);
 
     /* No function is supported yet. */
     byte_list[0] = 1 /* Not Supported */;
-    aml_append(method, aml_return(aml_buffer(1, byte_list)));
+    aml_append(unpatched, aml_return(aml_buffer(1, byte_list)));
+    aml_append(method, unpatched);
 
+    /*
+     * The HDLE indicates the DSM function is issued from which device,
+     * it is not used at this time as no function is supported yet.
+     * Currently we make it always be 0 for all the devices and will set
+     * the appropriate value once real function is implemented.
+     */
+    aml_append(method, aml_store(aml_int(0x0), aml_name("HDLE")));
+    aml_append(method, aml_store(aml_arg(1), aml_name("REVS")));
+    aml_append(method, aml_store(aml_arg(2), aml_name("FUNC")));
+
+    /*
+     * tell QEMU about the real address of DSM memory, then QEMU
+     * gets the control and fills the result in DSM memory.
+     */
+    aml_append(method, aml_store(dsm_mem, aml_name("NTFI")));
+
+    result_size = aml_local(1);
+    aml_append(method, aml_store(aml_name("RLEN"), result_size));
+    aml_append(method, aml_store(aml_shiftleft(result_size, aml_int(3)),
+                                 result_size));
+    aml_append(method, aml_create_field(aml_name("ODAT"), aml_int(0),
+                                        result_size, "OBUF"));
+    aml_append(method, aml_concatenate(aml_buffer(0, NULL), aml_name("OBUF"),
+                                       aml_arg(6)));
+    aml_append(method, aml_return(aml_arg(6)));
     aml_append(dev, method);
 }
 
@@ -472,7 +523,7 @@ 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, *field;
     int mem_addr_offset, nvdimm_ssdt;
 
     acpi_add_table(table_offsets, table_data);
@@ -497,6 +548,65 @@ static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets,
      */
     aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0012")));
 
+    /* map DSM memory and IO into ACPI namespace. */
+    aml_append(dev, aml_operation_region("NPIO", AML_SYSTEM_IO,
+               aml_int(NVDIMM_ACPI_IO_BASE), NVDIMM_ACPI_IO_LEN));
+    aml_append(dev, aml_operation_region("NRAM", AML_SYSTEM_MEMORY,
+               aml_name(NVDIMM_ACPI_MEM_ADDR), TARGET_PAGE_SIZE));
+
+    /*
+     * DSM notifier:
+     * NTFI: write the address of DSM memory and notify QEMU to emulate
+     *       the access.
+     *
+     * It is the IO port so that accessing them will cause VM-exit, the
+     * control will be transferred to QEMU.
+     */
+    field = aml_field("NPIO", AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE);
+    aml_append(field, aml_named_field("NTFI",
+               sizeof(uint32_t) * BITS_PER_BYTE));
+    aml_append(dev, field);
+
+    /*
+     * DSM input:
+     * HDLE: store device's handle, it's zero if the _DSM call happens
+     *       on NVDIMM Root Device.
+     * REVS: store the Arg1 of _DSM call.
+     * FUNC: store the Arg2 of _DSM call.
+     * ARG3: store the Arg3 of _DSM call.
+     *
+     * They are RAM mapping on host so that these accesses never cause
+     * VM-EXIT.
+     */
+    field = aml_field("NRAM", AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE);
+    aml_append(field, aml_named_field("HDLE",
+               sizeof(typeof_field(NvdimmDsmIn, handle)) * BITS_PER_BYTE));
+    aml_append(field, aml_named_field("REVS",
+               sizeof(typeof_field(NvdimmDsmIn, revision)) * BITS_PER_BYTE));
+    aml_append(field, aml_named_field("FUNC",
+               sizeof(typeof_field(NvdimmDsmIn, function)) * BITS_PER_BYTE));
+    aml_append(field, aml_named_field("ARG3",
+               (TARGET_PAGE_SIZE - offsetof(NvdimmDsmIn, arg3)) *
+                BITS_PER_BYTE));
+    aml_append(dev, field);
+
+    /*
+     * DSM output:
+     * RLEN: the size of the buffer filled by QEMU.
+     * ODAT: the buffer QEMU uses to store the result.
+     *
+     * Since the page is reused by both input and out, the input data
+     * will be lost after storing new result into ODAT so we should fetch
+     * all the input data before writing the result.
+     */
+    field = aml_field("NRAM", AML_DWORD_ACC, AML_NOLOCK, AML_PRESERVE);
+    aml_append(field, aml_named_field("RLEN",
+               sizeof(typeof_field(NvdimmDsmOut, len)) * BITS_PER_BYTE));
+    aml_append(field, aml_named_field("ODAT",
+               (TARGET_PAGE_SIZE - offsetof(NvdimmDsmOut, data)) *
+                     BITS_PER_BYTE));
+    aml_append(dev, field);
+
     nvdimm_build_common_dsm(dev);
     nvdimm_build_device_dsm(dev);
 
-- 
MST

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

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