Roll back the change which doesn't call LocateProtocol when TPL is TPL_NOTIFY because it may cause certain status code get lost in some rare case.

Signed-off-by: niruiyu

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12801 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu
2011-11-30 01:53:13 +00:00
parent 0c1992fbcc
commit 5db9d35f07

View File

@ -1,7 +1,7 @@
/** @file /** @file
Report Status Code Library for DXE Phase. Report Status Code Library for DXE Phase.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -45,7 +45,6 @@ InternalGetReportStatusCode (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_TPL Tpl;
if (mReportStatusCodeLibStatusCodeProtocol != NULL) { if (mReportStatusCodeLibStatusCodeProtocol != NULL) {
return; return;
@ -54,18 +53,10 @@ InternalGetReportStatusCode (
// //
// Check gBS just in case ReportStatusCode is called before gBS is initialized. // Check gBS just in case ReportStatusCode is called before gBS is initialized.
// //
if ((gBS != NULL) && (gBS->LocateProtocol != NULL) && (gBS->RaiseTPL != NULL) && (gBS->RestoreTPL != NULL)) { if (gBS != NULL && gBS->LocateProtocol != NULL) {
// Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**) &mReportStatusCodeLibStatusCodeProtocol);
// Retrieve the current TPL if (EFI_ERROR (Status)) {
// mReportStatusCodeLibStatusCodeProtocol = NULL;
Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
gBS->RestoreTPL (Tpl);
if (Tpl < TPL_NOTIFY) {
Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**) &mReportStatusCodeLibStatusCodeProtocol);
if (EFI_ERROR (Status)) {
mReportStatusCodeLibStatusCodeProtocol = NULL;
}
} }
} }
} }
@ -505,10 +496,7 @@ ReportStatusCodeEx (
ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0))); ASSERT (!((ExtendedData == NULL) && (ExtendedDataSize != 0)));
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0))); ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
if ((gBS == NULL) || if (gBS == NULL || gBS->AllocatePool == NULL || gBS->FreePool == NULL) {
(gBS->AllocatePool == NULL) || (gBS->FreePool == NULL) ||
(gBS->RaiseTPL == NULL) || (gBS->RestoreTPL == NULL)
) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }