* [PATCH edk2-platforms 1/4] Platform/ARM: fix for ARM_CORE_INFO struct layout changes
2022-01-31 11:45 [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Ard Biesheuvel
@ 2022-01-31 11:45 ` Ard Biesheuvel
2022-01-31 11:45 ` [PATCH edk2-platforms 2/4] Platform/HiKey: " Ard Biesheuvel
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2022-01-31 11:45 UTC (permalink / raw)
To: devel; +Cc: leif, rebecca, Ard Biesheuvel
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c | 8 ++++----
Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c | 2 +-
Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.c | 8 ++++----
3 files changed, 9 insertions(+), 9 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 a982e3d403fa..2a1c96c7a776 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,
+ 0x0,
},
};
diff --git a/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.c b/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.c
index c0effd37f333..faf476c18812 100644
--- a/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.c
+++ b/Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.c
@@ -11,10 +11,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
};
/**
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH edk2-platforms 2/4] Platform/HiKey: fix for ARM_CORE_INFO struct layout changes
2022-01-31 11:45 [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Ard Biesheuvel
2022-01-31 11:45 ` [PATCH edk2-platforms 1/4] Platform/ARM: fix for ARM_CORE_INFO struct layout changes Ard Biesheuvel
@ 2022-01-31 11:45 ` Ard Biesheuvel
2022-01-31 11:45 ` [PATCH edk2-platforms 3/4] Platform/NXP: " Ard Biesheuvel
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2022-01-31 11:45 UTC (permalink / raw)
To: devel; +Cc: leif, rebecca, Ard Biesheuvel
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 16 ++++++++--------
Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
index 801d63398524..c0c8b5b9035a 100644
--- a/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
+++ b/Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c
@@ -18,56 +18,56 @@
ARM_CORE_INFO mHiKeyInfoTable[] = {
{
// Cluster 0, Core 0
- 0x0, 0x0,
+ 0x000,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 0, Core 1
- 0x0, 0x1,
+ 0x001,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 0, Core 2
- 0x0, 0x2,
+ 0x002,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 0, Core 3
- 0x0, 0x3,
+ 0x003,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 0
- 0x1, 0x0,
+ 0x100,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 1
- 0x1, 0x1,
+ 0x101,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 2
- 0x1, 0x2,
+ 0x102,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 3
- 0x1, 0x3,
+ 0x103,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
diff --git a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
index 89cca920ad8d..b5f06fa0f7b1 100644
--- a/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
+++ b/Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c
@@ -16,56 +16,56 @@
ARM_CORE_INFO mHiKey960InfoTable[] = {
{
// Cluster 0, Core 0
- 0x0, 0x0,
+ 0x000,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 0, Core 1
- 0x0, 0x1,
+ 0x001,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 0, Core 2
- 0x0, 0x2,
+ 0x002,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 0, Core 3
- 0x0, 0x3,
+ 0x003,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 0
- 0x1, 0x0,
+ 0x100,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 1
- 0x1, 0x1,
+ 0x101,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 2
- 0x1, 0x2,
+ 0x102,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
},
{
// Cluster 1, Core 3
- 0x1, 0x3,
+ 0x103,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(UINT64)0xFFFFFFFF
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH edk2-platforms 3/4] Platform/NXP: fix for ARM_CORE_INFO struct layout changes
2022-01-31 11:45 [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Ard Biesheuvel
2022-01-31 11:45 ` [PATCH edk2-platforms 1/4] Platform/ARM: fix for ARM_CORE_INFO struct layout changes Ard Biesheuvel
2022-01-31 11:45 ` [PATCH edk2-platforms 2/4] Platform/HiKey: " Ard Biesheuvel
@ 2022-01-31 11:45 ` Ard Biesheuvel
2022-01-31 11:45 ` [PATCH edk2-platforms 4/4] Platform/RaspberryPi: " Ard Biesheuvel
2022-01-31 12:12 ` [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Leif Lindholm
4 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2022-01-31 11:45 UTC (permalink / raw)
To: devel; +Cc: leif, rebecca, Ard Biesheuvel
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 2 +-
Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 2 +-
Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c
index dc81e7ba3101..ab66d665575a 100644
--- a/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c
+++ b/Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c
@@ -94,7 +94,7 @@ ArmPlatformInitialize (
ARM_CORE_INFO LS1043aMpCoreInfoCTA53x4[] = {
{
// Cluster 0, Core 0
- 0x0, 0x0,
+ 0x000,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(EFI_PHYSICAL_ADDRESS)0,
diff --git a/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.c
index ef404991add8..371e35510a75 100644
--- a/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.c
+++ b/Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.c
@@ -23,7 +23,7 @@
ARM_CORE_INFO mLS1046aMpCoreInfoTable[] = {
{
// Cluster 0, Core 0
- 0x0, 0x0,
+ 0x000,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(EFI_PHYSICAL_ADDRESS)0,
diff --git a/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c b/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c
index f3f1e5b3f220..19c70e470e61 100644
--- a/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c
+++ b/Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c
@@ -16,7 +16,7 @@
ARM_CORE_INFO mLX2160aMpCoreInfoTable[] = {
{
// Cluster 0, Core 0
- 0x0, 0x0,
+ 0x000,
// MP Core MailBox Set/Get/Clear Addresses and Clear Value
(EFI_PHYSICAL_ADDRESS)0,
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH edk2-platforms 4/4] Platform/RaspberryPi: fix for ARM_CORE_INFO struct layout changes
2022-01-31 11:45 [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Ard Biesheuvel
` (2 preceding siblings ...)
2022-01-31 11:45 ` [PATCH edk2-platforms 3/4] Platform/NXP: " Ard Biesheuvel
@ 2022-01-31 11:45 ` Ard Biesheuvel
2022-01-31 12:12 ` [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Leif Lindholm
4 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2022-01-31 11:45 UTC (permalink / raw)
To: devel; +Cc: leif, rebecca, Ard Biesheuvel
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c
index f032f3c79238..422ad491f41f 100644
--- a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c
+++ b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c
@@ -51,10 +51,10 @@ ArmPlatformInitializeSystemMemory (
}
STATIC ARM_CORE_INFO mRpi3InfoTable[] = {
- { 0x0, 0x0, }, // Cluster 0, Core 0
- { 0x0, 0x1, }, // Cluster 0, Core 1
- { 0x0, 0x2, }, // Cluster 0, Core 2
- { 0x0, 0x3, }, // Cluster 0, Core 3
+ { 0x0, }, // Cluster 0, Core 0
+ { 0x1, }, // Cluster 0, Core 1
+ { 0x2, }, // Cluster 0, Core 2
+ { 0x3, }, // Cluster 0, Core 3
};
STATIC
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes
2022-01-31 11:45 [PATCH edk2-platforms 0/4] More ARM_CORE_INFO fixes Ard Biesheuvel
` (3 preceding siblings ...)
2022-01-31 11:45 ` [PATCH edk2-platforms 4/4] Platform/RaspberryPi: " Ard Biesheuvel
@ 2022-01-31 12:12 ` Leif Lindholm
4 siblings, 0 replies; 6+ messages in thread
From: Leif Lindholm @ 2022-01-31 12:12 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: devel, rebecca
On Mon, Jan 31, 2022 at 12:45:37 +0100, Ard Biesheuvel wrote:
> Some fixes related to the struct typedef change of ARM_CORE_INFO that
> were missed the first time around.
For the series:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
> Ard Biesheuvel (4):
> Platform/ARM: fix for ARM_CORE_INFO struct layout changes
> Platform/HiKey: fix for ARM_CORE_INFO struct layout changes
> Platform/NXP: fix for ARM_CORE_INFO struct layout changes
> Platform/RaspberryPi: fix for ARM_CORE_INFO struct layout changes
>
> Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c | 8 ++++----
> Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c | 2 +-
> Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKey.c | 16 ++++++++--------
> Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960.c | 16 ++++++++--------
> Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 2 +-
> Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 2 +-
> Platform/NXP/LX2160aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.c | 2 +-
> Platform/RaspberryPi/Library/PlatformLib/RaspberryPi.c | 8 ++++----
> Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.c | 8 ++++----
> 9 files changed, 32 insertions(+), 32 deletions(-)
>
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread