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 2/8] Platform/ARM/SgiPkg: move the GIC related ACPI helper macros
Date: Mon, 16 Mar 2020 22:47:19 +0530 [thread overview]
Message-ID: <CAJuA9ahCAhfW8ntp1rKFPsvAJkDck6NbvQPpBXkw2hEMBLaiNw@mail.gmail.com> (raw)
In-Reply-To: <20200312143520.16918-3-aditya.angadi@arm.com>
On Thu, Mar 12, 2020 at 8:05 PM Aditya Angadi <aditya.angadi@arm.com> wrote:
>
> Move the ACPI helper macros defines related to GIC structure,
> distributor, redistributor and ITS to SgiAcpiHeader.h as these are
> common across ARM SGI/RD platforms.
>
> Signed-off-by: Aditya Angadi <aditya.angadi@arm.com>
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
> ---
> .../ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc | 68 +-----------------
> .../ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc | 68 +-----------------
> .../SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc | 57 +--------------
> Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h | 70 ++++++++++++++++++-
> 4 files changed, 72 insertions(+), 191 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
> index 48e7a61478..9872549285 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc
> @@ -1,7 +1,7 @@
> /** @file
> * Multiple APIC Description Table (MADT)
> *
> -* Copyright (c) 2018, ARM Limited. All rights reserved.
> +* Copyright (c) 2018-2020, ARM Limited. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -14,72 +14,6 @@
> #include <Library/PcdLib.h>
> #include <IndustryStandard/Acpi.h>
>
> -// EFI_ACPI_6_2_GIC_STRUCTURE
> -#define EFI_ACPI_6_2_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags, \
> - PmuIrq, GicBase, GicVBase, GicHBase, GsivId, GicRBase, Efficiency) \
> - { \
> - EFI_ACPI_6_2_GIC, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_STRUCTURE), /* Length */ \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - GicId, /* CPUInterfaceNumber */ \
> - AcpiCpuUid, /* AcpiProcessorUid */ \
> - Flags, /* Flags */ \
> - 0, /* ParkingProtocolVersion */ \
> - PmuIrq, /* PerformanceInterruptGsiv */ \
> - 0, /* ParkedAddress */ \
> - GicBase, /* PhysicalBaseAddress */ \
> - GicVBase, /* GICV */ \
> - GicHBase, /* GICH */ \
> - GsivId, /* VGICMaintenanceInterrupt */ \
> - GicRBase, /* GICRBaseAddress */ \
> - Mpidr, /* MPIDR */ \
> - Efficiency, /* ProcessorPowerEfficiencyClass */ \
> - { \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> - EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> - } \
> - }
> -
> -// EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_DISTRIBUTOR_INIT(GicDistHwId, GicDistBase, \
> - GicDistVector, GicVersion) \
> - { \
> - EFI_ACPI_6_2_GICD, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE), \
> - EFI_ACPI_RESERVED_WORD, /* Reserved1 */ \
> - GicDistHwId, /* GicId */ \
> - GicDistBase, /* PhysicalBaseAddress */ \
> - GicDistVector, /* SystemVectorBase */ \
> - GicVersion, /* GicVersion */ \
> - { \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> - EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> - } \
> - }
> -
> -// EFI_ACPI_6_2_GICR_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_REDISTRIBUTOR_INIT(RedisRegionAddr, RedisDiscLength) \
> - { \
> - EFI_ACPI_6_2_GICR, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GICR_STRUCTURE), /* Length */ \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - RedisRegionAddr, /* DiscoveryRangeBaseAddress */ \
> - RedisDiscLength /* DiscoveryRangeLength */ \
> - }
> -
> -// EFI_ACPI_6_2_GIC_ITS_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_ITS_INIT(GicItsId, GicItsBase) \
> - { \
> - EFI_ACPI_6_2_GIC_ITS, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_ITS_STRUCTURE), \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - GicItsId, /* GicItsId */ \
> - GicItsBase, /* PhysicalBaseAddress */ \
> - EFI_ACPI_RESERVED_DWORD /* DiscoveryRangeLength */ \
> - }
> -
> // Multiple APIC Description Table
> #pragma pack (1)
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
> index 6312743a47..05eb78c561 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
> @@ -1,7 +1,7 @@
> /** @file
> * Multiple APIC Description Table (MADT)
> *
> -* Copyright (c) 2018, ARM Limited. All rights reserved.
> +* Copyright (c) 2018-2020, ARM Limited. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -17,72 +17,6 @@
> #define CORE_CNT (FixedPcdGet32 (PcdClusterCount) * \
> FixedPcdGet32 (PcdCoreCount))
>
> -// EFI_ACPI_6_2_GIC_STRUCTURE
> -#define EFI_ACPI_6_2_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags, \
> - PmuIrq, GicBase, GicVBase, GicHBase, GsivId, GicRBase, Efficiency) \
> - { \
> - EFI_ACPI_6_2_GIC, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_STRUCTURE), /* Length */ \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - GicId, /* CPUInterfaceNumber */ \
> - AcpiCpuUid, /* AcpiProcessorUid */ \
> - Flags, /* Flags */ \
> - 0, /* ParkingProtocolVersion */ \
> - PmuIrq, /* PerformanceInterruptGsiv */ \
> - 0, /* ParkedAddress */ \
> - GicBase, /* PhysicalBaseAddress */ \
> - GicVBase, /* GICV */ \
> - GicHBase, /* GICH */ \
> - GsivId, /* VGICMaintenanceInterrupt */ \
> - GicRBase, /* GICRBaseAddress */ \
> - Mpidr, /* MPIDR */ \
> - Efficiency, /* ProcessorPowerEfficiencyClass */ \
> - { \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> - EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> - } \
> - }
> -
> -// EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_DISTRIBUTOR_INIT(GicDistHwId, GicDistBase, \
> - GicDistVector, GicVersion) \
> - { \
> - EFI_ACPI_6_2_GICD, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE), \
> - EFI_ACPI_RESERVED_WORD, /* Reserved1 */ \
> - GicDistHwId, /* GicId */ \
> - GicDistBase, /* PhysicalBaseAddress */ \
> - GicDistVector, /* SystemVectorBase */ \
> - GicVersion, /* GicVersion */ \
> - { \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> - EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> - } \
> - }
> -
> -// EFI_ACPI_6_2_GICR_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_REDISTRIBUTOR_INIT(RedisRegionAddr, RedisDiscLength) \
> - { \
> - EFI_ACPI_6_2_GICR, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GICR_STRUCTURE), /* Length */ \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - RedisRegionAddr, /* DiscoveryRangeBaseAddress */ \
> - RedisDiscLength /* DiscoveryRangeLength */ \
> - }
> -
> -// EFI_ACPI_6_2_GIC_ITS_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_ITS_INIT(GicItsId, GicItsBase) \
> - { \
> - EFI_ACPI_6_2_GIC_ITS, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_ITS_STRUCTURE), \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - GicItsId, /* GicItsId */ \
> - GicItsBase, /* PhysicalBaseAddress */ \
> - EFI_ACPI_RESERVED_DWORD /* DiscoveryRangeLength */ \
> - }
> -
> // Multiple APIC Description Table
> #pragma pack (1)
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc
> index d4538233d7..47368931e3 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc
> @@ -1,7 +1,7 @@
> /** @file
> * Multiple APIC Description Table (MADT)
> *
> -* Copyright (c) 2019, ARM Limited. All rights reserved.
> +* Copyright (c) 2019-2020, ARM Limited. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -19,61 +19,6 @@
>
> #define CHIP_CNT 2
>
> -// EFI_ACPI_6_2_GIC_STRUCTURE
> -#define EFI_ACPI_6_2_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags, \
> - PmuIrq, GicBase, GicVBase, GicHBase, GsivId, GicRBase, Efficiency) \
> - { \
> - EFI_ACPI_6_2_GIC, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_STRUCTURE), /* Length */ \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - GicId, /* CPUInterfaceNumber */ \
> - AcpiCpuUid, /* AcpiProcessorUid */ \
> - Flags, /* Flags */ \
> - 0, /* ParkingProtocolVersion */ \
> - PmuIrq, /* PerformanceInterruptGsiv */ \
> - 0, /* ParkedAddress */ \
> - GicBase, /* PhysicalBaseAddress */ \
> - GicVBase, /* GICV */ \
> - GicHBase, /* GICH */ \
> - GsivId, /* VGICMaintenanceInterrupt */ \
> - GicRBase, /* GICRBaseAddress */ \
> - Mpidr, /* MPIDR */ \
> - Efficiency, /* ProcessorPowerEfficiencyClass */ \
> - { \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> - EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> - } \
> - }
> -
> -// EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_DISTRIBUTOR_INIT(GicDistHwId, GicDistBase, \
> - GicDistVector, GicVersion) \
> - { \
> - EFI_ACPI_6_2_GICD, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE), \
> - EFI_ACPI_RESERVED_WORD, /* Reserved1 */ \
> - GicDistHwId, /* GicId */ \
> - GicDistBase, /* PhysicalBaseAddress */ \
> - GicDistVector, /* SystemVectorBase */ \
> - GicVersion, /* GicVersion */ \
> - { \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> - EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> - EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> - } \
> - }
> -
> -// EFI_ACPI_6_2_GICR_STRUCTURE
> -#define EFI_ACPI_6_2_GIC_REDISTRIBUTOR_INIT(RedisRegionAddr, RedisDiscLength) \
> - { \
> - EFI_ACPI_6_2_GICR, /* Type */ \
> - sizeof (EFI_ACPI_6_2_GICR_STRUCTURE), /* Length */ \
> - EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> - RedisRegionAddr, /* DiscoveryRangeBaseAddress */ \
> - RedisDiscLength /* DiscoveryRangeLength */ \
> - }
> -
> // Multiple APIC Description Table
> #pragma pack (1)
>
> diff --git a/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h b/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
> index 5083dde15d..ecb0d4eccf 100644
> --- a/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
> +++ b/Platform/ARM/SgiPkg/Include/SgiAcpiHeader.h
> @@ -1,6 +1,6 @@
> /** @file
> *
> -* Copyright (c) 2018, ARM Limited. All rights reserved.
> +* Copyright (c) 2018-2020, ARM Limited. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -9,6 +9,8 @@
> #ifndef __SGI_ACPI_HEADER__
> #define __SGI_ACPI_HEADER__
>
> +#include <IndustryStandard/Acpi.h>
> +
> //
> // ACPI table information used to initialize tables.
> //
> @@ -32,4 +34,70 @@
> EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
> }
>
> +// EFI_ACPI_6_2_GIC_STRUCTURE
> +#define EFI_ACPI_6_2_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags, \
> + PmuIrq, GicBase, GicVBase, GicHBase, GsivId, GicRBase, Efficiency) \
> + { \
> + EFI_ACPI_6_2_GIC, /* Type */ \
> + sizeof (EFI_ACPI_6_2_GIC_STRUCTURE), /* Length */ \
> + EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> + GicId, /* CPUInterfaceNumber */ \
> + AcpiCpuUid, /* AcpiProcessorUid */ \
> + Flags, /* Flags */ \
> + 0, /* ParkingProtocolVersion */ \
> + PmuIrq, /* PerformanceInterruptGsiv */ \
> + 0, /* ParkedAddress */ \
> + GicBase, /* PhysicalBaseAddress */ \
> + GicVBase, /* GICV */ \
> + GicHBase, /* GICH */ \
> + GsivId, /* VGICMaintenanceInterrupt */ \
> + GicRBase, /* GICRBaseAddress */ \
> + Mpidr, /* MPIDR */ \
> + Efficiency, /* ProcessorPowerEfficiencyClass */ \
> + { \
> + EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> + EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> + EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> + } \
> + }
> +
> +// EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE
> +#define EFI_ACPI_6_2_GIC_DISTRIBUTOR_INIT(GicDistHwId, GicDistBase, \
> + GicDistVector, GicVersion) \
> + { \
> + EFI_ACPI_6_2_GICD, /* Type */ \
> + sizeof (EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE), \
> + EFI_ACPI_RESERVED_WORD, /* Reserved1 */ \
> + GicDistHwId, /* GicId */ \
> + GicDistBase, /* PhysicalBaseAddress */ \
> + GicDistVector, /* SystemVectorBase */ \
> + GicVersion, /* GicVersion */ \
> + { \
> + EFI_ACPI_RESERVED_BYTE, /* Reserved2[0] */ \
> + EFI_ACPI_RESERVED_BYTE, /* Reserved2[1] */ \
> + EFI_ACPI_RESERVED_BYTE /* Reserved2[2] */ \
> + } \
> + }
> +
> +// EFI_ACPI_6_2_GICR_STRUCTURE
> +#define EFI_ACPI_6_2_GIC_REDISTRIBUTOR_INIT(RedisRegionAddr, RedisDiscLength) \
> + { \
> + EFI_ACPI_6_2_GICR, /* Type */ \
> + sizeof (EFI_ACPI_6_2_GICR_STRUCTURE), /* Length */ \
> + EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> + RedisRegionAddr, /* DiscoveryRangeBaseAddress */ \
> + RedisDiscLength /* DiscoveryRangeLength */ \
> + }
> +
> +// EFI_ACPI_6_2_GIC_ITS_STRUCTURE
> +#define EFI_ACPI_6_2_GIC_ITS_INIT(GicItsId, GicItsBase) \
> + { \
> + EFI_ACPI_6_2_GIC_ITS, /* Type */ \
> + sizeof (EFI_ACPI_6_2_GIC_ITS_STRUCTURE), \
> + EFI_ACPI_RESERVED_WORD, /* Reserved */ \
> + GicItsId, /* GicItsId */ \
> + GicItsBase, /* PhysicalBaseAddress */ \
> + EFI_ACPI_RESERVED_DWORD /* DiscoveryRangeLength */ \
> + }
> +
> #endif /* __SGI_ACPI_HEADER__ */
> --
> 2.17.1
>
>
>
>
next prev parent reply other threads:[~2020-03-16 17:17 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 ` Thomas Abraham [this message]
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 ` [edk2-devel] " Thomas Abraham
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=CAJuA9ahCAhfW8ntp1rKFPsvAJkDck6NbvQPpBXkw2hEMBLaiNw@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