tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/CapsuleLib: Add lib destructors to handle unclosed events 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Hao Wu 2017-03-10 10:13:32 +08:00
parent c103e09b52
commit 96b17e00b9
4 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
View File

@ -47,9 +47,8 @@
#include <Protocol/FirmwareManagement.h> #include <Protocol/FirmwareManagement.h>
#include <Protocol/DevicePath.h> #include <Protocol/DevicePath.h>
EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable = NULL; BOOLEAN mDxeCapsuleLibEndOfDxe = FALSE;
BOOLEAN mIsVirtualAddrConverted = FALSE; EFI_EVENT mDxeCapsuleLibEndOfDxeEvent = NULL;
BOOLEAN mDxeCapsuleLibEndOfDxe = FALSE;
/** /**
Initialize capsule related variables. Initialize capsule related variables.
@ -1654,7 +1653,6 @@ DxeCapsuleLibConstructor (
IN EFI_SYSTEM_TABLE *SystemTable IN EFI_SYSTEM_TABLE *SystemTable
) )
{ {
EFI_EVENT EndOfDxeEvent;
EFI_STATUS Status; EFI_STATUS Status;
Status = gBS->CreateEventEx ( Status = gBS->CreateEventEx (
@ -1663,7 +1661,7 @@ DxeCapsuleLibConstructor (
DxeCapsuleLibEndOfDxe, DxeCapsuleLibEndOfDxe,
NULL, NULL,
&gEfiEndOfDxeEventGroupGuid, &gEfiEndOfDxeEventGroupGuid,
&EndOfDxeEvent &mDxeCapsuleLibEndOfDxeEvent
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
@ -1671,3 +1669,29 @@ DxeCapsuleLibConstructor (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
The destructor function closes the End of DXE event.
@param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
@retval EFI_SUCCESS The destructor completed successfully.
**/
EFI_STATUS
EFIAPI
DxeCapsuleLibDestructor (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
//
// Close the End of DXE event.
//
Status = gBS->CloseEvent (mDxeCapsuleLibEndOfDxeEvent);
ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
}

3
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
View File

@ -3,7 +3,7 @@
# #
# Capsule library instance for DXE_DRIVER module types. # Capsule library instance for DXE_DRIVER module types.
# #
# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2016 - 2017, 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
@ -23,6 +23,7 @@
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = CapsuleLib|DXE_DRIVER UEFI_APPLICATION LIBRARY_CLASS = CapsuleLib|DXE_DRIVER UEFI_APPLICATION
CONSTRUCTOR = DxeCapsuleLibConstructor CONSTRUCTOR = DxeCapsuleLibConstructor
DESTRUCTOR = DxeCapsuleLibDestructor
# #
# The following information is for reference only and not required by the build tools. # The following information is for reference only and not required by the build tools.

37
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleRuntime.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Capsule library runtime support. Capsule library runtime support.
Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2016 - 2017, 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
@ -26,8 +26,9 @@
#include <Library/UefiRuntimeServicesTableLib.h> #include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
extern EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable; EFI_SYSTEM_RESOURCE_TABLE *mEsrtTable = NULL;
extern BOOLEAN mIsVirtualAddrConverted; BOOLEAN mIsVirtualAddrConverted = FALSE;
EFI_EVENT mDxeRuntimeCapsuleLibVirtualAddressChangeEvent = NULL;
/** /**
Convert EsrtTable physical address to virtual address. Convert EsrtTable physical address to virtual address.
@ -92,21 +93,45 @@ DxeRuntimeCapsuleLibConstructor (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_EVENT Event;
// //
// Make sure we can handle virtual address changes. // Make sure we can handle virtual address changes.
// //
Event = NULL;
Status = gBS->CreateEventEx ( Status = gBS->CreateEventEx (
EVT_NOTIFY_SIGNAL, EVT_NOTIFY_SIGNAL,
TPL_NOTIFY, TPL_NOTIFY,
DxeCapsuleLibVirtualAddressChangeEvent, DxeCapsuleLibVirtualAddressChangeEvent,
NULL, NULL,
&gEfiEventVirtualAddressChangeGuid, &gEfiEventVirtualAddressChangeGuid,
&Event &mDxeRuntimeCapsuleLibVirtualAddressChangeEvent
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
The destructor function closes the VirtualAddressChange event.
@param ImageHandle The firmware allocated handle for the EFI image.
@param SystemTable A pointer to the EFI System Table.
@retval EFI_SUCCESS The destructor completed successfully.
**/
EFI_STATUS
EFIAPI
DxeRuntimeCapsuleLibDestructor (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
//
// Close the VirtualAddressChange event.
//
Status = gBS->CloseEvent (mDxeRuntimeCapsuleLibVirtualAddressChangeEvent);
ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
}

4
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
View File

@ -3,7 +3,7 @@
# #
# Capsule library instance for DXE_RUNTIME_DRIVER module types. # Capsule library instance for DXE_RUNTIME_DRIVER module types.
# #
# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2016 - 2017, 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
@ -24,6 +24,8 @@
LIBRARY_CLASS = CapsuleLib|DXE_RUNTIME_DRIVER LIBRARY_CLASS = CapsuleLib|DXE_RUNTIME_DRIVER
CONSTRUCTOR = DxeCapsuleLibConstructor CONSTRUCTOR = DxeCapsuleLibConstructor
CONSTRUCTOR = DxeRuntimeCapsuleLibConstructor CONSTRUCTOR = DxeRuntimeCapsuleLibConstructor
DESTRUCTOR = DxeCapsuleLibDestructor
DESTRUCTOR = DxeRuntimeCapsuleLibDestructor
# #
# The following information is for reference only and not required by the build tools. # The following information is for reference only and not required by the build tools.