From nobody Tue Feb 10 01:50:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+82237+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82237+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1634571596; cv=none; d=zohomail.com; s=zohoarc; b=RUZIcJW2AuqUKC21qBpBcsaN34Vz44R+2Hy0J9CKAmwgwCi1nBeAgEtVemc93e3ngmvpbiDzC9GXV0395QFwCu27/bwcdcMgjmgaggfnFBx56JCWujxlp60Vdd3eRZ1iF7OFiiFf14HI1zqEgDB8CflhuKwLQtzTNf0+uZ6gzfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634571596; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=RdSHRTEURyVAPckw7mGlkObW6MWbSmv1UpBJs8ZhhpU=; b=VBcxr60sSLR9ZvGprmahRFjRaT/p0oM56bMOnVKxgMS82wHVcBj6+AAan4/YvrfmTdXtEFx+5IT+Sr5CaQeH2155CHiR+MhQxTQL70EOUaJcYB/T3m7KWQaWKjfTt+kyM7PrcvAn2sP/yzqL2YMlHS3lfGV6QtMhKtf5ngjrIcE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82237+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1634571596213811.6623492490585; Mon, 18 Oct 2021 08:39:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id t5yqYY1788612xTkyP8qrVhz; Mon, 18 Oct 2021 08:39:55 -0700 X-Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.38139.1634571595411544449 for ; Mon, 18 Oct 2021 08:39:55 -0700 X-Received: by mail-pl1-f169.google.com with SMTP id g5so11533589plg.1 for ; Mon, 18 Oct 2021 08:39:55 -0700 (PDT) X-Gm-Message-State: 5U15NsTiJQoLCu4Hqgtud7oUx1787277AA= X-Google-Smtp-Source: ABdhPJwpSb5i0LQLvhn/IVeSR7O85J0zXEOkuX8YOhzt8o9d9AFbGfHYZwEm1oZn1kssMbhErA11WA== X-Received: by 2002:a17:902:dacb:b0:13e:f6c3:57dd with SMTP id q11-20020a170902dacb00b0013ef6c357ddmr27503704plx.45.1634571594946; Mon, 18 Oct 2021 08:39:54 -0700 (PDT) X-Received: from linbox.ba.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id y3sm13246952pfo.188.2021.10.18.08.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 08:39:54 -0700 (PDT) From: "Rebecca Cran" To: Sami Mujawar , Ard Biesheuvel , Gerd Hoffmann , Samer El-Haj-Mahmoud , Leif Lindholm , devel@edk2.groups.io Cc: Rebecca Cran Subject: [edk2-devel] [PATCH 1/2] ArmPkg: Replace CoreId and ClusterId with Mpidr in ARM_CORE_INFO struct Date: Mon, 18 Oct 2021 09:39:44 -0600 Message-Id: <20211018153945.1690-2-rebecca@nuviainc.com> In-Reply-To: <20211018153945.1690-1-rebecca@nuviainc.com> References: <20211018153945.1690-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634571595; bh=mQFj2//uSIvJKG5/M8cmFa22LykzhzSBKfH0tf0xsv4=; h=Cc:Date:From:Reply-To:Subject:To; b=SCuWzFDiG3NJ9Uvkw1LsE/mranslaZhg/3TUGnQDaP2UhqywHKBL9qI/94E0g7ZID8V ukbZE+ICJ/dzjsE6915+VW4hdbKBMkh9AQtLS+WmvRtj9OYN7Kdf6EMhr45/GgD7iSHPQ +8Ouk8nAzNtGjBy+aSPQj0xeLfXKTBbohV4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634571597756100001 Content-Type: text/plain; charset="utf-8" Remove the ClusterId and CoreId fields in the ARM_CORE_INFO structure in favor of a new Mpidr field. Update code in ArmPlatformPkg/PrePeiCore/MainMPCore and ArmPlatformPkg/PrePi/MainMPCore.c to use the new field and call new macros GET_MPIDR_AFF0 and GET_MPIDR_AFF1 instead. Signed-off-by: Rebecca Cran Reviewed-by: Sami Mujawar --- ArmPkg/Include/Guid/ArmMpCoreInfo.h | 3 +-- ArmPkg/Include/Library/ArmLib.h | 4 ++++ ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c | 8 ++++---- ArmPlatformPkg/PrePeiCore/MainMPCore.c | 2 +- ArmPlatformPkg/PrePi/MainMPCore.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ArmPkg/Include/Guid/ArmMpCoreInfo.h b/ArmPkg/Include/Guid/ArmM= pCoreInfo.h index b810767879ae..04c44650ebf5 100644 --- a/ArmPkg/Include/Guid/ArmMpCoreInfo.h +++ b/ArmPkg/Include/Guid/ArmMpCoreInfo.h @@ -14,8 +14,7 @@ #define MPIDR_U_BIT_MASK 0x40000000 =20 typedef struct { - UINT32 ClusterId; - UINT32 CoreId; + UINT64 Mpidr; =20 // MP Core Mailbox EFI_PHYSICAL_ADDRESS MailboxSetAddress; diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLi= b.h index 79ea755777a9..d764cc670970 100644 --- a/ArmPkg/Include/Library/ArmLib.h +++ b/ArmPkg/Include/Library/ArmLib.h @@ -107,6 +107,10 @@ typedef enum { #define GET_CORE_ID(MpId) ((MpId) & ARM_CORE_MASK) #define GET_CLUSTER_ID(MpId) (((MpId) & ARM_CLUSTER_MASK) >> 8) #define GET_MPID(ClusterId, CoreId) (((ClusterId) << 8) | (CoreId)) +#define GET_MPIDR_AFF0(MpId) ((MpId) & ARM_CORE_AFF0) +#define GET_MPIDR_AFF1(MpId) (((MpId) & ARM_CORE_AFF1) >> 8) +#define GET_MPIDR_AFF2(MpId) (((MpId) & ARM_CORE_AFF2) >> 16) +#define GET_MPIDR_AFF3(MpId) (((MpId) & ARM_CORE_AFF3) >> 32) #define PRIMARY_CORE_ID (PcdGet32(PcdArmPrimaryCore) & ARM_CORE_MASK) =20 /** Reads the CCSIDR register for the specified cache. diff --git a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c= b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c index 1cd9ec30a977..6630cb68452c 100644 --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c @@ -15,7 +15,7 @@ ARM_CORE_INFO mArmPlatformNullMpCoreInfoTable[] =3D { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x0, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)0, @@ -25,7 +25,7 @@ ARM_CORE_INFO mArmPlatformNullMpCoreInfoTable[] =3D { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x1, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)0, @@ -35,7 +35,7 @@ ARM_CORE_INFO mArmPlatformNullMpCoreInfoTable[] =3D { }, { // Cluster 0, Core 2 - 0x0, 0x2, + 0x2, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)0, @@ -45,7 +45,7 @@ ARM_CORE_INFO mArmPlatformNullMpCoreInfoTable[] =3D { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x3, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)0, diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePei= Core/MainMPCore.c index 859f1adf2078..5f8a268bf664 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c @@ -65,7 +65,7 @@ SecondaryMain ( =20 // Find the core in the ArmCoreTable for (Index =3D 0; Index < ArmCoreCount; Index++) { - if ((ArmCoreInfoTable[Index].ClusterId =3D=3D ClusterId) && (ArmCoreIn= foTable[Index].CoreId =3D=3D CoreId)) { + if ((GET_MPIDR_AFF1 (ArmCoreInfoTable[Index].Mpidr) =3D=3D ClusterId) = && (GET_MPIDR_AFF0 (ArmCoreInfoTable[Index].Mpidr) =3D=3D CoreId)) { break; } } diff --git a/ArmPlatformPkg/PrePi/MainMPCore.c b/ArmPlatformPkg/PrePi/MainM= PCore.c index 091464df2aa9..6497a1ad27fd 100644 --- a/ArmPlatformPkg/PrePi/MainMPCore.c +++ b/ArmPlatformPkg/PrePi/MainMPCore.c @@ -64,7 +64,7 @@ SecondaryMain ( =20 // Find the core in the ArmCoreTable for (Index =3D 0; Index < ArmCoreCount; Index++) { - if ((ArmCoreInfoTable[Index].ClusterId =3D=3D ClusterId) && (ArmCoreIn= foTable[Index].CoreId =3D=3D CoreId)) { + if ((GET_MPIDR_AFF1 (ArmCoreInfoTable[Index].Mpidr) =3D=3D ClusterId) = && (GET_MPIDR_AFF0 (ArmCoreInfoTable[Index].Mpidr) =3D=3D CoreId)) { break; } } --=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82237): https://edk2.groups.io/g/devel/message/82237 Mute This Topic: https://groups.io/mt/86417176/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-