[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/53] nvdimm acpi: emulate dsm method
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 25/53] nvdimm acpi: emulate dsm method |
Date: |
Fri, 11 Mar 2016 17:08:59 +0200 |
From: Xiao Guangrong <address@hidden>
Emulate dsm method after IO VM-exit
Currently, we only introduce the framework and no function is actually
supported
Signed-off-by: Xiao Guangrong <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/mem/nvdimm.h | 8 +++++++
hw/acpi/nvdimm.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index 26d5b78..517de9c 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -25,6 +25,14 @@
#include "hw/mem/pc-dimm.h"
+#define NVDIMM_DEBUG 0
+#define nvdimm_debug(fmt, ...) \
+ do { \
+ if (NVDIMM_DEBUG) { \
+ fprintf(stderr, "nvdimm: " fmt, ## __VA_ARGS__); \
+ } \
+ } while (0)
+
#define TYPE_NVDIMM "nvdimm"
#define NVDIMM_DSM_MEM_FILE "etc/acpi/nvdimm-mem"
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 19c2642..9531340 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -390,15 +390,71 @@ struct NvdimmDsmOut {
} QEMU_PACKED;
typedef struct NvdimmDsmOut NvdimmDsmOut;
+struct NvdimmDsmFunc0Out {
+ /* the size of buffer filled by QEMU. */
+ uint32_t len;
+ uint32_t supported_func;
+} QEMU_PACKED;
+typedef struct NvdimmDsmFunc0Out NvdimmDsmFunc0Out;
+
+struct NvdimmDsmFuncNoPayloadOut {
+ /* the size of buffer filled by QEMU. */
+ uint32_t len;
+ uint32_t func_ret_status;
+} QEMU_PACKED;
+typedef struct NvdimmDsmFuncNoPayloadOut NvdimmDsmFuncNoPayloadOut;
+
static uint64_t
nvdimm_dsm_read(void *opaque, hwaddr addr, unsigned size)
{
+ nvdimm_debug("BUG: we never read _DSM IO Port.\n");
return 0;
}
static void
nvdimm_dsm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size)
{
+ NvdimmDsmIn *in;
+ hwaddr dsm_mem_addr = val;
+
+ nvdimm_debug("dsm memory address %#" HWADDR_PRIx ".\n", dsm_mem_addr);
+
+ /*
+ * 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(TARGET_PAGE_SIZE);
+ cpu_physical_memory_read(dsm_mem_addr, in, TARGET_PAGE_SIZE);
+
+ 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);
+
+ /*
+ * function 0 is called to inquire which functions are supported by
+ * OSPM
+ */
+ if (in->function == 0) {
+ NvdimmDsmFunc0Out func0 = {
+ .len = cpu_to_le32(sizeof(func0)),
+ /* No function supported other than function 0 */
+ .supported_func = cpu_to_le32(0),
+ };
+ cpu_physical_memory_write(dsm_mem_addr, &func0, sizeof func0);
+ } else {
+ /* No function except function 0 is supported yet. */
+ NvdimmDsmFuncNoPayloadOut out = {
+ .len = cpu_to_le32(sizeof(out)),
+ .func_ret_status = cpu_to_le32(1) /* Not Supported */,
+ };
+ cpu_physical_memory_write(dsm_mem_addr, &out, sizeof(out));
+ }
+
+ g_free(in);
}
static const MemoryRegionOps nvdimm_dsm_ops = {
--
MST
- [Qemu-devel] [PULL 15/53] i386: update expected DSDT, (continued)
- [Qemu-devel] [PULL 15/53] i386: update expected DSDT, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 16/53] virtio-pci: call pci reset variant when guest requests reset., Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 18/53] ich9lpc: fix typo, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 17/53] msi_supported -> msi_nonbroken, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 19/53] hw/acpi: fix Q35 support for legacy Windows OS, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 20/53] acpi-test-data: add _DIS methods, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 21/53] pci-ids: add virtio 1.0 ids to spec, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 22/53] nvdimm acpi: initialize the resource used by NVDIMM ACPI, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 23/53] nvdimm acpi: introduce patched dsm memory, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 24/53] nvdimm acpi: let qemu handle _DSM method, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 25/53] nvdimm acpi: emulate dsm method,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 26/53] vhost-user: fix use after free, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 27/53] vhost-user: remove useless is_server field, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 29/53] qemu-char: remove all msgfds on disconnect, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 28/53] qemu-char: avoid potential double-free, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 31/53] pxb: cleanup, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 30/53] qemu-char: make tcp_chr_disconnect() reentrant-safe, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 32/53] pc: acpi: remove NOP assignment, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 34/53] machine: introduce MachineClass.possible_cpu_arch_ids() hook, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 33/53] pc: init pcms->apic_id_limit once and use it throughout pc.c, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 35/53] pc: acpi: cleanup qdev_get_machine() calls, Michael S. Tsirkin, 2016/03/11