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.web10.3434.1587985621760030378 for ; Mon, 27 Apr 2020 04:07:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ard.biesheuvel@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 62A251FB; Mon, 27 Apr 2020 04:07:01 -0700 (PDT) Received: from [192.168.1.81] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5D27E3F73D; Mon, 27 Apr 2020 04:07:00 -0700 (PDT) Subject: Re: [edk2-devel] [edk2-platforms][PATCH v4 3/9] Platform/ARM/Sgi: Move common platform description to SSDT To: devel@edk2.groups.io, aditya.angadi@arm.com Cc: thomas.abraham@arm.com, leif@nuviainc.com References: <20200414125208.2878-1-aditya.angadi@arm.com> <20200414125208.2878-4-aditya.angadi@arm.com> From: "Ard Biesheuvel" Message-ID: Date: Mon, 27 Apr 2020 13:06:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200414125208.2878-4-aditya.angadi@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 4/14/20 2:52 PM, Aditya Angadi via groups.io wrote: > Move common platform description entries in platform specific DSDT to > a SSDT that can be reused on all SGI/RD platforms. > > Signed-off-by: Aditya Angadi Reviewed-by: Ard Biesheuvel > --- > 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 => SsdtRos.asl} | 63 +++--------------- > 6 files changed, 17 insertions(+), 192 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) > } > > - // 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/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf > index e780698cdf57..7ebd70b197a6 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] > > [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) > } > > - // 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/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf > index 871697eab19e..2d4354f33018 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] > > [Sources] > Dbg2.aslc > + SsdtRos.asl > Fadt.aslc > Gtdt.aslc > Iort.aslc > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf > index 61f17b3ee8ac..75f8e6dd6685 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf > @@ -16,6 +16,7 @@ [Defines] > > [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 58% > copy from Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl > copy to Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl > index 45316d5005f4..5b348da90b73 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 available > +* under the terms and conditions of the BSD License which accompanies this > +* 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. > * > **/ > > #include "SgiPlatform.h" > #include "SgiAcpiHeader.h" > > -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") >