From: "Thomas Abraham" <thomas.abraham@arm.com>
To: devel@edk2.groups.io, aditya.angadi@arm.com
Cc: leif@nuviainc.com, michael.d.kinney@intel.com,
vijayenthiran.subramaniam@arm.com
Subject: Re: [edk2-devel] [edk2-platforms][PATCH 3/8] Platform/ARM/SgiPkg: move common platform description to SSDT
Date: Mon, 16 Mar 2020 22:51:37 +0530 [thread overview]
Message-ID: <CAJuA9agbe-XG5vrRSZN0K0+Gdffi6Qz=vxnOCP9A+_vqrnWwXA@mail.gmail.com> (raw)
In-Reply-To: <20200312143520.16918-4-aditya.angadi@arm.com>
On Thu, Mar 12, 2020 at 8:05 PM Aditya Angadi <aditya.angadi@arm.com> wrote:
>
> Move common platform description entries in platfrom specific DSDT to
> a SSDT that can be reused on all SGI/RD platforms.
>
> Signed-off-by: Aditya Angadi <aditya.angadi@arm.com>
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
> ---
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 70 +--------------
> .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 3 +-
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 69 +-------------
> .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 3 +-
> .../AcpiTables/RdN1EdgeX2AcpiTables.inf | 1 +
> Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl | 90 +++++++++++++++++++
> 6 files changed, 97 insertions(+), 139 deletions(-)
> create mode 100644 Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> index 5583e61097..d66c7cbf41 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 3a4d4e7b95..b08d7c2df5 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 @@
>
> [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 45316d5005..cb05eed358 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 58c33ecb8e..61b07bffcc 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 @@
>
> [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 1b584b1524..a4d5904f67 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
> @@ -16,6 +16,7 @@
>
> [Sources]
> Dbg2.aslc
> + SsdtRos.asl
> Fadt.aslc
> Gtdt.aslc
> Iort.aslc
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
> new file mode 100644
> index 0000000000..95ae23c1f5
> --- /dev/null
> +++ b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
> @@ -0,0 +1,90 @@
> +/** @file
> +* Secondary System Description Table Fields (SSDT)
> +*
> +* Copyright (c) 2020, ARM Ltd. All rights reserved.
> +*
> +* 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 ("SsdtRosTable.aml", "SSDT", 1, "ARMLTD", "ARMSGI",
> + EFI_ACPI_ARM_OEM_REVISION) {
> + Scope (_SB) {
> + // 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)
> + }
> + })
> + }
> + }
> +}
> --
> 2.17.1
>
>
>
>
next prev parent reply other threads:[~2020-03-16 17:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 14:35 [edk2-platforms][PATCH 0/8] Add platform support for RD-Daniel Aditya Angadi
2020-03-12 14:35 ` [edk2-platforms][PATCH 1/8] Platform/ARM/SgiPkg: Create individual Platform Description File Aditya Angadi
2020-03-16 17:15 ` [edk2-devel] " Thomas Abraham
2020-03-19 19:16 ` Leif Lindholm
2020-03-12 14:35 ` [edk2-platforms][PATCH 2/8] Platform/ARM/SgiPkg: move the GIC related ACPI helper macros Aditya Angadi
2020-03-16 17:17 ` [edk2-devel] " Thomas Abraham
2020-03-12 14:35 ` [edk2-platforms][PATCH 3/8] Platform/ARM/SgiPkg: move common platform description to SSDT Aditya Angadi
2020-03-16 17:21 ` Thomas Abraham [this message]
2020-03-12 14:35 ` [edk2-platforms][PATCH 4/8] Platform/ARM/SgiPkg: remove PcdCoreCount and PcdClusterCount Aditya Angadi
2020-03-16 17:23 ` [edk2-devel] " Thomas Abraham
2020-03-12 14:35 ` [edk2-platforms][PATCH 5/8] Platform/ARM/SgiPkg: Add ACPI tables for Rd-Daniel Config-M Aditya Angadi
2020-03-12 14:35 ` [edk2-platforms][PATCH 6/8] Platform/ARM/Sgi: Add initial support for RD-Daniel Config-M platform Aditya Angadi
2020-03-16 17:29 ` [edk2-devel] " Thomas Abraham
2020-03-12 14:35 ` [edk2-platforms][PATCH 7/8] Platform/ARM/SgiPkg: add ACPI tables for RD-Daniel Config-XLR Aditya Angadi
2020-03-16 17:31 ` [edk2-devel] " Thomas Abraham
2020-03-12 14:35 ` [edk2-platforms][PATCH 8/8] Platform/ARM/Sgi: Add initial support for RD-Daniel Config-XLR platform Aditya Angadi
2020-03-16 17:32 ` [edk2-devel] " Thomas Abraham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJuA9agbe-XG5vrRSZN0K0+Gdffi6Qz=vxnOCP9A+_vqrnWwXA@mail.gmail.com' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox