tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 22:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

IntelFsp2Pkg: Support 64bit FspResetType for X64 build.

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3999
FspResetType will be either 32bit or 64 bit basing on
the build type.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
This commit is contained in:
Chasel Chiu 2022-07-18 20:28:17 -07:00 committed by mergify[bot]
parent 671b0cea51
commit 140446cd59
4 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IntelFsp2Pkg/Include/FspEas/FspApi.h
View File

@ -11,19 +11,24 @@
#define _FSP_API_H_ #define _FSP_API_H_
#include <Pi/PiStatusCode.h> #include <Pi/PiStatusCode.h>
#include <Base.h>
/// ///
/// FSP Reset Status code /// FSP Reset Status code
/// These are defined in FSP EAS v2.0 section 11.2.2 - OEM Status Code /// These are defined in FSP EAS v2.4 section 13.2.2 - OEM Status Code
/// @{ /// @{
#define FSP_STATUS_RESET_REQUIRED_COLD 0x40000001
#define FSP_STATUS_RESET_REQUIRED_WARM 0x40000002 #define ENCODE_RESET_REQUEST(ResetType) \
#define FSP_STATUS_RESET_REQUIRED_3 0x40000003 ((EFI_STATUS)((MAX_BIT >> 1) | (ResetType)))
#define FSP_STATUS_RESET_REQUIRED_4 0x40000004 #define FSP_STATUS_RESET_REQUIRED_COLD ENCODE_RESET_REQUEST(1)
#define FSP_STATUS_RESET_REQUIRED_5 0x40000005 #define FSP_STATUS_RESET_REQUIRED_WARM ENCODE_RESET_REQUEST(2)
#define FSP_STATUS_RESET_REQUIRED_6 0x40000006 #define FSP_STATUS_RESET_REQUIRED_3 ENCODE_RESET_REQUEST(3)
#define FSP_STATUS_RESET_REQUIRED_7 0x40000007 #define FSP_STATUS_RESET_REQUIRED_4 ENCODE_RESET_REQUEST(4)
#define FSP_STATUS_RESET_REQUIRED_8 0x40000008 #define FSP_STATUS_RESET_REQUIRED_5 ENCODE_RESET_REQUEST(5)
#define FSP_STATUS_RESET_REQUIRED_6 ENCODE_RESET_REQUEST(6)
#define FSP_STATUS_RESET_REQUIRED_7 ENCODE_RESET_REQUEST(7)
#define FSP_STATUS_RESET_REQUIRED_8 ENCODE_RESET_REQUEST(8)
#define FSP_STATUS_VARIABLE_REQUEST ENCODE_RESET_REQUEST(10)
/// @} /// @}
/// ///

2
IntelFsp2Pkg/Include/Library/FspCommonLib.h
View File

@ -302,7 +302,7 @@ SetPhaseStatusCode (
VOID VOID
EFIAPI EFIAPI
FspApiReturnStatusReset ( FspApiReturnStatusReset (
IN UINT32 FspResetType IN EFI_STATUS FspResetType
); );
#endif #endif

4
IntelFsp2Pkg/Include/Library/FspSwitchStackLib.h
View File

@ -30,7 +30,7 @@
**/ **/
UINT32 EFI_STATUS
EFIAPI EFIAPI
Pei2LoaderSwitchStack ( Pei2LoaderSwitchStack (
VOID VOID
@ -46,7 +46,7 @@ Pei2LoaderSwitchStack (
**/ **/
UINT32 EFI_STATUS
EFIAPI EFIAPI
Loader2PeiSwitchStack ( Loader2PeiSwitchStack (
VOID VOID

4
IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
View File

@ -533,7 +533,7 @@ SetPhaseStatusCode (
VOID VOID
EFIAPI EFIAPI
FspApiReturnStatusReset ( FspApiReturnStatusReset (
IN UINT32 FspResetType IN EFI_STATUS FspResetType
) )
{ {
volatile BOOLEAN LoopUntilReset; volatile BOOLEAN LoopUntilReset;
@ -546,7 +546,7 @@ FspApiReturnStatusReset (
/// calls the FSP API without honoring the reset request by FSP /// calls the FSP API without honoring the reset request by FSP
/// ///
do { do {
SetFspApiReturnStatus ((EFI_STATUS)FspResetType); SetFspApiReturnStatus (FspResetType);
Pei2LoaderSwitchStack (); Pei2LoaderSwitchStack ();
DEBUG ((DEBUG_ERROR, "!!!ERROR: FSP has requested BootLoader for reset. But BootLoader has not honored the reset\n")); DEBUG ((DEBUG_ERROR, "!!!ERROR: FSP has requested BootLoader for reset. But BootLoader has not honored the reset\n"));
DEBUG ((DEBUG_ERROR, "!!!ERROR: Please add support in BootLoader to honor the reset request from FSP\n")); DEBUG ((DEBUG_ERROR, "!!!ERROR: Please add support in BootLoader to honor the reset request from FSP\n"));