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, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v2 10/18] nvdimm: init the address region used by DSM method
Date: Fri, 14 Aug 2015 22:52:03 +0800	[thread overview]
Message-ID: <1439563931-12352-11-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1439563931-12352-1-git-send-email-guangrong.xiao@linux.intel.com>

This memory range is used to transfer data between ACPI in guest and Qemu,
it occupies two pages:
- one is RAM-based used to save the input info of _DSM method and Qemu reuse
  it store output info

- another one is MMIO-based, ACPI write data to this page to transfer the
  control to Qemu

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
 hw/mem/nvdimm/acpi.c      | 80 ++++++++++++++++++++++++++++++++++++++++++++++-
 hw/mem/nvdimm/internal.h  |  1 +
 hw/mem/nvdimm/pc-nvdimm.c |  2 +-
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c
index f28752f..e0f2ad3 100644
--- a/hw/mem/nvdimm/acpi.c
+++ b/hw/mem/nvdimm/acpi.c
@@ -28,6 +28,7 @@
 
 #include "qemu-common.h"
 
+#include "exec/address-spaces.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/mem/pc-nvdimm.h"
 
@@ -257,14 +258,91 @@ static void build_nfit_table(GSList *device_list, char *buf)
     }
 }
 
+struct dsm_buffer {
+    /* RAM page. */
+    uint32_t handle;
+    uint8_t arg0[16];
+    uint32_t arg1;
+    uint32_t arg2;
+    union {
+        char arg3[PAGE_SIZE - 3 * sizeof(uint32_t) - 16 * sizeof(uint8_t)];
+    };
+
+    /* MMIO page. */
+    union {
+        uint32_t notify;
+        char pedding[PAGE_SIZE];
+    };
+};
+
+static ram_addr_t dsm_addr;
+static size_t dsm_size;
+
+static uint64_t dsm_read(void *opaque, hwaddr addr,
+                         unsigned size)
+{
+    return 0;
+}
+
+static void dsm_write(void *opaque, hwaddr addr,
+                      uint64_t val, unsigned size)
+{
+}
+
+static const MemoryRegionOps dsm_ops = {
+    .read = dsm_read,
+    .write = dsm_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
+static int build_dsm_buffer(void)
+{
+    MemoryRegion *dsm_ram_mr, *dsm_mmio_mr;
+    ram_addr_t addr;;
+
+    QEMU_BUILD_BUG_ON(PAGE_SIZE * 2 != sizeof(struct dsm_buffer));
+
+    /* DSM buffer has already been built. */
+    if (dsm_addr) {
+        return 0;
+    }
+
+    addr = reserved_range_push(2 * PAGE_SIZE);
+    if (!addr) {
+        return -1;
+    }
+
+    dsm_addr = addr;
+    dsm_size = PAGE_SIZE * 2;
+
+    dsm_ram_mr = g_new(MemoryRegion, 1);
+    memory_region_init_ram(dsm_ram_mr, NULL, "dsm_ram", PAGE_SIZE,
+                           &error_abort);
+    vmstate_register_ram_global(dsm_ram_mr);
+    memory_region_add_subregion(get_system_memory(), addr, dsm_ram_mr);
+
+    dsm_mmio_mr = g_new(MemoryRegion, 1);
+    memory_region_init_io(dsm_mmio_mr, NULL, &dsm_ops, dsm_ram_mr,
+                          "dsm_mmio", PAGE_SIZE);
+    memory_region_add_subregion(get_system_memory(), addr + PAGE_SIZE,
+                                dsm_mmio_mr);
+    return 0;
+}
+
 void pc_nvdimm_build_nfit_table(GArray *table_offsets, GArray *table_data,
                                 GArray *linker)
 {
-    GSList *list = get_nvdimm_built_list();
+    GSList *list;
     size_t total;
     char *buf;
     int nfit_start, nr;
 
+    if (build_dsm_buffer()) {
+        fprintf(stderr, "do not have enough space for DSM buffer.\n");
+        return;
+    }
+
+    list = get_nvdimm_built_list();
     nr = get_nvdimm_device_number(list);
     total = get_nfit_total_size(nr);
 
diff --git a/hw/mem/nvdimm/internal.h b/hw/mem/nvdimm/internal.h
index 252a222..90d54dc 100644
--- a/hw/mem/nvdimm/internal.h
+++ b/hw/mem/nvdimm/internal.h
@@ -26,4 +26,5 @@ typedef struct {
     (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) } })
 
 GSList *get_nvdimm_built_list(void);
+ram_addr_t reserved_range_push(uint64_t size);
 #endif
diff --git a/hw/mem/nvdimm/pc-nvdimm.c b/hw/mem/nvdimm/pc-nvdimm.c
index 2a6cfa2..752842a 100644
--- a/hw/mem/nvdimm/pc-nvdimm.c
+++ b/hw/mem/nvdimm/pc-nvdimm.c
@@ -45,7 +45,7 @@ void pc_nvdimm_reserve_range(ram_addr_t offset)
     nvdimms_info.current_addr = offset;
 }
 
-static ram_addr_t reserved_range_push(uint64_t size)
+ram_addr_t reserved_range_push(uint64_t size)
 {
     uint64_t current;
 
-- 
2.4.3

  parent reply	other threads:[~2015-08-14 14:58 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 14:51 [Qemu-devel] [PATCH v2 00/18] implement vNVDIMM Xiao Guangrong
2015-08-14 14:51 ` [Qemu-devel] [PATCH v2 01/18] acpi: allow aml_operation_region() working on 64 bit offset Xiao Guangrong
2015-09-02  8:05   ` Igor Mammedov
2015-08-14 14:51 ` [Qemu-devel] [PATCH v2 02/18] i386/acpi-build: allow SSDT to operate on 64 bit Xiao Guangrong
2015-09-02 10:06   ` Igor Mammedov
2015-09-02 10:43     ` Xiao Guangrong
2015-09-02 11:42       ` Igor Mammedov
2015-09-06  7:01         ` Xiao Guangrong
2015-09-02 12:05     ` Michael S. Tsirkin
2015-08-14 14:51 ` [Qemu-devel] [PATCH v2 03/18] acpi: add aml_derefof Xiao Guangrong
2015-09-02 10:16   ` Igor Mammedov
2015-09-02 10:38     ` Xiao Guangrong
2015-08-14 14:51 ` [Qemu-devel] [PATCH v2 04/18] acpi: add aml_sizeof Xiao Guangrong
2015-09-02 10:18   ` Igor Mammedov
2015-09-02 10:39     ` Xiao Guangrong
2015-08-14 14:51 ` [Qemu-devel] [PATCH v2 05/18] acpi: add aml_create_field Xiao Guangrong
2015-09-02 11:10   ` Igor Mammedov
2015-09-06  5:32     ` Xiao Guangrong
2015-08-14 14:51 ` [Qemu-devel] [PATCH v2 06/18] pc: implement NVDIMM device abstract Xiao Guangrong
2015-08-25 14:57   ` Stefan Hajnoczi
2015-08-26  9:37     ` Xiao Guangrong
2015-09-02  9:58   ` Igor Mammedov
2015-09-02 10:36     ` Xiao Guangrong
2015-09-02 11:31       ` Igor Mammedov
2015-09-06  6:07         ` Xiao Guangrong
2015-09-07 13:40           ` Igor Mammedov
2015-09-08 14:03             ` Xiao Guangrong
2015-09-10  9:47               ` Igor Mammedov
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 07/18] nvdimm: reserve address range for NVDIMM Xiao Guangrong
2015-08-25 15:12   ` Stefan Hajnoczi
2015-08-26  9:39     ` Xiao Guangrong
2015-08-26  9:40     ` Xiao Guangrong
2015-08-25 15:39   ` Stefan Hajnoczi
2015-08-28 17:25   ` Eduardo Habkost
2015-08-31  7:01     ` Xiao Guangrong
2015-09-04 12:02   ` Igor Mammedov
2015-09-06  7:22     ` Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 08/18] nvdimm: init backend memory mapping and config data area Xiao Guangrong
2015-08-25 16:03   ` Stefan Hajnoczi
2015-08-26 10:40     ` Xiao Guangrong
2015-08-28 11:58       ` Stefan Hajnoczi
2015-08-31  6:23         ` Xiao Guangrong
2015-09-01  9:14           ` Stefan Hajnoczi
2015-09-15 16:10             ` Paolo Bonzini
2015-09-17  8:39               ` Xiao Guangrong
2015-09-17  9:04                 ` Igor Mammedov
2015-09-17  9:14                   ` Xiao Guangrong
2015-09-17  9:34                     ` Paolo Bonzini
2015-09-17 12:43                       ` Xiao Guangrong
2015-09-15 16:07       ` Paolo Bonzini
2015-09-17  8:23         ` Xiao Guangrong
2015-09-15 16:06     ` Paolo Bonzini
2015-09-17  8:21       ` Xiao Guangrong
2015-09-07 14:11   ` Igor Mammedov
2015-09-08 13:38     ` Xiao Guangrong
2015-09-10 10:35       ` Igor Mammedov
2015-09-15 16:11     ` Paolo Bonzini
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 09/18] nvdimm: build ACPI NFIT table Xiao Guangrong
2015-09-15 16:12   ` Paolo Bonzini
2015-09-15 17:35     ` Igor Mammedov
2015-08-14 14:52 ` Xiao Guangrong [this message]
2015-08-25 16:11   ` [Qemu-devel] [PATCH v2 10/18] nvdimm: init the address region used by DSM method Stefan Hajnoczi
2015-08-26 10:41     ` Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 11/18] nvdimm: build ACPI nvdimm devices Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 12/18] nvdimm: save arg3 for NVDIMM device _DSM method Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 13/18] nvdimm: build namespace config data Xiao Guangrong
2015-08-25 16:16   ` Stefan Hajnoczi
2015-08-26 10:42     ` Xiao Guangrong
2015-08-28 11:59       ` Stefan Hajnoczi
2015-08-31  6:25         ` Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 14/18] nvdimm: support NFIT_CMD_IMPLEMENTED function Xiao Guangrong
2015-08-25 16:23   ` Stefan Hajnoczi
2015-08-26 10:46     ` Xiao Guangrong
2015-08-28 12:01       ` Stefan Hajnoczi
2015-08-31  6:51         ` Xiao Guangrong
2015-09-01  9:16           ` Stefan Hajnoczi
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 15/18] nvdimm: support NFIT_CMD_GET_CONFIG_SIZE function Xiao Guangrong
2015-08-25 16:24   ` Stefan Hajnoczi
2015-08-26 10:47     ` Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 16/18] nvdimm: support NFIT_CMD_GET_CONFIG_DATA Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 17/18] nvdimm: support NFIT_CMD_SET_CONFIG_DATA Xiao Guangrong
2015-08-14 14:52 ` [Qemu-devel] [PATCH v2 18/18] nvdimm: add maintain info Xiao Guangrong
2015-08-25 16:26 ` [Qemu-devel] [PATCH v2 00/18] implement vNVDIMM Stefan Hajnoczi
2015-08-26 10:49   ` Xiao Guangrong
2015-10-07 14:02     ` Stefan Hajnoczi
2015-10-07 14:43       ` Xiao Guangrong
2015-10-09 10:38         ` 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=1439563931-12352-11-git-send-email-guangrong.xiao@linux.intel.com \
    --to=guangrong.xiao@linux.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).