From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx.groups.io with SMTP id smtpd.web11.11099.1647720803180437148 for ; Sat, 19 Mar 2022 13:13:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bsdio.com header.s=fm2 header.b=jJVFE3Yi; spf=pass (domain: bsdio.com, ip: 66.111.4.25, mailfrom: rebecca@bsdio.com) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8BCDA5C00C4; Sat, 19 Mar 2022 16:13:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 19 Mar 2022 16:13:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; bh=f4yUChHkL0AQ7ghRCsUYcsIKoJSrSH EihQuKM6r/yjA=; b=jJVFE3Yihr7LG/fcadOSXJqZJPeXtd9rBoP+uUOq1LJ9XN j7exc0XI+NzeTxXOrv0XbI4lIY0Cw0O/2U1QY+CdoKBRDh6NujRmlP9xkLPeDSEY bQpvSJmyIiVLcyHwtlQF+5VLVUpqC1NFbPYKFHFDAqrbNs+9dcYEWgaSbg/2GKxL sQMzC6QcjUAe0Jn32+tBKm+OkbZLOA5ilRtgjlntGSyihCexyzHHmOaZb/72wI2U bwquyWzovlRkUUuYaGOTgsUGQf/XCQ742EcazpG2DmKKvfnPX3Z35KlHTvK1+8Uw o7MIeI7BgXCY/66ycAgMr9+BHAZVcHCT8Vo5EYOw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=f4yUCh HkL0AQ7ghRCsUYcsIKoJSrSHEihQuKM6r/yjA=; b=RYgeeKDzX8ZEnA3zmK4edF BctdNhKWmm4ww6uI8Li5gr32Ei5MJ/iizKnmzDaoFXC8ZBTPFb4fVZas7IJnHJqt nOU3AGzLbvvsHQxL2WQQ33dpQ87w/zKy4VCbAtQx/fzN3knGz/Tr3uQlySu2q7c+ s4F8MdjVMzWRpBFjvNsfCo6U8eHy2mC33M/3zcpoiuSo3eRqvu/CVRWdLzpacCUf EB3xsQKmtEv8bvoD4PjRfq1NKs3A1a7G8KsdOErN16MgLxyRgPUvhWcDIcjuYdFS GYFeLE25ypsRd3L/UqnMu18ixjfZVKDHTBy/jA2DsrAZNIH7sM2k46qOW+yl6LWQ == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudefkedgudefhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepveeiffeivdevudetueehiedthedthefhtdehfeelkeeitdfhhfefleetieeh gfevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 19 Mar 2022 16:13:21 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Thomas Abraham , Sami Mujawar Cc: Rebecca Cran Subject: [PATCH edk2-platforms v2 2/3] Platform/ARM/JunoPkg: Use MdePkg PcdPciExpressBaseAddress for ECAM addr Date: Sat, 19 Mar 2022 14:13:11 -0600 Message-Id: <20220319201312.158506-3-rebecca@bsdio.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220319201312.158506-1-rebecca@bsdio.com> References: <20220319201312.158506-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of using a custom Pcd for the ECAM address (gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress), use the Pcd from MdePkg. Signed-off-by: Rebecca Cran Reviewed-by: Sami Mujawar --- 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 #include -#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