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

OvmfPkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the OvmfPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Andrew Fish <afish@apple.com>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:09 -08:00
committed by mergify[bot]
parent d1050b9dff
commit ac0a286f4d
445 changed files with 30894 additions and 26369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

329
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
View File

@@ -27,8 +27,7 @@
//
// TRUE if the PCI platform supports extended config space, FALSE otherwise.
//
STATIC BOOLEAN mPciExtConfSpaceSupported;
STATIC BOOLEAN mPciExtConfSpaceSupported;
//
// The protocol interface this driver produces.
@@ -36,8 +35,7 @@ STATIC BOOLEAN mPciExtConfSpaceSupported;
// Refer to 12.6 "PCI Hot Plug PCI Initialization Protocol" in the Platform
// Init 1.4a Spec, Volume 5.
//
STATIC EFI_PCI_HOT_PLUG_INIT_PROTOCOL mPciHotPlugInit;
STATIC EFI_PCI_HOT_PLUG_INIT_PROTOCOL mPciHotPlugInit;
//
// Resource padding template for the GetResourcePadding() protocol member
@@ -58,12 +56,11 @@ STATIC EFI_PCI_HOT_PLUG_INIT_PROTOCOL mPciHotPlugInit;
//
#pragma pack (1)
typedef struct {
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR Padding[4];
EFI_ACPI_END_TAG_DESCRIPTOR EndDesc;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR Padding[4];
EFI_ACPI_END_TAG_DESCRIPTOR EndDesc;
} RESOURCE_PADDING;
#pragma pack ()
/**
Initialize a RESOURCE_PADDING object.
@@ -73,10 +70,10 @@ typedef struct {
STATIC
VOID
InitializeResourcePadding (
OUT RESOURCE_PADDING *ResourcePadding
OUT RESOURCE_PADDING *ResourcePadding
)
{
UINTN Index;
UINTN Index;
ZeroMem (ResourcePadding, sizeof *ResourcePadding);
@@ -84,17 +81,17 @@ InitializeResourcePadding (
// Fill in the Padding fields that don't vary across resource types.
//
for (Index = 0; Index < ARRAY_SIZE (ResourcePadding->Padding); ++Index) {
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;
Descriptor = ResourcePadding->Padding + Index;
Descriptor->Desc = ACPI_ADDRESS_SPACE_DESCRIPTOR;
Descriptor->Len = (UINT16)(
sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
OFFSET_OF (
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
ResType
)
);
sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
OFFSET_OF (
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
ResType
)
);
}
//
@@ -103,7 +100,6 @@ InitializeResourcePadding (
ResourcePadding->EndDesc.Desc = ACPI_END_TAG_DESCRIPTOR;
}
/**
Set up a descriptor entry for reserving IO space.
@@ -117,16 +113,15 @@ InitializeResourcePadding (
STATIC
VOID
SetIoPadding (
IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,
IN UINTN SizeExponent
IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,
IN UINTN SizeExponent
)
{
Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_IO;
Descriptor->AddrLen = LShiftU64 (1, SizeExponent);
Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_IO;
Descriptor->AddrLen = LShiftU64 (1, SizeExponent);
Descriptor->AddrRangeMax = Descriptor->AddrLen - 1;
}
/**
Set up a descriptor entry for reserving MMIO space.
@@ -152,10 +147,10 @@ SetIoPadding (
STATIC
VOID
SetMmioPadding (
IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,
IN BOOLEAN Prefetchable,
IN BOOLEAN ThirtyTwoBitOnly,
IN UINTN SizeExponent
IN OUT EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor,
IN BOOLEAN Prefetchable,
IN BOOLEAN ThirtyTwoBitOnly,
IN UINTN SizeExponent
)
{
Descriptor->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM;
@@ -168,11 +163,11 @@ SetMmioPadding (
EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_NON_CACHEABLE;
Descriptor->AddrSpaceGranularity = 32;
}
Descriptor->AddrLen = LShiftU64 (1, SizeExponent);
Descriptor->AddrLen = LShiftU64 (1, SizeExponent);
Descriptor->AddrRangeMax = Descriptor->AddrLen - 1;
}
/**
Round up a positive 32-bit value to the next whole power of two, and return
the bit position of the highest bit set in the result. Equivalent to
@@ -190,10 +185,10 @@ SetMmioPadding (
STATIC
INTN
HighBitSetRoundUp32 (
IN UINT32 Operand
IN UINT32 Operand
)
{
INTN HighBit;
INTN HighBit;
HighBit = HighBitSet32 (Operand);
if (HighBit == -1) {
@@ -202,16 +197,17 @@ HighBitSetRoundUp32 (
//
return HighBit;
}
if ((Operand & (Operand - 1)) != 0) {
//
// Operand is not a whole power of two.
//
++HighBit;
}
return (HighBit < 32) ? HighBit : -1;
}
/**
Round up a positive 64-bit value to the next whole power of two, and return
the bit position of the highest bit set in the result. Equivalent to
@@ -229,10 +225,10 @@ HighBitSetRoundUp32 (
STATIC
INTN
HighBitSetRoundUp64 (
IN UINT64 Operand
IN UINT64 Operand
)
{
INTN HighBit;
INTN HighBit;
HighBit = HighBitSet64 (Operand);
if (HighBit == -1) {
@@ -241,16 +237,17 @@ HighBitSetRoundUp64 (
//
return HighBit;
}
if ((Operand & (Operand - 1)) != 0) {
//
// Operand is not a whole power of two.
//
++HighBit;
}
return (HighBit < 64) ? HighBit : -1;
}
/**
Look up the QEMU-specific Resource Reservation capability in the conventional
config space of a Hotplug Controller (that is, PCI Bridge).
@@ -273,16 +270,16 @@ HighBitSetRoundUp64 (
STATIC
EFI_STATUS
QueryReservationHint (
IN CONST EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *HpcPciAddress,
OUT QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION *ReservationHint
)
IN CONST EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *HpcPciAddress,
OUT QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION *ReservationHint
)
{
UINT16 PciVendorId;
EFI_STATUS Status;
PCI_CAP_DEV *PciDevice;
PCI_CAP_LIST *CapList;
UINT16 VendorInstance;
PCI_CAP *VendorCap;
UINT16 PciVendorId;
EFI_STATUS Status;
PCI_CAP_DEV *PciDevice;
PCI_CAP_LIST *CapList;
UINT16 VendorInstance;
PCI_CAP *VendorCap;
//
// Check the vendor identifier.
@@ -313,6 +310,7 @@ QueryReservationHint (
if (EFI_ERROR (Status)) {
return Status;
}
Status = PciCapListInit (PciDevice, &CapList);
if (EFI_ERROR (Status)) {
goto UninitPciDevice;
@@ -323,9 +321,9 @@ QueryReservationHint (
// capability.
//
VendorInstance = 0;
for (;;) {
UINT8 VendorLength;
UINT8 BridgeCapType;
for ( ; ;) {
UINT8 VendorLength;
UINT8 BridgeCapType;
Status = PciCapListFindCap (
CapList,
@@ -351,6 +349,7 @@ QueryReservationHint (
if (EFI_ERROR (Status)) {
goto UninitCapList;
}
if (VendorLength != sizeof *ReservationHint) {
continue;
}
@@ -368,8 +367,10 @@ QueryReservationHint (
if (EFI_ERROR (Status)) {
goto UninitCapList;
}
if (BridgeCapType ==
QEMU_PCI_BRIDGE_CAPABILITY_TYPE_RESOURCE_RESERVATION) {
QEMU_PCI_BRIDGE_CAPABILITY_TYPE_RESOURCE_RESERVATION)
{
//
// We have a match.
//
@@ -397,7 +398,6 @@ UninitPciDevice:
return Status;
}
/**
Returns a list of root Hot Plug Controllers (HPCs) that require
initialization during the boot process.
@@ -428,12 +428,12 @@ STATIC
EFI_STATUS
EFIAPI
GetRootHpcList (
IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,
OUT UINTN *HpcCount,
OUT EFI_HPC_LOCATION **HpcList
IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,
OUT UINTN *HpcCount,
OUT EFI_HPC_LOCATION **HpcList
)
{
if (HpcCount == NULL || HpcList == NULL) {
if ((HpcCount == NULL) || (HpcList == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -442,11 +442,10 @@ GetRootHpcList (
// that would require special initialization.
//
*HpcCount = 0;
*HpcList = NULL;
*HpcList = NULL;
return EFI_SUCCESS;
}
/**
Initializes one root Hot Plug Controller (HPC). This process may causes
initialization of its subordinate buses.
@@ -486,11 +485,11 @@ STATIC
EFI_STATUS
EFIAPI
InitializeRootHpc (
IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,
IN EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath,
IN UINT64 HpcPciAddress,
IN EFI_EVENT Event OPTIONAL,
OUT EFI_HPC_STATE *HpcState
IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,
IN EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath,
IN UINT64 HpcPciAddress,
IN EFI_EVENT Event OPTIONAL,
OUT EFI_HPC_STATE *HpcState
)
{
//
@@ -502,10 +501,10 @@ InitializeRootHpc (
if (HpcState == NULL) {
return EFI_INVALID_PARAMETER;
}
return EFI_UNSUPPORTED;
}
/**
Returns the resource padding that is required by the PCI bus that is
controlled by the specified Hot Plug Controller (HPC).
@@ -546,43 +545,50 @@ STATIC
EFI_STATUS
EFIAPI
GetResourcePadding (
IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,
IN EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath,
IN UINT64 HpcPciAddress,
OUT EFI_HPC_STATE *HpcState,
OUT VOID **Padding,
OUT EFI_HPC_PADDING_ATTRIBUTES *Attributes
IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,
IN EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath,
IN UINT64 HpcPciAddress,
OUT EFI_HPC_STATE *HpcState,
OUT VOID **Padding,
OUT EFI_HPC_PADDING_ATTRIBUTES *Attributes
)
{
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *Address;
BOOLEAN DefaultIo;
BOOLEAN DefaultMmio;
RESOURCE_PADDING ReservationRequest;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FirstResource;
EFI_STATUS ReservationHintStatus;
QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION ReservationHint;
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *Address;
BOOLEAN DefaultIo;
BOOLEAN DefaultMmio;
RESOURCE_PADDING ReservationRequest;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FirstResource;
EFI_STATUS ReservationHintStatus;
QEMU_PCI_BRIDGE_CAPABILITY_RESOURCE_RESERVATION ReservationHint;
Address = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *)&HpcPciAddress;
DEBUG_CODE_BEGIN ();
CHAR16 *DevicePathString;
CHAR16 *DevicePathString;
DevicePathString = ConvertDevicePathToText (HpcDevicePath, FALSE, FALSE);
DevicePathString = ConvertDevicePathToText (HpcDevicePath, FALSE, FALSE);
DEBUG ((DEBUG_VERBOSE, "%a: Address=%02x:%02x.%x DevicePath=%s\n",
__FUNCTION__, Address->Bus, Address->Device, Address->Function,
(DevicePathString == NULL) ? L"<unavailable>" : DevicePathString));
DEBUG ((
DEBUG_VERBOSE,
"%a: Address=%02x:%02x.%x DevicePath=%s\n",
__FUNCTION__,
Address->Bus,
Address->Device,
Address->Function,
(DevicePathString == NULL) ? L"<unavailable>" : DevicePathString
));
if (DevicePathString != NULL) {
FreePool (DevicePathString);
}
if (DevicePathString != NULL) {
FreePool (DevicePathString);
}
DEBUG_CODE_END ();
if (HpcState == NULL || Padding == NULL || Attributes == NULL) {
if ((HpcState == NULL) || (Padding == NULL) || (Attributes == NULL)) {
return EFI_INVALID_PARAMETER;
}
DefaultIo = TRUE;
DefaultIo = TRUE;
DefaultMmio = TRUE;
//
@@ -599,7 +605,7 @@ GetResourcePadding (
//
ReservationHintStatus = QueryReservationHint (Address, &ReservationHint);
if (!EFI_ERROR (ReservationHintStatus)) {
INTN HighBit;
INTN HighBit;
DEBUG ((
DEBUG_VERBOSE,
@@ -618,82 +624,84 @@ GetResourcePadding (
// (a) Reserve bus numbers.
//
switch (ReservationHint.BusNumbers) {
case 0:
//
// No reservation needed.
//
break;
case MAX_UINT32:
//
// Firmware default (unspecified). Treat it as "no reservation needed".
//
break;
default:
//
// Request the specified amount.
//
--FirstResource;
FirstResource->ResType = ACPI_ADDRESS_SPACE_TYPE_BUS;
FirstResource->AddrLen = ReservationHint.BusNumbers;
break;
case 0:
//
// No reservation needed.
//
break;
case MAX_UINT32:
//
// Firmware default (unspecified). Treat it as "no reservation needed".
//
break;
default:
//
// Request the specified amount.
//
--FirstResource;
FirstResource->ResType = ACPI_ADDRESS_SPACE_TYPE_BUS;
FirstResource->AddrLen = ReservationHint.BusNumbers;
break;
}
//
// (b) Reserve IO space.
//
switch (ReservationHint.Io) {
case 0:
//
// No reservation needed, disable our built-in.
//
DefaultIo = FALSE;
break;
case MAX_UINT64:
//
// Firmware default (unspecified). Stick with our built-in.
//
break;
default:
//
// Round the specified amount up to the next power of two. If rounding is
// successful, reserve the rounded value. Fall back to the default
// otherwise.
//
HighBit = HighBitSetRoundUp64 (ReservationHint.Io);
if (HighBit != -1) {
SetIoPadding (--FirstResource, (UINTN)HighBit);
case 0:
//
// No reservation needed, disable our built-in.
//
DefaultIo = FALSE;
}
break;
break;
case MAX_UINT64:
//
// Firmware default (unspecified). Stick with our built-in.
//
break;
default:
//
// Round the specified amount up to the next power of two. If rounding is
// successful, reserve the rounded value. Fall back to the default
// otherwise.
//
HighBit = HighBitSetRoundUp64 (ReservationHint.Io);
if (HighBit != -1) {
SetIoPadding (--FirstResource, (UINTN)HighBit);
DefaultIo = FALSE;
}
break;
}
//
// (c) Reserve non-prefetchable MMIO space (32-bit only).
//
switch (ReservationHint.NonPrefetchable32BitMmio) {
case 0:
//
// No reservation needed, disable our built-in.
//
DefaultMmio = FALSE;
break;
case MAX_UINT32:
//
// Firmware default (unspecified). Stick with our built-in.
//
break;
default:
//
// Round the specified amount up to the next power of two. If rounding is
// successful, reserve the rounded value. Fall back to the default
// otherwise.
//
HighBit = HighBitSetRoundUp32 (ReservationHint.NonPrefetchable32BitMmio);
if (HighBit != -1) {
SetMmioPadding (--FirstResource, FALSE, TRUE, (UINTN)HighBit);
case 0:
//
// No reservation needed, disable our built-in.
//
DefaultMmio = FALSE;
}
break;
break;
case MAX_UINT32:
//
// Firmware default (unspecified). Stick with our built-in.
//
break;
default:
//
// Round the specified amount up to the next power of two. If rounding is
// successful, reserve the rounded value. Fall back to the default
// otherwise.
//
HighBit = HighBitSetRoundUp32 (ReservationHint.NonPrefetchable32BitMmio);
if (HighBit != -1) {
SetMmioPadding (--FirstResource, FALSE, TRUE, (UINTN)HighBit);
DefaultMmio = FALSE;
}
break;
}
//
@@ -708,14 +716,16 @@ GetResourcePadding (
// rounding is successful, reserve the rounded value. Do not reserve
// prefetchable MMIO space otherwise.
//
if (ReservationHint.Prefetchable32BitMmio > 0 &&
ReservationHint.Prefetchable32BitMmio < MAX_UINT32) {
if ((ReservationHint.Prefetchable32BitMmio > 0) &&
(ReservationHint.Prefetchable32BitMmio < MAX_UINT32))
{
HighBit = HighBitSetRoundUp32 (ReservationHint.Prefetchable32BitMmio);
if (HighBit != -1) {
SetMmioPadding (--FirstResource, TRUE, TRUE, (UINTN)HighBit);
}
} else if (ReservationHint.Prefetchable64BitMmio > 0 &&
ReservationHint.Prefetchable64BitMmio < MAX_UINT64) {
} else if ((ReservationHint.Prefetchable64BitMmio > 0) &&
(ReservationHint.Prefetchable64BitMmio < MAX_UINT64))
{
HighBit = HighBitSetRoundUp64 (ReservationHint.Prefetchable64BitMmio);
if (HighBit != -1) {
SetMmioPadding (--FirstResource, TRUE, FALSE, (UINTN)HighBit);
@@ -769,7 +779,6 @@ GetResourcePadding (
return EFI_SUCCESS;
}
/**
Entry point for this driver.
@@ -783,18 +792,22 @@ GetResourcePadding (
EFI_STATUS
EFIAPI
DriverInitialize (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
EFI_STATUS Status;
mPciExtConfSpaceSupported = (PcdGet16 (PcdOvmfHostBridgePciDevId) ==
INTEL_Q35_MCH_DEVICE_ID);
mPciHotPlugInit.GetRootHpcList = GetRootHpcList;
mPciHotPlugInit.InitializeRootHpc = InitializeRootHpc;
mPciHotPlugInit.GetRootHpcList = GetRootHpcList;
mPciHotPlugInit.InitializeRootHpc = InitializeRootHpc;
mPciHotPlugInit.GetResourcePadding = GetResourcePadding;
Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,
&gEfiPciHotPlugInitProtocolGuid, &mPciHotPlugInit, NULL);
Status = gBS->InstallMultipleProtocolInterfaces (
&ImageHandle,
&gEfiPciHotPlugInitProtocolGuid,
&mPciHotPlugInit,
NULL
);
return Status;
}