From patchwork Sun Oct 11 03:52:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 528680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5476B1402B9 for ; Sun, 11 Oct 2015 07:15:29 +1100 (AEDT) Received: from localhost ([::1]:46214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zl0YB-0002jx-Ja for incoming@patchwork.ozlabs.org; Sat, 10 Oct 2015 16:15:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zl0Ia-0001Ls-W9 for qemu-devel@nongnu.org; Sat, 10 Oct 2015 15:59:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zl0IY-000418-SP for qemu-devel@nongnu.org; Sat, 10 Oct 2015 15:59:20 -0400 Received: from mga03.intel.com ([134.134.136.65]:60642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zl0IY-0003bu-N4 for qemu-devel@nongnu.org; Sat, 10 Oct 2015 15:59:18 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 10 Oct 2015 12:59:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,664,1437462000"; d="scan'208";a="661783206" Received: from xiaoreal1.sh.intel.com (HELO xiaoreal1.sh.intel.com.sh.intel.com) ([10.239.48.79]) by orsmga003.jf.intel.com with ESMTP; 10 Oct 2015 12:59:16 -0700 From: Xiao Guangrong To: pbonzini@redhat.com, imammedo@redhat.com Date: Sun, 11 Oct 2015 11:52:58 +0800 Message-Id: <1444535584-18220-27-git-send-email-guangrong.xiao@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1444535584-18220-1-git-send-email-guangrong.xiao@linux.intel.com> References: <1444535584-18220-1-git-send-email-guangrong.xiao@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 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 Subject: [Qemu-devel] [PATCH v3 26/32] nvdimm: save arg3 for NVDIMM device _DSM method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Check if the input Arg3 is valid then store it into dsm_in 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/nvdimm/acpi.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hw/mem/nvdimm/acpi.c b/hw/mem/nvdimm/acpi.c index d9fa0fd..3b9399c 100644 --- a/hw/mem/nvdimm/acpi.c +++ b/hw/mem/nvdimm/acpi.c @@ -442,7 +442,7 @@ static void build_nvdimm_devices(NVDIMMState *state, GSList *device_list, int slot = object_property_get_int(OBJECT(nvdimm), DIMM_SLOT_PROP, NULL); uint32_t handle = nvdimm_slot_to_handle(slot); - Aml *dev, *method; + Aml *dev, *method, *ifctx; dev = aml_device("NV%02X", slot); aml_append(dev, aml_name_decl("_ADR", aml_int(handle))); @@ -452,6 +452,24 @@ static void build_nvdimm_devices(NVDIMMState *state, GSList *device_list, method = aml_method("_DSM", 4); { SAVE_ARG012_HANDLE_LOCK(method, aml_int(handle)); + + /* Arg3 is passed as Package and it has one element? */ + ifctx = aml_if(aml_and(aml_equal(aml_object_type(aml_arg(3)), + aml_int(4)), + aml_equal(aml_sizeof(aml_arg(3)), + aml_int(1)))); + { + /* Local0 = Index(Arg3, 0) */ + aml_append(ifctx, aml_store(aml_index(aml_arg(3), aml_int(0)), + aml_local(0))); + /* Local3 = DeRefOf(Local0) */ + aml_append(ifctx, aml_store(aml_derefof(aml_local(0)), + aml_local(3))); + /* ARG3 = Local3 */ + aml_append(ifctx, aml_store(aml_local(3), aml_name("ARG3"))); + } + aml_append(method, ifctx); + NOTIFY_AND_RETURN_UNLOCK(method); } aml_append(dev, method); @@ -534,6 +552,7 @@ static void nvdimm_build_acpi_devices(NVDIMMState *state, GSList *device_list, method = aml_method("_DSM", 4); { SAVE_ARG012_HANDLE_LOCK(method, aml_int(0)); + /* no command we support on ROOT device has Arg3. */ NOTIFY_AND_RETURN_UNLOCK(method); } aml_append(dev, method);