From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
To: pbonzini@redhat.com, imammedo@redhat.com
Cc: vsementsov@virtuozzo.com,
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 v7 29/35] nvdimm acpi: support function 0
Date: Mon, 2 Nov 2015 17:13:31 +0800 [thread overview]
Message-ID: <1446455617-129562-30-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1446455617-129562-1-git-send-email-guangrong.xiao@linux.intel.com>
__DSM is defined in ACPI 6.0: 9.14.1 _DSM (Device Specific Method)
Function 0 is a query function. We do not support any function on root
device and only 3 functions are support for NVDIMM device, Get Namespace
Label Size, Get Namespace Label Data and Set Namespace Label Data, that
means we currently only allow to access device's Label Namespace
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
hw/acpi/aml-build.c | 2 +-
hw/acpi/nvdimm.c | 158 +++++++++++++++++++++++++++++++++++++++++++-
include/hw/acpi/aml-build.h | 1 +
3 files changed, 159 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 8bee8b2..90229c5 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -231,7 +231,7 @@ static void build_extop_package(GArray *package, uint8_t op)
build_prepend_byte(package, 0x5B); /* ExtOpPrefix */
}
-static void build_append_int_noprefix(GArray *table, uint64_t value, int size)
+void build_append_int_noprefix(GArray *table, uint64_t value, int size)
{
int i;
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index e179a72..3895ad8 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -212,6 +212,22 @@ static uint32_t nvdimm_slot_to_dcr_index(int slot)
return nvdimm_slot_to_spa_index(slot) + 1;
}
+static NVDIMMDevice
+*nvdimm_get_device_by_handle(GSList *list, uint32_t handle)
+{
+ for (; list; list = list->next) {
+ NVDIMMDevice *nvdimm = list->data;
+ int slot = object_property_get_int(OBJECT(nvdimm), DIMM_SLOT_PROP,
+ NULL);
+
+ if (nvdimm_slot_to_handle(slot) == handle) {
+ return nvdimm;
+ }
+ }
+
+ return NULL;
+}
+
/* ACPI 6.0: 5.2.25.1 System Physical Address Range Structure */
static void
nvdimm_build_structure_spa(GArray *structures, NVDIMMDevice *nvdimm)
@@ -368,6 +384,29 @@ static void nvdimm_build_nfit(GSList *device_list, GArray *table_offsets,
g_array_free(structures, true);
}
+/* define NVDIMM DSM return status codes according to DSM Spec Rev1. */
+enum {
+ /* Common return status codes. */
+ /* Success */
+ NVDIMM_DSM_STATUS_SUCCESS = 0,
+ /* Not Supported */
+ NVDIMM_DSM_STATUS_NOT_SUPPORTED = 1,
+
+ /* NVDIMM Root Device _DSM function return status codes*/
+ /* Invalid Input Parameters */
+ NVDIMM_DSM_ROOT_DEV_STATUS_INVALID_PARAS = 2,
+ /* Function-Specific Error */
+ NVDIMM_DSM_ROOT_DEV_STATUS_FUNCTION_SPECIFIC_ERROR = 3,
+
+ /* NVDIMM Device (non-root) _DSM function return status codes*/
+ /* Non-Existing Memory Device */
+ NVDIMM_DSM_DEV_STATUS_NON_EXISTING_MEM_DEV = 2,
+ /* Invalid Input Parameters */
+ NVDIMM_DSM_DEV_STATUS_INVALID_PARAS = 3,
+ /* Vendor Specific Error */
+ NVDIMM_DSM_DEV_STATUS_VENDOR_SPECIFIC_ERROR = 4,
+};
+
struct NvdimmDsmIn {
uint32_t handle;
uint32_t revision;
@@ -377,10 +416,127 @@ struct NvdimmDsmIn {
} QEMU_PACKED;
typedef struct NvdimmDsmIn NvdimmDsmIn;
+static void nvdimm_dsm_write_status(GArray *out, uint32_t status)
+{
+ status = cpu_to_le32(status);
+ build_append_int_noprefix(out, status, sizeof(status));
+}
+
+static void nvdimm_dsm_root(NvdimmDsmIn *in, GArray *out)
+{
+ uint32_t status = NVDIMM_DSM_STATUS_NOT_SUPPORTED;
+
+ /*
+ * Query command implemented per ACPI Specification, it is defined in
+ * ACPI 6.0: 9.14.1 _DSM (Device Specific Method).
+ */
+ if (in->function == 0x0) {
+ /*
+ * Set it to zero to indicate no function is supported for NVDIMM
+ * root.
+ */
+ uint64_t cmd_list = cpu_to_le64(0);
+
+ build_append_int_noprefix(out, cmd_list, sizeof(cmd_list));
+ return;
+ }
+
+ nvdimm_debug("Return status %#x.\n", status);
+ nvdimm_dsm_write_status(out, status);
+}
+
+static void nvdimm_dsm_device(NvdimmDsmIn *in, GArray *out)
+{
+ GSList *list = nvdimm_get_plugged_device_list();
+ NVDIMMDevice *nvdimm = nvdimm_get_device_by_handle(list, in->handle);
+ uint32_t status = NVDIMM_DSM_DEV_STATUS_NON_EXISTING_MEM_DEV;
+ uint64_t cmd_list;
+
+ if (!nvdimm) {
+ goto set_status_free;
+ }
+
+ /* Encode DSM function according to DSM Spec Rev1. */
+ switch (in->function) {
+ /* see comments in nvdimm_dsm_root(). */
+ case 0x0:
+ cmd_list = cpu_to_le64(0x1 /* Bit 0 indicates whether there is
+ support for any functions other
+ than function 0.
+ */ |
+ 1 << 4 /* Get Namespace Label Size */ |
+ 1 << 5 /* Get Namespace Label Data */ |
+ 1 << 6 /* Set Namespace Label Data */);
+ build_append_int_noprefix(out, cmd_list, sizeof(cmd_list));
+ goto free;
+ default:
+ status = NVDIMM_DSM_STATUS_NOT_SUPPORTED;
+ };
+
+set_status_free:
+ nvdimm_debug("Return status %#x.\n", status);
+ nvdimm_dsm_write_status(out, status);
+free:
+ g_slist_free(list);
+}
+
static uint64_t
nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
{
- return 0;
+ AcpiNVDIMMState *state = opaque;
+ MemoryRegion *dsm_ram_mr = &state->ram_mr;
+ NvdimmDsmIn *in;
+ GArray *out;
+ void *dsm_ram_addr;
+ uint32_t buf_size;
+
+ assert(memory_region_size(dsm_ram_mr) >= sizeof(NvdimmDsmIn));
+ dsm_ram_addr = memory_region_get_ram_ptr(dsm_ram_mr);
+
+ /*
+ * The DSM memory is mapped to guest address space so an evil guest
+ * can change its content while we are doing DSM emulation. Avoid
+ * this by copying DSM memory to QEMU local memory.
+ */
+ in = g_malloc(memory_region_size(dsm_ram_mr));
+ memcpy(in, dsm_ram_addr, memory_region_size(dsm_ram_mr));
+
+ le32_to_cpus(&in->revision);
+ le32_to_cpus(&in->function);
+ le32_to_cpus(&in->handle);
+
+ nvdimm_debug("Revision %#x Handler %#x Function %#x.\n", in->revision,
+ in->handle, in->function);
+
+ out = g_array_new(false, true /* clear */, 1);
+
+ if (in->revision != 0x1 /* Current we support DSM Spec Rev1. */) {
+ nvdimm_debug("Revision %#x is not supported, expect %#x.\n",
+ in->revision, 0x1);
+ nvdimm_dsm_write_status(out, NVDIMM_DSM_STATUS_NOT_SUPPORTED);
+ goto exit;
+ }
+
+ /* Handle 0 is reserved for NVDIMM Root Device. */
+ if (!in->handle) {
+ nvdimm_dsm_root(in, out);
+ goto exit;
+ }
+
+ nvdimm_dsm_device(in, out);
+
+exit:
+ assert(out->len <= memory_region_size(dsm_ram_mr));
+
+ /* Write output result to dsm memory. */
+ memcpy(dsm_ram_addr, out->data, out->len);
+ memory_region_set_dirty(dsm_ram_mr, 0, out->len);
+
+ buf_size = cpu_to_le32(out->len);
+
+ g_free(in);
+ g_array_free(out, true);
+ return buf_size;
}
static void
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 00cf40e..2c80043 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -281,6 +281,7 @@ Aml *aml_create_field(Aml *srcbuf, Aml *index, Aml *len, const char *name);
Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target);
Aml *aml_object_type(Aml *object);
+void build_append_int_noprefix(GArray *table, uint64_t value, int size);
void
build_header(GArray *linker, GArray *table_data,
AcpiTableHeader *h, const char *sig, int len, uint8_t rev);
--
1.8.3.1
next prev parent reply other threads:[~2015-11-02 9:20 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 9:13 [Qemu-devel] [PATCH v7 00/35] implement vNVDIMM Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 01/35] acpi: add aml_derefof Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 02/35] acpi: add aml_sizeof Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 03/35] acpi: add aml_create_field Xiao Guangrong
2015-11-03 6:14 ` Shannon Zhao
2015-11-03 14:52 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 04/35] acpi: add aml_concatenate Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 05/35] acpi: add aml_object_type Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 06/35] acpi: add aml_method_serialized Xiao Guangrong
2015-11-03 12:30 ` Igor Mammedov
2015-11-03 13:27 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 07/35] util: introduce qemu_file_get_page_size() Xiao Guangrong
2015-11-02 13:56 ` Vladimir Sementsov-Ogievskiy
2015-11-06 15:36 ` Eduardo Habkost
2015-11-09 4:36 ` Xiao Guangrong
2015-11-09 18:34 ` Eduardo Habkost
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 08/35] exec: allow memory to be allocated from any kind of path Xiao Guangrong
2015-11-02 14:51 ` Vladimir Sementsov-Ogievskiy
2015-11-02 15:22 ` Xiao Guangrong
2015-11-02 15:52 ` Vladimir Sementsov-Ogievskiy
2015-11-03 23:00 ` Eduardo Habkost
2015-11-04 3:12 ` Xiao Guangrong
2015-11-04 12:40 ` Eduardo Habkost
2015-11-04 14:22 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 09/35] exec: allow file_ram_alloc to work on file Xiao Guangrong
2015-11-02 15:12 ` Vladimir Sementsov-Ogievskiy
2015-11-02 15:25 ` Xiao Guangrong
2015-11-02 15:58 ` Vladimir Sementsov-Ogievskiy
2015-11-02 21:12 ` Paolo Bonzini
2015-11-03 3:56 ` Xiao Guangrong
2015-11-03 13:55 ` Paolo Bonzini
2015-11-03 14:26 ` Xiao Guangrong
2015-11-03 12:34 ` Igor Mammedov
2015-11-03 13:32 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 10/35] hostmem-file: clean up memory allocation Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 11/35] util: introduce qemu_file_getlength() Xiao Guangrong
2015-11-02 15:26 ` Vladimir Sementsov-Ogievskiy
2015-11-03 23:21 ` Eduardo Habkost
2015-11-04 3:17 ` Xiao Guangrong
2015-11-04 14:44 ` Eduardo Habkost
2015-11-04 14:44 ` Xiao Guangrong
2015-11-06 15:50 ` Eduardo Habkost
2015-11-09 4:44 ` Xiao Guangrong
2015-11-09 19:21 ` Eduardo Habkost
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 12/35] util: let qemu_fd_getlength support block device Xiao Guangrong
2015-11-02 16:11 ` Vladimir Sementsov-Ogievskiy
2015-11-02 16:21 ` Xiao Guangrong
2015-11-06 15:44 ` Eduardo Habkost
2015-11-06 15:48 ` Eduardo Habkost
2015-11-06 15:54 ` Eduardo Habkost
2015-11-09 5:58 ` Xiao Guangrong
2015-11-09 18:43 ` Eduardo Habkost
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 13/35] hostmem-file: use whole file size if possible Xiao Guangrong
2015-11-02 17:09 ` Vladimir Sementsov-Ogievskiy
2015-11-03 14:51 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 14/35] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 15/35] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 16/35] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 17/35] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 18/35] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 19/35] dimm: abstract dimm device from pc-dimm Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 20/35] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong
2015-11-02 12:19 ` Vladimir Sementsov-Ogievskiy
2015-11-02 13:08 ` Xiao Guangrong
2015-11-02 14:26 ` Vladimir Sementsov-Ogievskiy
2015-11-02 15:06 ` Xiao Guangrong
2015-11-02 16:16 ` Vladimir Sementsov-Ogievskiy
2015-11-03 14:47 ` Xiao Guangrong
2015-11-05 8:53 ` Vladimir Sementsov-Ogievskiy
2015-11-05 17:29 ` Eduardo Habkost
2015-11-06 2:50 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 21/35] dimm: keep the state of the whole backend memory Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 22/35] dimm: introduce realize callback Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 23/35] nvdimm: implement NVDIMM device abstract Xiao Guangrong
2015-11-13 16:53 ` Vladimir Sementsov-Ogievskiy
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 24/35] docs: add NVDIMM ACPI documentation Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 25/35] nvdimm acpi: init the resource used by NVDIMM ACPI Xiao Guangrong
2015-11-05 9:58 ` Igor Mammedov
2015-11-05 10:15 ` Xiao Guangrong
2015-11-05 13:03 ` Igor Mammedov
2015-11-05 13:33 ` Xiao Guangrong
2015-11-05 14:49 ` Igor Mammedov
2015-11-06 8:31 ` Xiao Guangrong
2015-11-06 8:56 ` Xiao Guangrong
2015-11-09 11:13 ` Igor Mammedov
2015-11-11 3:01 ` [Qemu-devel] Ask for ACK (was Re: [PATCH v7 25/35] nvdimm acpi: init the resource used by NVDIMM ACPI) Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 26/35] nvdimm acpi: build ACPI NFIT table Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 27/35] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong
2015-11-03 13:13 ` Igor Mammedov
2015-11-03 14:22 ` Xiao Guangrong
2015-11-04 8:56 ` Igor Mammedov
2015-11-04 14:11 ` Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 28/35] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-11-02 9:13 ` Xiao Guangrong [this message]
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 30/35] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 31/35] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 32/35] nvdimm acpi: support Set " Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 33/35] nvdimm: allow using whole backend memory as pmem Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 34/35] nvdimm acpi: support _FIT method Xiao Guangrong
2015-11-02 9:13 ` [Qemu-devel] [PATCH v7 35/35] nvdimm: add maintain info Xiao Guangrong
2015-11-02 11:51 ` [Qemu-devel] [PATCH v7 00/35] 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=1446455617-129562-30-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 \
--cc=vsementsov@virtuozzo.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).