From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.8816.1585133602969149368 for ; Wed, 25 Mar 2020 03:53:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: aditya.angadi@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9BA3831B; Wed, 25 Mar 2020 03:53:22 -0700 (PDT) Received: from usa.arm.com (a073440-lin.blr.arm.com [10.162.16.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3BA8D3F71F; Wed, 25 Mar 2020 03:53:21 -0700 (PDT) From: "Aditya Angadi" To: devel@edk2.groups.io Cc: Aditya Angadi , Leif Lindholm , Ard Biesheuvel Subject: [edk2-platforms][PATCH v3 3/9] Platform/ARM/SgiPkg: move common Date: Wed, 25 Mar 2020 16:22:46 +0530 Message-Id: <20200325105252.13905-4-aditya.angadi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200325105252.13905-1-aditya.angadi@arm.com> References: <20200325105252.13905-1-aditya.angadi@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Move common platform description entries in platfrom specific DSDT to a SSDT that can be reused on all SGI/RD platforms. Cc: Leif Lindholm Cc: Ard Biesheuvel Signed-off-by: Aditya Angadi --- Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 70 += ------------------- Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 3 += - Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 69 += ------------------ Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 3 += - Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf | 1 + Platform/ARM/SgiPkg/AcpiTables/{RdN1Edge/Dsdt.asl =3D> SsdtRos.asl} | 67= ++++--------------- 6 files changed, 19 insertions(+), 194 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl b/Platform/= ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl index 5583e610973b..d66c7cbf4183 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2018, ARM Ltd. All rights reserved. +* Copyright (c) 2018-2020, ARM Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -208,73 +208,5 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD= ", "ARMSGI", Name (_STA, 0xF) } =20 - // UART PL011 - Device (COM0) { - Name (_HID, "ARMH0011") - Name (_CID, "ARMH0011") - Name (_UID, Zero) - Name (_STA, 0xF) - Name (_CRS, ResourceTemplate() { - Memory32Fixed ( - ReadWrite, - FixedPcdGet64 (PcdSerialDbgRegisterBase), - 0x1000 - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 147= } - }) - } - - // SMSC 91C111 - Device (ETH0) { - Name (_HID, "LNRO0003") - Name (_UID, Zero) - Name (_STA, 0xF) - Name (_CRS, ResourceTemplate() { - Memory32Fixed (ReadWrite, 0x18000000, 0x1000) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 111= } - }) - Name (_DSD, Package() { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () { - Package (2) {"reg-io-width", 4 }, - } - }) - } - - // VIRTIO DISK - Device (VR00) { - Name (_HID, "LNRO0005") - Name (_UID, 0) - Name (_CCA, 1) // mark the device coherent - - Name (_CRS, ResourceTemplate() { - Memory32Fixed ( - ReadWrite, - FixedPcdGet32 (PcdVirtioBlkBaseAddress), - FixedPcdGet32 (PcdVirtioBlkSize) - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { - FixedPcdGet32 (PcdVirtioBlkInterrupt) - } - }) - } - - // VIRTIO NET - Device (VR01) { - Name (_HID, "LNRO0005") - Name (_UID, 1) - Name (_CCA, 1) // mark the device coherent - - Name (_CRS, ResourceTemplate() { - Memory32Fixed ( - ReadWrite, - FixedPcdGet32 (PcdVirtioNetBaseAddress), - FixedPcdGet32 (PcdVirtioNetSize) - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { - FixedPcdGet32 (PcdVirtioNetInterrupt) - } - }) - } } // Scope(_SB) } diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Plat= form/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf index 3a4d4e7b9502..b08d7c2df5c7 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf @@ -1,7 +1,7 @@ ## @file # ACPI table data and ASL sources required to boot the platform. # -# Copyright (c) 2018, ARM Ltd. All rights reserved. +# Copyright (c) 2018-2020, ARM Ltd. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -16,6 +16,7 @@ [Defines] =20 [Sources] Dbg2.aslc + SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl b/Platform/= ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl index 45316d5005f4..cb05eed35878 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl @@ -1,7 +1,7 @@ /** @file * Differentiated System Description Table Fields (DSDT) * -* Copyright (c) 2018, ARM Ltd. All rights reserved. +* Copyright (c) 2018-2020, ARM Ltd. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -62,72 +62,5 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD",= "ARMSGI", Name (_STA, 0xF) } =20 - // UART PL011 - Device (COM0) { - Name (_HID, "ARMH0011") - Name (_CID, "ARMH0011") - Name (_UID, Zero) - Name (_STA, 0xF) - Name (_CRS, ResourceTemplate () { - Memory32Fixed ( - ReadWrite, - FixedPcdGet64 (PcdSerialDbgRegisterBase), - 0x1000 - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 147= } - }) - } - - // SMSC 91C111 - Device (ETH0) { - Name (_HID, "LNRO0003") - Name (_UID, Zero) - Name (_STA, 0xF) - Name (_CRS, ResourceTemplate () { - Memory32Fixed (ReadWrite, 0x18000000, 0x1000) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 111= } - }) - Name (_DSD, Package() { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package() { - Package(2) {"reg-io-width", 4 }, - } - }) - } - - // VIRTIO DISK - Device (VR00) { - Name (_HID, "LNRO0005") - Name (_UID, 0) - Name (_CCA, 1) // mark the device coherent - - Name (_CRS, ResourceTemplate() { - Memory32Fixed ( - ReadWrite, - FixedPcdGet32 (PcdVirtioBlkBaseAddress), - FixedPcdGet32 (PcdVirtioBlkSize) - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { - FixedPcdGet32 (PcdVirtioBlkInterrupt) - } - }) - } - - // VIRTIO NET - Device (VR01) { - Name (_HID, "LNRO0005") - Name (_UID, 1) - Name (_CCA, 1) // mark the device coherent - - Name (_CRS, ResourceTemplate() { - Memory32Fixed (ReadWrite, - FixedPcdGet32 (PcdVirtioNetBaseAddress), - FixedPcdGet32 (PcdVirtioNetSize) - ) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { - FixedPcdGet32 (PcdVirtioNetInterrupt) - } - }) - } } // Scope(_SB) } diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Plat= form/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf index 58c33ecb8ec2..61b07bffccf3 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf @@ -1,7 +1,7 @@ ## @file # ACPI table data and ASL sources required to boot the platform. # -# Copyright (c) 2018, ARM Ltd. All rights reserved. +# Copyright (c) 2018-2020, ARM Ltd. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -16,6 +16,7 @@ [Defines] =20 [Sources] Dbg2.aslc + SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Pl= atform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf index 1b584b152455..a4d5904f671c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf @@ -16,6 +16,7 @@ [Defines] =20 [Sources] Dbg2.aslc + SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl b/Platform/= ARM/SgiPkg/AcpiTables/SsdtRos.asl similarity index 57% copy from Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl copy to Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl index 45316d5005f4..95ae23c1f547 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl @@ -1,67 +1,24 @@ /** @file -* Differentiated System Description Table Fields (DSDT) +* Secondary System Description Table Fields (SSDT) * -* Copyright (c) 2018, ARM Ltd. All rights reserved. +* Copyright (c) 2020, ARM Ltd. All rights reserved. * -* SPDX-License-Identifier: BSD-2-Clause-Patent +* This program and the accompanying materials are licensed and made ava= ilable +* under the terms and conditions of the BSD License which accompanies t= his +* distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR = IMPLIED. * **/ =20 #include "SgiPlatform.h" #include "SgiAcpiHeader.h" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("SsdtRosTable.aml", "SSDT", 1, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { - - Device (CP00) { // Neoverse-N1: Cluster 0, Cpu 0 - Name (_HID, "ACPI0007") - Name (_UID, 0) - Name (_STA, 0xF) - } - - Device (CP01) { // Neoverse-N1: Cluster 0, Cpu 1 - Name (_HID, "ACPI0007") - Name (_UID, 1) - Name (_STA, 0xF) - } - - Device (CP02) { // Neoverse-N1: Cluster 0, Cpu 2 - Name (_HID, "ACPI0007") - Name (_UID, 2) - Name (_STA, 0xF) - } - - Device (CP03) { // Neoverse-N1: Cluster 0, Cpu 3 - Name (_HID, "ACPI0007") - Name (_UID, 3) - Name (_STA, 0xF) - } - - Device (CP04) { // Neoverse-N1: Cluster 1, Cpu 0 - Name (_HID, "ACPI0007") - Name (_UID, 4) - Name (_STA, 0xF) - } - - Device (CP05) { // Neoverse-N1: Cluster 1, Cpu 1 - Name (_HID, "ACPI0007") - Name (_UID, 5) - Name (_STA, 0xF) - } - - Device (CP06) { // Neoverse-N1: Cluster 1, Cpu 2 - Name (_HID, "ACPI0007") - Name (_UID, 6) - Name (_STA, 0xF) - } - - Device (CP07) { // Neoverse-N1: Cluster 1, Cpu 3 - Name (_HID, "ACPI0007") - Name (_UID, 7) - Name (_STA, 0xF) - } - // UART PL011 Device (COM0) { Name (_HID, "ARMH0011") @@ -73,7 +30,7 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", = "ARMSGI", ReadWrite, FixedPcdGet64 (PcdSerialDbgRegisterBase), 0x1000 - ) + ) Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 147= } }) } @@ -129,5 +86,5 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD",= "ARMSGI", } }) } - } // Scope(_SB) + } } --=20 2.17.1