From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@bsdio.com header.s=fm2 header.b=ALce69p7; spf=pass (domain: bsdio.com, ip: 66.111.4.26, mailfrom: rebecca@bsdio.com) 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) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 04 Mar 2022 23:20:02 -0500 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=eLVeRtIJdxW6HhRoHqwt8FA7ZITQ4N vc7mfUYLi1nAM=; b=ALce69p7yDj33S4F/TdJsPQHWbJEStrxTWaYFyLVojel2B t734hZazuWnTRX0RE6dm084YXMzoy77rjUy0dKxcbdMEJ0nAVbMPd6cqcaPsYOR/ e63SjIM8pPInHQ40qcdsn74lTRpnS1P2RwDAOeN6H24Ds9bk2xAGDjpZ68MTevEl 2xAaF5OjAfMTudHVnizoiM1H9d7g+bNoTBmaQ8zZ7L7OzGXQfd40C7SpxPZ245/1 lBhlHxW5BEdAL9LgDKhkf4kN0IbGoQMC+KCA+Urs6aGlnLeTsWfO0V/skzzAWpPv JKTGzWSFsSBbQbvIxeIbt4OKm+M6kCZvpIkJGWzw== 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=fm2; bh=eLVeRt IJdxW6HhRoHqwt8FA7ZITQ4Nvc7mfUYLi1nAM=; b=Ruhx7lExC65ZSLBoMOLppN SgNB2K/6I627J3uior3g+RUIKLxZUaNG7Ko3YkJLFAVbo6Gqtwwgg/Tqp6U7K6sc oSSXUsWCOOZxZNdZgFin8IhsoRcKtpCDy1F60g1saBFVt6g50zSpEp4/Z0wNyNuk DHDByidTtM8HZOAdxLkwX+Fgq97PvB4MaKJY7E13R/IpoHckar+ERhI1Yax9C0QU Ay3K/UiPU0SZQbS31k6w5ZS3qxRxfjVdePzDLiInYet+Ir6kMIloiJf3m9mej8S6 18D/3qotsuaBmCcAfxuB+uvWqSl5XXSTOQITkUMbEiI0Dg7Il5ZZ9xnfg0SaP7GA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddtledgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggsvggt tggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrghtth gvrhhnpeevieffiedvveduteeuheeitdehtdehhfdtheefleekiedthffhfeelteeihefg veenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvg gsvggttggrsegsshguihhordgtohhm X-ME-Proxy: 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: [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> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220305041955.20918-1-rebecca@bsdio.com> References: <20220305041955.20918-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 --- 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..3420b6eba66a 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 (gEfiMdePkgTokenSpaceGuid.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