//\r
BOOLEAN mInLegacyBoot = FALSE;\r
\r
+//\r
+// Flag to determine if it is during S3 resume.\r
+// It will be set in S3 entry callback and cleared at EndOfS3Resume.\r
+//\r
+BOOLEAN mDuringS3Resume = FALSE;\r
+\r
//\r
// Table of SMI Handlers that are registered by the SMM Core when it is initialized\r
//\r
{ SmmExitBootServicesHandler, &gEfiEventExitBootServicesGuid, NULL, FALSE },\r
{ SmmReadyToBootHandler, &gEfiEventReadyToBootGuid, NULL, FALSE },\r
{ SmmEndOfDxeHandler, &gEfiEndOfDxeEventGroupGuid, NULL, TRUE },\r
- { SmmEndOfS3ResumeHandler, &gEdkiiSmmEndOfS3ResumeProtocolGuid, NULL, FALSE },\r
+ { SmmEndOfS3ResumeHandler, &gEdkiiEndOfS3ResumeGuid, NULL, FALSE },\r
{ NULL, NULL, NULL, FALSE }\r
};\r
\r
{\r
EFI_STATUS Status;\r
EFI_HANDLE SmmHandle;\r
+ UINTN Index;\r
\r
//\r
// Install SMM Legacy Boot protocol.\r
\r
SmiHandlerUnRegister (DispatchHandle);\r
\r
+ //\r
+ // It is legacy boot, unregister ExitBootService SMI handler.\r
+ //\r
+ for (Index = 0; mSmmCoreSmiHandlers[Index].HandlerType != NULL; Index++) {\r
+ if (CompareGuid (mSmmCoreSmiHandlers[Index].HandlerType, &gEfiEventExitBootServicesGuid)) {\r
+ SmiHandlerUnRegister (mSmmCoreSmiHandlers[Index].DispatchHandle);\r
+ break;\r
+ }\r
+ }\r
+\r
return Status;\r
}\r
\r
{\r
EFI_STATUS Status;\r
EFI_HANDLE SmmHandle;\r
+ UINTN Index;\r
\r
//\r
// Install SMM Exit Boot Services protocol.\r
\r
SmiHandlerUnRegister (DispatchHandle);\r
\r
+ //\r
+ // It is UEFI boot, unregister LegacyBoot SMI handler.\r
+ //\r
+ for (Index = 0; mSmmCoreSmiHandlers[Index].HandlerType != NULL; Index++) {\r
+ if (CompareGuid (mSmmCoreSmiHandlers[Index].HandlerType, &gEfiEventLegacyBootGuid)) {\r
+ SmiHandlerUnRegister (mSmmCoreSmiHandlers[Index].DispatchHandle);\r
+ break;\r
+ }\r
+ }\r
+\r
return Status;\r
}\r
\r
+/**\r
+ Main entry point for an SMM handler dispatch or communicate-based callback.\r
+\r
+ @param[in] DispatchHandle The unique handle assigned to this handler by SmiHandlerRegister().\r
+ @param[in] Context Points to an optional handler context which was specified when the\r
+ handler was registered.\r
+ @param[in,out] CommBuffer A pointer to a collection of data in memory that will\r
+ be conveyed from a non-SMM environment into an SMM environment.\r
+ @param[in,out] CommBufferSize The size of the CommBuffer.\r
+\r
+ @retval EFI_SUCCESS The interrupt was handled and quiesced. No other handlers\r
+ should still be called.\r
+ @retval EFI_WARN_INTERRUPT_SOURCE_QUIESCED The interrupt has been quiesced but other handlers should\r
+ still be called.\r
+ @retval EFI_WARN_INTERRUPT_SOURCE_PENDING The interrupt is still pending and other handlers should still\r
+ be called.\r
+ @retval EFI_INTERRUPT_PENDING The interrupt could not be quiesced.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+SmmS3EntryCallBack (\r
+ IN EFI_HANDLE DispatchHandle,\r
+ IN CONST VOID *Context OPTIONAL,\r
+ IN OUT VOID *CommBuffer OPTIONAL,\r
+ IN OUT UINTN *CommBufferSize OPTIONAL\r
+ )\r
+{\r
+ mDuringS3Resume = TRUE;\r
+ return EFI_SUCCESS;\r
+}\r
+\r
/**\r
Software SMI handler that is called when an Ready To Boot event is signalled.\r
Then the SMM Core also install SMM Ready To Boot protocol to notify SMM driver\r
IN OUT UINTN *CommBufferSize OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_HANDLE SmmHandle;\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE SmmHandle;\r
+ EFI_SMM_SX_DISPATCH2_PROTOCOL *SxDispatch;\r
+ EFI_SMM_SX_REGISTER_CONTEXT EntryRegisterContext;\r
+ EFI_HANDLE S3EntryHandle;\r
\r
//\r
// Install SMM Ready To Boot protocol.\r
\r
SmiHandlerUnRegister (DispatchHandle);\r
\r
- return Status;\r
+ //\r
+ // Locate SmmSxDispatch2 protocol.\r
+ //\r
+ Status = SmmLocateProtocol (\r
+ &gEfiSmmSxDispatch2ProtocolGuid,\r
+ NULL,\r
+ (VOID **)&SxDispatch\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
+ //\r
+ // Register a S3 entry callback function to\r
+ // determine if it will be during S3 resume.\r
+ //\r
+ EntryRegisterContext.Type = SxS3;\r
+ EntryRegisterContext.Phase = SxEntry;\r
+ Status = SxDispatch->Register (\r
+ SxDispatch,\r
+ SmmS3EntryCallBack,\r
+ &EntryRegisterContext,\r
+ &S3EntryHandle\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
+\r
+ return EFI_SUCCESS;\r
}\r
\r
/**\r
}\r
\r
/**\r
- Software SMI handler that is called when the EndOfS3Resume event is trigged.\r
+ Software SMI handler that is called when the EndOfS3Resume signal is triggered.\r
This function installs the SMM EndOfS3Resume Protocol so SMM Drivers are informed that\r
S3 resume has finished.\r
\r
EFI_STATUS Status;\r
EFI_HANDLE SmmHandle;\r
\r
- DEBUG ((EFI_D_INFO, "SmmEndOfS3ResumeHandler\n"));\r
+ DEBUG ((DEBUG_INFO, "SmmEndOfS3ResumeHandler\n"));\r
+\r
+ if (!mDuringS3Resume) {\r
+ DEBUG ((DEBUG_ERROR, "It is not during S3 resume\n"));\r
+ return EFI_SUCCESS;\r
+ }\r
\r
//\r
// Install SMM EndOfS3Resume protocol\r
SmmHandle = NULL;\r
Status = SmmInstallProtocolInterface (\r
&SmmHandle,\r
- &gEdkiiSmmEndOfS3ResumeProtocolGuid,\r
+ &gEdkiiEndOfS3ResumeGuid,\r
EFI_NATIVE_INTERFACE,\r
NULL\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
//\r
- // Uninstall the protocol here because the comsume just hook the\r
+ // Uninstall the protocol here because the comsumer just hook the\r
// installation event.\r
//\r
Status = SmmUninstallProtocolInterface (\r
SmmHandle,\r
- &gEdkiiSmmEndOfS3ResumeProtocolGuid,\r
+ &gEdkiiEndOfS3ResumeGuid,\r
NULL\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
+ mDuringS3Resume = FALSE;\r
+\r
return Status;\r
}\r
\r
//\r
PlatformHookBeforeSmmDispatch ();\r
\r
- //
- // Call memory management hook function
- //
- SmmEntryPointMemoryManagementHook ();
-
+ //\r
+ // Call memory management hook function\r
+ //\r
+ SmmEntryPointMemoryManagementHook ();\r
+\r
//\r
// If a legacy boot has occured, then make sure gSmmCorePrivate is not accessed\r
//\r
// return EFI_INVALID_PARAMETER\r
//\r
gSmmCorePrivate->CommunicationBuffer = NULL;\r
- gSmmCorePrivate->ReturnStatus = EFI_INVALID_PARAMETER;\r
+ gSmmCorePrivate->ReturnStatus = EFI_ACCESS_DENIED;\r
} else {\r
CommunicateHeader = (EFI_SMM_COMMUNICATE_HEADER *)CommunicationBuffer;\r
BufferSize -= OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data);\r
//\r
gSmmCorePrivate->Smst = &gSmmCoreSmst;\r
gSmmCorePrivate->SmmEntryPoint = SmmEntryPoint;\r
-
+\r
//\r
// No need to initialize memory service.\r
// It is done in constructor of PiSmmCoreMemoryAllocationLib(),\r
projects / mirror_edk2.git / blobdiff