qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v6 25/33] nvdimm acpi: build ACPI nvdimm devices
Date: Fri, 30 Oct 2015 13:56:19 +0800	[thread overview]
Message-ID: <1446184587-142784-26-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1446184587-142784-1-git-send-email-guangrong.xiao@linux.intel.com>

NVDIMM devices is defined in ACPI 6.0 9.20 NVDIMM Devices

There is a root device under \_SB and specified NVDIMM devices are under the
root device. Each NVDIMM device has _ADR which returns its handle used to
associate MEMDEV structure in NFIT

We reserve handle 0 for root device. In this patch, we save handle, handle,
arg1 and arg2 to dsm memory. Arg3 is conditionally saved in later patch

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
 hw/acpi/nvdimm.c | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 184 insertions(+)

diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index dd84e5f..53ed675 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -368,6 +368,15 @@ 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. */
+    uint8_t arg3[0];
+} QEMU_PACKED;
+typedef struct NvdimmDsmIn NvdimmDsmIn;
+
 static uint64_t
 nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
 {
@@ -377,6 +386,7 @@ nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
 static void
 nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
 {
+    fprintf(stderr, "BUG: we never write DSM notification IO Port.\n");
 }
 
 static const MemoryRegionOps nvdimm_dsm_ops = {
@@ -402,6 +412,179 @@ void nvdimm_init_acpi_state(MemoryRegion *memory, MemoryRegion *io,
     memory_region_add_subregion(io, NVDIMM_ACPI_IO_BASE, &state->io_mr);
 }
 
+#define BUILD_STA_METHOD(_dev_, _method_)                                  \
+    do {                                                                   \
+        _method_ = aml_method("_STA", 0);                                  \
+        aml_append(_method_, aml_return(aml_int(0x0f)));                   \
+        aml_append(_dev_, _method_);                                       \
+    } while (0)
+
+#define BUILD_DSM_METHOD(_dev_, _method_, _handle_, _uuid_)                \
+    do {                                                                   \
+        Aml *ifctx, *uuid;                                                 \
+        _method_ = aml_method("_DSM", 4);                                  \
+        /* check UUID if it is we expect, return the errorcode if not.*/   \
+        uuid = aml_touuid(_uuid_);                                         \
+        ifctx = aml_if(aml_lnot(aml_equal(aml_arg(0), uuid)));             \
+        aml_append(ifctx, aml_return(aml_int(1 /* Not Supported */)));     \
+        aml_append(method, ifctx);                                         \
+        aml_append(method, aml_return(aml_call4("NCAL", aml_int(_handle_), \
+                   aml_arg(1), aml_arg(2), aml_arg(3))));                  \
+        aml_append(_dev_, _method_);                                       \
+    } while (0)
+
+#define BUILD_FIELD_UNIT_SIZE(_field_, _byte_, _name_)                     \
+    aml_append(_field_, aml_named_field(_name_, (_byte_) * BITS_PER_BYTE))
+
+#define BUILD_FIELD_UNIT_STRUCT(_field_, _s_, _f_, _name_)                 \
+    BUILD_FIELD_UNIT_SIZE(_field_, sizeof(typeof_field(_s_, _f_)), _name_)
+
+static void build_nvdimm_devices(GSList *device_list, Aml *root_dev)
+{
+    for (; device_list; device_list = device_list->next) {
+        NVDIMMDevice *nvdimm = device_list->data;
+        int slot = object_property_get_int(OBJECT(nvdimm), DIMM_SLOT_PROP,
+                                           NULL);
+        uint32_t handle = nvdimm_slot_to_handle(slot);
+        Aml *dev, *method;
+
+        dev = aml_device("NV%02X", slot);
+        aml_append(dev, aml_name_decl("_ADR", aml_int(handle)));
+
+        BUILD_STA_METHOD(dev, method);
+
+        /*
+         * Chapter 4: _DSM Interface for NVDIMM Device (non-root) - Example
+         * in DSM Spec Rev1.
+         */
+        BUILD_DSM_METHOD(dev, method,
+                         handle /* NVDIMM Device Handle */,
+                         "4309AC30-0D11-11E4-9191-0800200C9A66"
+                         /* UUID for NVDIMM Devices. */);
+
+        aml_append(root_dev, dev);
+    }
+}
+
+static void nvdimm_build_acpi_devices(GSList *device_list, Aml *sb_scope)
+{
+    Aml *dev, *method, *field;
+    uint64_t page_size = TARGET_PAGE_SIZE;
+
+    dev = aml_device("NVDR");
+    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,
+               NVDIMM_ACPI_IO_BASE, NVDIMM_ACPI_IO_LEN));
+    aml_append(dev, aml_operation_region("NRAM", AML_SYSTEM_MEMORY,
+               NVDIMM_ACPI_MEM_BASE, page_size));
+
+    /*
+     * DSM notifier:
+     * @NOTI: Read it will notify QEMU that _DSM method is being
+     *        called and the parameters can be found in NvdimmDsmIn.
+     *        The value read from it is the buffer size of DSM output
+     *        filled by QEMU.
+     */
+    field = aml_field("NPIO", AML_DWORD_ACC, AML_PRESERVE);
+    BUILD_FIELD_UNIT_SIZE(field, sizeof(uint32_t), "NOTI");
+    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_PRESERVE);
+    BUILD_FIELD_UNIT_STRUCT(field, NvdimmDsmIn, handle, "HDLE");
+    BUILD_FIELD_UNIT_STRUCT(field, NvdimmDsmIn, revision, "REVS");
+    BUILD_FIELD_UNIT_STRUCT(field, NvdimmDsmIn, function, "FUNC");
+    BUILD_FIELD_UNIT_SIZE(field, page_size - offsetof(NvdimmDsmIn, arg3),
+                          "ARG3");
+    aml_append(dev, field);
+
+    /*
+     * DSM output:
+     * @ODAT: the buffer QEMU uses to store the result, the actual size
+     *        filled by QEMU is the value read from NOT1.
+     *
+     * Since the page is reused by both input and out, the input data
+     * will be lost after storing new result into @ODAT.
+    */
+    field = aml_field("NRAM", AML_DWORD_ACC, AML_PRESERVE);
+    BUILD_FIELD_UNIT_SIZE(field, page_size, "ODAT");
+    aml_append(dev, field);
+
+    method = aml_method_serialized("NCAL", 4);
+    {
+        Aml *buffer_size = aml_local(0);
+
+        aml_append(method, aml_store(aml_arg(0), 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")));
+
+        /*
+         * transfer control to QEMU and the buffer size filled by
+         * QEMU is returned.
+         */
+        aml_append(method, aml_store(aml_name("NOTI"), buffer_size));
+
+        aml_append(method, aml_store(aml_shiftleft(buffer_size,
+                                       aml_int(3)), buffer_size));
+
+        aml_append(method, aml_create_field(aml_name("ODAT"), aml_int(0),
+                                            buffer_size , "OBUF"));
+        aml_append(method, aml_concatenate(aml_buffer(0, NULL),
+                                           aml_name("OBUF"), aml_local(1)));
+        aml_append(method, aml_return(aml_local(1)));
+    }
+    aml_append(dev, method);
+
+    BUILD_STA_METHOD(dev, method);
+
+    /*
+     * Chapter 3: _DSM Interface for NVDIMM Root Device - Example in DSM
+     * Spec Rev1.
+     */
+    BUILD_DSM_METHOD(dev, method,
+                     0 /* 0 is reserved for NVDIMM Root Device*/,
+                     "2F10E7A4-9E91-11E4-89D3-123B93F75CBA"
+                     /* UUID for NVDIMM Root Devices. */);
+
+    build_nvdimm_devices(device_list, dev);
+
+    aml_append(sb_scope, dev);
+}
+
+static void nvdimm_build_ssdt(GSList *device_list, GArray *table_offsets,
+                              GArray *table_data, GArray *linker)
+{
+    Aml *ssdt, *sb_scope;
+
+    acpi_add_table(table_offsets, table_data);
+
+    ssdt = init_aml_allocator();
+    acpi_data_push(ssdt->buf, sizeof(AcpiTableHeader));
+
+    sb_scope = aml_scope("\\_SB");
+    nvdimm_build_acpi_devices(device_list, sb_scope);
+
+    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);
+    build_header(linker, table_data,
+        (void *)(table_data->data + table_data->len - ssdt->buf->len),
+        "SSDT", ssdt->buf->len, 1);
+    free_aml_allocator();
+}
+
 void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
                        GArray *linker)
 {
@@ -414,5 +597,6 @@ void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data,
     }
 
     nvdimm_build_nfit(device_list, table_offsets, table_data, linker);
+    nvdimm_build_ssdt(device_list, table_offsets, table_data, linker);
     g_slist_free(device_list);
 }
-- 
1.8.3.1

  parent reply	other threads:[~2015-10-30  6:02 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-30  5:55 [Qemu-devel] [PATCH v6 00/33] implement vNVDIMM Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 01/33] acpi: add aml_derefof Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 02/33] acpi: add aml_sizeof Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 03/33] acpi: add aml_create_field Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 04/33] acpi: add aml_concatenate Xiao Guangrong
2015-10-30  5:55 ` [Qemu-devel] [PATCH v6 05/33] acpi: add aml_object_type Xiao Guangrong
2015-11-09 11:35   ` Michael S. Tsirkin
2015-11-09 12:40     ` Igor Mammedov
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 06/33] acpi: add aml_method_serialized Xiao Guangrong
2015-11-09 11:14   ` Michael S. Tsirkin
2015-11-09 11:18     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 07/33] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-10-30 13:26   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:26     ` Xiao Guangrong
2015-10-31  9:37       ` Vladimir Sementsov-Ogievskiy
2015-10-31 14:06         ` Xiao Guangrong
2015-10-30 15:54   ` Eduardo Habkost
2015-10-31  8:09     ` Xiao Guangrong
2015-10-31 14:11       ` Eduardo Habkost
2015-10-31 17:03         ` Xiao Guangrong
2015-11-09 20:00       ` Michael S. Tsirkin
2015-10-31  8:25     ` Xiao Guangrong
2015-11-09 10:33   ` Michael S. Tsirkin
2015-11-09 10:55     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 08/33] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-10-30 14:04   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:44     ` Xiao Guangrong
2015-10-31 13:55       ` Eduardo Habkost
2015-10-31 15:56         ` Xiao Guangrong
2015-11-09 10:39   ` Michael S. Tsirkin
2015-11-09 11:01     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 09/33] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-10-30 14:25   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:53     ` Xiao Guangrong
2015-11-09 10:13   ` Michael S. Tsirkin
2015-11-09 10:48     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 10/33] hostmem-file: clean up memory allocation Xiao Guangrong
2015-10-30 14:54   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 11/33] hostmem-file: use whole file size if possible Xiao Guangrong
2015-10-30 15:27   ` Vladimir Sementsov-Ogievskiy
2015-10-31  7:59     ` Xiao Guangrong
2015-10-30 17:30   ` Eduardo Habkost
2015-10-31  8:46     ` Xiao Guangrong
2015-10-31 13:45       ` Eduardo Habkost
2015-10-31 16:59         ` Xiao Guangrong
2015-11-09 10:17   ` Michael S. Tsirkin
2015-11-09 10:49     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 12/33] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-11-09 10:40   ` Michael S. Tsirkin
2015-11-09 11:03     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 13/33] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-10-30 15:38   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 14/33] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-10-30 16:10   ` Vladimir Sementsov-Ogievskiy
2015-10-31  8:18     ` Xiao Guangrong
2015-10-30 17:06   ` Eric Blake
2015-10-31  8:23     ` Xiao Guangrong
2015-11-09 20:05   ` Michael S. Tsirkin
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 15/33] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 16/33] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-10-31 10:28   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 17/33] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-10-31 10:41   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 18/33] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-10-31 10:52   ` Vladimir Sementsov-Ogievskiy
2015-10-31 14:15     ` Xiao Guangrong
2015-11-02  9:18       ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 19/33] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-10-31 11:05   ` Vladimir Sementsov-Ogievskiy
2015-10-31 14:19     ` Xiao Guangrong
2015-11-09 11:04   ` Michael S. Tsirkin
2015-11-09 11:13     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 20/33] dimm: introduce realize callback Xiao Guangrong
2015-10-31 11:22   ` Vladimir Sementsov-Ogievskiy
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 21/33] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 22/33] docs: add NVDIMM ACPI documentation Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 23/33] nvdimm acpi: init the resource used by NVDIMM ACPI Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 24/33] nvdimm acpi: build ACPI NFIT table Xiao Guangrong
2015-10-30  5:56 ` Xiao Guangrong [this message]
2015-11-08 17:38   ` [Qemu-devel] [PATCH v6 25/33] nvdimm acpi: build ACPI nvdimm devices Michael S. Tsirkin
2015-11-09  6:07     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 26/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 27/33] nvdimm acpi: support function 0 Xiao Guangrong
2015-10-30 10:14   ` Stefan Hajnoczi
2015-10-30 13:01     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 28/33] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 29/33] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 30/33] nvdimm acpi: support Set " Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 31/33] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 32/33] nvdimm acpi: support _FIT method Xiao Guangrong
2015-11-08 17:50   ` Michael S. Tsirkin
2015-11-09  6:37     ` Xiao Guangrong
2015-10-30  5:56 ` [Qemu-devel] [PATCH v6 33/33] nvdimm: add maintain info Xiao Guangrong
2015-10-30 10:15 ` [Qemu-devel] [PATCH v6 00/33] implement vNVDIMM Stefan Hajnoczi

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=1446184587-142784-26-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).