From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
To: pbonzini@redhat.com, imammedo@redhat.com
Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com,
mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com,
dan.j.williams@intel.com, kvm@vger.kernel.org,
qemu-devel@nongnu.org,
Xiao Guangrong <guangrong.xiao@linux.intel.com>
Subject: [Qemu-devel] [PATCH 4/8] nvdimm acpi: implement Read FIT function
Date: Mon, 11 Jul 2016 21:45:14 +0800 [thread overview]
Message-ID: <1468244718-3731-5-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1468244718-3731-1-git-send-email-guangrong.xiao@linux.intel.com>
Read FIT whose function index is 0xFFFFFFFF is reserved by QEMU to read
the piece of FIT buffer. Please refer to docs/specs/acpi_nvdimm.txt for
detailed info
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
hw/acpi/nvdimm.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 4bbd1e7..d099ef1 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -466,6 +466,22 @@ typedef struct NvdimmFuncSetLabelDataIn NvdimmFuncSetLabelDataIn;
QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncSetLabelDataIn) +
offsetof(NvdimmDsmIn, arg3) > 4096);
+struct NvdimmFuncReadFITIn {
+ uint32_t offset; /* the offset of FIT buffer. */
+} QEMU_PACKED;
+typedef struct NvdimmFuncReadFITIn NvdimmFuncReadFITIn;
+QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITIn) +
+ offsetof(NvdimmDsmIn, arg3) > 4096);
+
+struct NvdimmFuncReadFITOut {
+ /* the size of buffer filled by QEMU. */
+ uint32_t len;
+ uint32_t func_ret_status; /* return status code. */
+ uint8_t fit[0]; /* the FIT data. */
+} QEMU_PACKED;
+typedef struct NvdimmFuncReadFITOut NvdimmFuncReadFITOut;
+QEMU_BUILD_BUG_ON(sizeof(NvdimmFuncReadFITOut) > 4096);
+
static void
nvdimm_dsm_function0(uint32_t supported_func, hwaddr dsm_mem_addr)
{
@@ -486,6 +502,46 @@ nvdimm_dsm_no_payload(uint32_t func_ret_status, hwaddr dsm_mem_addr)
cpu_physical_memory_write(dsm_mem_addr, &out, sizeof(out));
}
+/* Read FIT data, defined in docs/specs/acpi_nvdimm.txt. */
+static void nvdimm_dsm_func_read_fit(NvdimmDsmIn *in, hwaddr dsm_mem_addr)
+{
+ NvdimmFuncReadFITIn *read_fit;
+ NvdimmFuncReadFITOut *read_fit_out;
+ GSList *device_list = nvdimm_get_plugged_device_list();
+ GArray *fit = nvdimm_build_device_structure(device_list);
+ uint32_t read_len = 0, func_ret_status;
+ int left, size;
+
+ read_fit = (NvdimmFuncReadFITIn *)in->arg3;
+ le32_to_cpus(&read_fit->offset);
+
+ nvdimm_debug("Read FIT: offset %#x FIT size %#x.\n", read_fit->offset,
+ fit->len);
+
+ left = fit->len - read_fit->offset;
+ if (left < 0) {
+ func_ret_status = 3 /* Invalid Input Parameters */;
+ goto build_out;
+ }
+
+ func_ret_status = 0 /* Success */;
+ read_len = MIN(left, 4096 - sizeof(NvdimmFuncReadFITOut));
+
+build_out:
+ size = sizeof(NvdimmFuncReadFITOut) + read_len;
+ read_fit_out = g_malloc(size);
+
+ read_fit_out->len = cpu_to_le32(size);
+ read_fit_out->func_ret_status = cpu_to_le32(func_ret_status);
+ memcpy(read_fit_out->fit, fit->data + read_fit->offset, read_len);
+
+ cpu_physical_memory_write(dsm_mem_addr, read_fit_out, size);
+
+ g_slist_free(device_list);
+ g_array_free(fit, true);
+ g_free(read_fit_out);
+}
+
static void nvdimm_dsm_root(NvdimmDsmIn *in, hwaddr dsm_mem_addr)
{
/*
@@ -498,6 +554,11 @@ static void nvdimm_dsm_root(NvdimmDsmIn *in, hwaddr dsm_mem_addr)
return;
}
+ if (in->function == 0xFFFFFFFF /* Read FIT */) {
+ nvdimm_dsm_func_read_fit(in, dsm_mem_addr);
+ return;
+ }
+
/* No function except function 0 is supported yet. */
nvdimm_dsm_no_payload(1 /* Not Supported */, dsm_mem_addr);
}
--
1.8.3.1
next prev parent reply other threads:[~2016-07-11 13:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 13:45 [Qemu-devel] [PATCH 0/8] nvdimm: hotplug support Xiao Guangrong
2016-07-11 13:45 ` [Qemu-devel] [PATCH 1/8] acpi nvdimm: fix wrong buffer size returned by DSM method Xiao Guangrong
2016-07-11 13:45 ` [Qemu-devel] [PATCH 2/8] nvdimm acpi: prebuild nvdimm devices for available slots Xiao Guangrong
2016-07-11 13:45 ` [Qemu-devel] [PATCH 3/8] nvdimm acpi: introduce _FIT Xiao Guangrong
2016-07-11 13:45 ` Xiao Guangrong [this message]
2016-07-14 12:17 ` [Qemu-devel] [PATCH 4/8] nvdimm acpi: implement Read FIT function Stefan Hajnoczi
2016-07-15 7:43 ` Xiao Guangrong
2016-07-11 13:45 ` [Qemu-devel] [PATCH 5/8] pc-dimm: introduce prepare_unplug() callback Xiao Guangrong
2016-07-11 13:45 ` [Qemu-devel] [PATCH 6/8] pc: memhp: do not export nvdimm's memory via _CRS Xiao Guangrong
2016-07-11 13:45 ` [Qemu-devel] [PATCH 7/8] pc: acpi: memhp: nvdimm hotplug support Xiao Guangrong
2016-07-14 12:17 ` Stefan Hajnoczi
2016-07-15 7:49 ` Xiao Guangrong
2016-07-15 9:56 ` Stefan Hajnoczi
2016-07-11 13:45 ` [Qemu-devel] [PATCH 8/8] nvdimm docs: add nvdimm Read FIT function Xiao Guangrong
2016-07-11 14:12 ` [Qemu-devel] [PATCH 0/8] nvdimm: hotplug support Igor Mammedov
2016-07-11 22:49 ` Xiao Guangrong
2016-07-14 12:17 ` Stefan Hajnoczi
2016-07-15 7:55 ` Xiao Guangrong
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=1468244718-3731-5-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).