1. DxeIplPeim will locate Vector Handoff Table PPI and build GUIDed HOB if it has.
2. DxeMain will get Vector Handoff Table GUIDed HOB to install configuration table if it has. 3. Updated CPU Exception Handler Library to provide 3 new APIs to replace original one API and updated NULL instance accordingly. 4. Updated DxeMain/CapsuleX64/BootSriptExectorDxe to use the new API in CPU Exception Handler Lib. Signed-off-by: Jeff Fan <jeff.fan@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14884 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -67,6 +67,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#include <Guid/EventExitBootServiceFailed.h>
|
||||
#include <Guid/LoadModuleAtFixedAddress.h>
|
||||
#include <Guid/IdleLoopEvent.h>
|
||||
#include <Guid/VectorHandoffTable.h>
|
||||
#include <Ppi/VectorHandoffInfo.h>
|
||||
|
||||
#include <Library/DxeCoreEntryPoint.h>
|
||||
#include <Library/DebugLib.h>
|
||||
|
@@ -2,7 +2,7 @@
|
||||
# This is core module in DXE phase. It provides an implementation of DXE Core that is
|
||||
# compliant with DXE CIS.
|
||||
#
|
||||
# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
# This program and the accompanying materials
|
||||
# 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
|
||||
@@ -112,6 +112,10 @@
|
||||
gLoadFixedAddressConfigurationTableGuid ## SOMETIMES_CONSUMES
|
||||
gIdleLoopEventGuid ## CONSUMES ## GUID
|
||||
gEventExitBootServicesFailedGuid ## CONSUMES ## GUID
|
||||
gEfiVectorHandoffTableGuid ## SOMETIMES_PRODUCES ## Configuration
|
||||
|
||||
[Ppis]
|
||||
gEfiVectorHandoffInfoPpiGuid ## UNDEFINED
|
||||
|
||||
[Protocols]
|
||||
gEfiStatusCodeRuntimeProtocolGuid ## SOMETIMES_CONSUMES
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
DXE Core Main Entry Point
|
||||
|
||||
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
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
|
||||
@@ -242,11 +242,21 @@ DxeMain (
|
||||
EFI_PHYSICAL_ADDRESS MemoryBaseAddress;
|
||||
UINT64 MemoryLength;
|
||||
PE_COFF_LOADER_IMAGE_CONTEXT ImageContext;
|
||||
UINTN Index;
|
||||
EFI_HOB_GUID_TYPE *GuidHob;
|
||||
EFI_VECTOR_HANDOFF_INFO *VectorInfoList;
|
||||
EFI_VECTOR_HANDOFF_INFO *VectorInfo;
|
||||
|
||||
//
|
||||
// Setup the default exception handlers
|
||||
//
|
||||
SetupCpuExceptionHandlers ();
|
||||
VectorInfoList = NULL;
|
||||
GuidHob = GetNextGuidHob (&gEfiVectorHandoffInfoPpiGuid, HobStart);
|
||||
if (GuidHob != NULL) {
|
||||
VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *) (GET_GUID_HOB_DATA(GuidHob));
|
||||
}
|
||||
Status = InitializeCpuExceptionHandlers (VectorInfoList);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// Initialize Debug Agent to support source level debug in DXE phase
|
||||
@@ -371,6 +381,24 @@ DxeMain (
|
||||
Status = CoreInitializeEventServices ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// Get persisted vector hand-off info from GUIDeed HOB again due to HobStart may be updated,
|
||||
// and install configuration table
|
||||
//
|
||||
GuidHob = GetNextGuidHob (&gEfiVectorHandoffInfoPpiGuid, HobStart);
|
||||
if (GuidHob != NULL) {
|
||||
VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *) (GET_GUID_HOB_DATA(GuidHob));
|
||||
VectorInfo = VectorInfoList;
|
||||
Index = 1;
|
||||
while (VectorInfo->Attribute != EFI_VECTOR_HANDOFF_LAST_ENTRY) {
|
||||
VectorInfo ++;
|
||||
Index ++;
|
||||
}
|
||||
VectorInfo = AllocateCopyPool (sizeof (EFI_VECTOR_HANDOFF_INFO) * Index, (VOID *) VectorInfoList);
|
||||
ASSERT (VectorInfo != NULL);
|
||||
Status = CoreInstallConfigurationTable (&gEfiVectorHandoffTableGuid, (VOID *) VectorInfo);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
//
|
||||
// Get the Protocols that were passed in from PEI to DXE through GUIDed HOBs
|
||||
|
Reference in New Issue
Block a user