From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web10.33929.1639526636553512682 for ; Tue, 14 Dec 2021 16:03:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20210112.gappssmtp.com header.s=20210112 header.b=PxO1QaY9; spf=pass (domain: nuviainc.com, ip: 209.85.210.171, mailfrom: rebecca@nuviainc.com) Received: by mail-pf1-f171.google.com with SMTP id o4so19125204pfp.13 for ; Tue, 14 Dec 2021 16:03:56 -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=PxO1QaY9f5WeZAsqKq6Xu4o84o/cJS8MInSx7SXcMAYuxVMsjwbofUQYwfUN2GTo7o OdTn7CWJy7qTZikTQJqpMQlU0aNCpTb40JTTAT19KR1MJDP2G1R71p4rhbKSWZ4yIA27 beYYiXqdk7HEMbfvN/K0k0uyQuQf/lQJz1vfGwHsn7fnyGEKMgz+f/+MEcV2QMpyTz1z xPk16ybYJSMxCh/dkOUJFbNfXowp4n6mD2oEJ92bbPaid9C05zbrWyYbZkpEJqP07KBw YligtDgYglTnKAKroCwLgSUL9q4cg4eh7hbXR4WrNvd/D6Nu2y7qbZLWDnqO6lFKgyJR /hvw== 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=M9yOIeD+8+WwZdhFVkBCe3hyB8LCb+poX2ECpgtXQp6PjB8W/FsegHZEVZaSgN76CD YE+TiBBfynEX1Fr6NCmLHWySp6vnnxw++OT2XESOa4Ma6etQ6Wlat9oXtfPUrgw/gjEa C7O5IykabuVNKPvLzbRfqvIdB0w9VdXsj00zhW/RACc33TuBKa3aaXHQVF2QgaJqJ1OR wOhzgVqb0Ka7Hnl1Cd4twXEw0ylIVUTtK/g2QRWRpMEtQr78tWenNx5vbr+B+9nu3W0l 4KUDZc+/h9Ocp6YPZ8SFRa2XodsjJQ28DUrHVUNGd5E1zjS6tj1cv/LgwVC2SyPJ1/mG yF+w== X-Gm-Message-State: AOAM5319JsO8Wjv6krDEvILosklL4cP5ZxgyogoAi4wQmAbCgTKlkQ+q 3XBCbxN2pLNHzCJXalPhD+aEjoQ4f/PkilBgPnQhW2H8IEFytk3aIUT012U/H6a6vfdjtZ6ViO5 zDktF9A5foL35lFV6CKdSyvc3epjEacsN1hNMrvT4OJ7WNuGKGyf/lFHMiIQkJzxsZMHa3Q== X-Google-Smtp-Source: ABdhPJykPhjw7nienn9kE0bv9CiCmqFkpAe4UyfLIG7x7zYALLa68tLYqUsPuHoYpeBWFLdBW5qGsA== X-Received: by 2002:a63:fc0a:: with SMTP id j10mr5786613pgi.36.1639526635733; Tue, 14 Dec 2021 16:03:55 -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 s30sm204489pfw.57.2021.12.14.16.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 16:03:55 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io, Ard Biesheuvel , Samer El-Haj-Mahmoud , Leif Lindholm , Sami Mujawar , Masami Hiramatsu , Graeme Gregory , Radoslaw Biernacki , Marcin Wojtas Cc: Rebecca Cran Subject: [edk2-platforms PATCH 5/8] Platform/ARM: Update ARM_CORE_INFO initializer for MPIDR field change Date: Tue, 14 Dec 2021 17:03:21 -0700 Message-Id: <20211215000324.11591-6-rebecca@nuviainc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211215000324.11591-1-rebecca@nuviainc.com> References: <20211215000324.11591-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