UefiCpuPkg/SecCore: Wrong Debug Information for SecCore

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1533

When SecCore and PeiCore in different FV, current
implementation still assuming SecCore and PeiCore are in
the same FV.
To fix this issue 2 FVs will be input parameters for
FindAndReportEntryPoints () and SecCore and PeiCore will
be found in each FV and correct debug information will
be reported.

Test: Booted with internal platform successfully.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/UefiCpuPkg/SecCore/SecMain.h b/UefiCpuPkg/SecCore/SecMain.h
index 80045d34f4..6f3b0c5d12 100644
--- a/UefiCpuPkg/SecCore/SecMain.h
+++ b/UefiCpuPkg/SecCore/SecMain.h
@@ -89,14 +89,16 @@ SecStartup (
   It also find SEC and PEI Core file debug information. It will report them if

   remote debug is enabled.

 

-  @param  BootFirmwareVolumePtr  Point to the boot firmware volume.

-  @param  PeiCoreEntryPoint      Point to the PEI core entry point.

+  @param   SecCoreFirmwareVolumePtr Point to the firmware volume for finding SecCore.

+  @param   PeiCoreFirmwareVolumePtr Point to the firmware volume for finding PeiCore.

+  @param   PeiCoreEntryPoint        The entry point of the PEI core.

 

 **/

 VOID

 EFIAPI

 FindAndReportEntryPoints (

-  IN  EFI_FIRMWARE_VOLUME_HEADER       *BootFirmwareVolumePtr,

+  IN  EFI_FIRMWARE_VOLUME_HEADER       *SecCoreFirmwareVolumePtr,

+  IN  EFI_FIRMWARE_VOLUME_HEADER       *PeiCoreFirmwareVolumePtr,

   OUT EFI_PEI_CORE_ENTRY_POINT         *PeiCoreEntryPoint

   );