From: "Rebecca Cran" <rebecca@nuviainc.com>
To: devel@edk2.groups.io, Ard Biesheuvel <ardb+tianocore@kernel.org>,
Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>,
Leif Lindholm <leif@nuviainc.com>,
Sami Mujawar <sami.mujawar@arm.com>,
Masami Hiramatsu <masami.hiramatsu@linaro.org>,
Graeme Gregory <graeme@nuviainc.com>,
Radoslaw Biernacki <rad@semihalf.com>,
Marcin Wojtas <mw@semihalf.com>
Cc: Rebecca Cran <rebecca@nuviainc.com>
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 [thread overview]
Message-ID: <20211215000324.11591-6-rebecca@nuviainc.com> (raw)
In-Reply-To: <20211215000324.11591-1-rebecca@nuviainc.com>
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 <rebecca@nuviainc.com>
---
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
next prev parent reply other threads:[~2021-12-15 0:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 0:03 [edk2-platforms PATCH 0/8] Update Arm platforms following addition of EFI_MP_SERVICES_PROTOCOL support in edk2 Rebecca Cran
2021-12-15 0:03 ` [edk2-platforms PATCH 1/8] Platform/ARM: Add MpInitLib instance Rebecca Cran
2021-12-15 0:03 ` [edk2-platforms PATCH 2/8] Platform/Socionext: Add instance of MpInitLib Rebecca Cran
2021-12-15 0:03 ` [edk2-platforms PATCH 3/8] Silicon/Marvell: " Rebecca Cran
2021-12-16 7:14 ` Marcin Wojtas
2021-12-15 0:03 ` [edk2-platforms PATCH 4/8] Platform/Qemu: " Rebecca Cran
2021-12-15 0:03 ` Rebecca Cran [this message]
2021-12-15 0:03 ` [edk2-platforms PATCH 6/8] Silicon/Marvell: Update ARM_CORE_INFO initializer for MPIDR field change Rebecca Cran
2021-12-15 0:03 ` [edk2-platforms PATCH 7/8] Silicon/Socionext: " Rebecca Cran
2021-12-15 0:03 ` [edk2-platforms PATCH 8/8] Silicon/Qemu: " Rebecca Cran
2021-12-15 8:16 ` [edk2-platforms PATCH 0/8] Update Arm platforms following addition of EFI_MP_SERVICES_PROTOCOL support in edk2 Ard Biesheuvel
2021-12-16 9:32 ` Ard Biesheuvel
2021-12-16 13:13 ` Rebecca Cran
2021-12-16 13:16 ` Ard Biesheuvel
2021-12-16 13:38 ` [edk2-devel] " Marcin Juszkiewicz
2021-12-16 15:05 ` Ard Biesheuvel
2021-12-16 18:54 ` Sami Mujawar
2021-12-16 18:55 ` Ard Biesheuvel
2021-12-16 22:09 ` Rebecca Cran
2021-12-19 10:32 ` Marcin Wojtas
2022-01-10 20:33 ` Rebecca Cran
2021-12-16 13:26 ` Sami Mujawar
2021-12-16 14:59 ` Rebecca Cran
2021-12-16 15:26 ` PierreGondois
2021-12-16 15:44 ` Rebecca Cran
2021-12-16 15:27 ` Rebecca Cran
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=20211215000324.11591-6-rebecca@nuviainc.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