ArmVirtPkg/FdtPciHostBridgeLib: map ECAM and I/O spaces in GCD memory map

Up until now, we have been getting away with not declaring the ECAM
and translated I/O spaces at all in the GCD memory map, simply because
we map the entire address space with device attributes in the early PEI
code, and so the ECAM space will be mapped wherever it ends up.

Now that we are about to make changes to how ArmVirtQemu reasons
about the size of the address space, it would be better to get rid
of this mapping of the entire address space, since it can get
arbitrarily large without real benefit.

So start by mapping the ECAM and translated I/O spaces explicitly,
instead of relying on the early PEI mapping.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

2 files changed, 46 insertions, 1 deletions

diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
index 5b9c887db3..ebfa14a349 100644
--- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
+++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
@@ -17,6 +17,7 @@
 #include <Library/PciHostBridgeLib.h>

 #include <Library/DebugLib.h>

 #include <Library/DevicePathLib.h>

+#include <Library/DxeServicesTableLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/PcdLib.h>

 #include <Library/UefiBootServicesTableLib.h>

@@ -84,6 +85,33 @@ typedef struct {
 

 STATIC

 EFI_STATUS

+MapGcdMmioSpace (

+  IN    UINT64    Base,

+  IN    UINT64    Size

+  )

+{

+  EFI_STATUS    Status;

+

+  Status = gDS->AddMemorySpace (EfiGcdMemoryTypeMemoryMappedIo, Base, Size,

+                  EFI_MEMORY_UC);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_ERROR,

+      "%a: failed to add GCD memory space for region [0x%Lx+0x%Lx)\n",

+      __FUNCTION__, Base, Size));

+    return Status;

+  }

+

+  Status = gDS->SetMemorySpaceAttributes (Base, Size, EFI_MEMORY_UC);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_ERROR,

+      "%a: failed to set memory space attributes for region [0x%Lx+0x%Lx)\n",

+      __FUNCTION__, Base, Size));

+  }

+  return Status;

+}

+

+STATIC

+EFI_STATUS

 ProcessPciHost (

   OUT  UINT64    *IoBase,

   OUT  UINT64    *IoSize,

@@ -266,7 +294,23 @@ ProcessPciHost (
     "Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n",

     __FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize,

     IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size));

-  return EFI_SUCCESS;

+

+  // Map the ECAM space in the GCD memory map

+  Status = MapGcdMmioSpace (ConfigBase, ConfigSize);

+  ASSERT_EFI_ERROR (Status);

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

+

+  //

+  // Map the MMIO window that provides I/O access - the PCI host bridge code

+  // is not aware of this translation and so it will only map the I/O view

+  // in the GCD I/O map.

+  //

+  Status = MapGcdMmioSpace (*IoBase + IoTranslation, *IoSize);

+  ASSERT_EFI_ERROR (Status);

+

+  return Status;

 }

 

 STATIC PCI_ROOT_BRIDGE mRootBridge;

diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
index 0995f4b7a1..4011336a35 100644
--- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
@@ -42,6 +42,7 @@
 [LibraryClasses]

   DebugLib

   DevicePathLib

+  DxeServicesTableLib

   MemoryAllocationLib

   PciPcdProducerLib