* [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
@ 2021-02-10 15:04 Rebecca Cran
2021-02-10 20:17 ` Leif Lindholm
2021-02-18 3:33 ` 回复: [edk2-devel] " gaoliming
0 siblings, 2 replies; 5+ messages in thread
From: Rebecca Cran @ 2021-02-10 15:04 UTC (permalink / raw)
To: devel; +Cc: Rebecca Cran, Leif Lindholm, Ard Biesheuvel
The ARM ProcessorSubClassDxe build was broken due to changes in the
SmbiosProcessor API and an unused variable.
Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
---
ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
index 0be4403c765f..c78bd41a7e06 100644
--- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
+++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
@@ -22,7 +22,7 @@
@return The cache size.
**/
UINT64
-ArmGetCacheSize (
+SmbiosProcessorGetCacheSize (
IN UINT8 CacheLevel,
IN BOOLEAN DataCache,
IN BOOLEAN UnifiedCache
@@ -66,14 +66,13 @@ ArmGetCacheSize (
@return The cache associativity.
**/
UINT32
-ArmGetCacheAssociativity (
+SmbiosProcessorGetCacheAssociativity (
IN UINT8 CacheLevel,
IN BOOLEAN DataCache,
IN BOOLEAN UnifiedCache
)
{
CCSIDR_DATA Ccsidr;
- CCSIDR2_DATA Ccsidr2;
CSSELR_DATA Csselr;
BOOLEAN CcidxSupported;
UINT32 Associativity;
@@ -88,7 +87,6 @@ ArmGetCacheAssociativity (
CcidxSupported = ArmHasCcidx ();
if (CcidxSupported) {
- Ccsidr2.Data = ReadCCSIDR2 (Csselr.Data);
Associativity = Ccsidr.BitsCcidxAA32.Associativity + 1;
} else {
Associativity = Ccsidr.BitsNonCcidx.Associativity + 1;
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
2021-02-10 15:04 [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build Rebecca Cran
@ 2021-02-10 20:17 ` Leif Lindholm
2021-02-18 3:33 ` 回复: [edk2-devel] " gaoliming
1 sibling, 0 replies; 5+ messages in thread
From: Leif Lindholm @ 2021-02-10 20:17 UTC (permalink / raw)
To: Rebecca Cran; +Cc: devel, Ard Biesheuvel
On Wed, Feb 10, 2021 at 08:04:57 -0700, Rebecca Cran wrote:
> The ARM ProcessorSubClassDxe build was broken due to changes in the
> SmbiosProcessor API and an unused variable.
>
> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
Pushed as c615265b366d.
Thanks!
> ---
> ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> index 0be4403c765f..c78bd41a7e06 100644
> --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> @@ -22,7 +22,7 @@
> @return The cache size.
> **/
> UINT64
> -ArmGetCacheSize (
> +SmbiosProcessorGetCacheSize (
> IN UINT8 CacheLevel,
> IN BOOLEAN DataCache,
> IN BOOLEAN UnifiedCache
> @@ -66,14 +66,13 @@ ArmGetCacheSize (
> @return The cache associativity.
> **/
> UINT32
> -ArmGetCacheAssociativity (
> +SmbiosProcessorGetCacheAssociativity (
> IN UINT8 CacheLevel,
> IN BOOLEAN DataCache,
> IN BOOLEAN UnifiedCache
> )
> {
> CCSIDR_DATA Ccsidr;
> - CCSIDR2_DATA Ccsidr2;
> CSSELR_DATA Csselr;
> BOOLEAN CcidxSupported;
> UINT32 Associativity;
> @@ -88,7 +87,6 @@ ArmGetCacheAssociativity (
> CcidxSupported = ArmHasCcidx ();
>
> if (CcidxSupported) {
> - Ccsidr2.Data = ReadCCSIDR2 (Csselr.Data);
> Associativity = Ccsidr.BitsCcidxAA32.Associativity + 1;
> } else {
> Associativity = Ccsidr.BitsNonCcidx.Associativity + 1;
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 5+ messages in thread* 回复: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
2021-02-10 15:04 [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build Rebecca Cran
2021-02-10 20:17 ` Leif Lindholm
@ 2021-02-18 3:33 ` gaoliming
2021-02-18 3:41 ` Rebecca Cran
1 sibling, 1 reply; 5+ messages in thread
From: gaoliming @ 2021-02-18 3:33 UTC (permalink / raw)
To: devel, rebecca; +Cc: 'Leif Lindholm', 'Ard Biesheuvel'
Rebecca:
Is this issue detected in open CI environment?
Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+71573+4905953+8761045@groups.io
> <bounce+27952+71573+4905953+8761045@groups.io> 代表 Rebecca Cran
> 发送时间: 2021年2月10日 23:05
> 收件人: devel@edk2.groups.io
> 抄送: Rebecca Cran <rebecca@nuviainc.com>; Leif Lindholm
> <leif@nuviainc.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>
> 主题: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
>
> The ARM ProcessorSubClassDxe build was broken due to changes in the
> SmbiosProcessor API and an unused variable.
>
> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
> ---
> ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c | 6
> ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git
> a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> index 0be4403c765f..c78bd41a7e06 100644
> ---
> a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> +++
> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
> @@ -22,7 +22,7 @@
> @return The cache size.
> **/
> UINT64
> -ArmGetCacheSize (
> +SmbiosProcessorGetCacheSize (
> IN UINT8 CacheLevel,
> IN BOOLEAN DataCache,
> IN BOOLEAN UnifiedCache
> @@ -66,14 +66,13 @@ ArmGetCacheSize (
> @return The cache associativity.
> **/
> UINT32
> -ArmGetCacheAssociativity (
> +SmbiosProcessorGetCacheAssociativity (
> IN UINT8 CacheLevel,
> IN BOOLEAN DataCache,
> IN BOOLEAN UnifiedCache
> )
> {
> CCSIDR_DATA Ccsidr;
> - CCSIDR2_DATA Ccsidr2;
> CSSELR_DATA Csselr;
> BOOLEAN CcidxSupported;
> UINT32 Associativity;
> @@ -88,7 +87,6 @@ ArmGetCacheAssociativity (
> CcidxSupported = ArmHasCcidx ();
>
> if (CcidxSupported) {
> - Ccsidr2.Data = ReadCCSIDR2 (Csselr.Data);
> Associativity = Ccsidr.BitsCcidxAA32.Associativity + 1;
> } else {
> Associativity = Ccsidr.BitsNonCcidx.Associativity + 1;
> --
> 2.26.2
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: 回复: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
2021-02-18 3:33 ` 回复: [edk2-devel] " gaoliming
@ 2021-02-18 3:41 ` Rebecca Cran
2021-02-18 5:54 ` Sami Mujawar
0 siblings, 1 reply; 5+ messages in thread
From: Rebecca Cran @ 2021-02-18 3:41 UTC (permalink / raw)
To: devel, gaoliming, rebecca
Cc: 'Leif Lindholm', 'Ard Biesheuvel'
Liming,
It was found via Linaro's CI environment, but not EDK2's.
I'm planning to set up my own Jenkins server to run CI to catch problems
like this before they're committed. It'll also let me test OvmfPkg/Bhyve
builds too.
--
Rebecca Cran
On 2/17/21 8:33 PM, gaoliming wrote:
> Rebecca:
> Is this issue detected in open CI environment?
>
> Thanks
> Liming
>> -----邮件原件-----
>> 发件人: bounce+27952+71573+4905953+8761045@groups.io
>> <bounce+27952+71573+4905953+8761045@groups.io> 代表 Rebecca Cran
>> 发送时间: 2021年2月10日 23:05
>> 收件人: devel@edk2.groups.io
>> 抄送: Rebecca Cran <rebecca@nuviainc.com>; Leif Lindholm
>> <leif@nuviainc.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>
>> 主题: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
>>
>> The ARM ProcessorSubClassDxe build was broken due to changes in the
>> SmbiosProcessor API and an unused variable.
>>
>> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
>> ---
>> ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c | 6
>> ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git
>> a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> index 0be4403c765f..c78bd41a7e06 100644
>> ---
>> a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> +++
>> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> @@ -22,7 +22,7 @@
>> @return The cache size.
>> **/
>> UINT64
>> -ArmGetCacheSize (
>> +SmbiosProcessorGetCacheSize (
>> IN UINT8 CacheLevel,
>> IN BOOLEAN DataCache,
>> IN BOOLEAN UnifiedCache
>> @@ -66,14 +66,13 @@ ArmGetCacheSize (
>> @return The cache associativity.
>> **/
>> UINT32
>> -ArmGetCacheAssociativity (
>> +SmbiosProcessorGetCacheAssociativity (
>> IN UINT8 CacheLevel,
>> IN BOOLEAN DataCache,
>> IN BOOLEAN UnifiedCache
>> )
>> {
>> CCSIDR_DATA Ccsidr;
>> - CCSIDR2_DATA Ccsidr2;
>> CSSELR_DATA Csselr;
>> BOOLEAN CcidxSupported;
>> UINT32 Associativity;
>> @@ -88,7 +87,6 @@ ArmGetCacheAssociativity (
>> CcidxSupported = ArmHasCcidx ();
>>
>> if (CcidxSupported) {
>> - Ccsidr2.Data = ReadCCSIDR2 (Csselr.Data);
>> Associativity = Ccsidr.BitsCcidxAA32.Associativity + 1;
>> } else {
>> Associativity = Ccsidr.BitsNonCcidx.Associativity + 1;
>> --
>> 2.26.2
>>
>>
>>
>>
>>
>
>
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: 回复: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
2021-02-18 3:41 ` Rebecca Cran
@ 2021-02-18 5:54 ` Sami Mujawar
0 siblings, 0 replies; 5+ messages in thread
From: Sami Mujawar @ 2021-02-18 5:54 UTC (permalink / raw)
To: devel@edk2.groups.io, gaoliming@byosoft.com.cn,
rebecca@nuviainc.com
Cc: 'Leif Lindholm', 'Ard Biesheuvel', nd
[-- Attachment #1: Type: text/plain, Size: 3245 bytes --]
Hi Liming,
We are working to get EDK2 Open CI enabled for ArmPkg and ArmPlatformPkg. We are doing some initial cleanup before the CI is enabled.
Regards,
Sami Mujawar
________________________________
From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Rebecca Cran via groups.io <rebecca=bsdio.com@groups.io>
Sent: Thursday, 18 February 2021, 3:42 am
To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; rebecca@nuviainc.com
Cc: 'Leif Lindholm'; 'Ard Biesheuvel'
Subject: Re: 回复: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
Liming,
It was found via Linaro's CI environment, but not EDK2's.
I'm planning to set up my own Jenkins server to run CI to catch problems
like this before they're committed. It'll also let me test OvmfPkg/Bhyve
builds too.
--
Rebecca Cran
On 2/17/21 8:33 PM, gaoliming wrote:
> Rebecca:
> Is this issue detected in open CI environment?
>
> Thanks
> Liming
>> -----�ʼ�ԭ��-----
>> ������: bounce+27952+71573+4905953+8761045@groups.io
>> <bounce+27952+71573+4905953+8761045@groups.io> ���� Rebecca Cran
>> ����ʱ��: 2021��2��10�� 23:05
>> �ռ���: devel@edk2.groups.io
>> ����: Rebecca Cran <rebecca@nuviainc.com>; Leif Lindholm
>> <leif@nuviainc.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>
>> ����: [edk2-devel] [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build
>>
>> The ARM ProcessorSubClassDxe build was broken due to changes in the
>> SmbiosProcessor API and an unused variable.
>>
>> Signed-off-by: Rebecca Cran <rebecca@nuviainc.com>
>> ---
>> ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c | 6
>> ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git
>> a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> index 0be4403c765f..c78bd41a7e06 100644
>> ---
>> a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> +++
>> b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c
>> @@ -22,7 +22,7 @@
>> @return The cache size.
>> **/
>> UINT64
>> -ArmGetCacheSize (
>> +SmbiosProcessorGetCacheSize (
>> IN UINT8 CacheLevel,
>> IN BOOLEAN DataCache,
>> IN BOOLEAN UnifiedCache
>> @@ -66,14 +66,13 @@ ArmGetCacheSize (
>> @return The cache associativity.
>> **/
>> UINT32
>> -ArmGetCacheAssociativity (
>> +SmbiosProcessorGetCacheAssociativity (
>> IN UINT8 CacheLevel,
>> IN BOOLEAN DataCache,
>> IN BOOLEAN UnifiedCache
>> )
>> {
>> CCSIDR_DATA Ccsidr;
>> - CCSIDR2_DATA Ccsidr2;
>> CSSELR_DATA Csselr;
>> BOOLEAN CcidxSupported;
>> UINT32 Associativity;
>> @@ -88,7 +87,6 @@ ArmGetCacheAssociativity (
>> CcidxSupported = ArmHasCcidx ();
>>
>> if (CcidxSupported) {
>> - Ccsidr2.Data = ReadCCSIDR2 (Csselr.Data);
>> Associativity = Ccsidr.BitsCcidxAA32.Associativity + 1;
>> } else {
>> Associativity = Ccsidr.BitsNonCcidx.Associativity + 1;
>> --
>> 2.26.2
>>
>>
>>
>>
>>
>
>
>
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 6285 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-18 5:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-10 15:04 [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build Rebecca Cran
2021-02-10 20:17 ` Leif Lindholm
2021-02-18 3:33 ` 回复: [edk2-devel] " gaoliming
2021-02-18 3:41 ` Rebecca Cran
2021-02-18 5:54 ` Sami Mujawar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox