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.web11.6188.1585651075755821959 for ; Tue, 31 Mar 2020 03:37:55 -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 4BA4C30E for ; Tue, 31 Mar 2020 03:37:55 -0700 (PDT) Received: from mail-wr1-f42.google.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2575C3F52E for ; Tue, 31 Mar 2020 03:37:55 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id m17so25205670wrw.11 for ; Tue, 31 Mar 2020 03:37:55 -0700 (PDT) X-Gm-Message-State: ANhLgQ3JchYlEHp5ohl26lSK5WXMSzuyT1ZZmafn5MJkWc/wD0n6g/YO ByhCoAzJIkCtNwaelpA2TvkGNXHSlgTS225mbmYEZw== X-Google-Smtp-Source: ADFU+vsoatXZglMdqSUqDCoa/1/dVmW6rDOwTx+wH5TWNbtm/o/CtKpbExwGdxuSNQRnn2GGeZ8E+rrxEltafXd8Hno= X-Received: by 2002:a5d:604a:: with SMTP id j10mr19351184wrt.126.1585651069907; Tue, 31 Mar 2020 03:37:49 -0700 (PDT) MIME-Version: 1.0 References: <20200325105252.13905-1-aditya.angadi@arm.com> <20200325105252.13905-5-aditya.angadi@arm.com> In-Reply-To: <20200325105252.13905-5-aditya.angadi@arm.com> From: "Ard Biesheuvel" Date: Tue, 31 Mar 2020 12:37:38 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-platforms][PATCH v3 4/9] Platform/ARM/SgiPkg: remove To: Aditya Angadi Cc: edk2-devel-groups-io , Leif Lindholm Content-Type: text/plain; charset="UTF-8" On Wed, 25 Mar 2020 at 11:53, Aditya Angadi wrote: > > The number of CPUs depend on the SGI/RD platform. So instead of depends > defining a Fixed PCD to specify the value of core and cluster count, > let each platform define these values. > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Signed-off-by: Aditya Angadi Reviewed-by: Ard Biesheuvel > --- > Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc | 7 ++++++- > Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 2 -- > Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc | 7 ++++--- > Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 2 -- > Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc | 12 ++++++------ > Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf | 2 -- > Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc | 9 +++++---- > Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 4 +--- > Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf | 3 --- > Platform/ARM/SgiPkg/SgiPlatform.dsc | 4 ---- > 10 files changed, 22 insertions(+), 30 deletions(-) > > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc > index 987254928535..a9540f2e0374 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc > @@ -14,12 +14,17 @@ > #include > #include > > +#define CLUSTER_COUNT 2 > +#define CORES_PER_CLUSTER 8 > +#define THREADS_PER_CORE 2 > +#define CORE_COUNT (CLUSTER_COUNT * CORES_PER_CLUSTER * THREADS_PER_CORE) > + > // Multiple APIC Description Table > #pragma pack (1) > > typedef struct { > EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header; > - EFI_ACPI_6_2_GIC_STRUCTURE GicInterfaces[32]; > + EFI_ACPI_6_2_GIC_STRUCTURE GicInterfaces[CORE_COUNT]; > EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE GicDistributor; > EFI_ACPI_6_2_GICR_STRUCTURE GicRedistributor; > EFI_ACPI_6_2_GIC_ITS_STRUCTURE GicIts; > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf > index b08d7c2df5c7..742ca9e68335 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf > @@ -34,8 +34,6 @@ [Packages] > Platform/ARM/SgiPkg/SgiPlatform.dec > > [FixedPcd] > - gArmPlatformTokenSpaceGuid.PcdCoreCount > - gArmPlatformTokenSpaceGuid.PcdClusterCount > gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase > gArmPlatformTokenSpaceGuid.PL011UartInterrupt > > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc > index 05eb78c5616a..d8ec0ce421dc 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc > @@ -14,15 +14,16 @@ > #include > #include > > -#define CORE_CNT (FixedPcdGet32 (PcdClusterCount) * \ > - FixedPcdGet32 (PcdCoreCount)) > +#define CLUSTER_COUNT 2 > +#define CORES_PER_CLUSTER 4 > +#define CORE_COUNT (CLUSTER_COUNT * CORES_PER_CLUSTER) > > // Multiple APIC Description Table > #pragma pack (1) > > typedef struct { > EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header; > - EFI_ACPI_6_2_GIC_STRUCTURE GicInterfaces[CORE_CNT]; > + EFI_ACPI_6_2_GIC_STRUCTURE GicInterfaces[CORE_COUNT]; > EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE GicDistributor; > EFI_ACPI_6_2_GICR_STRUCTURE GicRedistributor; > EFI_ACPI_6_2_GIC_ITS_STRUCTURE GicIts; > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf > index 61b07bffccf3..206479f9428e 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf > @@ -34,8 +34,6 @@ [Packages] > Platform/ARM/SgiPkg/SgiPlatform.dec > > [FixedPcd] > - gArmPlatformTokenSpaceGuid.PcdCoreCount > - gArmPlatformTokenSpaceGuid.PcdClusterCount > gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase > gArmPlatformTokenSpaceGuid.PL011UartInterrupt > > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc > index 47368931e367..add972437496 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2/Madt.aslc > @@ -14,19 +14,19 @@ > #include > #include > > -#define CORE_CNT (FixedPcdGet32 (PcdClusterCount) * \ > - FixedPcdGet32 (PcdCoreCount)) > - > -#define CHIP_CNT 2 > +#define CLUSTER_COUNT 2 > +#define CORES_PER_CLUSTER 4 > +#define CORE_COUNT (CLUSTER_COUNT * CORES_PER_CLUSTER) > +#define CHIP_COUNT 2 > > // Multiple APIC Description Table > #pragma pack (1) > > typedef struct { > EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header; > - EFI_ACPI_6_2_GIC_STRUCTURE GicInterfaces[CORE_CNT * CHIP_CNT]; > + EFI_ACPI_6_2_GIC_STRUCTURE GicInterfaces[CORE_COUNT * CHIP_COUNT]; > EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE GicDistributor; > - EFI_ACPI_6_2_GICR_STRUCTURE GicRedistributor[CHIP_CNT]; > + EFI_ACPI_6_2_GICR_STRUCTURE GicRedistributor[CHIP_COUNT]; > } EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE; > > #pragma pack () > diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf > index a4d5904f671c..8aec5e094e1a 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf > @@ -34,8 +34,6 @@ [Packages] > Platform/ARM/SgiPkg/SgiPlatform.dec > > [FixedPcd] > - gArmPlatformTokenSpaceGuid.PcdCoreCount > - gArmPlatformTokenSpaceGuid.PcdClusterCount > gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase > gArmPlatformTokenSpaceGuid.PL011UartInterrupt > > diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc > index dedabaaecdf4..ca259247785f 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Madt.aslc > +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/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,8 +14,9 @@ > #include > #include > > -#define CORES (FixedPcdGet32 (PcdClusterCount) * \ > - FixedPcdGet32 (PcdCoreCount)) > +#define CLUSTER_COUNT 2 > +#define CORES_PER_CLUSTER 4 > +#define CORE_COUNT (CLUSTER_COUNT * CORES_PER_CLUSTER) > > // EFI_ACPI_6_1_GIC_STRUCTURE > #define EFI_ACPI_6_1_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags, \ > @@ -90,7 +91,7 @@ > > typedef struct { > EFI_ACPI_6_1_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header; > - EFI_ACPI_6_1_GIC_STRUCTURE GicInterfaces[CORES]; > + EFI_ACPI_6_1_GIC_STRUCTURE GicInterfaces[CORE_COUNT]; > EFI_ACPI_6_1_GIC_DISTRIBUTOR_STRUCTURE GicDistributor; > EFI_ACPI_6_1_GICR_STRUCTURE GicRedistributor; > EFI_ACPI_6_1_GIC_ITS_STRUCTURE GicIts; > diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf > index 097ef854df42..df390c152648 100644 > --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf > +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.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 > # > @@ -33,8 +33,6 @@ [Packages] > Platform/ARM/SgiPkg/SgiPlatform.dec > > [FixedPcd] > - gArmPlatformTokenSpaceGuid.PcdCoreCount > - gArmPlatformTokenSpaceGuid.PcdClusterCount > gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase > gArmPlatformTokenSpaceGuid.PL011UartInterrupt > > diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > index a918afef5fba..fe96f5385d57 100644 > --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf > @@ -37,9 +37,6 @@ [Sources.AARCH64] > AArch64/Helper.S | GCC > > [FixedPcd] > - gArmPlatformTokenSpaceGuid.PcdClusterCount > - gArmPlatformTokenSpaceGuid.PcdCoreCount > - > gArmSgiTokenSpaceGuid.PcdDramBlock2Base > gArmSgiTokenSpaceGuid.PcdDramBlock2Size > gArmSgiTokenSpaceGuid.PcdGicSize > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc > index 4e1fcefb1442..7b95acb9db46 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc > +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc > @@ -156,10 +156,6 @@ [PcdsFixedAtBuild.common] > gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000 > gEmbeddedTokenSpaceGuid.PcdTimerPeriod|1000 > > - # ARM Cores and Clusters > - gArmPlatformTokenSpaceGuid.PcdCoreCount|4 > - gArmPlatformTokenSpaceGuid.PcdClusterCount|2 > - > # Virtio Disk > gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress|0x1c130000 > gArmSgiTokenSpaceGuid.PcdVirtioBlkSize|0x10000 > -- > 2.17.1 >