From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJQX-0006F4-2j for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:55:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAJQQ-0004kE-Ji for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:55:52 -0400 Received: from mga11.intel.com ([192.55.52.93]:65470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJQP-0004RQ-Vo for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:55:46 -0400 From: Xiao Guangrong Date: Wed, 1 Jul 2015 22:50:28 +0800 Message-Id: <1435762232-15543-13-git-send-email-guangrong.xiao@linux.intel.com> In-Reply-To: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1435762232-15543-1-git-send-email-guangrong.xiao@linux.intel.com> Subject: [Qemu-devel] [PATCH 12/16] nvdimm: 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, rth@twiddle.net Check if the function (Arg2) has additional input info (arg3) and save the info if needed We only do the save on NVDIMM device since we are not going to support any function on root device Signed-off-by: Xiao Guangrong --- hw/mem/pc-nvdimm.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-nvdimm.c b/hw/mem/pc-nvdimm.c index 0e2a9d5..c0965ae 100644 --- a/hw/mem/pc-nvdimm.c +++ b/hw/mem/pc-nvdimm.c @@ -329,6 +329,26 @@ static void build_nfit_table(GSList *device_list, char *buf) } } +enum { + NFIT_CMD_IMPLEMENTED = 0, + + /* bus commands */ + NFIT_CMD_ARS_CAP = 1, + NFIT_CMD_ARS_START = 2, + NFIT_CMD_ARS_QUERY = 3, + + /* per-dimm commands */ + NFIT_CMD_SMART = 1, + NFIT_CMD_SMART_THRESHOLD = 2, + NFIT_CMD_DIMM_FLAGS = 3, + NFIT_CMD_GET_CONFIG_SIZE = 4, + NFIT_CMD_GET_CONFIG_DATA = 5, + NFIT_CMD_SET_CONFIG_DATA = 6, + NFIT_CMD_VENDOR_EFFECT_LOG_SIZE = 7, + NFIT_CMD_VENDOR_EFFECT_LOG = 8, + NFIT_CMD_VENDOR = 9, +}; + struct dsm_buffer { /* RAM page. */ uint32_t handle; @@ -433,6 +453,19 @@ exit: g_slist_free(list); } +static bool device_cmd_has_arg3[] = { + false, /* NFIT_CMD_IMPLEMENTED */ + false, /* NFIT_CMD_SMART */ + false, /* NFIT_CMD_SMART_THRESHOLD */ + false, /* NFIT_CMD_DIMM_FLAGS */ + false, /* NFIT_CMD_GET_CONFIG_SIZE */ + true, /* NFIT_CMD_GET_CONFIG_DATA */ + true, /* NFIT_CMD_SET_CONFIG_DATA */ + false, /* NFIT_CMD_VENDOR_EFFECT_LOG_SIZE */ + false, /* NFIT_CMD_VENDOR_EFFECT_LOG */ + false, /* NFIT_CMD_VENDOR */ +}; + #define BUILD_STA_METHOD(_dev_, _method_) \ do { \ _method_ = aml_method("_STA", 0); \ @@ -457,10 +490,20 @@ exit: static void build_nvdimm_devices(Aml *root_dev, GSList *list) { + Aml *has_arg3; + int i, cmd_nr; + + cmd_nr = ARRAY_SIZE(device_cmd_has_arg3); + has_arg3 = aml_package(cmd_nr); + for (i = 0; i < cmd_nr; i++) { + aml_append(has_arg3, aml_int(device_cmd_has_arg3[i])); + } + aml_append(root_dev, aml_name_decl("CAG3", has_arg3)); + for (; list; list = list->next) { PCNVDIMMDevice *nvdimm = list->data; uint32_t handle = nvdimm_index_to_handle(nvdimm->device_index); - Aml *dev, *method; + Aml *dev, *method, *ifctx; dev = aml_device("NVD%d", nvdimm->device_index); aml_append(dev, aml_name_decl("_ADR", aml_int(handle))); @@ -470,6 +513,34 @@ static void build_nvdimm_devices(Aml *root_dev, GSList *list) method = aml_method("_DSM", 4); { SAVE_ARG012_HANDLE(method, aml_int(handle)); + + /* Local5 = DeRefOf(Index(CAG3, Arg2)) */ + aml_append(method, + aml_store(aml_derefof(aml_index(aml_name("CAG3"), + aml_arg(2))), aml_local(5))); + /* if 0 < local5 */ + ifctx = aml_if(aml_lless(aml_int(0), aml_local(5))); + { + /* Local0 = Index(Arg3, 0) */ + aml_append(ifctx, aml_store(aml_index(aml_arg(3), aml_int(0)), + aml_local(0))); + /* Local1 = sizeof(Local0) */ + aml_append(ifctx, aml_store(aml_sizeof(aml_local(0)), + aml_local(1))); + /* Local2 = Local1 << 3 */ + aml_append(ifctx, aml_store(aml_shiftleft(aml_local(1), + aml_int(3)), aml_local(2))); + /* Local3 = DeRefOf(Local0) */ + aml_append(ifctx, aml_store(aml_derefof(aml_local(0)), + aml_local(3))); + /* CreateField(Local3, 0, local2, IBUF) */ + aml_append(ifctx, aml_create_field(aml_local(3), + aml_int(0), aml_local(2), "IBUF")); + /* ARG3 = IBUF */ + aml_append(ifctx, aml_store(aml_name("IBUF"), + aml_name("ARG3"))); + } + aml_append(method, ifctx); NOTIFY_AND_RETURN(method); } aml_append(dev, method); -- 2.1.0