From nobody Mon Feb 9 19:29:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87300+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87300+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646454003718843.5593574860658; Fri, 4 Mar 2022 20:20:03 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id cAEOYY1788612xWgoBioi8F5; Fri, 04 Mar 2022 20:20:04 -0800 X-Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web12.2744.1646454003153359963 for ; Fri, 04 Mar 2022 20:20:03 -0800 X-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7B4E35C01EF; Fri, 4 Mar 2022 23:20:02 -0500 (EST) X-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 04 Mar 2022 23:20:02 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddtledgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggsvggt tggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrghtth gvrhhnpeevieffiedvveduteeuheeitdehtdehhfdtheefleekiedthffhfeelteeihefg veenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvg gsvggttggrsegsshguihhordgtohhm X-ME-Proxy: X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 4 Mar 2022 23:20:01 -0500 (EST) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Thomas Abraham , Sami Mujawar Cc: Rebecca Cran Subject: [edk2-devel] [PATCH edk2-platforms 2/3] Platform/ARM/JunoPkg: Use MdePkg PcdPciExpressBaseAddress for ECAM addr Date: Fri, 4 Mar 2022 21:19:54 -0700 Message-Id: <20220305041955.20918-3-rebecca@bsdio.com> In-Reply-To: <20220305041955.20918-1-rebecca@bsdio.com> References: <20220305041955.20918-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: eEInhDdX9SPrVlBNNxZtbmMdx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646454004; bh=hOIbLETBdlf5/VMioFLN/xOEjwCikrdrLpHUZEZhh54=; h=Cc:Date:From:Reply-To:Subject:To; b=amk37f/oS6b8tYbMrULd7HNY+dVp/uobZBlGbMvQbem+50EcbweQLu41HUHeCafmUOv lO7M6mIQpMIGiKeBRPhIYwQN1C57pB1QDETUpFQCRVtRSrj7RlyqMJhvqNtUP8hrBFLY+ Xhv1ftQR2fhj0mjmWxpicZ494Gp9IqfcbrE= X-ZohoMail-DKIM: fail (Signature date is -1 seconds in the future.) X-ZM-MESSAGEID: 1646454030665100001 Content-Type: text/plain; charset="utf-8" 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/Configur= ationManagerDxe.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/Configur= ationManager.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/ArmJun= o.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|0x000= 0000B gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress|0x7FF30000|UINT64|0x00= 00000C - gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress|0x40000000|UI= NT64|0x00000011 - gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize|0x10000000|UINT64|0x= 00000012 + gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize|0x10000000|UINT64|0x= 00000011 + gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceLimit|0x4FFFFFFF|UINT64|0= x00000012 =20 gArmJunoTokenSpaceGuid.PcdSynopsysUsbOhciBaseAddress|0x7FFB0000|UINT32|0= x00000004 gArmJunoTokenSpaceGuid.PcdSynopsysUsbEhciBaseAddress|0x7FFC0000|UINT32|0= x00000005 diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager= /ConfigurationManagerDxe/ConfigurationManagerDxe.inf index 00be2c435bd6..7ca134d6674b 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManagerDxe.inf @@ -46,7 +46,7 @@ [Protocols] =20 [FixedPcd] # PCI Root complex specific PCDs - gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize =20 ## PL011 Serial Debug UART diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platf= orm/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 =20 # PCI Root complex specific PCDs - gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gArmTokenSpaceGuid.PcdPciBusMin gArmTokenSpaceGuid.PcdPciBusMax =20 diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platf= orm/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 =20 gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress - gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize =20 # Framebuffer Memory diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostB= ridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHos= tBridgeLib.inf index f448803fda7d..784618ffa013 100644 --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLi= b.inf +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLi= b.inf @@ -62,7 +62,7 @@ [FixedPcd] =20 gArmJunoTokenSpaceGuid.PcdPcieControlBaseAddress gArmJunoTokenSpaceGuid.PcdPcieRootPortBaseAddress - gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceBaseAddress + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize =20 [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 =20 -#define PCI_ECAM_BASE FixedPcdGet64 (PcdPciConfigurationSpaceBaseAdd= ress) +#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/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index 80a98a10d869..3420b6eba66a 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -230,7 +230,7 @@ EDKII_PLATFORM_REPOSITORY_INFO ArmJunoPlatformRepositor= yInfo =3D { // PCI Configuration Space Info { // The physical base address for the PCI segment - FixedPcdGet64 (PcdPciConfigurationSpaceBaseAddress), + FixedPcdGet64 (gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress), // The PCI segment group number 0, // The start bus number diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/AcpiTables.c b/Platfor= m/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 mAcpi= McfgTable =3D { ), 0, // Reserved }, { - FixedPcdGet32 (PcdPciConfigurationSpaceBaseAddress), + FixedPcdGet32 (PcdPciExpressBaseAddress), 0, // PciSegmentGroupNumber FixedPcdGet32 (PcdPciBusMin), FixedPcdGet32 (PcdPciBusMax), diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoMem.c b/Platfor= m/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 =3D PcdGet64 (PcdPciConfigurat= ionSpaceBaseAddress); - VirtualMemoryTable[Index].VirtualBase =3D PcdGet64 (PcdPciConfigurat= ionSpaceBaseAddress); + VirtualMemoryTable[++Index].PhysicalBase =3D PcdGet64 (PcdPciExpressBas= eAddress); + VirtualMemoryTable[Index].VirtualBase =3D PcdGet64 (PcdPciExpressBas= eAddress); VirtualMemoryTable[Index].Length =3D PcdGet64 (PcdPciConfigurat= ionSpaceSize); VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIBUT= E_DEVICE; =20 --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#87300): https://edk2.groups.io/g/devel/message/87300 Mute This Topic: https://groups.io/mt/89565201/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-