Use AfterConsole event instead of ReadyToBoot for callback so the driver can update SMBIOS table before booting to setup menu.
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Change-Id: Ife697f4c78449b90f17ffa7b7bc5a6a5f77d9436 Signed-off-by: Zhen Gong <zhen.g...@intel.com> --- .../IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.inf | 3 ++- .../IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.h | 1 - .../IpmiFeaturePkg/IpmiRedirFru/FruSmbios.c | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.inf index 24fbc94128da..814f595b5abe 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.inf @@ -25,6 +25,7 @@ [Packages] IpmiFeaturePkg/IpmiFeaturePkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + MinPlatformPkg/MinPlatformPkg.dec [LibraryClasses] UefiDriverEntryPoint @@ -32,12 +33,12 @@ [LibraryClasses] UefiBootServicesTableLib BaseMemoryLib MemoryAllocationLib - UefiLib IpmiBaseLib [Guids] gEfiIpmiFormatFruGuid gEfiSystemTypeFruGuid + gBdsEventAfterConsoleReadyBeforeBootOptionGuid [Protocols] gEfiSmbiosProtocolGuid diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.h b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.h index 9fd0067973a6..b5ffe1ad0518 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.h +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/IpmiRedirFru.h @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Uefi.h> #include <Library/BaseLib.h> #include <Library/DebugLib.h> -#include <Library/UefiLib.h> #include <Library/BaseMemoryLib.h> #include <Library/MemoryAllocationLib.h> diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/FruSmbios.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/FruSmbios.c index bd4b35ba5793..9c63fae42678 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/FruSmbios.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiRedirFru/FruSmbios.c @@ -454,15 +454,17 @@ GenerateFruSmbiosData ( mFruRedirProtocol = This; - Status = EfiCreateEventReadyToBootEx ( - TPL_CALLBACK, - GenerateFruSmbiosType123DataNotified, - NULL, - &Event - ); + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + GenerateFruSmbiosType123DataNotified, + NULL, + &gBdsEventAfterConsoleReadyBeforeBootOptionGuid, + &Event + ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "GenerateFruSmbiosData(): EfiCreateEventReadyToBootEx failed with return value: %r\n", Status)); + DEBUG ((DEBUG_ERROR, "GenerateFruSmbiosData(): Create AfterConsole event failed with return value: %r\n", Status)); } return; -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111330): https://edk2.groups.io/g/devel/message/111330 Mute This Topic: https://groups.io/mt/102638229/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-