sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PrmPkg: Update code to be more C11 compliant by using __func__

Browse Source 
__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.

Since it's more standard, replace __FUNCTION__ with __func__ throughout
PrmPkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Rebecca Cran 2023-04-06 13:52:17 -06:00 committed by mergify[bot]
parent 1295e37d4b
commit 9e7b042ecb
8 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PrmPkg/Application/PrmInfo/PrmInfo.c
View File

@ -493,7 +493,7 @@ ExecutePrmHandlerByGuid (
DEBUG_ERROR, DEBUG_ERROR,
"%a - %a: An error occurred creating a context buffer for handler %g\n", "%a - %a: An error occurred creating a context buffer for handler %g\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
HandlerContext->Guid HandlerContext->Guid
)); ));
} }
@ -628,7 +628,7 @@ ParseParameterList (
DEBUG_ERROR, DEBUG_ERROR,
"%a - %a: An error occurred during PRM module discovery (%r)\n", "%a - %a: An error occurred during PRM module discovery (%r)\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
Status Status
)); ));
ReturnStatus = Status; ReturnStatus = Status;
@ -719,7 +719,7 @@ UefiMain (
DEBUG_ERROR, DEBUG_ERROR,
"%a - %a: An error occurred parsing user-provided arguments (%r)\n", "%a - %a: An error occurred parsing user-provided arguments (%r)\n",
gEfiCallerBaseName, gEfiCallerBaseName,
__FUNCTION__, __func__,
Status Status
)); ));
} }

10
PrmPkg/Library/DxePrmContextBufferLib/DxePrmContextBufferLib.c
View File

@ -40,7 +40,7 @@ FindContextBufferInModuleBuffers (
{ {
UINTN Index; UINTN Index;
DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __func__));
if ((HandlerGuid == NULL) || (ModuleContextBuffers == NULL) || (ContextBuffer == NULL)) { if ((HandlerGuid == NULL) || (ModuleContextBuffers == NULL) || (ContextBuffer == NULL)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -89,7 +89,7 @@ GetModuleContextBuffers (
PRM_CONFIG_PROTOCOL *PrmConfigProtocol; PRM_CONFIG_PROTOCOL *PrmConfigProtocol;
CONST PRM_CONTEXT_BUFFER *PrmContextBuffer; CONST PRM_CONTEXT_BUFFER *PrmContextBuffer;
DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __func__));
if ((Guid == NULL) || (PrmModuleContextBuffers == NULL)) { if ((Guid == NULL) || (PrmModuleContextBuffers == NULL)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -122,7 +122,7 @@ GetModuleContextBuffers (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Found a PRM configuration protocol for PRM module %g.\n", " %a %a: Found a PRM configuration protocol for PRM module %g.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
Guid Guid
)); ));
@ -143,7 +143,7 @@ GetModuleContextBuffers (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Could not locate a PRM configuration protocol for PRM handler %g.\n", " %a %a: Could not locate a PRM configuration protocol for PRM handler %g.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
Guid Guid
)); ));
@ -176,7 +176,7 @@ GetContextBuffer (
EFI_STATUS Status; EFI_STATUS Status;
CONST PRM_MODULE_CONTEXT_BUFFERS *ContextBuffers; CONST PRM_MODULE_CONTEXT_BUFFERS *ContextBuffers;
DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __func__));
if ((PrmHandlerGuid == NULL) || (PrmContextBuffer == NULL)) { if ((PrmHandlerGuid == NULL) || (PrmContextBuffer == NULL)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;

2
PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
View File

@ -384,7 +384,7 @@ VerifyGetModuleContextBuffers (
UT_ASSERT_TRUE (CompareGuid (TestContext->ExpectedModuleGuid, &ContextBuffers->ModuleGuid)); UT_ASSERT_TRUE (CompareGuid (TestContext->ExpectedModuleGuid, &ContextBuffers->ModuleGuid));
UT_LOG_INFO ( UT_LOG_INFO (
"%a: Searching by %a GUID ({%g}) returned ContextBuffers at 0x%x\n", "%a: Searching by %a GUID ({%g}) returned ContextBuffers at 0x%x\n",
__FUNCTION__, __func__,
((TestContext->GuidSearchType == ByModuleGuid) ? "module" : "handler"), ((TestContext->GuidSearchType == ByModuleGuid) ? "module" : "handler"),
TestContext->Guid, TestContext->Guid,
(UINTN)ContextBuffers (UINTN)ContextBuffers

14
PrmPkg/Library/DxePrmModuleDiscoveryLib/DxePrmModuleDiscoveryLib.c
View File

@ -48,7 +48,7 @@ GetNextPrmModuleEntry (
PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY *CurrentListEntry; PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY *CurrentListEntry;
PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY *ForwardListEntry; PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY *ForwardListEntry;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
if (ModuleImageContext == NULL) { if (ModuleImageContext == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -94,7 +94,7 @@ CreateNewPrmModuleImageContextListEntry (
{ {
PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY *PrmModuleImageContextListEntry; PRM_MODULE_IMAGE_CONTEXT_LIST_ENTRY *PrmModuleImageContextListEntry;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
PrmModuleImageContextListEntry = AllocateZeroPool (sizeof (*PrmModuleImageContextListEntry)); PrmModuleImageContextListEntry = AllocateZeroPool (sizeof (*PrmModuleImageContextListEntry));
if (PrmModuleImageContextListEntry == NULL) { if (PrmModuleImageContextListEntry == NULL) {
@ -105,7 +105,7 @@ CreateNewPrmModuleImageContextListEntry (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Allocated PrmModuleImageContextListEntry at 0x%x of size 0x%x bytes.\n", " %a %a: Allocated PrmModuleImageContextListEntry at 0x%x of size 0x%x bytes.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
(UINTN)PrmModuleImageContextListEntry, (UINTN)PrmModuleImageContextListEntry,
sizeof (*PrmModuleImageContextListEntry) sizeof (*PrmModuleImageContextListEntry)
)); ));
@ -186,7 +186,7 @@ DiscoverPrmModules (
EFI_MMRAM_DESCRIPTOR *MmramRanges; EFI_MMRAM_DESCRIPTOR *MmramRanges;
UINTN MmramRangeCount; UINTN MmramRangeCount;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
PrmHandlerCount = 0; PrmHandlerCount = 0;
PrmModuleCount = 0; PrmModuleCount = 0;
@ -203,7 +203,7 @@ DiscoverPrmModules (
&HandleBuffer &HandleBuffer
); );
if (EFI_ERROR (Status) && (HandleCount == 0)) { if (EFI_ERROR (Status) && (HandleCount == 0)) {
DEBUG ((DEBUG_ERROR, "%a %a: No LoadedImageProtocol instances found!\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a %a: No LoadedImageProtocol instances found!\n", _DBGMSGID_, __func__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
@ -255,7 +255,7 @@ DiscoverPrmModules (
DEBUG_WARN, DEBUG_WARN,
"%a %a: ImageHandle 0x%016lx is not a valid PE/COFF image. It cannot be considered a PRM module.\n", "%a %a: ImageHandle 0x%016lx is not a valid PE/COFF image. It cannot be considered a PRM module.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
(EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImageProtocol->ImageBase (EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImageProtocol->ImageBase
)); ));
continue; continue;
@ -304,7 +304,7 @@ DiscoverPrmModules (
InsertTailList (&mPrmModuleList, &PrmModuleImageContextListEntry->Link); InsertTailList (&mPrmModuleList, &PrmModuleImageContextListEntry->Link);
PrmHandlerCount += TempPrmModuleImageContext.ExportDescriptor->Header.NumberPrmHandlers; PrmHandlerCount += TempPrmModuleImageContext.ExportDescriptor->Header.NumberPrmHandlers;
PrmModuleCount++; PrmModuleCount++;
DEBUG ((DEBUG_INFO, "%a %a: New PRM Module inserted into list to be processed.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a: New PRM Module inserted into list to be processed.\n", _DBGMSGID_, __func__));
} }
if (HandlerCount != NULL) { if (HandlerCount != NULL) {

40
PrmPkg/Library/DxePrmPeCoffLib/DxePrmPeCoffLib.c
View File

@ -51,7 +51,7 @@ GetPrmModuleExportDescriptorTable (
UINT32 *ExportAddressTable; UINT32 *ExportAddressTable;
PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT *TempExportDescriptor; PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT *TempExportDescriptor;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
if ((ImageExportDirectory == NULL) || if ((ImageExportDirectory == NULL) ||
(PeCoffLoaderImageContext == NULL) || (PeCoffLoaderImageContext == NULL) ||
@ -67,7 +67,7 @@ GetPrmModuleExportDescriptorTable (
DEBUG_INFO, DEBUG_INFO,
" %a %a: %d exported names found in this image.\n", " %a %a: %d exported names found in this image.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
ImageExportDirectory->NumberOfNames ImageExportDirectory->NumberOfNames
)); ));
@ -85,7 +85,7 @@ GetPrmModuleExportDescriptorTable (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Export Name[0x%x] - %a.\n", " %a %a: Export Name[0x%x] - %a.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
Index, Index,
CurrentExportName CurrentExportName
)); ));
@ -101,29 +101,29 @@ GetPrmModuleExportDescriptorTable (
DEBUG_INFO, DEBUG_INFO,
" %a %a: PRM Module Export Descriptor found. Ordinal = %d.\n", " %a %a: PRM Module Export Descriptor found. Ordinal = %d.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
PrmModuleExportDescriptorOrdinal PrmModuleExportDescriptorOrdinal
)); ));
if (PrmModuleExportDescriptorOrdinal >= ImageExportDirectory->NumberOfFunctions) { if (PrmModuleExportDescriptorOrdinal >= ImageExportDirectory->NumberOfFunctions) {
DEBUG ((DEBUG_ERROR, "%a %a: The PRM Module Export Descriptor ordinal value is invalid.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a %a: The PRM Module Export Descriptor ordinal value is invalid.\n", _DBGMSGID_, __func__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
TempExportDescriptor = (PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT *)((UINTN)CurrentImageAddress + ExportAddressTable[PrmModuleExportDescriptorOrdinal]); TempExportDescriptor = (PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT *)((UINTN)CurrentImageAddress + ExportAddressTable[PrmModuleExportDescriptorOrdinal]);
if (TempExportDescriptor->Header.Signature == PRM_MODULE_EXPORT_DESCRIPTOR_SIGNATURE) { if (TempExportDescriptor->Header.Signature == PRM_MODULE_EXPORT_DESCRIPTOR_SIGNATURE) {
*ExportDescriptor = TempExportDescriptor; *ExportDescriptor = TempExportDescriptor;
DEBUG ((DEBUG_INFO, " %a %a: PRM Module Export Descriptor found at 0x%x.\n", _DBGMSGID_, __FUNCTION__, (UINTN)ExportDescriptor)); DEBUG ((DEBUG_INFO, " %a %a: PRM Module Export Descriptor found at 0x%x.\n", _DBGMSGID_, __func__, (UINTN)ExportDescriptor));
} else { } else {
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
" %a %a: PRM Module Export Descriptor found at 0x%x but signature check failed.\n", " %a %a: PRM Module Export Descriptor found at 0x%x but signature check failed.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
(UINTN)TempExportDescriptor (UINTN)TempExportDescriptor
)); ));
} }
DEBUG ((DEBUG_INFO, " %a %a: Exiting export iteration since export descriptor found.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a: Exiting export iteration since export descriptor found.\n", _DBGMSGID_, __func__));
return EFI_SUCCESS; return EFI_SUCCESS;
} }
} }
@ -194,7 +194,7 @@ GetExportDirectoryInPeCoffImage (
DEBUG_WARN, DEBUG_WARN,
"%a %a: The machine type for this image is not valid for a PRM module.\n", "%a %a: The machine type for this image is not valid for a PRM module.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__ __func__
)); ));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -208,7 +208,7 @@ GetExportDirectoryInPeCoffImage (
// Check the PE/COFF Header Signature. Determine if the image is valid and/or a TE image. // Check the PE/COFF Header Signature. Determine if the image is valid and/or a TE image.
// //
if (OptionalHeaderPtrUnion.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) { if (OptionalHeaderPtrUnion.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) {
DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __func__));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -237,18 +237,18 @@ GetExportDirectoryInPeCoffImage (
// //
// The directory address overflows // The directory address overflows
// //
DEBUG ((DEBUG_ERROR, "%a %a: The export directory entry in this image results in overflow.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a %a: The export directory entry in this image results in overflow.\n", _DBGMSGID_, __func__));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} else { } else {
DEBUG ((DEBUG_INFO, "%a %a: Export Directory Entry found in the image at 0x%x.\n", _DBGMSGID_, __FUNCTION__, (UINTN)OptionalHeaderPtrUnion.Pe32)); DEBUG ((DEBUG_INFO, "%a %a: Export Directory Entry found in the image at 0x%x.\n", _DBGMSGID_, __func__, (UINTN)OptionalHeaderPtrUnion.Pe32));
DEBUG ((DEBUG_INFO, " %a %a: Directory Entry Virtual Address = 0x%x.\n", _DBGMSGID_, __FUNCTION__, DirectoryEntry->VirtualAddress)); DEBUG ((DEBUG_INFO, " %a %a: Directory Entry Virtual Address = 0x%x.\n", _DBGMSGID_, __func__, DirectoryEntry->VirtualAddress));
ExportDirectory = (EFI_IMAGE_EXPORT_DIRECTORY *)((UINTN)Image + DirectoryEntry->VirtualAddress); ExportDirectory = (EFI_IMAGE_EXPORT_DIRECTORY *)((UINTN)Image + DirectoryEntry->VirtualAddress);
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
" %a %a: Export Directory Table found successfully at 0x%x. Name address = 0x%x. Name = %a.\n", " %a %a: Export Directory Table found successfully at 0x%x. Name address = 0x%x. Name = %a.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
(UINTN)ExportDirectory, (UINTN)ExportDirectory,
((UINTN)Image + ExportDirectory->Name), ((UINTN)Image + ExportDirectory->Name),
(CHAR8 *)((UINTN)Image + ExportDirectory->Name) (CHAR8 *)((UINTN)Image + ExportDirectory->Name)
@ -287,7 +287,7 @@ GetImageVersionInPeCoffImage (
EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION OptionalHeaderPtrUnion; EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION OptionalHeaderPtrUnion;
UINT16 Magic; UINT16 Magic;
DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a - Entry.\n", _DBGMSGID_, __func__));
if ((Image == NULL) || (PeCoffLoaderImageContext == NULL) || (ImageMajorVersion == NULL) || (ImageMinorVersion == NULL)) { if ((Image == NULL) || (PeCoffLoaderImageContext == NULL) || (ImageMajorVersion == NULL) || (ImageMinorVersion == NULL)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -320,7 +320,7 @@ GetImageVersionInPeCoffImage (
DEBUG_WARN, DEBUG_WARN,
"%a %a: The machine type for this image is not valid for a PRM module.\n", "%a %a: The machine type for this image is not valid for a PRM module.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__ __func__
)); ));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -333,7 +333,7 @@ GetImageVersionInPeCoffImage (
// Check the PE/COFF Header Signature. Determine if the image is valid and/or a TE image. // Check the PE/COFF Header Signature. Determine if the image is valid and/or a TE image.
// //
if (OptionalHeaderPtrUnion.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) { if (OptionalHeaderPtrUnion.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) {
DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, "%a %a: The PE signature is not valid for the current image.\n", _DBGMSGID_, __func__));
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -351,8 +351,8 @@ GetImageVersionInPeCoffImage (
*ImageMinorVersion = OptionalHeaderPtrUnion.Pe32Plus->OptionalHeader.MinorImageVersion; *ImageMinorVersion = OptionalHeaderPtrUnion.Pe32Plus->OptionalHeader.MinorImageVersion;
} }
DEBUG ((DEBUG_INFO, " %a %a - Image Major Version: 0x%02x.\n", _DBGMSGID_, __FUNCTION__, *ImageMajorVersion)); DEBUG ((DEBUG_INFO, " %a %a - Image Major Version: 0x%02x.\n", _DBGMSGID_, __func__, *ImageMajorVersion));
DEBUG ((DEBUG_INFO, " %a %a - Image Minor Version: 0x%02x.\n", _DBGMSGID_, __FUNCTION__, *ImageMinorVersion)); DEBUG ((DEBUG_INFO, " %a %a - Image Minor Version: 0x%02x.\n", _DBGMSGID_, __func__, *ImageMinorVersion));
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -404,7 +404,7 @@ GetExportEntryAddress (
ASSERT (CurrentExportOrdinal < ImageExportDirectory->NumberOfFunctions); ASSERT (CurrentExportOrdinal < ImageExportDirectory->NumberOfFunctions);
if (CurrentExportOrdinal >= ImageExportDirectory->NumberOfFunctions) { if (CurrentExportOrdinal >= ImageExportDirectory->NumberOfFunctions) {
DEBUG ((DEBUG_ERROR, " %a %a: The export ordinal value is invalid.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, " %a %a: The export ordinal value is invalid.\n", _DBGMSGID_, __func__));
break; break;
} }

44
PrmPkg/PrmConfigDxe/PrmConfigDxe.c
View File

@ -71,7 +71,7 @@ SetRuntimeMemoryRangeAttributes (
UINTN Index; UINTN Index;
EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor; EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
if ((RuntimeMmioRanges == NULL) || (RuntimeMmioRanges->Count == 0)) { if ((RuntimeMmioRanges == NULL) || (RuntimeMmioRanges->Count == 0)) {
return; return;
@ -82,14 +82,14 @@ SetRuntimeMemoryRangeAttributes (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Runtime MMIO Range [%d].\n", " %a %a: Runtime MMIO Range [%d].\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
Index Index
)); ));
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
" %a %a: Physical address = 0x%016x. Length = 0x%x.\n", " %a %a: Physical address = 0x%016x. Length = 0x%x.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
RuntimeMmioRanges->Range[Index].PhysicalBaseAddress, RuntimeMmioRanges->Range[Index].PhysicalBaseAddress,
RuntimeMmioRanges->Range[Index].Length RuntimeMmioRanges->Range[Index].Length
)); ));
@ -141,7 +141,7 @@ SetRuntimeMemoryRangeAttributes (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: Error [%r] finding descriptor for runtime memory range 0x%016x.\n", " %a %a: Error [%r] finding descriptor for runtime memory range 0x%016x.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
Status, Status,
RuntimeMmioRanges->Range[Index].PhysicalBaseAddress RuntimeMmioRanges->Range[Index].PhysicalBaseAddress
)); ));
@ -163,12 +163,12 @@ SetRuntimeMemoryRangeAttributes (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: Error [%r] setting descriptor for runtime memory range 0x%016x.\n", " %a %a: Error [%r] setting descriptor for runtime memory range 0x%016x.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
Status, Status,
RuntimeMmioRanges->Range[Index].PhysicalBaseAddress RuntimeMmioRanges->Range[Index].PhysicalBaseAddress
)); ));
} else { } else {
DEBUG ((DEBUG_INFO, " %a %a: Successfully set runtime attribute for the MMIO range.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a: Successfully set runtime attribute for the MMIO range.\n", _DBGMSGID_, __func__));
} }
} }
} }
@ -189,7 +189,7 @@ StoreVirtualMemoryAddressChangePointers (
EFI_HANDLE *HandleBuffer; EFI_HANDLE *HandleBuffer;
PRM_CONFIG_PROTOCOL *PrmConfigProtocol; PRM_CONFIG_PROTOCOL *PrmConfigProtocol;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
RangeIndex = 0; RangeIndex = 0;
@ -199,7 +199,7 @@ StoreVirtualMemoryAddressChangePointers (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: Memory allocation for runtime MMIO pointer array failed.\n", " %a %a: Memory allocation for runtime MMIO pointer array failed.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__ __func__
)); ));
ASSERT (FALSE); ASSERT (FALSE);
return; return;
@ -232,7 +232,7 @@ StoreVirtualMemoryAddressChangePointers (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: Index out of bounds - Actual count (%d) of runtime MMIO ranges exceeds maximum count (%d).\n", " %a %a: Index out of bounds - Actual count (%d) of runtime MMIO ranges exceeds maximum count (%d).\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
RangeIndex + 1, RangeIndex + 1,
mMaxRuntimeMmioRangeCount mMaxRuntimeMmioRangeCount
)); ));
@ -248,7 +248,7 @@ StoreVirtualMemoryAddressChangePointers (
DEBUG_INFO, DEBUG_INFO,
" %a %a: %d MMIO ranges buffers saved for future virtual memory conversion.\n", " %a %a: %d MMIO ranges buffers saved for future virtual memory conversion.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
RangeIndex RangeIndex
)); ));
} }
@ -277,12 +277,12 @@ ValidatePrmDataBuffer (
} }
if (PrmDataBuffer->Header.Signature != PRM_DATA_BUFFER_HEADER_SIGNATURE) { if (PrmDataBuffer->Header.Signature != PRM_DATA_BUFFER_HEADER_SIGNATURE) {
DEBUG ((DEBUG_ERROR, " %a %a: The PRM data buffer signature is invalid. PRM module.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, " %a %a: The PRM data buffer signature is invalid. PRM module.\n", _DBGMSGID_, __func__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
if (PrmDataBuffer->Header.Length < sizeof (PRM_DATA_BUFFER_HEADER)) { if (PrmDataBuffer->Header.Length < sizeof (PRM_DATA_BUFFER_HEADER)) {
DEBUG ((DEBUG_ERROR, " %a %a: The PRM data buffer length is invalid.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, " %a %a: The PRM data buffer length is invalid.\n", _DBGMSGID_, __func__));
return EFI_BUFFER_TOO_SMALL; return EFI_BUFFER_TOO_SMALL;
} }
@ -311,12 +311,12 @@ ValidatePrmContextBuffer (
} }
if (PrmContextBuffer->Signature != PRM_CONTEXT_BUFFER_SIGNATURE) { if (PrmContextBuffer->Signature != PRM_CONTEXT_BUFFER_SIGNATURE) {
DEBUG ((DEBUG_ERROR, " %a %a: The PRM context buffer signature is invalid.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, " %a %a: The PRM context buffer signature is invalid.\n", _DBGMSGID_, __func__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
if (IsZeroGuid (&PrmContextBuffer->HandlerGuid)) { if (IsZeroGuid (&PrmContextBuffer->HandlerGuid)) {
DEBUG ((DEBUG_ERROR, " %a %a: The PRM context buffer GUID is zero.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_ERROR, " %a %a: The PRM context buffer GUID is zero.\n", _DBGMSGID_, __func__));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
@ -325,7 +325,7 @@ ValidatePrmContextBuffer (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: Error in static buffer for PRM handler %g.\n", " %a %a: Error in static buffer for PRM handler %g.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
&PrmContextBuffer->HandlerGuid &PrmContextBuffer->HandlerGuid
)); ));
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
@ -387,7 +387,7 @@ PrmConfigEndOfDxeNotification (
PRM_CONTEXT_BUFFER *CurrentContextBuffer; PRM_CONTEXT_BUFFER *CurrentContextBuffer;
PRM_CONFIG_PROTOCOL *PrmConfigProtocol; PRM_CONFIG_PROTOCOL *PrmConfigProtocol;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
HandleBuffer = NULL; HandleBuffer = NULL;
Status = gBS->LocateHandleBuffer ( Status = gBS->LocateHandleBuffer (
@ -413,11 +413,11 @@ PrmConfigEndOfDxeNotification (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Found PRM configuration protocol for PRM module %g.\n", " %a %a: Found PRM configuration protocol for PRM module %g.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
&PrmConfigProtocol->ModuleContextBuffers.ModuleGuid &PrmConfigProtocol->ModuleContextBuffers.ModuleGuid
)); ));
DEBUG ((DEBUG_INFO, " %a %a: Validating module context buffers...\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a: Validating module context buffers...\n", _DBGMSGID_, __func__));
for (BufferIndex = 0; BufferIndex < PrmConfigProtocol->ModuleContextBuffers.BufferCount; BufferIndex++) { for (BufferIndex = 0; BufferIndex < PrmConfigProtocol->ModuleContextBuffers.BufferCount; BufferIndex++) {
CurrentContextBuffer = &(PrmConfigProtocol->ModuleContextBuffers.Buffer[BufferIndex]); CurrentContextBuffer = &(PrmConfigProtocol->ModuleContextBuffers.Buffer[BufferIndex]);
@ -427,20 +427,20 @@ PrmConfigEndOfDxeNotification (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: Context buffer validation failed for PRM handler %g.\n", " %a %a: Context buffer validation failed for PRM handler %g.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
CurrentContextBuffer->HandlerGuid CurrentContextBuffer->HandlerGuid
)); ));
} }
} }
DEBUG ((DEBUG_INFO, " %a %a: Module context buffer validation complete.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, " %a %a: Module context buffer validation complete.\n", _DBGMSGID_, __func__));
if (PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges != NULL) { if (PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges != NULL) {
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
" %a %a: Found %d PRM runtime MMIO ranges.\n", " %a %a: Found %d PRM runtime MMIO ranges.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges->Count PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges->Count
)); ));
SetRuntimeMemoryRangeAttributes (PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges); SetRuntimeMemoryRangeAttributes (PrmConfigProtocol->ModuleContextBuffers.RuntimeMmioRanges);
@ -478,7 +478,7 @@ PrmConfigEntryPoint (
EFI_STATUS Status; EFI_STATUS Status;
EFI_EVENT Event; EFI_EVENT Event;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
// //
// Register a notification function to change memory attributes at end of DXE // Register a notification function to change memory attributes at end of DXE

22
PrmPkg/PrmLoaderDxe/PrmLoaderDxe.c
View File

@ -73,7 +73,7 @@ ProcessPrmModules (
UINT64 HandlerPhysicalAddress; UINT64 HandlerPhysicalAddress;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
if (PrmAcpiDescriptionTable == NULL) { if (PrmAcpiDescriptionTable == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -89,19 +89,19 @@ ProcessPrmModules (
DEBUG_ERROR, DEBUG_ERROR,
" %a %a: The Platform GUID in the DSC file must be set to a unique non-zero value.\n", " %a %a: The Platform GUID in the DSC file must be set to a unique non-zero value.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__ __func__
)); ));
ASSERT (!CompareGuid (&gEdkiiDscPlatformGuid, &gZeroGuid)); ASSERT (!CompareGuid (&gEdkiiDscPlatformGuid, &gZeroGuid));
} }
DEBUG ((DEBUG_INFO, " %a %a: %d total PRM modules to process.\n", _DBGMSGID_, __FUNCTION__, mPrmModuleCount)); DEBUG ((DEBUG_INFO, " %a %a: %d total PRM modules to process.\n", _DBGMSGID_, __func__, mPrmModuleCount));
DEBUG ((DEBUG_INFO, " %a %a: %d total PRM handlers to process.\n", _DBGMSGID_, __FUNCTION__, mPrmHandlerCount)); DEBUG ((DEBUG_INFO, " %a %a: %d total PRM handlers to process.\n", _DBGMSGID_, __func__, mPrmHandlerCount));
PrmAcpiDescriptionTableBufferSize = (UINT32)(OFFSET_OF (PRM_ACPI_DESCRIPTION_TABLE, PrmModuleInfoStructure) + PrmAcpiDescriptionTableBufferSize = (UINT32)(OFFSET_OF (PRM_ACPI_DESCRIPTION_TABLE, PrmModuleInfoStructure) +
(OFFSET_OF (PRM_MODULE_INFORMATION_STRUCT, HandlerInfoStructure) * mPrmModuleCount) + (OFFSET_OF (PRM_MODULE_INFORMATION_STRUCT, HandlerInfoStructure) * mPrmModuleCount) +
(sizeof (PRM_HANDLER_INFORMATION_STRUCT) * mPrmHandlerCount) (sizeof (PRM_HANDLER_INFORMATION_STRUCT) * mPrmHandlerCount)
); );
DEBUG ((DEBUG_INFO, " %a %a: Total PRM ACPI table size: 0x%x.\n", _DBGMSGID_, __FUNCTION__, PrmAcpiDescriptionTableBufferSize)); DEBUG ((DEBUG_INFO, " %a %a: Total PRM ACPI table size: 0x%x.\n", _DBGMSGID_, __func__, PrmAcpiDescriptionTableBufferSize));
PrmAcpiTable = AllocateZeroPool ((UINTN)PrmAcpiDescriptionTableBufferSize); PrmAcpiTable = AllocateZeroPool ((UINTN)PrmAcpiDescriptionTableBufferSize);
if (PrmAcpiTable == NULL) { if (PrmAcpiTable == NULL) {
@ -139,7 +139,7 @@ ProcessPrmModules (
DEBUG_INFO, DEBUG_INFO,
" %a %a: PRM Module - %a with %d handlers.\n", " %a %a: PRM Module - %a with %d handlers.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
(CHAR8 *)((UINTN)CurrentImageAddress + CurrentImageExportDirectory->Name), (CHAR8 *)((UINTN)CurrentImageAddress + CurrentImageExportDirectory->Name),
CurrentExportDescriptorStruct->Header.NumberPrmHandlers CurrentExportDescriptorStruct->Header.NumberPrmHandlers
)); ));
@ -212,7 +212,7 @@ ProcessPrmModules (
DEBUG_INFO, DEBUG_INFO,
" %a %a: Found %a handler physical address at 0x%016x.\n", " %a %a: Found %a handler physical address at 0x%016x.\n",
_DBGMSGID_, _DBGMSGID_,
__FUNCTION__, __func__,
CurrentExportDescriptorHandlerName, CurrentExportDescriptorHandlerName,
CurrentHandlerInfoStruct->PhysicalAddress CurrentHandlerInfoStruct->PhysicalAddress
)); ));
@ -279,7 +279,7 @@ PublishPrmAcpiTable (
&TableKey &TableKey
); );
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "%a %a: The PRMT ACPI table was installed successfully.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a: The PRMT ACPI table was installed successfully.\n", _DBGMSGID_, __func__));
} }
} }
@ -316,7 +316,7 @@ PrmLoaderEndOfDxeNotification (
EFI_STATUS Status; EFI_STATUS Status;
PRM_ACPI_DESCRIPTION_TABLE *PrmAcpiDescriptionTable; PRM_ACPI_DESCRIPTION_TABLE *PrmAcpiDescriptionTable;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
Status = DiscoverPrmModules (&mPrmModuleCount, &mPrmHandlerCount); Status = DiscoverPrmModules (&mPrmModuleCount, &mPrmHandlerCount);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
@ -354,7 +354,7 @@ PrmLoaderEntryPoint (
EFI_STATUS Status; EFI_STATUS Status;
EFI_EVENT EndOfDxeEvent; EFI_EVENT EndOfDxeEvent;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
// //
// Discover and process installed PRM modules at the End of DXE // Discover and process installed PRM modules at the End of DXE
@ -369,7 +369,7 @@ PrmLoaderEntryPoint (
&EndOfDxeEvent &EndOfDxeEvent
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "%a %a: EndOfDxe callback registration failed! %r.\n", _DBGMSGID_, __FUNCTION__, Status)); DEBUG ((DEBUG_ERROR, "%a %a: EndOfDxe callback registration failed! %r.\n", _DBGMSGID_, __func__, Status));
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
} }

4
PrmPkg/PrmSsdtInstallDxe/PrmSsdtInstallDxe.c
View File

@ -42,7 +42,7 @@ InstallPrmSsdt (
EFI_ACPI_TABLE_PROTOCOL *AcpiTableProtocol; EFI_ACPI_TABLE_PROTOCOL *AcpiTableProtocol;
EFI_ACPI_DESCRIPTION_HEADER *Ssdt; EFI_ACPI_DESCRIPTION_HEADER *Ssdt;
DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a - Entry.\n", _DBGMSGID_, __func__));
if (OemId == NULL) { if (OemId == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -61,7 +61,7 @@ InstallPrmSsdt (
&SsdtSize &SsdtSize
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
DEBUG ((DEBUG_INFO, "%a %a: SSDT loaded...\n", _DBGMSGID_, __FUNCTION__)); DEBUG ((DEBUG_INFO, "%a %a: SSDT loaded...\n", _DBGMSGID_, __func__));
// //
// Update OEM ID in the SSDT // Update OEM ID in the SSDT