From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web09.17261.1628735421740755069 for ; Wed, 11 Aug 2021 19:30:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=M4TsaiSV; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10073"; a="279010096" X-IronPort-AV: E=Sophos;i="5.84,314,1620716400"; d="scan'208";a="279010096" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2021 19:30:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,314,1620716400"; d="scan'208";a="676604693" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga005.fm.intel.com with ESMTP; 11 Aug 2021 19:30:20 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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:30:20 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx607.amr.corp.intel.com (10.18.126.87) 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:30:19 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) 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:30:19 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.43) by edgegateway.intel.com (192.55.55.68) 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:30:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CKXZqDK+4fzJVcUP7K2Sqbm8VRVfkyVx4v1+0MNDFWPAUOSpni7cxpeILVus8fujXQsdaXH00NNKE652zpxGv0KWIZlKhaqfKSv36KYckXHbCpjY0hi5mNpEovZUkILCVyCMwhNomgYKpYGjTfXjhzBHq158Mkg/Xpof637sz/M0j+urcum5FGTM6ODOq24J2fC8YtLjvUUbc2PQrHADiApzxJmqecGgsxvskpRRfvr53YWtiIsbgmhpcT9805adUZNbK0pVRkUZxv1T0scoOW85mF2XW8Todw67ShH5l/U8fXrq5uTkovg8cckPwtdvUJWEu5u/M0ylPcWyLvq7ng== 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=jhXFF/78XJgg4SGrfbI3Jrg20AkPIxqPAu8L2/so0OE=; b=Oo30iJavFj0OswTrkaDz4pE8/AjRN3RUwTULPt80Lr6Nnb5iev6OkHNUNt3A/oJTkSg5nqJWUyfqLIlf2e4wMawZXIlOjS58rXhLojR1dCvnLqI+WDckexDQPcZlzxAU6KzZxhe/Stdh8L3+v5sksyxuPl6bh6XcDqZMlib5aK50xz1CzMzvsnwX0hMbyPuc76NtxYtMN3Lt35Fx12fm9VF48+Rruc3FKV4DhnST8vKfFUs2qvnpeSvIsUOyeJAeMLCfpYsoHiO8HYkRFNncu8zb5dzO/nYPY8192oGsFmCyC/YCNJUa7tLBay2tavIbdX0qfv3TXMGAYlSsI8g8Zw== 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=jhXFF/78XJgg4SGrfbI3Jrg20AkPIxqPAu8L2/so0OE=; b=M4TsaiSVWorGKceGt0wEVx2pKo+u/k/6jrd3xXAe6E/IqAdZC1+IA/OZu3IyWtH7Mmzm1DeZM5QL5W/4qCRDyD8WCyaWddtCTWzHlHfdv47hqcwgaEO+FY8KjA4N+O/ZYPd98RZNpd8Qz4sQxA9F75NmkkndkRMqDAdKsVYRoX4= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by MWHPR1101MB2255.namprd11.prod.outlook.com (2603:10b6:301:5b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Thu, 12 Aug 2021 02:30:16 +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:30:16 +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: AQHXjwpU87MxfK9aJUemxS19FlQJ86tvJc0A Date: Thu, 12 Aug 2021 02:30:16 +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: 5894407a-32c4-4135-5780-08d95d391ef9 x-ms-traffictypediagnostic: MWHPR1101MB2255: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3631; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 18JmkFl6REDeYBYT8f92NCowwNwgSFUG1e61XM1ME1Co+OJzehtulmzuqpfS3M5OR9T2IA+00a7vxoTXYL0JA2YCb0tx1pNkH/5kd4fW6C6YdivTwNgc8xPYyblWaNAGESbOdAXq4BcIa6qxD6BUZCoUG3Dz79RQEmCMkSKT31kRMxgIvJhHymvyZ35yC7T37HPXgDLDZLQKqxtQNVZopRrD8z8sONpMwwKyXtkFO9Iu7xSCnTw5Ncj4kAQrRz6MBSCmV7AuJ/CkXOokXzLtUdcoQbPZqWngJ0V+341uOhClDMchKEn9qGcmKcSr63mngpWqyVAEYkQKIv56QVNoSNyKxhY97D2yTZPXJR4kEvFPLej3WBlaj7izJKoJBR8k1CbAT4BURxDqOjwV8g+AdTAm18uf+6GDUy+NWPMQ9238TNWSh3fRWxItHjHYBIVTTsjLatWN0Lh1pDnXfFw1VBMQZ1oex5Aus5eLxiHling7JhHbIIt210xy0Wy8ROMKLIxl+wZucfQAoPS62zCSV+ZodR2WXjvYEkZlEGRecIvuEHwuI/fXdt/sMzQ0YNlADq0Oahx6oYIqHN0KtPOBOTxp2LH3bLvTIIelC4mzhA86BIca7oVel9/B21JxNlALK0cTRttf38QZncZ6+BQocBKBeGREPDR+Vl58vag6fN3MlqeSGOlYZHWuwv5ex7YL5eg46TJ2xSeH266AZvNPCA== 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)(396003)(376002)(39860400002)(346002)(136003)(107886003)(38070700005)(71200400001)(110136005)(64756008)(66556008)(76116006)(66946007)(83380400001)(478600001)(66476007)(186003)(33656002)(6506007)(53546011)(8676002)(7696005)(26005)(4326008)(86362001)(2906002)(55016002)(122000001)(38100700002)(66446008)(8936002)(52536014)(316002)(9686003)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?q6FvaQaEuPWNr7qUxpmpbvGUCxEMv62H5TY44zCRBkEAT/7/FdCF4iwZpLYQ?= =?us-ascii?Q?NpOncKqDPEJY98e3+GMum0yr4uqlq6qDsis2lWqiRZ1+Xx52iGjHaK23Q1yZ?= =?us-ascii?Q?gupHJu0/w2/DS/5efvZiIxkmmNwcB4BTHlow4WxYwVwaKo9w/hI4nU7iPste?= =?us-ascii?Q?swpZGVQBBXAC53VNuaOFcqgbzM9hwGarXbfY1EJjA210cLn4c1Gfdjm70qr/?= =?us-ascii?Q?z3VvVULQEga51ADnq1mcO839Ji/ggDz9kFynEmPUkNww1TU4YRJtF++3ytsH?= =?us-ascii?Q?QeKwvMeb0qyVa0F4bhT4VPooXMfSEffRrb673eXSqPGoihFmmH/co9sAKZWR?= =?us-ascii?Q?6/WoOJTPN6rz6tNjs75zJz9YVteCoUEb8ipek7aAvMpE+eaVC3QuqEDGWfTj?= =?us-ascii?Q?DGMeM6m/Z+JEB2jRBZawSrs4hJg3kfR44keCBO8oZjrz8k3tTH/tRQTAFo8l?= =?us-ascii?Q?x60GCXfGACGfIB1Ek48pkY7bv8sN/FLpCxb5XXi7yE4ad+bsspGkNViAul0+?= =?us-ascii?Q?6t24rmiEOF8BIRUDZ4aMtnB65eu9auv+RbqZzk4r41u7Y6cVTWvAD5vqaL7D?= =?us-ascii?Q?QstnIW4TuGOFTcysnqoXEMkbkyI6xSmqBe4rEyveQsXWaEKmSM97jin/JdXc?= =?us-ascii?Q?FWAT6Y7BP0GL0i1IexEMXJ4okuYkzF+okmQiQzv9/ZkFGMFbv7ALGrvSXwK8?= =?us-ascii?Q?Ul3MElo1Fr1JR3VZYvaRnGcvKbG4twctZHuMnmTc7zQxTt9N9351hiWFPBLR?= =?us-ascii?Q?be4kk7b1XcrBovO9WNNfqKzS6qXtoEyXGfCI5aoxwzZmf+GRV8u8hUiAzIYW?= =?us-ascii?Q?RtJLVpoWVdqFs967vEmlAFMod4Qw33FRIaQfcDv3w5tSY/5sykWFk/mPzCv4?= =?us-ascii?Q?/2T2rmZlRsNcuLb913e6DPTwSwsnZSsND8IRwKEdZpvV+QToY19szkY9ehiw?= =?us-ascii?Q?X9RK+sQLWfDlzPw2Bwx85LXZMpVM3ENPFu2edyKOjYgBcQmuMtMgLlt1/8Uz?= =?us-ascii?Q?wWcPtTfXDuypDreDFrl49wU4keckXLn+W6eNxkNK7kRdzIyiApns0KJ3nm9j?= =?us-ascii?Q?cSskoWX8VQc6xhzs+IJxhjhD6vi8/JsuVpriipfktd/uneJhgc6BMrVm5Xtl?= =?us-ascii?Q?CSCgpjT2rm9CRmlgjIuJwUHLMi/u23wVajwQy4uVKeHIDOmV6w1fZ3qrr5qL?= =?us-ascii?Q?sJxwW8VtccPe8bGkllRoOl7lGACl3orW8W/xangNfgNIRbSk8Ce5+5tqsX1N?= =?us-ascii?Q?bb6uW+dxDkaZl/QzkhumYfN5IOZX9SBXyU4DYgTkFasRZrGUYDjXZplelnon?= =?us-ascii?Q?uWiAOelPwFGdghcalWigWXJX?= 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: 5894407a-32c4-4135-5780-08d95d391ef9 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2021 02:30:16.2812 (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: G5+jBwxvlP7epaMxzVOftZ+rmdrAIGVPDu++40uton7TyrdMt6+D7Aa4Ob2DVOi8tZnf2aYvQ6DlQF5/QhPneOEg/Fj2CTPKuwQAR8tLrwk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2255 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 Good Catch! Reviewed-by: Nate DeSimone -----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