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 v3 25/32] nvdimm: build ACPI nvdimm devices
Date: Sun, 11 Oct 2015 11:52:57 +0800 [thread overview]
Message-ID: <1444535584-18220-26-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1444535584-18220-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, arg0,
arg1 and arg2. Arg3 is conditionally saved in later patch
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
hw/mem/nvdimm/acpi.c | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 203 insertions(+)
diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c
index 1450a6a..d9fa0fd 100644
--- a/hw/mem/nvdimm/acpi.c
+++ b/hw/mem/nvdimm/acpi.c
@@ -308,15 +308,38 @@ static void build_nfit(void *fit, GSList *device_list, GArray *table_offsets,
"NFIT", table_data->len - nfit_start, 1);
}
+#define NOTIFY_VALUE 0x99
+
+struct dsm_in {
+ uint32_t handle;
+ uint8_t arg0[16];
+ uint32_t arg1;
+ uint32_t arg2;
+ /* the remaining size in the page is used by arg3. */
+ uint8_t arg3[0];
+} QEMU_PACKED;
+typedef struct dsm_in dsm_in;
+
+struct dsm_out {
+ /* the size of buffer filled by QEMU. */
+ uint16_t len;
+ uint8_t data[0];
+} QEMU_PACKED;
+typedef struct dsm_out dsm_out;
+
static uint64_t dsm_read(void *opaque, hwaddr addr,
unsigned size)
{
+ fprintf(stderr, "BUG: we never read DSM notification MMIO.\n");
return 0;
}
static void dsm_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
+ if (val != NOTIFY_VALUE) {
+ fprintf(stderr, "BUG: unexepected notify value 0x%" PRIx64, val);
+ }
}
static const MemoryRegionOps dsm_ops = {
@@ -372,6 +395,183 @@ static MemoryRegion *build_dsm_memory(NVDIMMState *state)
return dsm_fit_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 SAVE_ARG012_HANDLE_LOCK(_method_, _handle_) \
+ do { \
+ aml_append(_method_, aml_acquire(aml_name("NLCK"), 0xFFFF)); \
+ aml_append(_method_, aml_store(_handle_, aml_name("HDLE"))); \
+ aml_append(_method_, aml_store(aml_arg(0), aml_name("ARG0"))); \
+ aml_append(_method_, aml_store(aml_arg(1), aml_name("ARG1"))); \
+ aml_append(_method_, aml_store(aml_arg(2), aml_name("ARG2"))); \
+ } while (0)
+
+#define NOTIFY_AND_RETURN_UNLOCK(_method_) \
+ do { \
+ aml_append(_method_, aml_store(aml_int(NOTIFY_VALUE), \
+ aml_name("NOTI"))); \
+ aml_append(_method_, aml_store(aml_name("RLEN"), aml_local(6))); \
+ aml_append(_method_, aml_store(aml_shiftleft(aml_local(6), \
+ aml_int(3)), aml_local(6))); \
+ aml_append(_method_, aml_create_field(aml_name("ODAT"), aml_int(0),\
+ aml_local(6) , "OBUF")); \
+ aml_append(_method_, aml_name_decl("ZBUF", aml_buffer(0, NULL))); \
+ aml_append(_method_, aml_concatenate(aml_name("ZBUF"), \
+ aml_name("OBUF"), aml_arg(6))); \
+ aml_append(_method_, aml_release(aml_name("NLCK"))); \
+ aml_append(_method_, aml_return(aml_arg(6))); \
+ } while (0)
+
+#define BUILD_FIELD_UNIT_STRUCT(_field_, _s_, _f_, _name_) \
+ aml_append(_field_, aml_named_field(_name_, \
+ sizeof(typeof_field(_s_, _f_)) * BITS_PER_BYTE))
+
+#define BUILD_FIELD_UNIT_SIZE(_field_, _byte_, _name_) \
+ aml_append(_field_, aml_named_field(_name_, (_byte_) * BITS_PER_BYTE))
+
+static void build_nvdimm_devices(NVDIMMState *state, 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);
+
+ method = aml_method("_DSM", 4);
+ {
+ SAVE_ARG012_HANDLE_LOCK(method, aml_int(handle));
+ NOTIFY_AND_RETURN_UNLOCK(method);
+ }
+ aml_append(dev, method);
+
+ aml_append(root_dev, dev);
+ }
+}
+
+static void nvdimm_build_acpi_devices(NVDIMMState *state, GSList *device_list,
+ Aml *sb_scope)
+{
+ Aml *dev, *method, *field;
+ int fit_size = nvdimm_device_structure_size(g_slist_length(device_list));
+
+ dev = aml_device("NVDR");
+ aml_append(dev, aml_name_decl("_HID", aml_string("ACPI0012")));
+
+ /* map DSM memory into ACPI namespace. */
+ aml_append(dev, aml_operation_region("NMIO", AML_SYSTEM_MEMORY,
+ state->base, state->page_size));
+ aml_append(dev, aml_operation_region("NRAM", AML_SYSTEM_MEMORY,
+ state->base + state->page_size, state->page_size));
+ aml_append(dev, aml_operation_region("NFIT", AML_SYSTEM_MEMORY,
+ state->base + state->page_size * 2,
+ memory_region_size(&state->mr) - state->page_size * 2));
+
+ /*
+ * DSM notifier:
+ * @NOTI: write value to it will notify QEMU that _DSM method is being
+ * called and the parameters can be found in dsm_in.
+ *
+ * It is MMIO mapping on host so that it will cause VM-exit then QEMU
+ * gets control.
+ */
+ field = aml_field("NMIO", 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 ROOT.
+ * @ARG0 ~ @ARG3: store the parameters 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, dsm_in, handle, "HDLE");
+ BUILD_FIELD_UNIT_STRUCT(field, dsm_in, arg0, "ARG0");
+ BUILD_FIELD_UNIT_STRUCT(field, dsm_in, arg1, "ARG1");
+ BUILD_FIELD_UNIT_STRUCT(field, dsm_in, arg2, "ARG2");
+ BUILD_FIELD_UNIT_SIZE(field, state->page_size - offsetof(dsm_in, arg3),
+ "ARG3");
+ aml_append(dev, field);
+
+ /*
+ * DSM output:
+ * @RLEN: the size of 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 @RLEN and @ODAT
+ */
+ field = aml_field("NRAM", AML_DWORD_ACC, AML_PRESERVE);
+ BUILD_FIELD_UNIT_STRUCT(field, dsm_out, len, "RLEN");
+ BUILD_FIELD_UNIT_SIZE(field, state->page_size - offsetof(dsm_out, data),
+ "ODAT");
+ aml_append(dev, field);
+
+ /* @RFIT, returned by _FIT method. */
+ field = aml_field("NFIT", AML_DWORD_ACC, AML_PRESERVE);
+ BUILD_FIELD_UNIT_SIZE(field, fit_size, "RFIT");
+ aml_append(dev, field);
+
+ aml_append(dev, aml_mutex("NLCK", 0));
+
+ BUILD_STA_METHOD(dev, method);
+
+ method = aml_method("_DSM", 4);
+ {
+ SAVE_ARG012_HANDLE_LOCK(method, aml_int(0));
+ NOTIFY_AND_RETURN_UNLOCK(method);
+ }
+ aml_append(dev, method);
+
+ method = aml_method("_FIT", 0);
+ {
+ aml_append(method, aml_return(aml_name("RFIT")));
+ }
+ aml_append(dev, method);
+
+ build_nvdimm_devices(state, device_list, dev);
+
+ aml_append(sb_scope, dev);
+}
+
+static void nvdimm_build_ssdt(NVDIMMState *state, 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(state, 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_table(NVDIMMState *state, GArray *table_offsets,
GArray *table_data, GArray *linker)
{
@@ -387,6 +587,9 @@ void nvdimm_build_acpi_table(NVDIMMState *state, GArray *table_offsets,
build_device_structure(device_list, fit);
build_nfit(fit, device_list, table_offsets, table_data, linker);
+
+ nvdimm_build_ssdt(state, device_list, table_offsets, table_data,
+ linker);
g_slist_free(device_list);
}
}
--
1.8.3.1
next prev parent reply other threads:[~2015-10-10 19:59 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 3:52 [Qemu-devel] [PATCH v3 00/32] implement vNVDIMM Xiao Guangrong
2015-10-10 21:17 ` Dan Williams
2015-10-12 4:33 ` Xiao Guangrong
2015-10-12 16:36 ` Dan Williams
2015-10-13 3:14 ` Xiao Guangrong
2015-10-13 3:38 ` Dan Williams
2015-10-13 5:49 ` Xiao Guangrong
2015-10-13 6:36 ` Dan Williams
2015-10-14 4:03 ` Xiao Guangrong
2015-10-14 19:20 ` Dan Williams
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 01/32] acpi: add aml_derefof Xiao Guangrong
2015-10-13 12:30 ` Igor Mammedov
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 02/32] acpi: add aml_sizeof Xiao Guangrong
2015-10-13 12:33 ` Igor Mammedov
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 03/32] acpi: add aml_create_field Xiao Guangrong
2015-10-13 12:38 ` Igor Mammedov
2015-10-13 16:36 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 04/32] acpi: add aml_mutex, aml_acquire, aml_release Xiao Guangrong
2015-10-13 13:34 ` Igor Mammedov
2015-10-13 16:44 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 05/32] acpi: add aml_concatenate Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 06/32] acpi: add aml_object_type Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 07/32] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 08/32] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-10-12 10:08 ` Michael S. Tsirkin
2015-10-13 3:31 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 09/32] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 10/32] hostmem-file: clean up memory allocation Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 11/32] hostmem-file: use whole file size if possible Xiao Guangrong
2015-10-13 11:50 ` Vladimir Sementsov-Ogievskiy
2015-10-13 16:53 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 12/32] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 13/32] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 14/32] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-10-12 16:43 ` Eric Blake
2015-10-13 3:32 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 15/32] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 16/32] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 17/32] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 18/32] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 19/32] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 20/32] dimm: introduce realize callback Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 21/32] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 22/32] nvdimm: init the address region used by NVDIMM ACPI Xiao Guangrong
2015-10-19 6:56 ` Michael S. Tsirkin
2015-10-19 7:27 ` Xiao Guangrong
2015-10-19 7:39 ` Michael S. Tsirkin
2015-10-19 7:44 ` Xiao Guangrong
2015-10-19 9:17 ` Michael S. Tsirkin
2015-10-19 9:46 ` Igor Mammedov
2015-10-19 10:01 ` Xiao Guangrong
2015-10-19 10:34 ` Michael S. Tsirkin
2015-10-19 10:42 ` Igor Mammedov
2015-10-19 17:56 ` Xiao Guangrong
2015-10-20 2:27 ` Xiao Guangrong
2015-10-19 9:18 ` Igor Mammedov
2015-10-19 10:25 ` Michael S. Tsirkin
2015-10-19 17:54 ` Xiao Guangrong
2015-10-19 21:20 ` Michael S. Tsirkin
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 23/32] nvdimm: build ACPI NFIT table Xiao Guangrong
2015-10-12 11:27 ` Michael S. Tsirkin
2015-10-13 5:13 ` Xiao Guangrong
2015-10-13 5:42 ` Michael S. Tsirkin
2015-10-13 6:06 ` Xiao Guangrong
2015-10-12 16:40 ` Dan Williams
2015-10-13 5:17 ` Xiao Guangrong
2015-10-13 6:07 ` Michael S. Tsirkin
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 24/32] nvdimm: init the address region used by DSM method Xiao Guangrong
2015-10-11 3:52 ` Xiao Guangrong [this message]
2015-10-13 14:39 ` [Qemu-devel] [PATCH v3 25/32] nvdimm: build ACPI nvdimm devices Igor Mammedov
2015-10-13 17:24 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 26/32] nvdimm: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-10-19 6:50 ` Michael S. Tsirkin
2015-10-19 7:14 ` Xiao Guangrong
2015-10-19 7:47 ` Michael S. Tsirkin
2015-10-19 7:51 ` Xiao Guangrong
2015-10-11 3:52 ` [Qemu-devel] [PATCH v3 27/32] nvdimm: support DSM_CMD_IMPLEMENTED function Xiao Guangrong
2015-10-14 9:40 ` Stefan Hajnoczi
2015-10-14 14:50 ` Xiao Guangrong
2015-10-14 17:06 ` Eduardo Habkost
2015-10-15 1:43 ` Xiao Guangrong
2015-10-15 15:07 ` Stefan Hajnoczi
2015-10-16 2:30 ` Xiao Guangrong
2015-10-14 9:41 ` Stefan Hajnoczi
2015-10-14 14:52 ` Xiao Guangrong
2015-10-15 15:01 ` Stefan Hajnoczi
2015-10-16 2:32 ` Xiao Guangrong
2015-10-11 3:53 ` [Qemu-devel] [PATCH v3 28/32] nvdimm: support DSM_CMD_NAMESPACE_LABEL_SIZE function Xiao Guangrong
2015-10-11 3:53 ` [Qemu-devel] [PATCH v3 29/32] nvdimm: support DSM_CMD_GET_NAMESPACE_LABEL_DATA Xiao Guangrong
2015-10-11 3:53 ` [Qemu-devel] [PATCH v3 30/32] nvdimm: support DSM_CMD_SET_NAMESPACE_LABEL_DATA Xiao Guangrong
2015-10-11 3:53 ` [Qemu-devel] [PATCH v3 31/32] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-10-11 3:53 ` [Qemu-devel] [PATCH v3 32/32] nvdimm: add maintain info Xiao Guangrong
2015-10-12 2:59 ` [Qemu-devel] [PATCH v3 00/32] implement vNVDIMM Bharata B Rao
2015-10-12 3:06 ` Xiao Guangrong
2015-10-12 8:20 ` Igor Mammedov
2015-10-12 8:21 ` Xiao Guangrong
2015-10-12 11:55 ` Michael S. Tsirkin
2015-10-13 5:29 ` Xiao Guangrong
2015-10-13 5:57 ` Michael S. Tsirkin
2015-10-13 5:52 ` Xiao Guangrong
2015-10-19 6:57 ` Michael S. Tsirkin
2015-10-19 6:56 ` Michael S. Tsirkin
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=1444535584-18220-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).