Parcourir la source

Platform/ARM/JunoPkg: Use MdePkg PcdPciExpressBaseAddress for ECAM addr

Instead of using a custom Pcd for the ECAM address
(gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress),
use the Pcd from MdePkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Rebecca Cran il y a 2 ans
Parent
commit
5e208bdccc

+ 2 - 2
Platform/ARM/JunoPkg/ArmJuno.dec

@@ -34,8 +34,8 @@
 [PcdsFixedAtBuild.common]
   gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress|0x7FF20000|UINT64|0x0000000B
   gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress|0x7FF30000|UINT64|0x0000000C
-  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress|0x40000000|UINT64|0x00000011
-  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize|0x10000000|UINT64|0x00000012
+  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize|0x10000000|UINT64|0x00000011
+  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceLimit|0x4FFFFFFF|UINT64|0x00000012
 
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress|0x7FFB0000|UINT32|0x00000004
   gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0x00000005

+ 1 - 1
Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c

@@ -230,7 +230,7 @@ EDKII_PLATFORM_REPOSITORY_INFO ArmJunoPlatformRepositoryInfo = {
   // PCI Configuration Space Info
   {
     // The physical base address for the PCI segment
-    FixedPcdGet64 (PcdPciConfigurationSpaceBaseAddress),
+    FixedPcdGet64 (PcdPciExpressBaseAddress),
     // The PCI segment group number
     0,
     // The start bus number

+ 1 - 1
Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf

@@ -46,7 +46,7 @@
 
 [FixedPcd]
   # PCI Root complex specific PCDs
-  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
   gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize
 
   ## PL011 Serial Debug UART

+ 1 - 1
Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c

@@ -30,7 +30,7 @@ MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ACCESS_TABLE mAcpiMcfgTable = {
         ),
         0, // Reserved
     }, {
-        FixedPcdGet32 (PcdPciConfigurationSpaceBaseAddress),
+        FixedPcdGet32 (PcdPciExpressBaseAddress),
         0, // PciSegmentGroupNumber
         FixedPcdGet32 (PcdPciBusMin),
         FixedPcdGet32 (PcdPciBusMax),

+ 1 - 1
Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf

@@ -67,7 +67,7 @@
   gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath
 
   # PCI Root complex specific PCDs
-  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
   gArmTokenSpaceGuid.PcdPciBusMin
   gArmTokenSpaceGuid.PcdPciBusMax
 

+ 1 - 1
Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf

@@ -45,7 +45,7 @@
   gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
 
   gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress
-  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
   gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize
 
   # Framebuffer Memory

+ 2 - 2
Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c

@@ -118,8 +118,8 @@ ArmPlatformGetVirtualMemoryMap (
   //
   // PCI Configuration Space
   //
-  VirtualMemoryTable[++Index].PhysicalBase  = PcdGet64 (PcdPciConfigurationSpaceBaseAddress);
-  VirtualMemoryTable[Index].VirtualBase     = PcdGet64 (PcdPciConfigurationSpaceBaseAddress);
+  VirtualMemoryTable[++Index].PhysicalBase  = PcdGet64 (PcdPciExpressBaseAddress);
+  VirtualMemoryTable[Index].VirtualBase     = PcdGet64 (PcdPciExpressBaseAddress);
   VirtualMemoryTable[Index].Length          = PcdGet64 (PcdPciConfigurationSpaceSize);
   VirtualMemoryTable[Index].Attributes      = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
 

+ 1 - 1
Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf

@@ -62,7 +62,7 @@
 
   gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress
   gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress
-  gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
   gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize
 
 [Protocols]

+ 1 - 1
Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h

@@ -13,7 +13,7 @@
 #include <Protocol/CpuIo2.h>
 #include <Library/PcdLib.h>
 
-#define PCI_ECAM_BASE       FixedPcdGet64 (PcdPciConfigurationSpaceBaseAddress)
+#define PCI_ECAM_BASE       FixedPcdGet64 (PcdPciExpressBaseAddress)
 #define PCI_ECAM_SIZE       FixedPcdGet64 (PcdPciConfigurationSpaceSize)
 #define PCI_IO_BASE         FixedPcdGet64 (PcdPciIoTranslation)
 #define PCI_IO_SIZE         FixedPcdGet64 (PcdPciIoSize)