From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrRmU-0005tZ-DT for qemu-devel@nongnu.org; Wed, 28 Oct 2015 10:32:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrRmT-0002WB-IN for qemu-devel@nongnu.org; Wed, 28 Oct 2015 10:32:50 -0400 Received: from mga01.intel.com ([192.55.52.88]:15622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrRmT-00028A-Cw for qemu-devel@nongnu.org; Wed, 28 Oct 2015 10:32:49 -0400 From: Xiao Guangrong Date: Wed, 28 Oct 2015 22:26:24 +0000 Message-Id: <1446071191-62591-27-git-send-email-guangrong.xiao@linux.intel.com> In-Reply-To: <1446071191-62591-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1446071191-62591-1-git-send-email-guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH v5 26/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong , 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 Check if the input Arg3 is valid then store it into dsm_in if needed Signed-off-by: Xiao Guangrong --- hw/acpi/nvdimm.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 8412be3..69de4f6 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -524,13 +524,38 @@ static void nvdimm_build_acpi_devices(GSList *device_list, Aml *sb_scope) method = aml_method_serialized("NCAL", 4); { - Aml *buffer_size = aml_local(0); + Aml *ifctx, *pckg, *buffer_size = aml_local(0); aml_append(method, aml_store(aml_arg(0), aml_name("HDLE"))); aml_append(method, aml_store(aml_arg(1), aml_name("REVS"))); aml_append(method, aml_store(aml_arg(2), aml_name("FUNC"))); /* + * The fourth parameter (Arg3) of _DSM is a package which contains + * a buffer, the layout of the buffer is specified by UUID (Arg0), + * Revision ID (Arg1) and Function Index (Arg2) which are documented + * in the DSM Spec. + */ + pckg = aml_arg(3); + ifctx = aml_if(aml_and(aml_equal(aml_object_type(pckg), + aml_int(4 /* Package */)), + aml_equal(aml_sizeof(pckg), + aml_int(1)))); + { + Aml *pckg_index, *pckg_buf; + + pckg_index = aml_local(2); + pckg_buf = aml_local(3); + + aml_append(ifctx, aml_store(aml_index(pckg, aml_int(0)), + pckg_index)); + aml_append(ifctx, aml_store(aml_derefof(pckg_index), + pckg_buf)); + aml_append(ifctx, aml_store(pckg_buf, aml_name("ARG3"))); + } + aml_append(method, ifctx); + + /* * transfer control to QEMU and the buffer size filled by * QEMU is returned. */ -- 1.8.3.1