IN UINTN ContextSize\r
)\r
{\r
+ CHAR16 *Str;\r
+\r
if (CompareGuid (HandlerType, &gEfiSmmSwDispatch2ProtocolGuid)) {\r
DEBUG ((DEBUG_INFO, " SwSmi - 0x%x\n", ((EFI_SMM_SW_REGISTER_CONTEXT *)Context)->SwSmiInputValue));\r
} else if (CompareGuid (HandlerType, &gEfiSmmSxDispatch2ProtocolGuid)) {\r
DEBUG ((DEBUG_INFO, " IoTrapType - 0x%x\n", ((EFI_SMM_IO_TRAP_REGISTER_CONTEXT *)Context)->Type));\r
} else if (CompareGuid (HandlerType, &gEfiSmmUsbDispatch2ProtocolGuid)) {\r
DEBUG ((DEBUG_INFO, " UsbType - 0x%x\n", ((SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT *)Context)->Type));\r
- DEBUG ((DEBUG_INFO, " UsbDevicePath - %s\n", ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL *)(((SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT *)Context) + 1), TRUE, TRUE)));\r
+ Str = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL *)(((SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT *)Context) + 1), TRUE, TRUE);\r
+ DEBUG ((DEBUG_INFO, " UsbDevicePath - %s\n", Str));\r
+ if (Str != NULL) {\r
+ FreePool (Str);\r
+ }\r
} else {\r
DEBUG ((DEBUG_INFO, " Context - "));\r
InternalDumpData (Context, ContextSize);\r
ImageStruct->EntryPoint = mImageStruct[Index].EntryPoint;\r
ImageStruct->ImageBase = mImageStruct[Index].ImageBase;\r
ImageStruct->ImageSize = mImageStruct[Index].ImageSize;\r
- ImageStruct->PdbStringOffset = sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE);\r
- CopyMem ((VOID *)((UINTN)ImageStruct + ImageStruct->PdbStringOffset), mImageStruct[Index].PdbString, mImageStruct[Index].PdbStringSize);\r
+ if (mImageStruct[Index].PdbStringSize != 0) {\r
+ ImageStruct->PdbStringOffset = sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE);\r
+ CopyMem ((VOID *)((UINTN)ImageStruct + ImageStruct->PdbStringOffset), mImageStruct[Index].PdbString, mImageStruct[Index].PdbStringSize);\r
+ } else {\r
+ ImageStruct->PdbStringOffset = 0;\r
+ }\r
ImageStruct = (SMM_CORE_IMAGE_DATABASE_STRUCTURE *)((UINTN)ImageStruct + ImageStruct->Header.Length);\r
Size += sizeof(SMM_CORE_IMAGE_DATABASE_STRUCTURE) + mImageStruct[Index].PdbStringSize;\r
}\r
return SmiEntry;\r
}\r
\r
+/**\r
+ Convert EFI_SMM_USB_REGISTER_CONTEXT to SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT.\r
+\r
+ @param UsbContext A pointer to EFI_SMM_USB_REGISTER_CONTEXT\r
+ @param UsbContextSize The size of EFI_SMM_USB_REGISTER_CONTEXT in bytes\r
+ @param SmiHandlerUsbContextSize The size of SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT in bytes\r
+\r
+ @return SmiHandlerUsbContext A pointer to SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT\r
+**/\r
+SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT *\r
+ConvertSmiHandlerUsbContext (\r
+ IN EFI_SMM_USB_REGISTER_CONTEXT *UsbContext,\r
+ IN UINTN UsbContextSize,\r
+ OUT UINTN *SmiHandlerUsbContextSize\r
+ )\r
+{\r
+ UINTN DevicePathSize;\r
+ SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT *SmiHandlerUsbContext;\r
+\r
+ ASSERT (UsbContextSize == sizeof(EFI_SMM_USB_REGISTER_CONTEXT));\r
+\r
+ DevicePathSize = GetDevicePathSize (UsbContext->Device);\r
+ SmiHandlerUsbContext = AllocatePool (sizeof (SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT) + DevicePathSize);\r
+ if (SmiHandlerUsbContext == NULL) {\r
+ *SmiHandlerUsbContextSize = 0;\r
+ return NULL;\r
+ }\r
+ SmiHandlerUsbContext->Type = UsbContext->Type;\r
+ SmiHandlerUsbContext->DevicePathSize = (UINT32)DevicePathSize;\r
+ CopyMem (SmiHandlerUsbContext + 1, UsbContext->Device, DevicePathSize);\r
+ *SmiHandlerUsbContextSize = sizeof (SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT) + DevicePathSize;\r
+ return SmiHandlerUsbContext;\r
+}\r
+\r
/**\r
This function is called by SmmChildDispatcher module to report\r
a new SMI handler is registered, to SmmCore.\r
SMI_ENTRY *SmiEntry;\r
LIST_ENTRY *List;\r
\r
+ if (((ContextSize == 0) && (Context != NULL)) ||\r
+ ((ContextSize != 0) && (Context == NULL))) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
SmiHandler = AllocateZeroPool (sizeof (SMI_HANDLER));\r
if (SmiHandler == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
SmiHandler->Signature = SMI_HANDLER_SIGNATURE;\r
SmiHandler->Handler = Handler;\r
SmiHandler->CallerAddr = (UINTN)CallerAddress;\r
- if (ContextSize != 0 && Context != NULL) {\r
+ SmiHandler->Context = Context;\r
+ SmiHandler->ContextSize = ContextSize;\r
+\r
+ if (Context != NULL) {\r
if (CompareGuid (HandlerGuid, &gEfiSmmUsbDispatch2ProtocolGuid)) {\r
- EFI_SMM_USB_REGISTER_CONTEXT *UsbContext;\r
- UINTN DevicePathSize;\r
- SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT *SmiHandlerUsbContext;\r
-\r
- ASSERT (ContextSize == sizeof(EFI_SMM_USB_REGISTER_CONTEXT));\r
-\r
- UsbContext = (EFI_SMM_USB_REGISTER_CONTEXT *)Context;\r
- DevicePathSize = GetDevicePathSize (UsbContext->Device);\r
- SmiHandlerUsbContext = AllocatePool (sizeof (SMI_HANDLER_PROFILE_USB_REGISTER_CONTEXT) + DevicePathSize);\r
- if (SmiHandlerUsbContext != NULL) {\r
- SmiHandlerUsbContext->Type = UsbContext->Type;\r
- SmiHandlerUsbContext->DevicePathSize = (UINT32)DevicePathSize;\r
- CopyMem (SmiHandlerUsbContext + 1, UsbContext->Device, DevicePathSize);\r
- SmiHandler->Context = SmiHandlerUsbContext;\r
- }\r
+ SmiHandler->Context = ConvertSmiHandlerUsbContext (Context, ContextSize, &SmiHandler->ContextSize);\r
} else {\r
SmiHandler->Context = AllocateCopyPool (ContextSize, Context);\r
}\r
}\r
- if (SmiHandler->Context != NULL) {\r
- SmiHandler->ContextSize = ContextSize;\r
+ if (SmiHandler->Context == NULL) {\r
+ SmiHandler->ContextSize = 0;\r
}\r
\r
SmiEntry = SmmCoreFindHardwareSmiEntry (HandlerGuid, TRUE);\r
if (SmiEntry == NULL) {\r
+ if (SmiHandler->Context != NULL) {\r
+ FreePool (SmiHandler->Context);\r
+ }\r
+ FreePool (SmiHandler);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
For the SmmChildDispatch protocol, the HandlerGuid\r
must be the GUID of SmmChildDispatch protocol.\r
@param Handler The SMI handler.\r
+ @param Context The context of the SMI handler.\r
+ If it is NOT NULL, it will be used to check what is registered.\r
+ @param ContextSize The size of the context in bytes.\r
+ If Context is NOT NULL, it will be used to check what is registered.\r
\r
@retval EFI_SUCCESS The original record is removed.\r
@retval EFI_NOT_FOUND There is no record for the HandlerGuid and handler.\r
SmiHandlerProfileUnregisterHandler (\r
IN SMI_HANDLER_PROFILE_PROTOCOL *This,\r
IN EFI_GUID *HandlerGuid,\r
- IN EFI_SMM_HANDLER_ENTRY_POINT2 Handler\r
+ IN EFI_SMM_HANDLER_ENTRY_POINT2 Handler,\r
+ IN VOID *Context, OPTIONAL\r
+ IN UINTN ContextSize OPTIONAL\r
)\r
{\r
LIST_ENTRY *Link;\r
SMI_HANDLER *SmiHandler;\r
SMI_ENTRY *SmiEntry;\r
SMI_HANDLER *TargetSmiHandler;\r
+ VOID *SearchContext;\r
+ UINTN SearchContextSize;\r
+\r
+ if (((ContextSize == 0) && (Context != NULL)) ||\r
+ ((ContextSize != 0) && (Context == NULL))) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
SmiEntry = SmmCoreFindHardwareSmiEntry (HandlerGuid, FALSE);\r
if (SmiEntry == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
\r
+ SearchContext = Context;\r
+ SearchContextSize = ContextSize;\r
+ if (Context != NULL) {\r
+ if (CompareGuid (HandlerGuid, &gEfiSmmUsbDispatch2ProtocolGuid)) {\r
+ SearchContext = ConvertSmiHandlerUsbContext (Context, ContextSize, &SearchContextSize);\r
+ }\r
+ }\r
+\r
TargetSmiHandler = NULL;\r
Head = &SmiEntry->SmiHandlers;\r
for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {\r
SmiHandler = CR (Link, SMI_HANDLER, Link, SMI_HANDLER_SIGNATURE);\r
if (SmiHandler->Handler == Handler) {\r
- TargetSmiHandler = SmiHandler;\r
- break;\r
+ if ((SearchContext == NULL) ||\r
+ ((SearchContextSize == SmiHandler->ContextSize) && (CompareMem (SearchContext, SmiHandler->Context, SearchContextSize) == 0))) {\r
+ TargetSmiHandler = SmiHandler;\r
+ break;\r
+ }\r
+ }\r
+ }\r
+\r
+ if (SearchContext != NULL) {\r
+ if (CompareGuid (HandlerGuid, &gEfiSmmUsbDispatch2ProtocolGuid)) {\r
+ FreePool (SearchContext);\r
}\r
}\r
+\r
if (TargetSmiHandler == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
SmiHandler = TargetSmiHandler;\r
\r
RemoveEntryList (&SmiHandler->Link);\r
+ if (SmiHandler->Context != NULL) {\r
+ FreePool (SmiHandler->Context);\r
+ }\r
FreePool (SmiHandler);\r
\r
if (IsListEmpty (&SmiEntry->SmiHandlers)) {\r