From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20210112.gappssmtp.com header.s=20210112 header.b=sSWxe/m3; spf=pass (domain: nuviainc.com, ip: 209.85.214.175, mailfrom: rebecca@nuviainc.com) Received: by mail-pl1-f175.google.com with SMTP id z6so166899plk.6 for ; Thu, 16 Dec 2021 14:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nP0YT09wlbMFZx4eQo9j25lsII3Jzbey2dXj/j0S4nw=; b=sSWxe/m3A4xHkhRwC+PM1L+X9xE6BHt4g9JDiDFS6WMhHqaPlHkbnI5tB5EgWhNca+ x7xTvNed2TB0tb9sdN5X7qBcOKlKccMl+bWxdnKBoLHP4RycgN0bgN2emvnHz7Hzdgm4 wXbHXq23BUGq1jFzis082l4v4Y5BuYkE+tDJTc08POGc+Q2etoin4/X3cf25fJcPSvTV vJBJgXfkueGUett95iSI39zdDT5547rIwb4fD1bhLb6XvRcF06gXR2MzWZ7Mxi277m++ SXfX07IhVG/LvnJpyrWfQWwkdCognPXaqeaLxBGFpu1ow4XCQSZWiMeckD7KWxjw2NYq pTKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nP0YT09wlbMFZx4eQo9j25lsII3Jzbey2dXj/j0S4nw=; b=mkI6m9GZddl8NBbwjZ0wIFFmYb8IlFgaLHwSucTp6BGAAzJwB/OTJDHt0CDd7JYa9n amdLYtjUkFf56RPEeyNHbiTeqUwLC7GWt28frexXY0alIAfjjkUn/LRDuRYZcaBMRD9Z 6DeRtNC6Ec+urCSR1qwI1OPnaDuhiAGLsGjtenCc9Fe6haYxMHntDoYtjw42fpd1usHJ vQi2j1MayTN/OrtVVFIRCB0cz9VRoCWKm8w0YwpTdtQt3dBO1pZz2Q5HxSuXpAU91WkF QMLfm+nREaJMkpvMpPMGoV30pJ20p9qJddRYn53XaumOULB6bOEHuA4/nImuFROWZoRV u+sA== X-Gm-Message-State: AOAM530dkNVlmOiv6rP8uvvqvZONt2YINVeJCcIpn/IvDzyCmczAIkqe 0Ucxh7kvIpeCb8QH5A2RMCTTCgiq/fX+/pOx8wsglAUz7PR13wL+i9HWuPvzsb//f65CtivAbHa jJ2O50OHaNL6V2jexTyrlzmXsPdFWhv5vqAAn+Hvv9o1iBMlF3uX1mO9s5PyVFqPAB8duYw== 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) Return-Path: 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: [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> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211216220800.9628-1-rebecca@nuviainc.com> References: <20211216220800.9628-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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/ARM/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[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, // 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[] = { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, // 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[] = { }, { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, // 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[] = { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, // 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[] = { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, // 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[] = { }, { // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, // 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[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, // 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[] = { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, // 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[] = { #ifndef ARM_BIGLITTLE_TC2 { // Cluster 0, Core 2 - 0x0, 0x2, + 0x002, // 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[] = { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x003, // 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[] = { #endif { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, // 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[] = { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, // 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[] = { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, // 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[] = { #ifndef ARM_BIGLITTLE_TC2 ,{ // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, // 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/Platform/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[] = { { // Cluster 0, Core 0 - 0x0, 0x0, + 0x000, // 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[] = { }, { // Cluster 0, Core 1 - 0x0, 0x1, + 0x001, // 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[] = { }, { // Cluster 0, Core 2 - 0x0, 0x2, + 0x002, // 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[] = { }, { // Cluster 0, Core 3 - 0x0, 0x3, + 0x003, // 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[] = { }, { // Cluster 1, Core 0 - 0x1, 0x0, + 0x100, // 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[] = { }, { // Cluster 1, Core 1 - 0x1, 0x1, + 0x101, // 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[] = { }, { // Cluster 1, Core 2 - 0x1, 0x2, + 0x102, // 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[] = { }, { // Cluster 1, Core 3 - 0x1, 0x3, + 0x103, // MP Core MailBox Set/Get/Clear Addresses and Clear Value (EFI_PHYSICAL_ADDRESS)ARM_VE_SYS_FLAGS_REG, -- 2.31.1