From patchwork Wed Jul 1 14:50:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 6704031 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 263A59F380 for ; Wed, 1 Jul 2015 14:56:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D42720649 for ; Wed, 1 Jul 2015 14:56:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 310C820648 for ; Wed, 1 Jul 2015 14:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754105AbbGAOzy (ORCPT ); Wed, 1 Jul 2015 10:55:54 -0400 Received: from mga03.intel.com ([134.134.136.65]:39644 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753363AbbGAOzr (ORCPT ); Wed, 1 Jul 2015 10:55:47 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 01 Jul 2015 07:55:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,386,1432623600"; d="scan'208";a="517239476" Received: from xiao.sh.intel.com ([10.239.159.86]) by FMSMGA003.fm.intel.com with ESMTP; 01 Jul 2015 07:55:43 -0700 From: Xiao Guangrong 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, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong Subject: [PATCH 12/16] nvdimm: save arg3 for NVDIMM device _DSM method Date: Wed, 1 Jul 2015 22:50:28 +0800 Message-Id: <1435762232-15543-13-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 2.1.0 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> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);