Add MM_STANDALONE type support for SmmIpmiBaseLib instance. Replace Smst with Mmst. Remove unused UefiBootServicesTableLib reference.
Cc: Abner Chang <abner.ch...@amd.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Signed-off-by: Wei6 Xu <wei6...@intel.com> --- .../Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c | 39 +++++-------------- .../Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf | 7 ++-- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c index 6282adc269f8..d05798d94866 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.c @@ -2,15 +2,14 @@ A Library to support all BMC access via IPMI command during SMM Phase. @copyright - Copyright 1999 - 2021 Intel Corporation. <BR> + Copyright 1999 - 2023 Intel Corporation. <BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#include <PiDxe.h> +#include <PiMm.h> #include <Protocol/IpmiTransportProtocol.h> #include <Library/IpmiBaseLib.h> -#include <Library/UefiBootServicesTableLib.h> -#include <Library/SmmServicesTableLib.h> +#include <Library/MmServicesTableLib.h> #include <Library/DebugLib.h> STATIC IPMI_TRANSPORT *mIpmiTransport = NULL; @@ -37,7 +36,7 @@ NotifyIpmiTransportCallback ( EFI_STATUS Status; Status = EFI_SUCCESS; if (mIpmiTransport == NULL) { - Status = gSmst->SmmLocateProtocol ( + Status = gMmst->MmLocateProtocol ( &gSmmIpmiTransportProtocolGuid, NULL, (VOID **) &mIpmiTransport @@ -60,15 +59,15 @@ InitializeIpmiBase ( { EFI_STATUS Status; if (mIpmiTransport == NULL) { - Status = gSmst->SmmLocateProtocol ( + Status = gMmst->MmLocateProtocol ( &gSmmIpmiTransportProtocolGuid, NULL, (VOID **) &mIpmiTransport ); if (EFI_ERROR (Status)) { - Status = gSmst->SmmRegisterProtocolNotify ( + Status = gMmst->MmRegisterProtocolNotify ( &gSmmIpmiTransportProtocolGuid, - (EFI_SMM_NOTIFY_FN) NotifyIpmiTransportCallback, + (EFI_MM_NOTIFY_FN) NotifyIpmiTransportCallback, &mEfiIpmiProtocolNotifyReg ); } @@ -104,30 +103,10 @@ IpmiSubmitCommand ( OUT UINT8 *ResponseData, IN OUT UINT32 *ResponseDataSize ) -/*++ - -Routine Description: - - Routine to send commands to BMC - -Arguments: - - NetFunction - Net function of the command - Command - IPMI Command - CommandData - Command Data - CommandDataSize - Size of CommandData - ResponseData - Response Data - ResponseDataSize - Response Data Size - -Returns: - - EFI_NOT_AVAILABLE_YET - IpmiTransport Protocol is not installed yet - ---*/ { EFI_STATUS Status; - Status = gSmst->SmmLocateProtocol (&gSmmIpmiTransportProtocolGuid, NULL, (VOID **) &mIpmiTransport); + Status = gMmst->MmLocateProtocol (&gSmmIpmiTransportProtocolGuid, NULL, (VOID **) &mIpmiTransport); if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status); return Status; @@ -164,7 +143,7 @@ GetBmcStatus ( { EFI_STATUS Status; - Status = gSmst->SmmLocateProtocol (&gSmmIpmiTransportProtocolGuid, NULL, (VOID **) &mIpmiTransport); + Status = gMmst->MmLocateProtocol (&gSmmIpmiTransportProtocolGuid, NULL, (VOID **) &mIpmiTransport); if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status); return Status; diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf index 7ea688fc165f..df43c81e6493 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf @@ -1,7 +1,7 @@ ## @file # # @copyright -# Copyright 2010 - 2021 Intel Corporation. <BR> +# Copyright 2010 - 2023 Intel Corporation. <BR> # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -11,7 +11,7 @@ FILE_GUID = 2B5AD78E-5CF8-45d2-B2AC-749A09425911 MODULE_TYPE = DXE_SMM_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = IpmiBaseLib|DXE_SMM_DRIVER SMM_CORE + LIBRARY_CLASS = IpmiBaseLib|DXE_SMM_DRIVER SMM_CORE MM_STANDALONE MM_CORE_STANDALONE [sources] SmmIpmiBaseLib.c @@ -21,9 +21,8 @@ IpmiFeaturePkg/IpmiFeaturePkg.dec [LibraryClasses] - UefiBootServicesTableLib DebugLib - SmmServicesTableLib + MmServicesTableLib [Protocols] gSmmIpmiTransportProtocolGuid -- 2.29.2.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#110683): https://edk2.groups.io/g/devel/message/110683 Mute This Topic: https://groups.io/mt/102402215/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-