From nobody Wed May 15 18:44:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1663854523; cv=none; d=zohomail.com; s=zohoarc; b=ZQzchrkJ9SWtL0IHvVLARwmFYKPsQrYS/3PxLPrC/wbnxDUy0dMWdcun7WZDN9N1omqVI07C3Jtxsq7RA6/k5oaXSU5RX6AxiZM+skaxNF1j3VM6Yl/uxzkqbu2MiEHVuzeXHMkUED2YKi6J7nm7ysQMafPaNQYM+ZXBBsE0MnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663854523; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7h1LCbUPzt5Oa3Q2BSrnKmT6KlaHLa78oGIQYyMM22E=; b=jttUsvb6c3Qv0VeOOyX8B/UimJl+kuFfC0kTEvDmJwo3f9AShnLCUB9P1p7uvyQPZlhUiS+t0l8MuFTeZzuvxd73W6At76iIUw6i+Z6Vd4ZE+q6Or52mBRNHysQnnnI6njwBkgPafHW0/EYcc7TfyNl+xQMEeL5pH604pFbV0/4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663854523512519.7764926142679; Thu, 22 Sep 2022 06:48:43 -0700 (PDT) Received: from localhost ([::1]:45014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obMZF-0001x9-GM for importer@patchew.org; Thu, 22 Sep 2022 09:48:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDY-0001no-2J for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:13 -0400 Received: from mga09.intel.com ([134.134.136.24]:16854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDW-0000vn-EO for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:11 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 05:22:07 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-clx2.tsp.org) ([10.239.48.212]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2022 05:22:04 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663849330; x=1695385330; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3HysGTG5BKJ/q3qUeWLum+k4xx1MNT2xlgtUg5jXhpQ=; b=kdDxEUmkT8QWV37Ripu8C9IEVFnmAp704cpblAOJrAqyfaCH3/SqjORK 97UMZYkBCYVmxTfF1c6IegX/snZLqHdjHxo5eBZQKH7daNfJPaVA4ck+M bD9Y5pA0CFXbTVgUvGII1amMQxFAAyCnVpD0jkXNpLm+SpVNdxpOfGNU+ fGYjmT9hJvuroLum7/y8IYPvOntOam0y2PCjy2glsdnbPVoY/bBkUPvDV +CJQtFQKDjS5fwSN1+y6wqbJ+s7yaf98PuoKnab69yR9b2juilo/fuh38 OKAd+zAFUuoPf7UpymkKilXxXA1MA3AB1MkBRDHIsU1E1jAbqKTZz/HL3 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="301128368" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="301128368" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="795063210" From: Robert Hoo To: imammedo@redhat.com, mst@redhat.com, xiaoguangrong.eric@gmail.com, ani@anisinha.ca, jingqi.liu@intel.com Cc: qemu-devel@nongnu.org, robert.hu@intel.com, Robert Hoo Subject: [PATCH v4 1/5] tests/acpi: allow SSDT changes Date: Thu, 22 Sep 2022 20:21:51 +0800 Message-Id: <20220922122155.1326543-2-robert.hu@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220922122155.1326543-1-robert.hu@linux.intel.com> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.24; envelope-from=robert.hu@linux.intel.com; helo=mga09.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1663854525300100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Robert Hoo Reviewed-by: Jingqi Liu --- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..eb8bae1407 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,3 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/SSDT.dimmpxm", +"tests/data/acpi/q35/SSDT.dimmpxm", --=20 2.31.1 From nobody Wed May 15 18:44:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1663850667; cv=none; d=zohomail.com; s=zohoarc; b=W4EaJP5yj/+l9QiwS+hTbVuwuvaCPh1xRcBYmme3T0KfkXBO1nIqTMutxDMk05sHQ0RvvqBA/fzNb0sSvz+IN0LdGnzahwkbsQlY+bd7XGXs9Q47mC8/nRajZAu8M0fr9vvCgGZ/EGFOKRDrKI2N69IrEAV80zQBWQTOcqwoAmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663850667; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MsM7VwdO4jf5+yXs89/Jb2BugK5DNfkrXG0PPPtNrxg=; b=jV7g/jV66DvVsxYqTbWuv27b9oYfzmIhrJvWFtV4oR7/FnZVNyVCTV2o0w8j8za9yHsTFE73BGiqpRc/BvXyDZVSbSn1Zb7Z2pqJ0c65CUAnjh9YUYCTx07Tqe5x7RE6nXkM5xdFl5g8uxd12LDqsqQt8E/y+IWMJy7Lb3Ys5so= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663850667517123.37803235637875; Thu, 22 Sep 2022 05:44:27 -0700 (PDT) Received: from localhost ([::1]:53230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obLZ3-0000Ol-PN for importer@patchew.org; Thu, 22 Sep 2022 08:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDY-0001o0-GT for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:13 -0400 Received: from mga09.intel.com ([134.134.136.24]:16856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDW-0000w1-Ql for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:12 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 05:22:09 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-clx2.tsp.org) ([10.239.48.212]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2022 05:22:07 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663849330; x=1695385330; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PsoLe8vgHzR+AwIMYbvv3iaU4zCz8BxOcycp5wGPxHg=; b=m78hy2Z1VVIRA8X5VPSxZl3AfNwm1DRf6LVhlWmnWvIpTKJhxkiOr18I 5rxUkHxeW0Yg18giXiYK4hpTicWOHyfxXB8J4u2QkPvM86xj5HdODtHo2 PHaF1wX7Z1B8og/4rQ3an+VEytZVj51GhRL7LJjStYE+JkU6yHAnJR3eZ 4Tf3S0jko0xUoY+pnea75y7GMb+2VGYHW3n2m1RL5JTHWwn98biVBUvX7 1FEB8c3M62kDdjzJyG6HHNXtNtZTDFO1wxPYZ11weHKuU4kXtjKoFEZVd b7MIz8B/GOdJytf9THCX6dNzdGJQB1GlfIVtJhjwOE8vRgXLfYeupfYIx Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="301128373" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="301128373" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="795063231" From: Robert Hoo To: imammedo@redhat.com, mst@redhat.com, xiaoguangrong.eric@gmail.com, ani@anisinha.ca, jingqi.liu@intel.com Cc: qemu-devel@nongnu.org, robert.hu@intel.com, Robert Hoo Subject: [PATCH v4 2/5] acpi/ssdt: Fix aml_or() and aml_and() in if clause Date: Thu, 22 Sep 2022 20:21:52 +0800 Message-Id: <20220922122155.1326543-3-robert.hu@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220922122155.1326543-1-robert.hu@linux.intel.com> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.24; envelope-from=robert.hu@linux.intel.com; helo=mga09.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1663850668644100001 Content-Type: text/plain; charset="utf-8" In If condition, using bitwise and/or, rather than logical and/or. The result change in AML code: If (((Local6 =3D=3D Zero) | (Arg0 !=3D Local0))) =3D=3D> If (((Local6 =3D=3D Zero) || (Arg0 !=3D Local0))) If (((ObjectType (Arg3) =3D=3D 0x04) & (SizeOf (Arg3) =3D=3D One))) =3D=3D> If (((ObjectType (Arg3) =3D=3D 0x04) && (SizeOf (Arg3) =3D=3D One))) Fixes: 90623ebf603 ("nvdimm acpi: check UUID") Fixes: 4568c948066 ("nvdimm acpi: save arg3 of _DSM method") Signed-off-by: Robert Hoo Reviewed-by: Jingqi Liu Reviewed-by: Igor Mammedov --- hw/acpi/nvdimm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 31e46df0bd..201317c611 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -1037,7 +1037,7 @@ static void nvdimm_build_common_dsm(Aml *dev, =20 uuid_invalid =3D aml_lnot(aml_equal(uuid, expected_uuid)); =20 - unsupport =3D aml_if(aml_or(unpatched, uuid_invalid, NULL)); + unsupport =3D aml_if(aml_lor(unpatched, uuid_invalid)); =20 /* * function 0 is called to inquire what functions are supported by @@ -1069,10 +1069,9 @@ static void nvdimm_build_common_dsm(Aml *dev, * in the DSM Spec. */ pckg =3D aml_arg(3); - ifctx =3D aml_if(aml_and(aml_equal(aml_object_type(pckg), + ifctx =3D aml_if(aml_land(aml_equal(aml_object_type(pckg), aml_int(4 /* Package */)) /* It is a Package? */, - aml_equal(aml_sizeof(pckg), aml_int(1)) /* 1 element? *= /, - NULL)); + aml_equal(aml_sizeof(pckg), aml_int(1)) /* 1 element? *= /)); =20 pckg_index =3D aml_local(2); pckg_buf =3D aml_local(3); --=20 2.31.1 From nobody Wed May 15 18:44:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1663854910; cv=none; d=zohomail.com; s=zohoarc; b=TKNVSh9YPA5nSQ8aGTSKH5omDVndYd9ALgtxCtgoKcHXI4kYFfPqCBrC7SPOrr/b0ddErTrLtNYXkIRkc8z4TRT4K9CF1rcgHNDHQHRlTk5Bz8Aca5dHAcSqJKQvpHUDqmpgXBCPaXeWxTCg9ah6WXc35RCuBCZfCOIblUfVA6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663854910; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sfsjmu+0uPkReRajJt0S+4gLXlKdGmVa+4qj6ew2acI=; b=ILlWp2I+Ds1pUn/2/lnaPtSy2+oWdhYMS/omIWNepDJxTRqpajQqDJYca3CUVlGxQwSTViTHTeaJspP2pJ+NejNzLNzg7L+jsjAkpx6rLkfP7s0yh3CqHt5C5oHfRS5GpOp3WlYuAkTlz1qWu2+f6eLhRtQGThU3vjYc2vAyT3o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663854910301495.25267124461595; Thu, 22 Sep 2022 06:55:10 -0700 (PDT) Received: from localhost ([::1]:39826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obMfT-00082q-H1 for importer@patchew.org; Thu, 22 Sep 2022 09:55:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDm-0002Bm-RY for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:26 -0400 Received: from mga09.intel.com ([134.134.136.24]:16864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDl-0000xF-0S for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:26 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 05:22:11 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-clx2.tsp.org) ([10.239.48.212]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2022 05:22:09 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663849345; x=1695385345; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MmZEcM/DX7E2Mrb4q8YJoVFF6Y6AX8QuVLN7woNCJWE=; b=Ia+BpIyOMVuX/RvtgHzBTgUPvf1Anitg+iGwCh8I9EEo0cexCHZUwXH5 B9Jklxko3Vxhmmy5arWOmKzY4ynWegBRfFrsjD5tcju6yXY6/Xn1UUFeq BY0ja6AjYpZtM640+TOnrB9IXU6W0hy/yLBMKiJsSyYVLJZXc5WwzG2re sX82XF0SHwYtcRyl2gvIfwcYf/tuAxmhOjWqCPJfH4gRexDe1g2C4dOyp PB82QWf6kdj14XrCfVMEQrd3ZpcddLr0q/y51+90QzeqGBIgCgg0SAyGI ZYN3A2S8YzO+bYnVHNzJf2vsqbBLwtG2+ipWO+JSBa8aoLlXMd/S4sz4U w==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="301128378" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="301128378" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="795063261" From: Robert Hoo To: imammedo@redhat.com, mst@redhat.com, xiaoguangrong.eric@gmail.com, ani@anisinha.ca, jingqi.liu@intel.com Cc: qemu-devel@nongnu.org, robert.hu@intel.com, Robert Hoo Subject: [PATCH v4 3/5] acpi/nvdimm: define macro for NVDIMM Device _DSM Date: Thu, 22 Sep 2022 20:21:53 +0800 Message-Id: <20220922122155.1326543-4-robert.hu@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220922122155.1326543-1-robert.hu@linux.intel.com> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.24; envelope-from=robert.hu@linux.intel.com; helo=mga09.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1663854911761100001 Content-Type: text/plain; charset="utf-8" Since it will be heavily used in next patch, define macro NVDIMM_DEVICE_DSM_UUID for "4309AC30-0D11-11E4-9191-0800200C9A66", which is NVDIMM device specific method uuid defined in NVDIMM _DSM interface spec, Section 3. [1] No functional changes in this patch. [1] https://pmem.io/documents/IntelOptanePMem_DSM_Interface-V2.0.pdf Signed-off-by: Robert Hoo Reviewed-by: Igor Mammedov --- hw/acpi/nvdimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 201317c611..afff911c1e 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -922,6 +922,7 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryR= egion *io, #define NVDIMM_DSM_RFIT_STATUS "RSTA" =20 #define NVDIMM_QEMU_RSVD_UUID "648B9CF2-CDA1-4312-8AD9-49C4AF32BD62" +#define NVDIMM_DEVICE_DSM_UUID "4309AC30-0D11-11E4-9191-0800200C9A66" =20 static void nvdimm_build_common_dsm(Aml *dev, NVDIMMState *nvdimm_state) @@ -1029,8 +1030,7 @@ static void nvdimm_build_common_dsm(Aml *dev, /* UUID for QEMU internal use */), expected_uuid)); aml_append(elsectx, ifctx); elsectx2 =3D aml_else(); - aml_append(elsectx2, aml_store( - aml_touuid("4309AC30-0D11-11E4-9191-0800200C9A66") + aml_append(elsectx2, aml_store(aml_touuid(NVDIMM_DEVICE_DSM_UUID) /* UUID for NVDIMM Devices */, expected_uuid)); aml_append(elsectx, elsectx2); aml_append(method, elsectx); --=20 2.31.1 From nobody Wed May 15 18:44:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1663851388; cv=none; d=zohomail.com; s=zohoarc; b=R53tK5/+6dxxBEqZ5ILiWcB60uo2cEO4eedZdxAdixRsDN+A+ANcd6JyHLZLO/9A6rcyNR0IH7JGS+wnGJXmhuzsJ4ufHYDed6jWEhQj77ivuSdu/xVdpjJDJwBfBamsBY/a8gZcVM/0gsb4mQe2InKbbqr1O0ChenKPv41/yOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663851388; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BOUQoxGTx1esK1yTunob4NjQrMsddMscTFCB5lOzPLc=; b=XQ2K30ITTWD11VpF/d2cUMNAwxoL7WdhSvFL12uWjeQjXc91ONNnj1MbIH0Zvw3fUzCZ/bao/J7avKmc66DIS8oLFVOw3JgfP2j3yF99EYyWOXsyTTH862W5103eVkuZsbTaCGGXoSY9fqusRGy1uEeBOxkh5qLzyrwviCPa+uA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663851388047877.3885553320077; Thu, 22 Sep 2022 05:56:28 -0700 (PDT) Received: from localhost ([::1]:35014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obLkg-000155-Sr for importer@patchew.org; Thu, 22 Sep 2022 08:56:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDp-0002GY-4l for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:29 -0400 Received: from mga09.intel.com ([134.134.136.24]:16864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDn-0000xF-56 for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:28 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 05:22:14 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-clx2.tsp.org) ([10.239.48.212]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2022 05:22:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663849347; x=1695385347; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NcK7vI/jjf+pZtFQbyYkQwKsR455DOSRfRqLBmFZxEM=; b=AFFJ6IS8t/9A0X7vLV94kLMQf0QmsuUSbmZpH/fD0Ym1ntbv1RNxlpsy gKgi6CbzZmgAVjzhJN5lZuHZKRneJ7yNe6In3fpLG7FEvyDI+mJmxEQvP lj2bgP4yfbKIAi6J036PBLtsf5X9Pzofxs3HupiSQ21cGaxMvKY6YdBk4 lGx0qL5zsj7tLYBQI21Xy0r728IlOJQ/IPhvLdsxSV+EiXKWjOa4EtmXM 5ruNQEryG55m7N+5rQ1m/Iqma2FeutrrBCAN58PZ6cJvY8vlauVMDzOiC teacijBGpclxlCkfU1p4L/kcPRmGfcVzSpOuSrQEajj9USIhAfnXaz9DP g==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="301128383" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="301128383" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="795063271" From: Robert Hoo To: imammedo@redhat.com, mst@redhat.com, xiaoguangrong.eric@gmail.com, ani@anisinha.ca, jingqi.liu@intel.com Cc: qemu-devel@nongnu.org, robert.hu@intel.com, Robert Hoo Subject: [PATCH v4 4/5] acpi/nvdimm: Implement ACPI NVDIMM Label Methods Date: Thu, 22 Sep 2022 20:21:54 +0800 Message-Id: <20220922122155.1326543-5-robert.hu@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220922122155.1326543-1-robert.hu@linux.intel.com> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.24; envelope-from=robert.hu@linux.intel.com; helo=mga09.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1663851388908100001 Content-Type: text/plain; charset="utf-8" Recent ACPI spec [1] has defined NVDIMM Label Methods _LS{I,R,W}, which deprecates corresponding _DSM Functions defined by PMEM _DSM Interface spec [2]. Since the semantics of the new Label Methods are almost same as old _DSM methods, the implementations here simply wrapper old ones. ASL form diff can be found in next patch of updating golden master binaries. [1] ACPI Spec v6.4, 6.5.10 NVDIMM Label Methods https://uefi.org/sites/default/files/resources/ACPI_Spec_6_4_Jan22.pdf [2] Intel PMEM _DSM Interface Spec v2.0, 3.10 Deprecated Functions https://pmem.io/documents/IntelOptanePMem_DSM_Interface-V2.0.pdf Signed-off-by: Robert Hoo Reviewed-by: Igor Mammedov --- hw/acpi/nvdimm.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index afff911c1e..a3b25a92f3 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -1243,6 +1243,7 @@ static void nvdimm_build_fit(Aml *dev) static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots) { uint32_t slot; + Aml *method, *pkg, *field, *com_call; =20 for (slot =3D 0; slot < ram_slots; slot++) { uint32_t handle =3D nvdimm_slot_to_handle(slot); @@ -1260,6 +1261,100 @@ static void nvdimm_build_nvdimm_devices(Aml *root_d= ev, uint32_t ram_slots) */ aml_append(nvdimm_dev, aml_name_decl("_ADR", aml_int(handle))); =20 + /* + * ACPI v6.4: Section 6.5.10 NVDIMM Label Methods + */ + /* _LSI */ + method =3D aml_method("_LSI", 0, AML_SERIALIZED); + com_call =3D aml_call5(NVDIMM_COMMON_DSM, + aml_touuid(NVDIMM_DEVICE_DSM_UUID), + aml_int(1), aml_int(4), aml_int(0), + aml_int(handle)); + aml_append(method, aml_store(com_call, aml_local(0))); + + aml_append(method, aml_create_dword_field(aml_local(0), + aml_int(0), "STTS")); + aml_append(method, aml_create_dword_field(aml_local(0), aml_int(4), + "SLSA")); + aml_append(method, aml_create_dword_field(aml_local(0), aml_int(8), + "MAXT")); + + pkg =3D aml_package(3); + aml_append(pkg, aml_name("STTS")); + aml_append(pkg, aml_name("SLSA")); + aml_append(pkg, aml_name("MAXT")); + aml_append(method, aml_store(pkg, aml_local(1))); + aml_append(method, aml_return(aml_local(1))); + + aml_append(nvdimm_dev, method); + + /* _LSR */ + method =3D aml_method("_LSR", 2, AML_SERIALIZED); + aml_append(method, aml_name_decl("INPT", aml_buffer(8, NULL))); + + aml_append(method, aml_create_dword_field(aml_name("INPT"), + aml_int(0), "OFST")); + aml_append(method, aml_create_dword_field(aml_name("INPT"), + aml_int(4), "LEN")); + aml_append(method, aml_store(aml_arg(0), aml_name("OFST"))); + aml_append(method, aml_store(aml_arg(1), aml_name("LEN"))); + + pkg =3D aml_package(1); + aml_append(pkg, aml_name("INPT")); + aml_append(method, aml_store(pkg, aml_local(0))); + + com_call =3D aml_call5(NVDIMM_COMMON_DSM, + aml_touuid(NVDIMM_DEVICE_DSM_UUID), + aml_int(1), aml_int(5), aml_local(0), + aml_int(handle)); + aml_append(method, aml_store(com_call, aml_local(3))); + field =3D aml_create_dword_field(aml_local(3), aml_int(0), "STTS"); + aml_append(method, field); + field =3D aml_create_field(aml_local(3), aml_int(32), + aml_shiftleft(aml_name("LEN"), aml_int(3)= ), + "LDAT"); + aml_append(method, field); + aml_append(method, aml_name_decl("LSA", aml_buffer(0, NULL))); + aml_append(method, aml_to_buffer(aml_name("LDAT"), aml_name("LSA")= )); + + pkg =3D aml_package(2); + aml_append(pkg, aml_name("STTS")); + aml_append(pkg, aml_name("LSA")); + + aml_append(method, aml_store(pkg, aml_local(1))); + aml_append(method, aml_return(aml_local(1))); + + aml_append(nvdimm_dev, method); + + /* _LSW */ + method =3D aml_method("_LSW", 3, AML_SERIALIZED); + aml_append(method, aml_store(aml_arg(2), aml_local(2))); + aml_append(method, aml_name_decl("INPT", aml_buffer(8, NULL))); + field =3D aml_create_dword_field(aml_name("INPT"), + aml_int(0), "OFST"); + aml_append(method, field); + field =3D aml_create_dword_field(aml_name("INPT"), + aml_int(4), "TLEN"); + aml_append(method, field); + aml_append(method, aml_store(aml_arg(0), aml_name("OFST"))); + aml_append(method, aml_store(aml_arg(1), aml_name("TLEN"))); + + aml_append(method, aml_concatenate(aml_name("INPT"), aml_local(2), + aml_name("INPT"))); + pkg =3D aml_package(1); + aml_append(pkg, aml_name("INPT")); + aml_append(method, aml_store(pkg, aml_local(0))); + com_call =3D aml_call5(NVDIMM_COMMON_DSM, + aml_touuid(NVDIMM_DEVICE_DSM_UUID), + aml_int(1), aml_int(6), aml_local(0), + aml_int(handle)); + aml_append(method, aml_store(com_call, aml_local(3))); + field =3D aml_create_dword_field(aml_local(3), aml_int(0), "STTS"); + aml_append(method, field); + aml_append(method, aml_return(aml_name("STTS"))); + + aml_append(nvdimm_dev, method); + nvdimm_build_device_dsm(nvdimm_dev, handle); aml_append(root_dev, nvdimm_dev); } --=20 2.31.1 From nobody Wed May 15 18:44:09 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1663852062; cv=none; d=zohomail.com; s=zohoarc; b=BqigJG35ySvPYS62LPkm92jnWLWQAYF2AokeOkztcoCe4yU6gKTXdgTm0pMMni7nclQ7njjrW6UijM3Gcdhp0kJkfCTA6hnygWf11LHwjCT4zcUq34UKr9/OS6DXSzCmCPcuOhN0naA9gzYSQmk9Q1gBAPbfjRVgzyFIggkxDnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663852062; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CpJpNZNH+SpE0YJK66pHGT0aWzs3uhSRDAEm8XZfVdA=; b=XwMUvr01aNadhdgYR0+7Jyra8cA6Xa5hUF7mYoRzttePMzY0pfGP8j3OJ6iB4hSN0AuSgGLETNDirESxWE1Ez6CvJyQRA6Y9Lpd/b5OvyckcWmrI2U72B6jl8WkIdN4zJnqRQIVDtf+wkQeikvvUpAyg7OzTQXa86kFyfhcc8kc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663852062251170.3034903433395; Thu, 22 Sep 2022 06:07:42 -0700 (PDT) Received: from localhost ([::1]:33088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obLvY-0007kG-Vc for importer@patchew.org; Thu, 22 Sep 2022 09:07:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDp-0002I3-Qc for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:29 -0400 Received: from mga09.intel.com ([134.134.136.24]:16873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obLDn-0000xh-Sc for qemu-devel@nongnu.org; Thu, 22 Sep 2022 08:22:29 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 05:22:17 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-clx2.tsp.org) ([10.239.48.212]) by orsmga005.jf.intel.com with ESMTP; 22 Sep 2022 05:22:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663849347; x=1695385347; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=60SkYtbvJkp6Nw4XkGxycV3VMuidgs1r0mB6+JR8L5Q=; b=kVUrFFX4Ekc3vZ7JGhC7YEEzjSDjiy36lGMc+FUVtW4Kr/m1CFeuiDsB z2X529VjnkXKI941tB/Q+N9yfu/uUU4BThOupTQwb9cd3lR80bnC8yTEH CXFWY1jPT1CBk2RI23bVTZHicBI2nasbOjC44Y/MkM3Pl70QYUZpKuYi6 3wySYfmPOCwr5VTkFPFUdJMDUnx/dzVg5Nmo+qnHSqtqhRXcJ9M5OLB92 XIbxOBx/4OTQJ9nZvHT4sXrgpZSN+N2xi3Vwk7+ijiH8GoQ45q7YhMTvZ GpaIQw8qU1WnltffF73UAhfFdqKK15w3fWdbPHL0HqbnvGaVXlMXsl+t6 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="301128387" X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="301128387" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,335,1654585200"; d="scan'208";a="795063288" From: Robert Hoo To: imammedo@redhat.com, mst@redhat.com, xiaoguangrong.eric@gmail.com, ani@anisinha.ca, jingqi.liu@intel.com Cc: qemu-devel@nongnu.org, robert.hu@intel.com, Robert Hoo Subject: [PATCH v4 5/5] test/acpi/bios-tables-test: SSDT: update golden master binaries Date: Thu, 22 Sep 2022 20:21:55 +0800 Message-Id: <20220922122155.1326543-6-robert.hu@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220922122155.1326543-1-robert.hu@linux.intel.com> References: <20220922122155.1326543-1-robert.hu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=134.134.136.24; envelope-from=robert.hu@linux.intel.com; helo=mga09.intel.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1663852064756100001 Content-Type: text/plain; charset="utf-8" And empty bios-tables-test-allowed-diff.h. Diff of ASL form, from qtest testlog.txt: Acked-by: Igor Mammedov --- /tmp/asl-RFWZS1.dsl 2022-09-22 18:25:06.191519589 +0800 +++ /tmp/asl-B1ZZS1.dsl 2022-09-22 18:25:06.187519182 +0800 @@ -1,30 +1,30 @@ /* * Intel ACPI Component Architecture * AML/ASL+ Disassembler version 20180629 (64-bit version) * Copyright (c) 2000 - 2018 Intel Corporation * * Disassembling to symbolic ASL+ operators * - * Disassembly of tests/data/acpi/pc/SSDT.dimmpxm, Thu Sep 22 18:25:06 2022 + * Disassembly of /tmp/aml-YYZZS1, Thu Sep 22 18:25:06 2022 * * Original Table Header: * Signature "SSDT" - * Length 0x000002DE (734) + * Length 0x00000717 (1815) * Revision 0x01 - * Checksum 0x56 + * Checksum 0xBC * OEM ID "BOCHS " * OEM Table ID "NVDIMM" * OEM Revision 0x00000001 (1) * Compiler ID "BXPC" * Compiler Version 0x00000001 (1) */ DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001) { Scope (\_SB) { Device (NVDR) { Name (_HID, "ACPI0012" /* NVDIMM Root Device */) // _HID: Har= dware ID Method (NCAL, 5, Serialized) { Local6 =3D MEMA /* \MEMA */ @@ -49,52 +49,52 @@ ODAT, 32736 } If ((Arg4 =3D=3D Zero)) { Local0 =3D ToUUID ("2f10e7a4-9e91-11e4-89d3-123b93f75c= ba") } ElseIf ((Arg4 =3D=3D 0x00010000)) { Local0 =3D ToUUID ("648b9cf2-cda1-4312-8ad9-49c4af32bd= 62") } Else { Local0 =3D ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a= 66") } - If (((Local6 =3D=3D Zero) | (Arg0 !=3D Local0))) + If (((Local6 =3D=3D Zero) || (Arg0 !=3D Local0))) { If ((Arg2 =3D=3D Zero)) { Return (Buffer (One) { 0x00 = // . }) } Return (Buffer (One) { 0x01 = // . }) } HDLE =3D Arg4 REVS =3D Arg1 FUNC =3D Arg2 - If (((ObjectType (Arg3) =3D=3D 0x04) & (SizeOf (Arg3) =3D= =3D One))) + If (((ObjectType (Arg3) =3D=3D 0x04) && (SizeOf (Arg3) =3D= =3D One))) { Local2 =3D Arg3 [Zero] Local3 =3D DerefOf (Local2) FARG =3D Local3 } NTFI =3D Local6 Local1 =3D (RLEN - 0x04) If ((Local1 < 0x08)) { Local2 =3D Zero Name (TBUF, Buffer (One) { 0x00 = // . }) Local7 =3D Buffer (Zero){} @@ -161,45 +161,234 @@ Else { If ((Local1 =3D=3D Zero)) { Return (Local2) } Local3 +=3D Local1 Concatenate (Local2, Local0, Local2) } } } Device (NV00) { Name (_ADR, One) // _ADR: Address + Method (_LSI, 0, Serialized) // _LSI: Label Storage Infor= mation + { + Local0 =3D NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800= 200c9a66"), One, 0x04, Zero, One) + CreateDWordField (Local0, Zero, STTS) + CreateDWordField (Local0, 0x04, SLSA) + CreateDWordField (Local0, 0x08, MAXT) + Local1 =3D Package (0x03) + { + STTS, + SLSA, + MAXT + } + Return (Local1) + } + + Method (_LSR, 2, Serialized) // _LSR: Label Storage Read + { + Name (INPT, Buffer (0x08) + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 = // ........ + }) + CreateDWordField (INPT, Zero, OFST) + CreateDWordField (INPT, 0x04, LEN) + OFST =3D Arg0 + LEN =3D Arg1 + Local0 =3D Package (0x01) + { + INPT + } + Local3 =3D NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800= 200c9a66"), One, 0x05, Local0, One) + CreateDWordField (Local3, Zero, STTS) + CreateField (Local3, 0x20, (LEN << 0x03), LDAT) + Name (LSA, Buffer (Zero){}) + ToBuffer (LDAT, LSA) /* \_SB_.NVDR.NV00._LSR.LSA_ */ + Local1 =3D Package (0x02) + { + STTS, + LSA + } + Return (Local1) + } + + Method (_LSW, 3, Serialized) // _LSW: Label Storage Write + { + Local2 =3D Arg2 + Name (INPT, Buffer (0x08) + { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 = // ........ + }) + CreateDWordField (INPT, Zero, OFST) + CreateDWordField (INPT, 0x04, TLEN) + OFST =3D Arg0 + TLEN =3D Arg1 + Concatenate (INPT, Local2, INPT) /* \_SB_.NVDR.NV00._L= SW.INPT */ + Local0 =3D Package (0x01) + { + INPT + } + Local3 =3D NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800= 200c9a66"), One, 0x06, Local0, One) + CreateDWordField (Local3, Zero, STTS) + Return (STTS) /* \_SB_.NVDR.NV00._LSW.STTS */ + } + (iterates in each NV) Signed-off-by: Robert Hoo --- tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 3 files changed, 2 deletions(-) diff --git a/tests/data/acpi/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT.dimm= pxm index ac55387d57e48adb99eb738a102308688a262fb8..70f133412f5e0aa128ab210245a= 8de7304eeb843 100644 GIT binary patch literal 1815 zcmdUwyKmD_6vnUPv~g}y6emHgc**|(X$OSF0FILox3Lr1ZmHx-examI3c8|YVC!RO z2@)c;%774ZDvwC)2sTzGCN_pj>?}wOz&%bMqC!xRK#<|wbI(0K`Q7hx6kRVFqX~qV z7sa|%)dh8?Br6KtBZP{x4GGpv_2!(V7cFzGeuJKCoK=3D-eBcjxh3x)9sl%G1ON@8t< zC}l-#nk#BUt~04IjN>%dLxHlK*k;x!u1QobwmcfE+b^ zczo}A|8-XCzLj4+n|SHk{n4mic$$>>kzKymqe^LJ0ZG7X5M#F6I*C?GzXSG@cDl2fPncQ;69=3D?`MKx80Oyc z9B;|BU2{zuQ)dbV&Js%+lfN=3D#)pVIV;6G{kbZ#&Nx-i*)4_an>N&6Rd6+ zI@DnAgic;g(t#T0WVK=3DNDa_GVIQn#oVA@DG+o@4h6y0>WY85C8xG delta 135 zcmbQvcaN1TIM^lR9uortW7tG4X>Nb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I zVKOVD5|2#vdc3J@?GX?|$Ee=3Dz7T*O(4YV z6zft|7u04+RusBN2o+}<60Di(?O97NTIOo~7CqNEt16d9M5!Sc3gZ(fKXqD_#M%f^ z%8J-Bm(_+`XHsJr$7!yK3TmZL##~83omGvBESM|j;DD``YGpwyH+7*htx7^g)UGdo zN|-Cz=3Dv1qfRiR!IjpfgY;Ecb32%p25@LlF&|Jg2o|4sIa|8e$(J-8fP@E6j695sA+ z`rzi^byn)Vm0vxdcT{mo#dk$uiW9Fa%IdxhOA>=3DbwNmt?_2s}66=3D^{?k z4H4y)gjSJ_Bv-HK1|oB?5aUFHt?j~m6{IAZp&4ZUaMxL(smx^jv*W034ARyPbC zYOr@gCod=3DIKn-)U+A#PO=3DIARNeR@zpphT46IJL~$7jHhwsZh{k|A1x4X1tz91v7Lr z=3DTT|kLF!$N8plxxi>mS%HjtAnjzK5nKsK46WH(ZzNb5nD}6)_~<4#t%(LAjJ^|Hw{uC>PEKQ(G&v)I zVKOVD5|2#v