sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1) Replace mBS with gBS from UefiBootServicesTablePointer Lib to avoid library instance to cache too many copies of Boot Service Pointer.

Browse Source 
2) Check gBS before make call using it.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5944 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12
2008-09-22 10:20:41 +00:00
parent 834a2e41fb
commit 9556741cbf
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/ReportStatusCodeLibInternal.h
View File

@ -23,6 +23,7 @@
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/UefiRuntimeServicesTableLib.h> #include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Guid/StatusCodeDataTypeId.h> #include <Guid/StatusCodeDataTypeId.h>
#include <Protocol/StatusCode.h> #include <Protocol/StatusCode.h>

1
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeReportStatusCodeLibFramework.inf
View File

@ -49,6 +49,7 @@
BaseLib BaseLib
DebugLib DebugLib
UefiRuntimeServicesTableLib UefiRuntimeServicesTableLib
UefiBootServicesTableLib
OemHookStatusCodeLib OemHookStatusCodeLib
[Guids] [Guids]

35
IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibFramework/SmmRuntimeDxeSupport.c
View File

@ -37,9 +37,6 @@ EFI_SMM_BASE_PROTOCOL *mSmmBase;
STATIC STATIC
EFI_RUNTIME_SERVICES *mRT; EFI_RUNTIME_SERVICES *mRT;
STATIC
EFI_BOOT_SERVICES *mBS;
STATIC STATIC
BOOLEAN mHaveExitedBootServices = FALSE; BOOLEAN mHaveExitedBootServices = FALSE;
@ -59,12 +56,17 @@ InternalGetReportStatusCode (
if (mInSmm) { if (mInSmm) {
return (EFI_REPORT_STATUS_CODE) OemHookStatusCodeReport; return (EFI_REPORT_STATUS_CODE) OemHookStatusCodeReport;
} else if (mRT->Hdr.Revision < 0x20000) { } else if (mRT != NULL && mRT->Hdr.Revision < 0x20000) {
return ((FRAMEWORK_EFI_RUNTIME_SERVICES*)mRT)->ReportStatusCode; return ((FRAMEWORK_EFI_RUNTIME_SERVICES*)mRT)->ReportStatusCode;
} else if (!mHaveExitedBootServices) { } else if (!mHaveExitedBootServices) {
Status = mBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**)&StatusCodeProtocol); //
if (!EFI_ERROR (Status) && StatusCodeProtocol != NULL) { // Check gBS just in case. ReportStatusCode is called before gBS is initialized.
return StatusCodeProtocol->ReportStatusCode; //
if (gBS != NULL) {
Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**)&StatusCodeProtocol);
if (!EFI_ERROR (Status) && StatusCodeProtocol != NULL) {
return StatusCodeProtocol->ReportStatusCode;
}
} }
} }
@ -127,14 +129,11 @@ ReportStatusCodeLibConstruct (
{ {
EFI_STATUS Status; EFI_STATUS Status;
mBS = SystemTable->BootServices;
// //
// SMM driver depends on the SMM BASE protocol. // SMM driver depends on the SMM BASE protocol.
// the SMM driver must be success to locate protocol. // the SMM driver must be success to locate protocol.
// //
ASSERT (mBS != NULL); Status = gBS->LocateProtocol (&gEfiSmmBaseProtocolGuid, NULL, (VOID **) &mSmmBase);
Status = mBS->LocateProtocol (&gEfiSmmBaseProtocolGuid, NULL, (VOID **) &mSmmBase);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
mSmmBase->InSmm (mSmmBase, &mInSmm); mSmmBase->InSmm (mSmmBase, &mInSmm);
if (mInSmm) { if (mInSmm) {
@ -157,7 +156,7 @@ ReportStatusCodeLibConstruct (
mRT = gRT; mRT = gRT;
mInSmm = FALSE; mInSmm = FALSE;
mBS->AllocatePool (EfiRuntimeServicesData, sizeof (EFI_STATUS_CODE_DATA) + EFI_STATUS_CODE_DATA_MAX_SIZE, (VOID **)&mStatusCodeData); gBS->AllocatePool (EfiRuntimeServicesData, sizeof (EFI_STATUS_CODE_DATA) + EFI_STATUS_CODE_DATA_MAX_SIZE, (VOID **)&mStatusCodeData);
ASSERT (NULL != mStatusCodeData); ASSERT (NULL != mStatusCodeData);
// //
// Cache the report status code service // Cache the report status code service
@ -167,7 +166,7 @@ ReportStatusCodeLibConstruct (
// //
// Register the call back of virtual address change // Register the call back of virtual address change
// //
Status = mBS->CreateEvent ( Status = gBS->CreateEvent (
EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
TPL_NOTIFY, TPL_NOTIFY,
ReportStatusCodeLibVirtualAddressChange, ReportStatusCodeLibVirtualAddressChange,
@ -180,7 +179,7 @@ ReportStatusCodeLibConstruct (
// //
// Register the call back of virtual address change // Register the call back of virtual address change
// //
Status = mBS->CreateEvent ( Status = gBS->CreateEvent (
EVT_SIGNAL_EXIT_BOOT_SERVICES, EVT_SIGNAL_EXIT_BOOT_SERVICES,
TPL_NOTIFY, TPL_NOTIFY,
ReportStatusCodeLibExitBootServices, ReportStatusCodeLibExitBootServices,
@ -212,13 +211,13 @@ ReportStatusCodeLibDestruct (
// //
// Close SetVirtualAddressMap () notify function // Close SetVirtualAddressMap () notify function
// //
ASSERT (mBS != NULL); ASSERT (gBS != NULL);
Status = mBS->CloseEvent (mVirtualAddressChangeEvent); Status = gBS->CloseEvent (mVirtualAddressChangeEvent);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
Status = mBS->CloseEvent (mExitBootServicesEvent); Status = gBS->CloseEvent (mExitBootServicesEvent);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
mBS->FreePool (mStatusCodeData); gBS->FreePool (mStatusCodeData);
} else { } else {
mSmmBase->SmmFreePool (mSmmBase, mStatusCodeData); mSmmBase->SmmFreePool (mSmmBase, mStatusCodeData);
} }