From nobody Sun Sep 7 23:51:53 2025 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+85017+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+85017+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1639692500; cv=none; d=zohomail.com; s=zohoarc; b=lDAWi3V7bfqOHD7fN0KVMCIQJLf9I/81ZGQjergmE1GpcLYBqtD/+Doj10+hfQiwpt0UTuo6pwQD+j2vyZBkMuASgZr2QAECosTpbxkk5SHR8LX/WPmSz7DyLEQIDPan4nW/iCrj+E2zfC5MxPJA1WOYNZD2f5FsLdS1pvlK3yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639692500; 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=TXTsi5FifoJN0SZjFdqEFRP/UCHe8d3OVybjqCx05NI=; b=bZI9qcoINA4sPgngs3PDvm8XDu9gthX8yExc46F4Vk07ayWONSyBnEJ4w0qoe0BqJ7HPis/S2F6STW9zeGVr1CvnL3GdgHoPeNgvlW7bnugfWRd6m0WHtEok1h4+FLakeIQeLXpE77gpuXN3tQj7tlgU8c9FhwF8VNJx0XVQa04= 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+85017+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1639692500747296.7451555196525; Thu, 16 Dec 2021 14:08:20 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id VQCnYY1788612xxluwLi3bLF; Thu, 16 Dec 2021 14:08:20 -0800 X-Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.1019.1639692499851088041 for ; Thu, 16 Dec 2021 14:08:20 -0800 X-Received: by mail-pl1-f175.google.com with SMTP id z6so166899plk.6 for ; Thu, 16 Dec 2021 14:08:19 -0800 (PST) X-Gm-Message-State: gpA26PrxPwNpVT3XwzDigjDzx1787277AA= X-Google-Smtp-Source: ABdhPJz72Pyuonn3+Mir1bfwfYx7knCz64y2y8ckG9NjVyKzCrOpXwm1HDjIAM/vFxxENqPioWnAyg== X-Received: by 2002:a17:90b:314b:: with SMTP id ip11mr8291508pjb.133.1639692499134; Thu, 16 Dec 2021 14:08:19 -0800 (PST) X-Received: from linbox.ba.nuviainc.com ([2601:681:4300:69e:9e7b:efff:fe2b:884c]) by smtp.gmail.com with ESMTPSA id 32sm5982619pgs.48.2021.12.16.14.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 14:08:18 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Samer El-Haj-Mahmoud , Leif Lindholm , Sami Mujawar , Wenyi Xie , Peng Xie , Ling Jia , Yiqi Shu , Nhi Pham , Vu Nguyen , Thang Nguyen , Chuong Tran , Pete Batard , Masami Hiramatsu , Graeme Gregory , Radoslaw Biernacki , Marcin Wojtas Cc: Rebecca Cran Subject: [edk2-devel] [PATCH v2 05/17] Platform/ARM: Update ARM_CORE_INFO initializer for MPIDR field change Date: Thu, 16 Dec 2021 15:07:48 -0700 Message-Id: <20211216220800.9628-6-rebecca@nuviainc.com> In-Reply-To: <20211216220800.9628-1-rebecca@nuviainc.com> References: <20211216220800.9628-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=1639692500; bh=1WoIcz0sT6Gsy63VxRkUNAzE9DvCu8/Vxb3tllTJFK8=; h=Cc:Date:From:Reply-To:Subject:To; b=AviuRUg94WI5ztw/yS85XBijjnJp9LxDVKfeX0FPFyxmngD9DbmThi3Nb9rdA+C+Mmi eY8sxNxhWxmqctpj4SoMlEvHEq0WaupDT9xvrIEKHhxtshsJXEUluvjFbkCsMe7Apac19 +JVD5tnS/aB2rvxV8D3tkAsKqEqU6h81OW4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1639692501045100014 Content-Type: text/plain; charset="utf-8" The ARM_CORE_INFO struct has been updated so the MPIDR is now a single field instead of separate cluster/core fields. Update the initializer. Signed-off-by: Rebecca Cran --- Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c | 12 ++= ++++------ Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c | 16 ++= ++++++-------- Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c | 16 ++= ++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c b/Platform/A= RM/JunoPkg/Library/ArmJunoLib/ArmJuno.c index c5d4f70fc0f5..a5d5f3fd9b79 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJuno.c @@ -19,7 +19,7 @@ ARM_CORE_INFO mJunoInfoTable[] =3D { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -29,7 +29,7 @@ ARM_CORE_INFO mJunoInfoTable[] =3D { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -39,7 +39,7 @@ ARM_CORE_INFO mJunoInfoTable[] =3D { }, { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -49,7 +49,7 @@ ARM_CORE_INFO mJunoInfoTable[] =3D { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -59,7 +59,7 @@ ARM_CORE_INFO mJunoInfoTable[] =3D { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -69,7 +69,7 @@ ARM_CORE_INFO mJunoInfoTable[] =3D { }, { // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-= A7.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c index 09521bdf003a..d51784a47c0e 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7.c @@ -18,7 +18,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR0, @@ -28,7 +28,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR1, @@ -39,7 +39,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { #ifndef ARM_BIGLITTLE_TC2 { // Cluster 0, Core 2 - 0x0, 0x2, + 0x002, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR2, @@ -49,7 +49,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x003, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A15_BX_ADDR3, @@ -60,7 +60,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { #endif { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR0, @@ -70,7 +70,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR1, @@ -80,7 +80,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR2, @@ -91,7 +91,7 @@ ARM_CORE_INFO mVersatileExpressCTA15A7InfoTable[] =3D { #ifndef ARM_BIGLITTLE_TC2 ,{ // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_CTA15A7_SPC_A7_BX_ADDR3, diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c b/P= latform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c index e7a8c1dbbde8..eed1a98324b5 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/RTSM.c @@ -31,7 +31,7 @@ ArmGetCpuCountPerCluster ( ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -41,7 +41,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -51,7 +51,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 0, Core 2 - 0x0, 0x2, + 0x002, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -61,7 +61,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x003, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -71,7 +71,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -81,7 +81,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -91,7 +91,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, @@ -101,7 +101,7 @@ ARM_CORE_INFO mVersatileExpressMpCoreInfoTable[] =3D { }, { // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, =20 // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, --=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 (#85017): https://edk2.groups.io/g/devel/message/85017 Mute This Topic: https://groups.io/mt/87777822/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-