OvmfPkg/PciHotPlugInitDxe: reserve more mmio space

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>

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

diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
index 78b95faa7a7a169aa5dab8ca7c2f379a4793a4e8..f56b1de6fd9213a6cc11f379279f02b001811a0c 100644 (file)
--- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
+++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
@@ -40,6 +40,7 @@
 \r
 [Pcd]\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId ## CONSUMES\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size          ## CONSUMES\r
 \r
 [Depex]\r
   TRUE\r