Instead of using a custom Pcd for the ECAM address
(gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress),
use the Pcd from MdePkg.
Signed-off-by: Rebecca Cran <rebe...@bsdio.com>
Reviewed-by: Sami Mujawar <sami.muja...@arm.com>
---
Platform/ARM/JunoPkg/ArmJuno.dec
| 4 ++--
Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
| 2 +-
Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
| 2 +-
Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
| 2 +-
Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
| 2 +-
Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
| 2 +-
Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
| 2 +-
Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
| 2 +-
Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
| 4 ++--
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dec b/Platform/ARM/JunoPkg/ArmJuno.dec
index 37ea6857366f..b6437d6fe98c 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dec
+++ b/Platform/ARM/JunoPkg/ArmJuno.dec
@@ -34,8 +34,8 @@ [PcdsFeatureFlag.common]
[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
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index 00be2c435bd6..7ca134d6674b 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -46,7 +46,7 @@ [Protocols]
[FixedPcd]
# PCI Root complex specific PCDs
- gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize
## PL011 Serial Debug UART
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
index d016967c3c37..c35984c172e1 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
+++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf
@@ -67,7 +67,7 @@ [FixedPcd]
gArmJunoTokenSpaceGuid.PcdJunoFdtDevicePath
# PCI Root complex specific PCDs
- gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gArmTokenSpaceGuid.PcdPciBusMin
gArmTokenSpaceGuid.PcdPciBusMax
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
index 145663c2fa28..fb80f10a9409 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
+++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf
@@ -45,7 +45,7 @@ [FixedPcd]
gArmTokenSpaceGuid.PcdArmPrimaryCoreMask
gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress
- gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize
# Framebuffer Memory
diff --git
a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index f448803fda7d..784618ffa013 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -62,7 +62,7 @@ [FixedPcd]
gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress
gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress
- gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize
[Protocols]
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
index 420bdda7534b..78889c1b1196 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/XPressRich3.h
+++ b/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)
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 80a98a10d869..8a0464c5f637 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/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
diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
index aaa493a9284b..870dfa5f7ef3 100644
--- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c
+++ b/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),
diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
index 990a1664e496..8ac2e3273a4a 100644
--- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c
+++ b/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;
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#87766): https://edk2.groups.io/g/devel/message/87766
Mute This Topic: https://groups.io/mt/89895616/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
