From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.15604.1628725251304556968 for ; Wed, 11 Aug 2021 16:40:51 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: isaac.w.oram@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10073"; a="237270443" X-IronPort-AV: E=Sophos;i="5.84,314,1620716400"; d="scan'208";a="237270443" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2021 16:40:50 -0700 X-IronPort-AV: E=Sophos;i="5.84,314,1620716400"; d="scan'208";a="422354006" Received: from iworam-desk.amr.corp.intel.com ([10.7.150.79]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2021 16:40:49 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Nate DeSimone , Chasel Chiu Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/BoardAcpiLib: Fix GP Fault in ACPI Enable SMI Date: Wed, 11 Aug 2021 16:40:13 -0700 Message-Id: X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fixed AcpiSmm library BoardAcpiLib to use the correct SMM services table and DynamicSiliconLibrarySmmProtocol. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.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/SmmBoardAcpiEnableLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf index fcbc94cc50..19d29ed40f 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf @@ -42,7 +42,7 @@ SmmBoardAcpiEnableLib.c [Protocols] - gDynamicSiLibraryProtocolGuid ## CONSUMES + gDynamicSiLibrarySmmProtocolGuid ## CONSUMES [Depex] - gDynamicSiLibraryProtocolGuid + gDynamicSiLibrarySmmProtocolGuid diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c index 2b8a35c7e8..484311811b 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmSiliconAcpiEnableLib.c @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include /** Clear Port 80h @@ -61,9 +61,9 @@ SiliconEnableAcpi ( UINT16 Pm1Cnt; UINT16 PchPmBase; EFI_STATUS Status; - DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL; + DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL; - Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol); + Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, 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 = DynamicSiLibraryProtocol->PmcGetAcpiBase (); + PchPmBase = DynamicSiLibrarySmmProtocol->PmcGetAcpiBase (); SmiEn = IoRead32 (PchPmBase + R_ACPI_IO_SMI_EN); @@ -112,9 +112,9 @@ SiliconDisableAcpi ( UINT16 Pm1Cnt; UINT16 PchPmBase; EFI_STATUS Status; - DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL; + DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL; - Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol); + Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, 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 = DynamicSiLibraryProtocol->PmcGetAcpiBase (); + PchPmBase = DynamicSiLibrarySmmProtocol->PmcGetAcpiBase (); Pm1Cnt = IoRead16 (PchPmBase + R_ACPI_IO_PM1_CNT); -- 2.27.0.windows.1