public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Rebecca Cran" <rebecca@bsdio.com>
To: devel@edk2.groups.io, Ard Biesheuvel <ardb+tianocore@kernel.org>,
	Thomas Abraham <thomas.abraham@arm.com>,
	Sami Mujawar <sami.mujawar@arm.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Subject: [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change
Date: Sun, 11 Sep 2022 13:15:22 -0600	[thread overview]
Message-ID: <20220911191522.366209-1-rebecca@bsdio.com> (raw)

The ARM_CORE_INFO struct now has a single Mpidr field instead of
separate ClusterId and CoreId fields. Update mCoreInfoTable in
PlatformLib.c in Morello and SgiPkg to match.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c | 8 ++++----
 Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c
index 52318a62911a..894a53c9ca01 100644
--- a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c
+++ b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c
@@ -10,10 +10,10 @@
 #include <Ppi/ArmMpCoreInfo.h>
 
 STATIC ARM_CORE_INFO mCoreInfoTable[] = {
-  { 0x0, 0x0 }, // Cluster 0, Core 0
-  { 0x0, 0x1 }, // Cluster 0, Core 1
-  { 0x1, 0x0 }, // Cluster 1, Core 0
-  { 0x1, 0x1 }  // Cluster 1, Core 1
+  { 0x000 }, // Cluster 0, Core 0
+  { 0x001 }, // Cluster 0, Core 1
+  { 0x100 }, // Cluster 1, Core 0
+  { 0x101 }  // Cluster 1, Core 1
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
index fa006320025b..b9ec998d8ef4 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
@@ -20,7 +20,7 @@ STATIC SGI_NT_FW_CONFIG_INFO_PPI mNtFwConfigDtInfoPpi;
 STATIC ARM_CORE_INFO mCoreInfoTable[] = {
   {
     // Cluster 0, Core 0
-    0x0, 0x0,
+    0x000,
   },
 };
 
-- 
2.34.1


             reply	other threads:[~2022-09-11 19:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-11 19:15 Rebecca Cran [this message]
2022-09-11 19:49 ` [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change Thomas Abraham
2022-09-11 20:40   ` [edk2-devel] " Rebecca Cran
2022-09-14 15:27     ` Sami Mujawar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220911191522.366209-1-rebecca@bsdio.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox