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

OvmfPkg/PciHotPlugInitDxe: reserve more mmio space

Browse Source 
In case the 64-bit pci mmio window is larger than the default size
of 32G be generous and hand out larger chunks of address space for
prefetchable mmio bridge windows.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Gerd Hoffmann 2022-10-04 15:47:28 +02:00 committed by mergify[bot]
parent ecb778d0ac
commit 9e6b552b4c
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
View File

@ -556,6 +556,7 @@ GetResourcePadding (
EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *Address; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *Address;
BOOLEAN DefaultIo; BOOLEAN DefaultIo;
BOOLEAN DefaultMmio; BOOLEAN DefaultMmio;
BOOLEAN DefaultPrefMmio;
RESOURCE_PADDING ReservationRequest; RESOURCE_PADDING ReservationRequest;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FirstResource; EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *FirstResource;
EFI_STATUS ReservationHintStatus; EFI_STATUS ReservationHintStatus;
@ -588,8 +589,9 @@ GetResourcePadding (
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
DefaultIo = TRUE; DefaultIo = TRUE;
DefaultMmio = TRUE; DefaultMmio = TRUE;
DefaultPrefMmio = TRUE;
// //
// Init ReservationRequest, and point FirstResource one past the last // Init ReservationRequest, and point FirstResource one past the last
@ -722,6 +724,7 @@ GetResourcePadding (
HighBit = HighBitSetRoundUp32 (ReservationHint.Prefetchable32BitMmio); HighBit = HighBitSetRoundUp32 (ReservationHint.Prefetchable32BitMmio);
if (HighBit != -1) { if (HighBit != -1) {
SetMmioPadding (--FirstResource, TRUE, TRUE, (UINTN)HighBit); SetMmioPadding (--FirstResource, TRUE, TRUE, (UINTN)HighBit);
DefaultPrefMmio = FALSE;
} }
} else if ((ReservationHint.Prefetchable64BitMmio > 0) && } else if ((ReservationHint.Prefetchable64BitMmio > 0) &&
(ReservationHint.Prefetchable64BitMmio < MAX_UINT64)) (ReservationHint.Prefetchable64BitMmio < MAX_UINT64))
@ -729,6 +732,7 @@ GetResourcePadding (
HighBit = HighBitSetRoundUp64 (ReservationHint.Prefetchable64BitMmio); HighBit = HighBitSetRoundUp64 (ReservationHint.Prefetchable64BitMmio);
if (HighBit != -1) { if (HighBit != -1) {
SetMmioPadding (--FirstResource, TRUE, FALSE, (UINTN)HighBit); SetMmioPadding (--FirstResource, TRUE, FALSE, (UINTN)HighBit);
DefaultPrefMmio = FALSE;
} }
} }
} }
@ -752,6 +756,19 @@ GetResourcePadding (
); );
} }
if (DefaultPrefMmio) {
UINT64 Pci64Size = PcdGet64 (PcdPciMmio64Size);
if (Pci64Size > SIZE_32GB) {
SetMmioPadding (
--FirstResource,
TRUE,
FALSE,
(UINTN)HighBitSetRoundUp64 (RShiftU64 (Pci64Size, 8))
);
}
}
// //
// Output a copy of ReservationRequest from the lowest-address populated // Output a copy of ReservationRequest from the lowest-address populated
// entry until the end of the structure (including // entry until the end of the structure (including

1
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
View File

@ -40,6 +40,7 @@
[Pcd] [Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId ## CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId ## CONSUMES
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size ## CONSUMES
[Depex] [Depex]
TRUE TRUE