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 v2 3/8] nvdimm acpi: introduce _FIT
Date: Fri, 12 Aug 2016 14:54:05 +0800 [thread overview]
Message-ID: <1470984850-66891-4-git-send-email-guangrong.xiao@linux.intel.com> (raw)
In-Reply-To: <1470984850-66891-1-git-send-email-guangrong.xiao@linux.intel.com>
_FIT is required for hotplug support, guest will inquire the updated
device info from it if a hotplug event is received
As FIT buffer is not completely mapped into guest address space, so a
new function, Read FIT whose function index is 0xFFFFFFFF, is reserved
by QEMU to read the piece of FIT buffer. The buffer is concatenated
before _FIT return
Refer to docs/specs/acpi-nvdimm.txt for detailed design
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
---
hw/acpi/nvdimm.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index 0e2b9f0..4bbd1e7 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -886,6 +886,87 @@ static void nvdimm_build_device_dsm(Aml *dev, uint32_t handle)
aml_append(dev, method);
}
+static void nvdimm_build_fit(Aml *dev)
+{
+ Aml *method, *pkg, *buf, *buf_size, *offset, *call_result;
+ Aml *whilectx, *ifcond, *ifctx, *fit;
+
+ buf = aml_local(0);
+ buf_size = aml_local(1);
+ fit = aml_local(2);
+
+ /* build helper function, RFIT. */
+ method = aml_method("RFIT", 1, AML_NOTSERIALIZED);
+ aml_append(method, aml_create_dword_field(aml_buffer(4, NULL),
+ aml_int(0), "OFST"));
+
+ /* prepare input package. */
+ pkg = aml_package(1);
+ aml_append(method, aml_store(aml_arg(0), aml_name("OFST")));
+ aml_append(pkg, aml_name("OFST"));
+
+ /* call Read_FIT function. */
+ call_result = aml_call5(NVDIMM_COMMON_DSM,
+ aml_touuid("2F10E7A4-9E91-11E4-89D3-123B93F75CBA"
+ /* UUID for NVDIMM Root Device */),
+ aml_int(1) /* Revision 1 */,
+ aml_int(0xFFFFFFFF) /* Read FIT. */,
+ pkg, aml_int(0) /* for root device. */);
+ aml_append(method, aml_store(call_result, buf));
+
+ /* handle _DSM result. */
+ aml_append(method, aml_create_dword_field(buf,
+ aml_int(0) /* offset at byte 0 */, "STAU"));
+
+ /* if something is wrong during _DSM. */
+ ifcond = aml_equal(aml_int(0 /* Success */), aml_name("STAU"));
+ ifctx = aml_if(aml_lnot(ifcond));
+ aml_append(ifctx, aml_return(aml_buffer(0, NULL)));
+ aml_append(method, ifctx);
+
+ aml_append(method, aml_store(aml_sizeof(buf), buf_size));
+ aml_append(method, aml_subtract(buf_size,
+ aml_int(4) /* the size of "STAU" */,
+ buf_size));
+
+ /* if we read the end of fit. */
+ ifctx = aml_if(aml_equal(buf_size, aml_int(0)));
+ aml_append(ifctx, aml_return(aml_buffer(0, NULL)));
+ aml_append(method, ifctx);
+
+ aml_append(method, aml_store(aml_shiftleft(buf_size, aml_int(3)),
+ buf_size));
+ aml_append(method, aml_create_field(buf,
+ aml_int(4 * BITS_PER_BYTE), /* offset at byte 4.*/
+ buf_size, "BUFF"));
+ aml_append(method, aml_return(aml_name("BUFF")));
+ aml_append(dev, method);
+
+ /* build _FIT. */
+ method = aml_method("_FIT", 0, AML_NOTSERIALIZED);
+ offset = aml_local(3);
+
+ aml_append(method, aml_store(aml_buffer(0, NULL), fit));
+ aml_append(method, aml_store(aml_int(0), offset));
+
+ whilectx = aml_while(aml_int(1));
+ aml_append(whilectx, aml_store(aml_call1("RFIT", offset), buf));
+ aml_append(whilectx, aml_store(aml_sizeof(buf), buf_size));
+
+ /* finish fit read if no data is read out. */
+ ifctx = aml_if(aml_equal(buf_size, aml_int(0)));
+ aml_append(ifctx, aml_return(fit));
+ aml_append(whilectx, ifctx);
+
+ /* update the offset. */
+ aml_append(whilectx, aml_add(offset, buf_size, offset));
+ /* append the data we read out to the fit buffer. */
+ aml_append(whilectx, aml_concatenate(fit, buf, fit));
+ aml_append(method, whilectx);
+
+ aml_append(dev, method);
+}
+
static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)
{
uint32_t slot;
@@ -1001,6 +1082,7 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
/* 0 is reserved for root device. */
nvdimm_build_device_dsm(dev, 0);
+ nvdimm_build_fit(dev);
nvdimm_build_nvdimm_devices(dev, ram_slots);
--
1.8.3.1
next prev parent reply other threads:[~2016-08-12 14:21 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-12 6:54 [Qemu-devel] [PATCH v2 0/8] nvdimm: hotplug support Xiao Guangrong
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 1/8] acpi nvdimm: fix wrong buffer size returned by DSM method Xiao Guangrong
2016-09-20 14:07 ` Igor Mammedov
2016-09-20 15:14 ` Michael S. Tsirkin
2016-09-20 16:23 ` Igor Mammedov
2016-09-21 5:30 ` Xiao Guangrong
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 2/8] nvdimm acpi: prebuild nvdimm devices for available slots Xiao Guangrong
2016-09-21 11:48 ` Igor Mammedov
2016-09-22 2:43 ` Xiao Guangrong
2016-08-12 6:54 ` Xiao Guangrong [this message]
2016-09-30 13:14 ` [Qemu-devel] [PATCH v2 3/8] nvdimm acpi: introduce _FIT Igor Mammedov
2016-10-08 7:17 ` Xiao Guangrong
2016-10-10 12:51 ` Igor Mammedov
2016-10-10 13:09 ` Xiao Guangrong
2016-10-11 11:49 ` Igor Mammedov
2016-10-12 8:20 ` Xiao Guangrong
2016-10-13 13:33 ` Igor Mammedov
2016-10-14 7:43 ` Xiao Guangrong
2016-10-14 11:59 ` Igor Mammedov
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 4/8] nvdimm acpi: implement Read FIT function Xiao Guangrong
2016-09-30 13:17 ` Igor Mammedov
2016-10-08 7:17 ` Xiao Guangrong
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 5/8] pc-dimm: introduce prepare_unplug() callback Xiao Guangrong
2016-10-03 9:45 ` Igor Mammedov
2016-10-08 7:20 ` Xiao Guangrong
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 6/8] pc: memhp: do not export nvdimm's memory via _CRS Xiao Guangrong
2016-10-03 13:21 ` Igor Mammedov
2016-10-08 7:42 ` Xiao Guangrong
2016-10-10 12:47 ` Igor Mammedov
2016-10-10 13:10 ` Xiao Guangrong
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 7/8] pc: acpi: memhp: nvdimm hotplug support Xiao Guangrong
2016-08-12 6:54 ` [Qemu-devel] [PATCH v2 8/8] nvdimm docs: add nvdimm Read FIT function Xiao Guangrong
2016-09-30 14:03 ` Igor Mammedov
2016-10-08 7:18 ` Xiao Guangrong
2016-08-12 8:35 ` [Qemu-devel] [PATCH v2 0/8] nvdimm: hotplug support Stefan Hajnoczi
2016-08-12 15:13 ` Igor Mammedov
2016-09-12 7:33 ` Xiao Guangrong
2016-09-12 12:22 ` Igor Mammedov
2016-08-18 17:47 ` Dan Williams
2016-08-18 18:54 ` Vishal Verma
2016-08-19 3:40 ` Xiao Guangrong
2016-08-19 3:46 ` Xiao Guangrong
2016-08-19 5:14 ` Dan Williams
2016-10-03 13:48 ` Igor Mammedov
2016-10-08 8:34 ` Xiao Guangrong
2016-10-10 12:59 ` Igor Mammedov
2016-10-10 13:57 ` Xiao Guangrong
2016-10-11 12:32 ` Igor Mammedov
2016-10-12 10:19 ` 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=1470984850-66891-4-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).