From nobody Tue Feb 10 20:48:07 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+84950+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+84950+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1639626404; cv=none; d=zohomail.com; s=zohoarc; b=S+Nwle3NO/dUeNCswxe6ufajZoKYMAoS/IwWAnDl+9TFYdjYxqaJEYOAsu8zVS/86zAr3EzOqUQk4siH/PyrfUOZNMLXPLQUYYXBnG8TOPzt/OZlk9q/4z3TfHdjXhoRhDHxBrHMj/C8I+sMUtMQDa4qzC0uAfHBILQb15Kt590= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639626404; 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=66JBL7SZGzFrcMFh4G1gPS7DnwJNiA9Joz3r1N1QPGs=; b=UOz+qytnTXzecFH0MMtB7dQmXp4jYsJVE0cvvaMAGz8kgs8R3HL4lYf7H4bqVM0q0rRa4Kl7+oJqkw4bzmuK4jEzzAUOcOzS+PS+r7IRE1AxA5YVQarEJxdDMzr4KQBn98qVpGjNmXLLBcDRL5xKe0B2oV9qa+jxYmG4LperG0A= 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+84950+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163962640456184.84931475792212; Wed, 15 Dec 2021 19:46:44 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id bqkkYY1788612xmgj3ED4QaN; Wed, 15 Dec 2021 19:46:44 -0800 X-Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.5705.1639626403425249140 for ; Wed, 15 Dec 2021 19:46:43 -0800 X-Received: by mail-pj1-f47.google.com with SMTP id k6-20020a17090a7f0600b001ad9d73b20bso21301635pjl.3 for ; Wed, 15 Dec 2021 19:46:43 -0800 (PST) X-Gm-Message-State: 0E8kNuqt0lS3xdxxGmbKDcXrx1787277AA= X-Google-Smtp-Source: ABdhPJy9f38N0F14S2lmY99anJsu6QjkicPiNEzYaJUYUJxgNU5BVqYlFpCpGU2tQMPeOlfpXvmy4g== X-Received: by 2002:a17:902:e841:b0:148:a2e7:fb39 with SMTP id t1-20020a170902e84100b00148a2e7fb39mr7789495plg.122.1639626402689; Wed, 15 Dec 2021 19:46:42 -0800 (PST) X-Received: from linbox.ba.nuviainc.com ([2601:681:4300:69e:9e7b:efff:fe2b:884c]) by smtp.gmail.com with ESMTPSA id c21sm4124054pfl.138.2021.12.15.19.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 19:46:42 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Gerd Hoffmann , Samer El-Haj-Mahmoud , Leif Lindholm , Sami Mujawar Cc: Rebecca Cran Subject: [edk2-devel] [PATCH v3 1/4] ArmPkg: Replace CoreId and ClusterId with Mpidr in ARM_CORE_INFO struct Date: Wed, 15 Dec 2021 20:46:31 -0700 Message-Id: <20211216034634.15468-2-rebecca@nuviainc.com> In-Reply-To: <20211216034634.15468-1-rebecca@nuviainc.com> References: <20211216034634.15468-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=1639626404; bh=s67x6vq9YivWt8Dykpre3ZFUAvKD8TCyfhtsT2tw+bE=; h=Cc:Date:From:Reply-To:Subject:To; b=DSSj6bl/uHlSe4Ad3z7Mf7go8nvPnI6YWJfgHqpP4pJQfqhhIE2dNneLccpl3uVd237 Vg9kr52sudL2tJo2HlVa12qcHtob4Iv+dqYEzu5EqyF9fi4BOs7QnE3WtXh07yMlL5GD7 nF7bD7r1Hyfym5WnWDcEAgKgkHSn8Xe3f+4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1639626405471100006 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 --- ArmPkg/Include/Guid/ArmMpCoreInfo.h | 3 +-- ArmPkg/Include/Library/ArmLib.h | 4 ++++ ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c | 8 ++++---- ArmPlatformPkg/PrePeiCore/MainMPCore.c | 4 +++- ArmPlatformPkg/PrePi/MainMPCore.c | 4 +++- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ArmPkg/Include/Guid/ArmMpCoreInfo.h b/ArmPkg/Include/Guid/ArmM= pCoreInfo.h index 06f9326ca021..43f0848e78b8 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 e4d0476090c7..6566deebdde2 100644 --- a/ArmPkg/Include/Library/ArmLib.h +++ b/ArmPkg/Include/Library/ArmLib.h @@ -111,6 +111,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 eeab58805e67..852275f44fc3 100644 --- a/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c +++ b/ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.c @@ -14,7 +14,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, @@ -24,7 +24,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, @@ -34,7 +34,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, @@ -44,7 +44,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 0b8e5dfb3f30..b5d0d3a6442f 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c @@ -68,7 +68,9 @@ 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 ce53cea6367c..68a7c13298d0 100644 --- a/ArmPlatformPkg/PrePi/MainMPCore.c +++ b/ArmPlatformPkg/PrePi/MainMPCore.c @@ -67,7 +67,9 @@ 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 (#84950): https://edk2.groups.io/g/devel/message/84950 Mute This Topic: https://groups.io/mt/87760630/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-