* [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change
@ 2022-09-11 19:15 Rebecca Cran
2022-09-11 19:49 ` Thomas Abraham
0 siblings, 1 reply; 4+ messages in thread
From: Rebecca Cran @ 2022-09-11 19:15 UTC (permalink / raw)
To: devel, Ard Biesheuvel, Thomas Abraham, Sami Mujawar; +Cc: Rebecca Cran
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change
2022-09-11 19:15 [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change Rebecca Cran
@ 2022-09-11 19:49 ` Thomas Abraham
2022-09-11 20:40 ` [edk2-devel] " Rebecca Cran
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Abraham @ 2022-09-11 19:49 UTC (permalink / raw)
To: Rebecca Cran, devel, Ard Biesheuvel, Sami Mujawar
On 11/09/2022 20:15, Rebecca Cran wrote:
> 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,
> },
> };
>
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [edk2-devel] [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change
2022-09-11 19:49 ` Thomas Abraham
@ 2022-09-11 20:40 ` Rebecca Cran
2022-09-14 15:27 ` Sami Mujawar
0 siblings, 1 reply; 4+ messages in thread
From: Rebecca Cran @ 2022-09-11 20:40 UTC (permalink / raw)
To: devel, thomas.abraham, Ard Biesheuvel, Sami Mujawar
This is more correct than it previously was, but is still wrong for platforms where the cluster is in Aff2 and the core in Aff1. I haven’t checked which those are, but it’s at least the Neoverse N2.
Rebecca
On Sun, Sep 11, 2022, at 1:49 PM, Thomas Abraham wrote:
> On 11/09/2022 20:15, Rebecca Cran wrote:
>> 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,
>> },
>> };
>>
>
> Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-14 15:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-11 19:15 [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change Rebecca Cran
2022-09-11 19:49 ` Thomas Abraham
2022-09-11 20:40 ` [edk2-devel] " Rebecca Cran
2022-09-14 15:27 ` Sami Mujawar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox