From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web09.17427.1628736724126436031 for ; Wed, 11 Aug 2021 19:52:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=NTNuXwO5; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10073"; a="212155948" X-IronPort-AV: E=Sophos;i="5.84,314,1620716400"; d="scan'208";a="212155948" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2021 19:52:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,314,1620716400"; d="scan'208";a="460934222" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga007.jf.intel.com with ESMTP; 11 Aug 2021 19:52:01 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Wed, 11 Aug 2021 19:52:00 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Wed, 11 Aug 2021 19:52:00 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.43) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Wed, 11 Aug 2021 19:52:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c3eDe/V0Ed86BKusaRrmgwi8dVMCFQe9TjcQxLp9uevI3NuVbi6FnjSGKg/ZgW++bY2A+r+WGiRdhjIpAbTVNWcUQwSivXC6Pb7VzYUvPloT8nXtz7fR8kTMvllu++FPn36MZuEXT7gaLgLz5k0RyMFGxEx3w5sjsBZybT4LkdSj1yLwCj84IrufIaZOSbJwh1yPZs0bABXMC+vx0eJ0GGOaNLIPphofxH2KgH+fDgxyqzz2zgWMlk5Ds7q6vjuJxDOnC0dA5b0jjhdZLZzdna7CmG+P5LnQ+yt7FTbTuAYV8anRSC8R8z555trQHRHOLbchDCgn8oOTWWCMQwuEnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hcf8mDg/ugKD4GZerevlrSXekX5uZ/wysgGrW7Hy1Sk=; b=ZIkdYvuGNT+R9PhKC+NjxN8W3GIy3K+2VsMc/gD6S8q6BjFKVo5+6t9HZH8+d5KRiVi4Y14Y4wI+w8XgYLGpzSn7rDiExIRt+sTf38m/fx1nQTUmjJ5GMJlUXp7khxu32ksm+GQ5hOrmeFCNT9pQnEePcl1T2/sw5KL+pbiLyM5R5vvzm15IQunEdeOO8PBWMuEe7eqZ3RN6rfwx+1mm6XCbg3paFPqmSIvwkNLdqCtNnFtCOAGyRQGZcsrRQSt9RqgrSsW1jUoXwJKBdT8vEG7NbnkH87dowSDjfvKGEbjlOAq1ReVTzSxPztCWZwBCImjPbUmJNGHTr1KZZCcjyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hcf8mDg/ugKD4GZerevlrSXekX5uZ/wysgGrW7Hy1Sk=; b=NTNuXwO5XrHLlCvIZ5/nW8VWzt0JaBt8ZDBDmYotWgHbFveCTG1saFV4WeKcEfu3Az60hCz+WjDJrze7WrPj1fO4uy8xghp4r5btnVkK/uSGzrf4C2NtlW3Tkt6b//yx1ec5NN0oIr159mwWnxuHc+lcwedblp4uVp6dAHYOG4Q= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by MWHPR11MB1456.namprd11.prod.outlook.com (2603:10b6:301:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Thu, 12 Aug 2021 02:51:59 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::546c:f20e:35d2:65a7]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::546c:f20e:35d2:65a7%5]) with mapi id 15.20.4415.016; Thu, 12 Aug 2021 02:51:59 +0000 From: "Nate DeSimone" To: "Oram, Isaac W" , "devel@edk2.groups.io" CC: "Chiu, Chasel" Subject: Re: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/BoardAcpiLib: Fix GP Fault in ACPI Enable SMI Thread-Topic: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/BoardAcpiLib: Fix GP Fault in ACPI Enable SMI Thread-Index: AQHXjwpU87MxfK9aJUemxS19FlQJ86tvK97Q Date: Thu, 12 Aug 2021 02:51:59 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e42560b4-745d-4c3c-4244-08d95d3c27ef x-ms-traffictypediagnostic: MWHPR11MB1456: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:328; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CO2yWweA2wYYNDdyf6S/OyrGlXYF5e7j2N7eC4Nx3WyZ1qiPTC+ryr6jOaFDzTskQnM6dVdLsD2qBzzQ3tPRtzSSNU8bs3d5XSU/qsauDS7U8vwbnLAxt5sjvtets0/AU/qdrSgcS+KDrB8MyWXqIrDbq/huIRLl9lSVeKCk0oR8IrN8cy2BzNBPvz227lHLM44v45XjQqEFEMs03MPloE/tnmKG6/R6aIxTWvGQ/rSXOPsVo6GjG9TrErVhX2B+KPMpjadPgWD7YsiuYgizTnqLTeKN0g45H0BYbVEBnS/CE+3OnMnKu8QEHoUbrlMt5j/oK9YqqPSDJARC0aciW08uvGItxYNj2bqCZI4B+/iL4BzUadU0sPKL8SvYNewk+dajvTPkj6eKi4L1IzEwoPSayUvHDvj8G5lyNHxQpM2ivahz4pIekZ/9DmK3eEhw6GeSsmm7pXVk79iBeYCKDI7TDACgqGRmUaD8fxYIwG/mzupPtZvfncVQzdFU+NDklNKVoditMVJ4J6Mo2ilj/B/bv84F/rHTTNt2gCexf81vbntW4JvPUNk2J7BtmutwjYaDqz2aMN5SKu8K1otcSIAdT6tL5sxDuooYWKHfI+rxmbVIymT+rFoIIKnb7YOwtg/vGtYDJvYwAlpjU0vXJ+X5bQlNvn1VvlQGEuJanRv0zDSnsBqKt9N1yWjR3k3FNBYfIjq+iCFQNI3upnirlngwAT42ZmzY7cm7lmPMfysvZF2q05pleVsj/Su037jwbXQQpeqnA9sZF3vr8EX1mGatksZeeRjdBMvjWK6gXCg= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(346002)(396003)(376002)(136003)(39860400002)(107886003)(2906002)(478600001)(26005)(316002)(110136005)(86362001)(186003)(33656002)(38070700005)(966005)(52536014)(6506007)(8676002)(76116006)(64756008)(66476007)(8936002)(66556008)(66446008)(71200400001)(66946007)(4326008)(53546011)(5660300002)(9686003)(122000001)(55016002)(38100700002)(83380400001)(7696005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zp/CD5cSnJJ1/nHyBeKSU7WVl+BHJCQ9nhIj7wK/afK2ZGPey6l1fl25SRU/?= =?us-ascii?Q?vJc/hiVhFTrTqoWclcZuULIKXMsBVvBrifx2Jowlrw2/lAQtMcprdaANwEKC?= =?us-ascii?Q?k5eUEWP5iDHs6vNYsaXEqHRwPidkPkWP5XtAx2FfKPV7ZwNNVRGdpmWpsnY4?= =?us-ascii?Q?jxa8bGAUUfTGQlSbGZHwEHJVyh2jMc84tIuyJcozIx9K6EcaPJ02w0fADl0k?= =?us-ascii?Q?GFc0d7eXAf+xeO8PK0/H3kuUE14JooOk6HAjc4pESoFAyTaV7FSAJgPb59zs?= =?us-ascii?Q?cHqixVbTZrKNO0VyHpEmdrZAsK19ZSI6bjcxN3iHjvcvUzOp8m9NsFycpD0M?= =?us-ascii?Q?lEdbTfOOWmsyRGGwG+jMEoaAI+Tm06M87nT6HJupMx/+grsaaO0k8hhJra88?= =?us-ascii?Q?98wOKZsZjUQQsxn6UICgSghMOFd/ZDUtHI4/04QJGQscXnh6MEnP4EBft6Y5?= =?us-ascii?Q?5ZznECw1O2ytHHjmi+QYFkVWiIgbnCmujZ/1pNQha8lgYRXRvrGDTekMxyaC?= =?us-ascii?Q?bTN8FUCWGX0Mb80w1xJq9dTBQMmHCY/j9O67fqeOb28pnZhqWemfDT6Gsrn9?= =?us-ascii?Q?kNPC7NQKrbIb5PhxxapeIPHin5yzMZghxqo4NUgVjv7WWTVL7IirRMJaN+/H?= =?us-ascii?Q?VU2d62ygDzQ8Ymb1h8idOJWTLSr+6yFkK2C6JbZLFCwt3e33dBqn6HjlSIVn?= =?us-ascii?Q?Fp3XVyKYWATxUltAcD6vt8Gp7a02pQxJ+6eqDlEtrmVLL91l0oxEPdf4Cais?= =?us-ascii?Q?f5hCn5tOTouinOP72wtSnbPjSu847WNvk0UGecIlEV+PWxID66g9kHkAohtC?= =?us-ascii?Q?QbwUqkYemxZRhsfGD/FOcKiUxpDH89EkDTIgmqLDJR6F0gn8Hk4JZ55pIOWM?= =?us-ascii?Q?kXdCP/OO33p7b1bjTTFgOlL2qd/h9nFziF8b2gOMtvcfBJwYnGF6mZBmhCAj?= =?us-ascii?Q?wBalhGQ/DUvUn+Ujhza4oBTDhYxaVvnM9sqJrz03wkNbQif2LzDTtg5g1P+i?= =?us-ascii?Q?035eyFjB0hkGdHEJ7hAedeTl/ROqRAVP2Vc4Z+DYNhIQL5bbCgt2zdINK8X6?= =?us-ascii?Q?rUk4kumvqNhwfIlnU+A5Vq2pEm3EW5lHXdXbZ4MTUeu/xtWyPgwRNLijRbP5?= =?us-ascii?Q?vTMgMCQRgZT5Z7R4fAPD4ZhG+W+WXyXFO90e6Yai+gm3dO4ACda5uwFmht+6?= =?us-ascii?Q?QeK2Z2/YvguVhAt2h/hY0ILdHga0zmG9QEX7zDSkPDJn7iXKbQ4VPQJDrFlT?= =?us-ascii?Q?9CG9Uj68pcNLgQN2cmRYgqvhiw52zgK2yzpvj7ypNPi6fKkiCD+DiY2D3eQ/?= =?us-ascii?Q?dexmn7NJZj9JTRIiLmmKxs5F?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e42560b4-745d-4c3c-4244-08d95d3c27ef X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2021 02:51:59.7818 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rPdptfarCCPT5ZT/8uUNRHhvvHfwmIRbjgIn69brIPzBfSph26oI4n7papBUl4wNCHMEjTXCk0bPu+fy439hAqFyQinwcOojz5WXwxjKzHw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1456 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: https://github.com/tianocore/edk2-platforms/commit/cd4e6b7 -----Original Message----- From: Oram, Isaac W =20 Sent: Wednesday, August 11, 2021 4:40 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Chiu, Chasel Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/Boa= rdAcpiLib: Fix GP Fault in ACPI Enable SMI Fixed AcpiSmm library BoardAcpiLib to use the correct SMM services table an= d DynamicSiliconLibrarySmmProtocol. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnable= Lib.inf | 4 ++-- Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/= SmmSiliconAcpiEnableLib.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoa= rdAcpiEnableLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiL= ib/SmmBoardAcpiEnableLib.inf index fcbc94cc50..19d29ed40f 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiE= nableLib.inf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAc +++ piEnableLib.inf @@ -42,7 +42,7 @@ SmmBoardAcpiEnableLib.c =20 [Protocols] - gDynamicSiLibraryProtocolGuid ## CONSUMES + gDynamicSiLibrarySmmProtocolGuid ## CONSUMES =20 [Depex] - gDynamicSiLibraryProtocolGuid + gDynamicSiLibrarySmmProtocolGuid diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSil= iconAcpiEnableLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiL= ib/SmmSiliconAcpiEnableLib.c index 2b8a35c7e8..484311811b 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSiliconAcp= iEnableLib.c +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSilicon +++ AcpiEnableLib.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include =20 /** Clear Port 80h @@ -61,9 +61,9 @@ SiliconEnableAcpi ( UINT16 Pm1Cnt; UINT16 PchPmBase; EFI_STATUS Status; - DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol =3D NULL; + DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol =3D NULL; =20 - Status =3D gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &D= ynamicSiLibraryProtocol); + Status =3D gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid,= =20 + NULL, &DynamicSiLibrarySmmProtocol); if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status); return Status; @@ -72,7 +72,7 @@ SiliconEnableAcpi ( // // Init Power Management I/O Base aka ACPI Base // - PchPmBase =3D DynamicSiLibraryProtocol->PmcGetAcpiBase (); + PchPmBase =3D DynamicSiLibrarySmmProtocol->PmcGetAcpiBase (); =20 SmiEn =3D IoRead32 (PchPmBase + R_ACPI_IO_SMI_EN); =20 @@ -112,9 +112,9 @@ SiliconDisableAcpi ( UINT16 Pm1Cnt; UINT16 PchPmBase; EFI_STATUS Status; - DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol =3D NULL; + DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol =3D NULL; =20 - Status =3D gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &D= ynamicSiLibraryProtocol); + Status =3D gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid,= =20 + NULL, &DynamicSiLibrarySmmProtocol); if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status); return Status; @@ -123,7 +123,7 @@ SiliconDisableAcpi ( // // Init Power Management I/O Base aka ACPI Base // - PchPmBase =3D DynamicSiLibraryProtocol->PmcGetAcpiBase (); + PchPmBase =3D DynamicSiLibrarySmmProtocol->PmcGetAcpiBase (); =20 Pm1Cnt =3D IoRead16 (PchPmBase + R_ACPI_IO_PM1_CNT); =20 -- 2.27.0.windows.1