From nobody Sun May 19 20:29:57 2024 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+87299+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87299+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1646454003; cv=none; d=zohomail.com; s=zohoarc; b=L2EKYtDhkLgKldENNOShqkNgxl2OZqjmUDMoU/rs5hVjYmVtbvQ8C7iY2qOJZG/NLqZvn3APbUKh33PY09XgKDNQA0zre1/OCpBoPT6s8EyLjUMyLzkhk+UYUj3FCg9XJ7lkKF/wFaahneposLe9ZPJ4ksAsyITfRm5JIFSXBfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646454003; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=o0vb9PXIGKg+po32iOZfB3itjcMY6wsg21P2X6oyl1E=; b=BDWupsWshmG4978oOuuj8lngjP3WZvJeD3QrB8NF5SXYew2/je/Pa/GZnMyzx9D+8fpNlYtOr5C8FawHVeJr/eadoOcbbVhiWMDw6dFgXNRn1/6Su4VSMF7HSdoYVb6GmYLPa2Uc2vkAoFVZrOe6t7p9x/Rh4vwg1kYiac9dypU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87299+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646454003453403.75236049346256; Fri, 4 Mar 2022 20:20:03 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id z1hnYY1788612xSe2Ej99H9r; Fri, 04 Mar 2022 20:20:03 -0800 X-Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web11.2779.1646454002131933246 for ; Fri, 04 Mar 2022 20:20:02 -0800 X-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5A9D85C01F0; Fri, 4 Mar 2022 23:20:01 -0500 (EST) X-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 04 Mar 2022 23:20:01 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddruddtledgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeftvggsvggt tggrucevrhgrnhcuoehrvggsvggttggrsegsshguihhordgtohhmqeenucggtffrrghtth gvrhhnpeejjeehfffhieelleeffffhvefgkeeuhfegvdfhleeufffhkedtffegkeeugfel feenucffohhmrghinhepuggvvhhitggvrdiivghrohenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 4 Mar 2022 23:20:00 -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 1/3] Platform/ARM/JunoPkg: Convert AcpiSsdtRootPci.asl from tabs to spaces Date: Fri, 4 Mar 2022 21:19:53 -0700 Message-Id: <20220305041955.20918-2-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: TftO10cFDV0ZiGxNpVwfxTlbx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646454003; bh=raNZZX4aDr3AwllvxrcfusUtJI8RDAoSS4EF1xtWGY4=; h=Cc:Date:From:Reply-To:Subject:To; b=ZvfWMt45HLldxr+Yk0uxa1Vmva90aSslESAU2+IG5MMHV3pQ/FEhhMkyFonFLh1w1O5 2hMxndOjiGM8PSbv0fwKfH+K3O0BY4TVdDv0e2eiKdCbVuslghL6Xb84EG+s+LLPwYWtl xZRTulmB9pFI+02K9ZYHseXoZCELZXr3FGc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646454004403100004 Content-Type: text/plain; charset="utf-8" Other .asl files in Platform/ARM/JunoPkg/AcpiTables use spaces, while AcpiSsdtRootPci.asl uses tabs. To be consistent, convert it to spaces. Signed-off-by: Rebecca Cran Reviewed-by: Sami Mujawar --- Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl | 288 ++++++++++------= ---- 1 file changed, 144 insertions(+), 144 deletions(-) diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl b/Platform= /ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl index ba41a9586555..317b621e013e 100644 --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl @@ -28,24 +28,24 @@ interrupt type as PCI defaults (Level Triggered, Active Low) are not compatible with GICv2. */ -#define LNK_DEVICE(Unique_Id, Link_Name, irq) \ - Device(Link_Name) { \ - Name(_HID, EISAID("PNP0C0F")) \ - Name(_UID, Unique_Id) \ - Name(_PRS, ResourceTemplate() { \ - Interrupt(ResourceProducer, Level, ActiveHigh, Exclusive) { irq }= \ - }) \ - Method (_CRS, 0) { Return (_PRS) } \ - Method (_SRS, 1) { } \ - Method (_DIS) { } \ - } +#define LNK_DEVICE(Unique_Id, Link_Name, irq) = \ + Device(Link_Name) { = \ + Name(_HID, EISAID("PNP0C0F")) = \ + Name(_UID, Unique_Id) = \ + Name(_PRS, ResourceTemplate() { = \ + Interrupt(ResourceProducer, Level, ActiveHigh, Exclusive) { irq = } \ + }) = \ + Method (_CRS, 0) { Return (_PRS) } = \ + Method (_SRS, 1) { } = \ + Method (_DIS) { } = \ + } =20 -#define PRT_ENTRY(Address, Pin, Link) \ +#define PRT_ENTRY(Address, Pin, Link) = \ Package (4) { = \ Address, /* uses the same format as _ADR */ = \ Pin, /* The PCI pin number of the device (0-INTA, 1-INT= B, 2-INTC, 3-INTD). */ \ - Link, /* Interrupt allocated via Link device. */ = \ - Zero /* global system interrupt number (no used) */ = \ + Link, /* Interrupt allocated via Link device. */ = \ + Zero /* global system interrupt number (no used) */ = \ } =20 /* @@ -59,155 +59,155 @@ =20 DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_A= RM_OEM_REVISION) { Scope(_SB) { - // - // PCI Root Complex - // - LNK_DEVICE(1, LNKA, 168) - LNK_DEVICE(2, LNKB, 169) - LNK_DEVICE(3, LNKC, 170) - LNK_DEVICE(4, LNKD, 171) + // + // PCI Root Complex + // + LNK_DEVICE(1, LNKA, 168) + LNK_DEVICE(2, LNKB, 169) + LNK_DEVICE(3, LNKC, 170) + LNK_DEVICE(4, LNKD, 171) =20 - Device(PCI0) + Device(PCI0) { - Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge - Name(_CID, EISAID("PNP0A03")) // Compatible PCI Root Bridge - Name(_SEG, Zero) // PCI Segment Group number - Name(_BBN, Zero) // PCI Base Bus Number - Name(_CCA, 1) // Initially mark the PCI coherent (for JunoR1) + Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge + Name(_CID, EISAID("PNP0A03")) // Compatible PCI Root Bridge + Name(_SEG, Zero) // PCI Segment Group number + Name(_BBN, Zero) // PCI Base Bus Number + Name(_CCA, 1) // Initially mark the PCI coherent (for JunoR1) =20 - // Root Complex 0 - Device (RP0) { - Name(_ADR, 0xF0000000) // Dev 0, Func 0 - } + // Root Complex 0 + Device (RP0) { + Name(_ADR, 0xF0000000) // Dev 0, Func 0 + } =20 - // PCI Routing Table - Name(_PRT, Package() { - ROOT_PRT_ENTRY(0, LNKA), // INTA - ROOT_PRT_ENTRY(1, LNKB), // INTB - ROOT_PRT_ENTRY(2, LNKC), // INTC - ROOT_PRT_ENTRY(3, LNKD), // INTD - }) - // Root complex resources - Method (_CRS, 0, Serialized) { - Name (RBUF, ResourceTemplate () { - WordBusNumber ( // Bus numbers assigned to this root - ResourceProducer, - MinFixed, MaxFixed, PosDecode, - 0, // AddressGranularity - 0, // AddressMinimum - Minimum Bus Number - 255, // AddressMaximum - Maximum Bus Number - 0, // AddressTranslation - Set to 0 - 256 // RangeLength - Number of Busses - ) + // PCI Routing Table + Name(_PRT, Package() { + ROOT_PRT_ENTRY(0, LNKA), // INTA + ROOT_PRT_ENTRY(1, LNKB), // INTB + ROOT_PRT_ENTRY(2, LNKC), // INTC + ROOT_PRT_ENTRY(3, LNKD), // INTD + }) + // Root complex resources + Method (_CRS, 0, Serialized) { + Name (RBUF, ResourceTemplate () { + WordBusNumber ( // Bus numbers assigned to this root + ResourceProducer, + MinFixed, MaxFixed, PosDecode, + 0, // AddressGranularity + 0, // AddressMinimum - Minimum Bus Number + 255, // AddressMaximum - Maximum Bus Number + 0, // AddressTranslation - Set to 0 + 256 // RangeLength - Number of Busses + ) =20 - DWordMemory ( // 32-bit BAR Windows - ResourceProducer, PosDecode, - MinFixed, MaxFixed, - Cacheable, ReadWrite, - 0x00000000, // Granularity - 0x50000000, // Min Base Address - 0x57FFFFFF, // Max Base Address - 0x00000000, // Translate - 0x08000000 // Length - ) + DWordMemory ( // 32-bit BAR Windows + ResourceProducer, PosDecode, + MinFixed, MaxFixed, + Cacheable, ReadWrite, + 0x00000000, // Granularity + 0x50000000, // Min Base Address + 0x57FFFFFF, // Max Base Address + 0x00000000, // Translate + 0x08000000 // Length + ) =20 - QWordMemory ( // 64-bit BAR Windows - ResourceProducer, PosDecode, - MinFixed, MaxFixed, - Cacheable, ReadWrite, - 0x00000000, // Granularity - 0x4000000000, // Min Base Address - 0x40FFFFFFFF, // Max Base Address - 0x00000000, // Translate - 0x100000000 // Length - ) + QWordMemory ( // 64-bit BAR Windows + ResourceProducer, PosDecode, + MinFixed, MaxFixed, + Cacheable, ReadWrite, + 0x00000000, // Granularity + 0x4000000000, // Min Base Address + 0x40FFFFFFFF, // Max Base Address + 0x00000000, // Translate + 0x100000000 // Length + ) =20 - DWordIo ( // IO window - ResourceProducer, - MinFixed, - MaxFixed, - PosDecode, - EntireRange, - 0x00000000, // Granularity - 0x00000000, // Min Base Address - 0x007fffff, // Max Base Address - 0x5f800000, // Translate - 0x00800000, // Length - ,,,TypeTranslation - ) - }) // Name(RBUF) + DWordIo ( // IO window + ResourceProducer, + MinFixed, + MaxFixed, + PosDecode, + EntireRange, + 0x00000000, // Granularity + 0x00000000, // Min Base Address + 0x007fffff, // Max Base Address + 0x5f800000, // Translate + 0x00800000, // Length + ,,,TypeTranslation + ) + }) // Name(RBUF) =20 - Return (RBUF) - } // Method(_CRS) + Return (RBUF) + } // Method(_CRS) =20 - // - // OS Control Handoff - // - Name(SUPP, Zero) // PCI _OSC Support Field value - Name(CTRL, Zero) // PCI _OSC Control Field value + // + // OS Control Handoff + // + Name(SUPP, Zero) // PCI _OSC Support Field value + Name(CTRL, Zero) // PCI _OSC Control Field value =20 - /* - See [1] 6.2.10, [2] 4.5 - */ - Method(_OSC,4) { - // Check for proper UUID - If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { - // Create DWord-adressable fields from the Capabilities Buffer - CreateDWordField(Arg3,0,CDW1) - CreateDWordField(Arg3,4,CDW2) - CreateDWordField(Arg3,8,CDW3) + /* + See [1] 6.2.10, [2] 4.5 + */ + Method(_OSC,4) { + // Check for proper UUID + If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { + // Create DWord-adressable fields from the Capabilities Buffer + CreateDWordField(Arg3,0,CDW1) + CreateDWordField(Arg3,4,CDW2) + CreateDWordField(Arg3,8,CDW3) =20 - // Save Capabilities DWord2 & 3 - Store(CDW2,SUPP) - Store(CDW3,CTRL) + // Save Capabilities DWord2 & 3 + Store(CDW2,SUPP) + Store(CDW3,CTRL) =20 - // Only allow native hot plug control if OS supports: - // * ASPM - // * Clock PM - // * MSI/MSI-X - If(LNotEqual(And(SUPP, 0x16), 0x16)) { - And(CTRL,0x1E,CTRL) // Mask bit 0 (and undefined bits) - } + // Only allow native hot plug control if OS supports: + // * ASPM + // * Clock PM + // * MSI/MSI-X + If(LNotEqual(And(SUPP, 0x16), 0x16)) { + And(CTRL,0x1E,CTRL) // Mask bit 0 (and undefined bits) + } =20 - // Always allow native PME, AER (no dependencies) + // Always allow native PME, AER (no dependencies) =20 - // Never allow SHPC (no SHPC controller in this system) - And(CTRL,0x1D,CTRL) + // Never allow SHPC (no SHPC controller in this system) + And(CTRL,0x1D,CTRL) =20 #if 0 - If(LNot(And(CDW1,1))) { // Query flag clear? - // Disable GPEs for features granted native control. - If(And(CTRL,0x01)) { // Hot plug control granted? - Store(0,HPCE) // clear the hot plug SCI enable bit - Store(1,HPCS) // clear the hot plug SCI status bit - } - If(And(CTRL,0x04)) { // PME control granted? - Store(0,PMCE) // clear the PME SCI enable bit - Store(1,PMCS) // clear the PME SCI status bit - } - If(And(CTRL,0x10)) { // OS restoring PCIe cap structure? - // Set status to not restore PCIe cap structure - // upon resume from S3 - Store(1,S3CR) - } - } + If(LNot(And(CDW1,1))) { // Query flag clear? + // Disable GPEs for features granted native control. + If(And(CTRL,0x01)) { // Hot plug control granted? + Store(0,HPCE) // clear the hot plug SCI enable bit + Store(1,HPCS) // clear the hot plug SCI status bit + } + If(And(CTRL,0x04)) { // PME control granted? + Store(0,PMCE) // clear the PME SCI enable bit + Store(1,PMCS) // clear the PME SCI status bit + } + If(And(CTRL,0x10)) { // OS restoring PCIe cap structure? + // Set status to not restore PCIe cap structure + // upon resume from S3 + Store(1,S3CR) + } + } #endif =20 - If(LNotEqual(Arg1,One)) { // Unknown revision - Or(CDW1,0x08,CDW1) - } + If(LNotEqual(Arg1,One)) { // Unknown revision + Or(CDW1,0x08,CDW1) + } =20 - If(LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked - Or(CDW1,0x10,CDW1) - } - // Update DWORD3 in the buffer - Store(CTRL,CDW3) - Return(Arg3) - } Else { - Or(CDW1,4,CDW1) // Unrecognized UUID - Return(Arg3) - } - } // End _OSC + If(LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked + Or(CDW1,0x10,CDW1) + } + // Update DWORD3 in the buffer + Store(CTRL,CDW3) + Return(Arg3) + } Else { + Or(CDW1,4,CDW1) // Unrecognized UUID + Return(Arg3) + } + } // End _OSC } // PCI0 } } --=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 (#87299): https://edk2.groups.io/g/devel/message/87299 Mute This Topic: https://groups.io/mt/89565200/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- From nobody Sun May 19 20:29:57 2024 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- From nobody Sun May 19 20:29:57 2024 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+87301+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87301+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1646454005; cv=none; d=zohomail.com; s=zohoarc; b=OhCZWffPQ0lTHvURTJpnNtGJLCD1u6IzewMeGDD4GmaLjyo6wfLhLlgu4NeDT0zBCcMhUgtSR0a5IWZfgIS/Qmn0o7tvdE/1jcF44PAbaHGRTwqDX6ePdJ+Cnu5Xix5slGbj1zJT5cAL2oUSkdWfUu5GbWq9jc69pSGpbVvB4xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646454005; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=C+VIwERxWjzMpDDcv1LOeqb54JpOVaSYApaVUIcDzSA=; b=V25QKo4XzMvijZtEGo/qi/N4hTP8KApYbrM8wbual7GFciY0eSfYGY0jjmNf5QDpneTDX3IVoUSsyRuMxPzSU9dEvoWOgL3FvOdSKETxH0S3MEFDDDtrHFISPBJW3btQlHaSFVgpIT1dRiLeS6uGoAh1C87Ow1oDauzK7N6pjPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87301+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646454005073331.6417845892538; Fri, 4 Mar 2022 20:20:05 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id URiBYY1788612xTb9C0vKfi3; 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.web08.2852.1646454003979910575 for ; Fri, 04 Mar 2022 20:20:04 -0800 X-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 51C6D5C01DE; Fri, 4 Mar 2022 23:20:03 -0500 (EST) X-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 04 Mar 2022 23:20:03 -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:02 -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 3/3] Platform/ARM/JunoPkg: Reserve the ECAM area in ACPI with RES0 device Date: Fri, 4 Mar 2022 21:19:55 -0700 Message-Id: <20220305041955.20918-4-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: NyrxEM5GUTBiRIhC71PY7Pw3x1787277AA= 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=O/xZtF65qPViEpfS+Ce0P8oqPTNgIEyErapet9viybg=; h=Cc:Date:From:Reply-To:Subject:To; b=uPEiI7CR2Ujw0ukFA/aXF0B93BLMfy5bq14/J8V2pZ560lG4/ljUZn5aYMb1hUl9KUd v7K9s1/cV0Yd5U/MJSwv69T8UO5xs5mY7KrynTOOxwBBdUj+O42LTI6GrNOCR06moQbo+ SpI/y4uvqswzBRDV4gSf7brefDQzpZj8beg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646454006232100010 Content-Type: text/plain; charset="utf-8" Add a RES0 device to the SSDT to reserve the PCI ECAM area. This fixes the warning that Linux prints: acpi PNP0A08:00: [Firmware Bug]: ECAM area [mem 0x40000000-0x4fffffff] not reserved in ACPI namespace Signed-off-by: Rebecca Cran Reviewed-by: Sami Mujawar Tested-by: Sami Mujawar --- Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf | 4 ++++ Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/= JunoPkg/AcpiTables/AcpiTables.inf index f140febc4ad4..9a76475765f0 100644 --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf @@ -45,6 +45,10 @@ [FixedPcd] gArmTokenSpaceGuid.PcdGenericWatchdogControlBase gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase =20 + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress + gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceSize + gArmJunoTokenSpaceGuid.PcdPciConfigurationSpaceLimit + # # PL011 UART Settings for Serial Port Console Redirection # diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl b/Platform= /ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl index 317b621e013e..e60fc42a3340 100644 --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiSsdtRootPci.asl @@ -140,6 +140,19 @@ DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "A= RM-JUNO", EFI_ACPI_ARM_OEM Return (RBUF) } // Method(_CRS) =20 + Device (RES0) { + Name (_HID, "PNP0C02" /* PNP Motherboard Resources */) // _HID: H= ardware ID + Name (_CRS, ResourceTemplate () { // _CRS: C= urrent Resource Settings + QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, N= onCacheable, ReadWrite, + 0x0000000000000000, // Granula= rity + FixedPcdGet64 (PcdPciExpressBaseAddress), // Range M= inimum + FixedPcdGet64 (PcdPciConfigurationSpaceLimit), // Range M= aximum + 0x0000000000000000, // Transla= tion Offset + FixedPcdGet64 (PcdPciConfigurationSpaceSize), // Length + ,, , AddressRangeMemory, TypeStatic) + }) + } + // // OS Control Handoff // --=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 (#87301): https://edk2.groups.io/g/devel/message/87301 Mute This Topic: https://groups.io/mt/89565202/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-