* [PATCH edk2-platforms v1 01/10] Platform/ARM: Modify duplicated GUID in PciHostBridgeLib
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:14 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 02/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLib PierreGondois
` (9 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
The two following modules have the same GUID:
- Platform/ARM/Morello/Library/PciHostBridgeLib/
PciHostBridgeLibFvp.inf
- Platform/ARM/SgiPkg/Library/PciHostBridgeLib/
PciHostBridgeLib.inf
The module in the SgiPkg was created first. Update the GUID
of the module in the Morello folder.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
index 1d6c5b01d13d..8524b8572af8 100644
--- a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
+++ b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
@@ -10,7 +10,7 @@
[Defines]
INF_VERSION = 0x0001001B
BASE_NAME = PciHostBridgeLib
- FILE_GUID = 6879CEAD-DC94-42EB-895C-096D36B8083C
+ FILE_GUID = 972E5394-AF1D-45FE-8DC4-F9E5C896E04D
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
LIBRARY_CLASS = PciHostBridgeLib|DXE_DRIVER
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 01/10] Platform/ARM: Modify duplicated GUID in PciHostBridgeLib
2021-11-24 16:23 ` [PATCH edk2-platforms v1 01/10] Platform/ARM: Modify duplicated GUID in PciHostBridgeLib PierreGondois
@ 2021-12-17 14:14 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:14 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> The two following modules have the same GUID:
> - Platform/ARM/Morello/Library/PciHostBridgeLib/
> PciHostBridgeLibFvp.inf
> - Platform/ARM/SgiPkg/Library/PciHostBridgeLib/
> PciHostBridgeLib.inf
>
> The module in the SgiPkg was created first. Update the GUID
> of the module in the Morello folder.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
> index 1d6c5b01d13d..8524b8572af8 100644
> --- a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
> +++ b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf
> @@ -10,7 +10,7 @@
> [Defines]
> INF_VERSION = 0x0001001B
> BASE_NAME = PciHostBridgeLib
> - FILE_GUID = 6879CEAD-DC94-42EB-895C-096D36B8083C
> + FILE_GUID = 972E5394-AF1D-45FE-8DC4-F9E5C896E04D
> MODULE_TYPE = DXE_DRIVER
> VERSION_STRING = 1.0
> LIBRARY_CLASS = PciHostBridgeLib|DXE_DRIVER
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 02/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLib
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
2021-11-24 16:23 ` [PATCH edk2-platforms v1 01/10] Platform/ARM: Modify duplicated GUID in PciHostBridgeLib PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:14 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec PierreGondois
` (8 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
The two following modules have the same GUID:
- Platform/ARM/VExpressPkg/Library/
ArmVExpressLibRTSM/ArmVExpressLib.inf
- Platform/ARM/VExpressPkg/Library/
ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
Both files were imported at the same time. Modify the
GUID of the ArmVExpressLibRTSM/ArmVExpressLib.inf.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
index 929dadc28a84..4b582fdfc945 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
@@ -8,7 +8,7 @@
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = RTSMArmVExpressLib
- FILE_GUID = b98a6cb7-d472-4128-ad62-a7347f85ce13
+ FILE_GUID = BCD1958C-B7D1-48E9-B7F9-5ED25F5EBE0B
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = ArmPlatformLib
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 02/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLib
2021-11-24 16:23 ` [PATCH edk2-platforms v1 02/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLib PierreGondois
@ 2021-12-17 14:14 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:14 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> The two following modules have the same GUID:
> - Platform/ARM/VExpressPkg/Library/
> ArmVExpressLibRTSM/ArmVExpressLib.inf
> - Platform/ARM/VExpressPkg/Library/
> ArmVExpressLibCTA15-A7/ArmVExpressLib.inf
>
> Both files were imported at the same time. Modify the
> GUID of the ArmVExpressLibRTSM/ArmVExpressLib.inf.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
> index 929dadc28a84..4b582fdfc945 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf
> @@ -8,7 +8,7 @@
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = RTSMArmVExpressLib
> - FILE_GUID = b98a6cb7-d472-4128-ad62-a7347f85ce13
> + FILE_GUID = BCD1958C-B7D1-48E9-B7F9-5ED25F5EBE0B
> MODULE_TYPE = BASE
> VERSION_STRING = 1.0
> LIBRARY_CLASS = ArmPlatformLib
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
2021-11-24 16:23 ` [PATCH edk2-platforms v1 01/10] Platform/ARM: Modify duplicated GUID in PciHostBridgeLib PierreGondois
2021-11-24 16:23 ` [PATCH edk2-platforms v1 02/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLib PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 13:59 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 04/10] Platform/ARM: Modify duplicated GUID in ArmVExpressPkg.dec PierreGondois
` (7 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
The two following modules have the same GUID:
- Platform/ARM/VExpressPkg/Library/
ArmVExpressLibRTSM/ArmVExpressLibSec.inf
- Silicon/Hisilicon/Library/
ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
The inf file in the Platform/ARM/ folder is based
on the one in Silicon/Hisilicon/. Modify the one
in the Silicon/Hisilicon/.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
index ac587deedfd8..7fd7b5183e5b 100644
--- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
+++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
@@ -12,7 +12,7 @@
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = ArmPlatformLibSec
- FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
+ FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = ArmPlatformLib
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-11-24 16:23 ` [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec PierreGondois
@ 2021-12-17 13:59 ` Sami Mujawar
2021-12-17 14:15 ` PierreGondois
0 siblings, 1 reply; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 13:59 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Please find my response inline marked [SAMI].
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> The two following modules have the same GUID:
> - Platform/ARM/VExpressPkg/Library/
> ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> - Silicon/Hisilicon/Library/
> ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>
> The inf file in the Platform/ARM/ folder is based
> on the one in Silicon/Hisilicon/. Modify the one
[SAMI] I believe you want to say the inf file in Silicon/Hisilicon/is
based on the one in Platform/ARM and therefore you are modifying the inf
file in Silicon/Hisilicon.
Please let me know if this is correct, and I will update this in the
commit message before merging the change.
[/SAMI]
> in the Silicon/Hisilicon/.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> index ac587deedfd8..7fd7b5183e5b 100644
> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> @@ -12,7 +12,7 @@
> [Defines]
> INF_VERSION = 0x00010005
> BASE_NAME = ArmPlatformLibSec
> - FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
> + FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
> MODULE_TYPE = BASE
> VERSION_STRING = 1.0
> LIBRARY_CLASS = ArmPlatformLib
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-12-17 13:59 ` Sami Mujawar
@ 2021-12-17 14:15 ` PierreGondois
2021-12-17 16:30 ` Sami Mujawar
0 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-12-17 14:15 UTC (permalink / raw)
To: Sami Mujawar, devel, nd
Hi Sami,
You are correct, as stated in Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf:
"Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/"
Thanks for updating the commit,
Regards,
Pierre
On 12/17/21 2:59 PM, Sami Mujawar wrote:
> Hi Pierre,
>
> Please find my response inline marked [SAMI].
>
> Regards,
>
> Sami Mujawar
>
>
> On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
>> From: Pierre Gondois <Pierre.Gondois@arm.com>
>>
>> The two following modules have the same GUID:
>> - Platform/ARM/VExpressPkg/Library/
>> ArmVExpressLibRTSM/ArmVExpressLibSec.inf
>> - Silicon/Hisilicon/Library/
>> ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>>
>> The inf file in the Platform/ARM/ folder is based
>> on the one in Silicon/Hisilicon/. Modify the one
> [SAMI] I believe you want to say the inf file in Silicon/Hisilicon/is based on the one in Platform/ARM and therefore you are modifying the inf file in Silicon/Hisilicon.
> Please let me know if this is correct, and I will update this in the commit message before merging the change.
> [/SAMI]
>> in the Silicon/Hisilicon/.
>>
>> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
>> ---
>> .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>> index ac587deedfd8..7fd7b5183e5b 100644
>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>> @@ -12,7 +12,7 @@
>> [Defines]
>> INF_VERSION = 0x00010005
>> BASE_NAME = ArmPlatformLibSec
>> - FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
>> + FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
>> MODULE_TYPE = BASE
>> VERSION_STRING = 1.0
>> LIBRARY_CLASS = ArmPlatformLib
>> --
>> 2.25.1
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-12-17 14:15 ` PierreGondois
@ 2021-12-17 16:30 ` Sami Mujawar
2021-12-17 16:33 ` [edk2-devel] " Ard Biesheuvel
0 siblings, 1 reply; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 16:30 UTC (permalink / raw)
To: Pierre Gondois, devel, nd, Leif Lindholm, Ard Biesheuvel,
xiewenyi2
Hi Leif, Ard, Wenyi,
Is it possible to review and provde feedback for this change, please?
Regards,
Sami Mujawar
On 17/12/2021 02:15 PM, Pierre Gondois wrote:
> Hi Sami,
>
> You are correct, as stated in Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf:
>
> "Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/"
>
> Thanks for updating the commit,
>
> Regards,
>
> Pierre
>
>
>
> On 12/17/21 2:59 PM, Sami Mujawar wrote:
>> Hi Pierre,
>>
>> Please find my response inline marked [SAMI].
>>
>> Regards,
>>
>> Sami Mujawar
>>
>>
>> On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
>>> From: Pierre Gondois <Pierre.Gondois@arm.com>
>>>
>>> The two following modules have the same GUID:
>>> - Platform/ARM/VExpressPkg/Library/
>>> ArmVExpressLibRTSM/ArmVExpressLibSec.inf
>>> - Silicon/Hisilicon/Library/
>>> ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>>>
>>> The inf file in the Platform/ARM/ folder is based
>>> on the one in Silicon/Hisilicon/. Modify the one
>> [SAMI] I believe you want to say the inf file in Silicon/Hisilicon/is based on the one in Platform/ARM and therefore you are modifying the inf file in Silicon/Hisilicon.
>> Please let me know if this is correct, and I will update this in the commit message before merging the change.
>> [/SAMI]
>>> in the Silicon/Hisilicon/.
>>>
>>> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
>>> ---
>>> .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>>> index ac587deedfd8..7fd7b5183e5b 100644
>>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
>>> @@ -12,7 +12,7 @@
>>> [Defines]
>>> INF_VERSION = 0x00010005
>>> BASE_NAME = ArmPlatformLibSec
>>> - FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
>>> + FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
>>> MODULE_TYPE = BASE
>>> VERSION_STRING = 1.0
>>> LIBRARY_CLASS = ArmPlatformLib
>>> --
>>> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-12-17 16:30 ` Sami Mujawar
@ 2021-12-17 16:33 ` Ard Biesheuvel
2021-12-17 16:39 ` Sami Mujawar
0 siblings, 1 reply; 28+ messages in thread
From: Ard Biesheuvel @ 2021-12-17 16:33 UTC (permalink / raw)
To: edk2-devel-groups-io, Sami Mujawar
Cc: Pierre Gondois, nd, Leif Lindholm, Ard Biesheuvel, xiewenyi2
On Fri, 17 Dec 2021 at 17:30, Sami Mujawar <sami.mujawar@arm.com> wrote:
>
> Hi Leif, Ard, Wenyi,
>
> Is it possible to review and provde feedback for this change, please?
>
I agree that this should be resolved, and I don't think it matters
which one we change. The INF GUIDs of libraries are never used anyway,
as far as I know.
>
>
> On 17/12/2021 02:15 PM, Pierre Gondois wrote:
> > Hi Sami,
> >
> > You are correct, as stated in Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf:
> >
> > "Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/"
> >
> > Thanks for updating the commit,
> >
> > Regards,
> >
> > Pierre
> >
> >
> >
> > On 12/17/21 2:59 PM, Sami Mujawar wrote:
> >> Hi Pierre,
> >>
> >> Please find my response inline marked [SAMI].
> >>
> >> Regards,
> >>
> >> Sami Mujawar
> >>
> >>
> >> On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> >>> From: Pierre Gondois <Pierre.Gondois@arm.com>
> >>>
> >>> The two following modules have the same GUID:
> >>> - Platform/ARM/VExpressPkg/Library/
> >>> ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> >>> - Silicon/Hisilicon/Library/
> >>> ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>>
> >>> The inf file in the Platform/ARM/ folder is based
> >>> on the one in Silicon/Hisilicon/. Modify the one
> >> [SAMI] I believe you want to say the inf file in Silicon/Hisilicon/is based on the one in Platform/ARM and therefore you are modifying the inf file in Silicon/Hisilicon.
> >> Please let me know if this is correct, and I will update this in the commit message before merging the change.
> >> [/SAMI]
> >>> in the Silicon/Hisilicon/.
> >>>
> >>> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> >>> ---
> >>> .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
> >>> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>> index ac587deedfd8..7fd7b5183e5b 100644
> >>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>> @@ -12,7 +12,7 @@
> >>> [Defines]
> >>> INF_VERSION = 0x00010005
> >>> BASE_NAME = ArmPlatformLibSec
> >>> - FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
> >>> + FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
> >>> MODULE_TYPE = BASE
> >>> VERSION_STRING = 1.0
> >>> LIBRARY_CLASS = ArmPlatformLib
> >>> --
> >>> 2.25.1
>
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
>
>
>
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-12-17 16:33 ` [edk2-devel] " Ard Biesheuvel
@ 2021-12-17 16:39 ` Sami Mujawar
2021-12-20 9:29 ` wenyi,xie
0 siblings, 1 reply; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 16:39 UTC (permalink / raw)
To: Ard Biesheuvel, edk2-devel-groups-io
Cc: Pierre Gondois, nd, Leif Lindholm, Ard Biesheuvel,
xiewenyi2@huawei.com
Hi Ard,
On 17/12/2021, 16:34, "Ard Biesheuvel" <ardb@kernel.org> wrote:
On Fri, 17 Dec 2021 at 17:30, Sami Mujawar <sami.mujawar@arm.com> wrote:
>
> Hi Leif, Ard, Wenyi,
>
> Is it possible to review and provde feedback for this change, please?
>
I agree that this should be resolved, and I don't think it matters
which one we change. The INF GUIDs of libraries are never used anyway,
as far as I know.
In that case I will update this patch to modify the ArmVExpressLibRTSM version.
Regards,
Sami Mujawar
>
>
> On 17/12/2021 02:15 PM, Pierre Gondois wrote:
> > Hi Sami,
> >
> > You are correct, as stated in Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf:
> >
> > "Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/"
> >
> > Thanks for updating the commit,
> >
> > Regards,
> >
> > Pierre
> >
> >
> >
> > On 12/17/21 2:59 PM, Sami Mujawar wrote:
> >> Hi Pierre,
> >>
> >> Please find my response inline marked [SAMI].
> >>
> >> Regards,
> >>
> >> Sami Mujawar
> >>
> >>
> >> On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> >>> From: Pierre Gondois <Pierre.Gondois@arm.com>
> >>>
> >>> The two following modules have the same GUID:
> >>> - Platform/ARM/VExpressPkg/Library/
> >>> ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> >>> - Silicon/Hisilicon/Library/
> >>> ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>>
> >>> The inf file in the Platform/ARM/ folder is based
> >>> on the one in Silicon/Hisilicon/. Modify the one
> >> [SAMI] I believe you want to say the inf file in Silicon/Hisilicon/is based on the one in Platform/ARM and therefore you are modifying the inf file in Silicon/Hisilicon.
> >> Please let me know if this is correct, and I will update this in the commit message before merging the change.
> >> [/SAMI]
> >>> in the Silicon/Hisilicon/.
> >>>
> >>> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> >>> ---
> >>> .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
> >>> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>> index ac587deedfd8..7fd7b5183e5b 100644
> >>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> >>> @@ -12,7 +12,7 @@
> >>> [Defines]
> >>> INF_VERSION = 0x00010005
> >>> BASE_NAME = ArmPlatformLibSec
> >>> - FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
> >>> + FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
> >>> MODULE_TYPE = BASE
> >>> VERSION_STRING = 1.0
> >>> LIBRARY_CLASS = ArmPlatformLib
> >>> --
> >>> 2.25.1
>
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
>
>
>
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [edk2-devel] [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec
2021-12-17 16:39 ` Sami Mujawar
@ 2021-12-20 9:29 ` wenyi,xie
0 siblings, 0 replies; 28+ messages in thread
From: wenyi,xie @ 2021-12-20 9:29 UTC (permalink / raw)
To: Sami Mujawar, Ard Biesheuvel, edk2-devel-groups-io
Cc: Pierre Gondois, nd, Leif Lindholm, Ard Biesheuvel
On 2021/12/18 0:39, Sami Mujawar wrote:
> Hi Ard,
>
>
> On 17/12/2021, 16:34, "Ard Biesheuvel" <ardb@kernel.org> wrote:
>
> On Fri, 17 Dec 2021 at 17:30, Sami Mujawar <sami.mujawar@arm.com> wrote:
> >
> > Hi Leif, Ard, Wenyi,
> >
> > Is it possible to review and provde feedback for this change, please?
> >
Sorry to reply late, it's OK to update the GUID in ArmPlatformLibSec.inf.
Regards
Wenyi
>
> I agree that this should be resolved, and I don't think it matters
> which one we change. The INF GUIDs of libraries are never used anyway,
> as far as I know.
> In that case I will update this patch to modify the ArmVExpressLibRTSM version.
>
> Regards,
>
> Sami Mujawar
>
> >
> >
> > On 17/12/2021 02:15 PM, Pierre Gondois wrote:
> > > Hi Sami,
> > >
> > > You are correct, as stated in Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf:
> > >
> > > "Based on the files under ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/"
> > >
> > > Thanks for updating the commit,
> > >
> > > Regards,
> > >
> > > Pierre
> > >
> > >
> > >
> > > On 12/17/21 2:59 PM, Sami Mujawar wrote:
> > >> Hi Pierre,
> > >>
> > >> Please find my response inline marked [SAMI].
> > >>
> > >> Regards,
> > >>
> > >> Sami Mujawar
> > >>
> > >>
> > >> On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> > >>> From: Pierre Gondois <Pierre.Gondois@arm.com>
> > >>>
> > >>> The two following modules have the same GUID:
> > >>> - Platform/ARM/VExpressPkg/Library/
> > >>> ArmVExpressLibRTSM/ArmVExpressLibSec.inf
> > >>> - Silicon/Hisilicon/Library/
> > >>> ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> > >>>
> > >>> The inf file in the Platform/ARM/ folder is based
> > >>> on the one in Silicon/Hisilicon/. Modify the one
> > >> [SAMI] I believe you want to say the inf file in Silicon/Hisilicon/is based on the one in Platform/ARM and therefore you are modifying the inf file in Silicon/Hisilicon.
> > >> Please let me know if this is correct, and I will update this in the commit message before merging the change.
> > >> [/SAMI]
> > >>> in the Silicon/Hisilicon/.
> > >>>
> > >>> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> > >>> ---
> > >>> .../Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf | 2 +-
> > >>> 1 file changed, 1 insertion(+), 1 deletion(-)
> > >>>
> > >>> diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> > >>> index ac587deedfd8..7fd7b5183e5b 100644
> > >>> --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> > >>> +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf
> > >>> @@ -12,7 +12,7 @@
> > >>> [Defines]
> > >>> INF_VERSION = 0x00010005
> > >>> BASE_NAME = ArmPlatformLibSec
> > >>> - FILE_GUID = a79eed97-4b98-4974-9690-37b32d6a5b56
> > >>> + FILE_GUID = ABF3B82B-892F-438F-901F-F148C2DF89E6
> > >>> MODULE_TYPE = BASE
> > >>> VERSION_STRING = 1.0
> > >>> LIBRARY_CLASS = ArmPlatformLib
> > >>> --
> > >>> 2.25.1
> >
> > IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
> >
> >
> >
> >
> >
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 04/10] Platform/ARM: Modify duplicated GUID in ArmVExpressPkg.dec
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (2 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 03/10] Platform/ARM: Modify duplicated GUID in ArmVExpressLibSec PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:14 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 05/10] Platform/ARM: Fix Ecc error 1001 PierreGondois
` (6 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
The two following packages have the same GUID:
- Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
- edk2/ArmPlatformPkg/ArmPlatformPkg.dec
The gArmVExpressTokenSpaceGuid in
Platform/ARM/VExpressPkg/ArmVExpressPkg.dec is also
identical.
All the GUIDs have been added at the same time, initially
in the edk2 repository. Modify the GUIDs in the edk2-platforms
repository.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
index 848510bff17e..76ba4f7f6485 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
+++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
@@ -10,7 +10,7 @@
[Defines]
DEC_SPECIFICATION = 0x00010005
PACKAGE_NAME = ArmVExpressPkg
- PACKAGE_GUID = 9c0aaed4-74c5-4043-b417-a3223814ce76
+ PACKAGE_GUID = 9F8DA3A6-3B84-44E4-9E36-E51972F6F688
PACKAGE_VERSION = 0.1
################################################################################
@@ -29,7 +29,7 @@ [LibraryClasses]
ArmPlatformSysConfigLib|Include/Library/ArmPlatformSysConfigLib.h
[Guids.common]
- gArmVExpressTokenSpaceGuid = { 0x9c0aaed4, 0x74c5, 0x4043, { 0xb4, 0x17, 0xa3, 0x22, 0x38, 0x14, 0xce, 0x76 } }
+ gArmVExpressTokenSpaceGuid = { 0xD8D68B8E, 0x0ACE, 0x4942, { 0xA4, 0xB9, 0x36, 0xEE, 0x9E, 0x80, 0x80, 0x9D } }
[PcdsFeatureFlag.common]
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 04/10] Platform/ARM: Modify duplicated GUID in ArmVExpressPkg.dec
2021-11-24 16:23 ` [PATCH edk2-platforms v1 04/10] Platform/ARM: Modify duplicated GUID in ArmVExpressPkg.dec PierreGondois
@ 2021-12-17 14:14 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:14 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> The two following packages have the same GUID:
> - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> - edk2/ArmPlatformPkg/ArmPlatformPkg.dec
>
> The gArmVExpressTokenSpaceGuid in
> Platform/ARM/VExpressPkg/ArmVExpressPkg.dec is also
> identical.
>
> All the GUIDs have been added at the same time, initially
> in the edk2 repository. Modify the GUIDs in the edk2-platforms
> repository.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> Platform/ARM/VExpressPkg/ArmVExpressPkg.dec | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> index 848510bff17e..76ba4f7f6485 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> +++ b/Platform/ARM/VExpressPkg/ArmVExpressPkg.dec
> @@ -10,7 +10,7 @@
> [Defines]
> DEC_SPECIFICATION = 0x00010005
> PACKAGE_NAME = ArmVExpressPkg
> - PACKAGE_GUID = 9c0aaed4-74c5-4043-b417-a3223814ce76
> + PACKAGE_GUID = 9F8DA3A6-3B84-44E4-9E36-E51972F6F688
> PACKAGE_VERSION = 0.1
>
> ################################################################################
> @@ -29,7 +29,7 @@ [LibraryClasses]
> ArmPlatformSysConfigLib|Include/Library/ArmPlatformSysConfigLib.h
>
> [Guids.common]
> - gArmVExpressTokenSpaceGuid = { 0x9c0aaed4, 0x74c5, 0x4043, { 0xb4, 0x17, 0xa3, 0x22, 0x38, 0x14, 0xce, 0x76 } }
> + gArmVExpressTokenSpaceGuid = { 0xD8D68B8E, 0x0ACE, 0x4942, { 0xA4, 0xB9, 0x36, 0xEE, 0x9E, 0x80, 0x80, 0x9D } }
>
> [PcdsFeatureFlag.common]
>
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 05/10] Platform/ARM: Fix Ecc error 1001
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (3 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 04/10] Platform/ARM: Modify duplicated GUID in ArmVExpressPkg.dec PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:15 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 06/10] Platform/ARM: Fix Ecc error 1008 PierreGondois
` (5 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
'TAB' character is not allowed in source code,
please replace each 'TAB' with two spaces.
The patch also format and document the InstallStructures
function to comply to edk2 coding style.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 38 ++++++++++---------
.../Drivers/Lan9118Dxe/Lan9118DxeUtil.h | 4 +-
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index ac18b16ca676..a5a675b2a613 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -743,36 +743,40 @@ InstallMemoryStructure (
}
/**
- Install a whole table worth of structructures
+ Install a whole table worth of structures.
- @parm
+ @param [in] Smbios Smbios protocol.
+ @param [in] DefaultTables Default Smbios tables.
+
+ @retval EFI_SUCCESS Record was added.
+ @retval EFI_OUT_OF_RESOURCES Record was not added.
+ @retval EFI_ALREADY_STARTED The SmbiosHandle passed in was already in use.
**/
EFI_STATUS
InstallStructures (
- IN EFI_SMBIOS_PROTOCOL *Smbios,
- IN CONST VOID *DefaultTables[]
+ IN EFI_SMBIOS_PROTOCOL *Smbios,
+ IN CONST VOID *DefaultTables[]
)
{
EFI_STATUS Status = EFI_SUCCESS;
EFI_SMBIOS_HANDLE SmbiosHandle;
+ UINTN TableEntry;
- int TableEntry;
- for ( TableEntry=0; DefaultTables[TableEntry] != NULL; TableEntry++)
- {
- SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER*)DefaultTables[TableEntry])->Handle;
- Status = Smbios->Add (
- Smbios,
- NULL,
- &SmbiosHandle,
- (EFI_SMBIOS_TABLE_HEADER*) DefaultTables[TableEntry]
- );
- if (EFI_ERROR(Status))
- break;
+ for (TableEntry = 0; DefaultTables[TableEntry] != NULL; TableEntry++) {
+ SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER*)DefaultTables[TableEntry])->Handle;
+ Status = Smbios->Add (
+ Smbios,
+ NULL,
+ &SmbiosHandle,
+ (EFI_SMBIOS_TABLE_HEADER*)DefaultTables[TableEntry]
+ );
+ if (EFI_ERROR(Status)) {
+ break;
+ }
}
return Status;
}
-
/**
Install all structures from the DefaultTables structure
diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
index 601714c94387..e50c458f8c3a 100644
--- a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
+++ b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
@@ -45,7 +45,7 @@ Lan9118RawMmioRead32(
UINTN Delay
);
#define Lan9118MmioRead32(a) \
- Lan9118RawMmioRead32(a, a ## _RD_DELAY)
+ Lan9118RawMmioRead32(a, a ## _RD_DELAY)
UINT32
Lan9118RawMmioWrite32(
@@ -54,7 +54,7 @@ Lan9118RawMmioWrite32(
UINTN Delay
);
#define Lan9118MmioWrite32(a, v) \
- Lan9118RawMmioWrite32(a, v, a ## _WR_DELAY)
+ Lan9118RawMmioWrite32(a, v, a ## _WR_DELAY)
/* ------------------ MAC CSR Access ------------------- */
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 05/10] Platform/ARM: Fix Ecc error 1001
2021-11-24 16:23 ` [PATCH edk2-platforms v1 05/10] Platform/ARM: Fix Ecc error 1001 PierreGondois
@ 2021-12-17 14:15 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:15 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> This patch fixes the following Ecc reported error:
> 'TAB' character is not allowed in source code,
> please replace each 'TAB' with two spaces.
>
> The patch also format and document the InstallStructures
> function to comply to edk2 coding style.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 38 ++++++++++---------
> .../Drivers/Lan9118Dxe/Lan9118DxeUtil.h | 4 +-
> 2 files changed, 23 insertions(+), 19 deletions(-)
>
> diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> index ac18b16ca676..a5a675b2a613 100644
> --- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> +++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> @@ -743,36 +743,40 @@ InstallMemoryStructure (
> }
>
> /**
> - Install a whole table worth of structructures
> + Install a whole table worth of structures.
>
> - @parm
> + @param [in] Smbios Smbios protocol.
> + @param [in] DefaultTables Default Smbios tables.
> +
> + @retval EFI_SUCCESS Record was added.
> + @retval EFI_OUT_OF_RESOURCES Record was not added.
> + @retval EFI_ALREADY_STARTED The SmbiosHandle passed in was already in use.
> **/
> EFI_STATUS
> InstallStructures (
> - IN EFI_SMBIOS_PROTOCOL *Smbios,
> - IN CONST VOID *DefaultTables[]
> + IN EFI_SMBIOS_PROTOCOL *Smbios,
> + IN CONST VOID *DefaultTables[]
> )
> {
> EFI_STATUS Status = EFI_SUCCESS;
> EFI_SMBIOS_HANDLE SmbiosHandle;
> + UINTN TableEntry;
>
> - int TableEntry;
> - for ( TableEntry=0; DefaultTables[TableEntry] != NULL; TableEntry++)
> - {
> - SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER*)DefaultTables[TableEntry])->Handle;
> - Status = Smbios->Add (
> - Smbios,
> - NULL,
> - &SmbiosHandle,
> - (EFI_SMBIOS_TABLE_HEADER*) DefaultTables[TableEntry]
> - );
> - if (EFI_ERROR(Status))
> - break;
> + for (TableEntry = 0; DefaultTables[TableEntry] != NULL; TableEntry++) {
> + SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER*)DefaultTables[TableEntry])->Handle;
> + Status = Smbios->Add (
> + Smbios,
> + NULL,
> + &SmbiosHandle,
> + (EFI_SMBIOS_TABLE_HEADER*)DefaultTables[TableEntry]
> + );
> + if (EFI_ERROR(Status)) {
> + break;
> + }
> }
> return Status;
> }
>
> -
> /**
> Install all structures from the DefaultTables structure
>
> diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
> index 601714c94387..e50c458f8c3a 100644
> --- a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
> +++ b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.h
> @@ -45,7 +45,7 @@ Lan9118RawMmioRead32(
> UINTN Delay
> );
> #define Lan9118MmioRead32(a) \
> - Lan9118RawMmioRead32(a, a ## _RD_DELAY)
> + Lan9118RawMmioRead32(a, a ## _RD_DELAY)
>
> UINT32
> Lan9118RawMmioWrite32(
> @@ -54,7 +54,7 @@ Lan9118RawMmioWrite32(
> UINTN Delay
> );
> #define Lan9118MmioWrite32(a, v) \
> - Lan9118RawMmioWrite32(a, v, a ## _WR_DELAY)
> + Lan9118RawMmioWrite32(a, v, a ## _WR_DELAY)
>
> /* ------------------ MAC CSR Access ------------------- */
>
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 06/10] Platform/ARM: Fix Ecc error 1008
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (4 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 05/10] Platform/ARM: Fix Ecc error 1001 PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:15 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 07/10] Platform/ARM: Fix Ecc error 1012 PierreGondois
` (4 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
File has invalid Non-ACSII char.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
index b51e2b3fa1a6..90907bc19a8f 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
@@ -259,7 +259,7 @@ UpdateMemorySize (
}
/* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
- Table 75 – Memory Device (Type 17) structure, description for Size field.
+ Table 75 - Memory Device (Type 17) structure, description for Size field.
If the value is 0, no memory device is installed in the socket; if
the size is unknown, the field value is FFFFh.
*/
@@ -276,13 +276,13 @@ UpdateMemorySize (
}
/* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
- Table 75 – Memory Device (Type 17) structure, description for Size field.
+ Table 75 - Memory Device (Type 17) structure, description for Size field.
If the size is 32 GB-1 MB or greater, the field value is 7FFFh and the
actual size is stored in the Extended Size field.
*/
if (MemorySize < (SIZE_32GB - SIZE_1MB)) {
/* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
- section 7.18.5 Memory Device — Extended Size
+ section 7.18.5 Memory Device - Extended Size
For compatibility with older SMBIOS parsers, memory devices
smaller than (32 GB - 1 MB) should be represented using their
size in the Size field, leaving the Extended Size field set to 0.
@@ -290,7 +290,7 @@ UpdateMemorySize (
Type17Table->ExtendedSize = 0;
/* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
- Table 75 – Memory Device (Type 17) structure, description for Size field.
+ Table 75 - Memory Device (Type 17) structure, description for Size field.
The granularity in which the value is specified depends on the setting
of the most-significant bit (bit 15). If the bit is 0, the value is
specified in megabyte units; if the bit is 1, the value is specified
@@ -308,7 +308,7 @@ UpdateMemorySize (
}
/* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
- section 7.18.5 Memory Device — Extended Size
+ section 7.18.5 Memory Device - Extended Size
The Extended Size field is intended to represent memory devices
larger than 32,767 MB (32 GB - 1 MB), which cannot be described
using the Size field. This field is only meaningful if the value
@@ -317,12 +317,12 @@ UpdateMemorySize (
Type17Table->Size = 0x7FFF;
/* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
- section 7.18.5 Memory Device — Extended Size
+ section 7.18.5 Memory Device - Extended Size
Bit 31 is reserved for future use and must be set to 0.
Bits 30:0 represent the size of the memory device in megabytes.
EXAMPLE: 0000_8000h indicates a 32 GB memory device (32,768 MB),
0002_0000h represents a 128 GB memory device (131,072 MB), and
- 0000_7FFFh represents a 32,767 MB (32 GB – 1 MB) device.
+ 0000_7FFFh represents a 32,767 MB (32 GB - 1 MB) device.
*/
Type17Table->ExtendedSize = (MemorySize >> 20) & (~BIT31);
return EFI_SUCCESS;
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 06/10] Platform/ARM: Fix Ecc error 1008
2021-11-24 16:23 ` [PATCH edk2-platforms v1 06/10] Platform/ARM: Fix Ecc error 1008 PierreGondois
@ 2021-12-17 14:15 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:15 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> This patch fixes the following Ecc reported error:
> File has invalid Non-ACSII char.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
> index b51e2b3fa1a6..90907bc19a8f 100644
> --- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
> +++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
> @@ -259,7 +259,7 @@ UpdateMemorySize (
> }
>
> /* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
> - Table 75 – Memory Device (Type 17) structure, description for Size field.
> + Table 75 - Memory Device (Type 17) structure, description for Size field.
> If the value is 0, no memory device is installed in the socket; if
> the size is unknown, the field value is FFFFh.
> */
> @@ -276,13 +276,13 @@ UpdateMemorySize (
> }
>
> /* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
> - Table 75 – Memory Device (Type 17) structure, description for Size field.
> + Table 75 - Memory Device (Type 17) structure, description for Size field.
> If the size is 32 GB-1 MB or greater, the field value is 7FFFh and the
> actual size is stored in the Extended Size field.
> */
> if (MemorySize < (SIZE_32GB - SIZE_1MB)) {
> /* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
> - section 7.18.5 Memory Device — Extended Size
> + section 7.18.5 Memory Device - Extended Size
> For compatibility with older SMBIOS parsers, memory devices
> smaller than (32 GB - 1 MB) should be represented using their
> size in the Size field, leaving the Extended Size field set to 0.
> @@ -290,7 +290,7 @@ UpdateMemorySize (
> Type17Table->ExtendedSize = 0;
>
> /* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
> - Table 75 – Memory Device (Type 17) structure, description for Size field.
> + Table 75 - Memory Device (Type 17) structure, description for Size field.
> The granularity in which the value is specified depends on the setting
> of the most-significant bit (bit 15). If the bit is 0, the value is
> specified in megabyte units; if the bit is 1, the value is specified
> @@ -308,7 +308,7 @@ UpdateMemorySize (
> }
>
> /* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
> - section 7.18.5 Memory Device — Extended Size
> + section 7.18.5 Memory Device - Extended Size
> The Extended Size field is intended to represent memory devices
> larger than 32,767 MB (32 GB - 1 MB), which cannot be described
> using the Size field. This field is only meaningful if the value
> @@ -317,12 +317,12 @@ UpdateMemorySize (
> Type17Table->Size = 0x7FFF;
>
> /* Ref: SMBIOS Specifiation, Version 3.4.0, Document Identifier: DSP0134,
> - section 7.18.5 Memory Device — Extended Size
> + section 7.18.5 Memory Device - Extended Size
> Bit 31 is reserved for future use and must be set to 0.
> Bits 30:0 represent the size of the memory device in megabytes.
> EXAMPLE: 0000_8000h indicates a 32 GB memory device (32,768 MB),
> 0002_0000h represents a 128 GB memory device (131,072 MB), and
> - 0000_7FFFh represents a 32,767 MB (32 GB – 1 MB) device.
> + 0000_7FFFh represents a 32,767 MB (32 GB - 1 MB) device.
> */
> Type17Table->ExtendedSize = (MemorySize >> 20) & (~BIT31);
> return EFI_SUCCESS;
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 07/10] Platform/ARM: Fix Ecc error 1012
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (5 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 06/10] Platform/ARM: Fix Ecc error 1008 PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:15 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 08/10] Platform/ARM: Fix Ecc error 3003 PierreGondois
` (3 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
There should be no trailing white space in one line.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index a5a675b2a613..76084279a558 100644
--- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -797,7 +797,7 @@ InstallAllStructures (
// Fixup some table values
mArmDefaultType0.Base.SystemBiosMajorRelease = (PcdGet32 ( PcdFirmwareRevision ) >> 16) & 0xFF;
mArmDefaultType0.Base.SystemBiosMinorRelease = PcdGet32 ( PcdFirmwareRevision ) & 0xFF;
- if ( JunoRevision == JUNO_REVISION_R1 )
+ if ( JunoRevision == JUNO_REVISION_R1 )
{
mArmDefaultType2.Base.Version = 6;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 07/10] Platform/ARM: Fix Ecc error 1012
2021-11-24 16:23 ` [PATCH edk2-platforms v1 07/10] Platform/ARM: Fix Ecc error 1012 PierreGondois
@ 2021-12-17 14:15 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:15 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> This patch fixes the following Ecc reported error:
> There should be no trailing white space in one line.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> index a5a675b2a613..76084279a558 100644
> --- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> +++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
> @@ -797,7 +797,7 @@ InstallAllStructures (
> // Fixup some table values
> mArmDefaultType0.Base.SystemBiosMajorRelease = (PcdGet32 ( PcdFirmwareRevision ) >> 16) & 0xFF;
> mArmDefaultType0.Base.SystemBiosMinorRelease = PcdGet32 ( PcdFirmwareRevision ) & 0xFF;
> - if ( JunoRevision == JUNO_REVISION_R1 )
> + if ( JunoRevision == JUNO_REVISION_R1 )
> {
> mArmDefaultType2.Base.Version = 6;
> }
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 08/10] Platform/ARM: Fix Ecc error 3003
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (6 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 07/10] Platform/ARM: Fix Ecc error 1012 PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:15 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 09/10] Platform/ARM: Fix Ecc error 9005 PierreGondois
` (2 subsequent siblings)
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
A comparison of any pointer to zero must be done
via the NULL type
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c | 4 ++--
.../ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c
index ad7cc1cd75a1..6f2ce401b3cc 100644
--- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c
+++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c
@@ -91,7 +91,7 @@ SataSiI3132Constructor (
SATA_SI3132_INSTANCE *Instance;
EFI_ATA_PASS_THRU_MODE *AtaPassThruMode;
- if (!SataSiI3132Instance) {
+ if (SataSiI3132Instance == NULL) {
return EFI_INVALID_PARAMETER;
}
@@ -223,7 +223,7 @@ SataSiI3132Initialization (
UINTN Index;
EFI_PCI_IO_PROTOCOL* PciIo;
- if (!SataSiI3132Instance) {
+ if (SataSiI3132Instance == NULL) {
return EFI_INVALID_PARAMETER;
}
diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
index f15b59788310..0ec53782835b 100644
--- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
+++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
@@ -260,7 +260,7 @@ SiI3132AtaPassThruCommand (
// Clear Command Complete
SATA_PORT_WRITE32 (SataPort->RegBase + SII3132_PORT_INTSTATUS_REG, SII3132_PORT_INT_CMDCOMPL << 16);
- if (PciAllocMapping) {
+ if (PciAllocMapping != NULL) {
Status = PciIo->Unmap (PciIo, PciAllocMapping);
ASSERT (!EFI_ERROR (Status));
}
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 08/10] Platform/ARM: Fix Ecc error 3003
2021-11-24 16:23 ` [PATCH edk2-platforms v1 08/10] Platform/ARM: Fix Ecc error 3003 PierreGondois
@ 2021-12-17 14:15 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:15 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> This patch fixes the following Ecc reported error:
> A comparison of any pointer to zero must be done
> via the NULL type
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c | 4 ++--
> .../ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c
> index ad7cc1cd75a1..6f2ce401b3cc 100644
> --- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c
> +++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132.c
> @@ -91,7 +91,7 @@ SataSiI3132Constructor (
> SATA_SI3132_INSTANCE *Instance;
> EFI_ATA_PASS_THRU_MODE *AtaPassThruMode;
>
> - if (!SataSiI3132Instance) {
> + if (SataSiI3132Instance == NULL) {
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -223,7 +223,7 @@ SataSiI3132Initialization (
> UINTN Index;
> EFI_PCI_IO_PROTOCOL* PciIo;
>
> - if (!SataSiI3132Instance) {
> + if (SataSiI3132Instance == NULL) {
> return EFI_INVALID_PARAMETER;
> }
>
> diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
> index f15b59788310..0ec53782835b 100644
> --- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
> +++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
> @@ -260,7 +260,7 @@ SiI3132AtaPassThruCommand (
> // Clear Command Complete
> SATA_PORT_WRITE32 (SataPort->RegBase + SII3132_PORT_INTSTATUS_REG, SII3132_PORT_INT_CMDCOMPL << 16);
>
> - if (PciAllocMapping) {
> + if (PciAllocMapping != NULL) {
> Status = PciIo->Unmap (PciIo, PciAllocMapping);
> ASSERT (!EFI_ERROR (Status));
> }
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 09/10] Platform/ARM: Fix Ecc error 9005
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (7 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 08/10] Platform/ARM: Fix Ecc error 3003 PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:15 ` Sami Mujawar
2021-11-24 16:23 ` [PATCH edk2-platforms v1 10/10] Platform/ARM: Fix Ecc error 5005 PierreGondois
2021-11-24 18:34 ` [edk2-devel] [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors Chris Jones
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
Only Doxygen commands '@bug', '@todo', '@example',
'@file', '@attention', '@param', '@post', '@pre',
'@retval', '@return', '@sa', '@since', '@test',
'@note', '@par', '@endcode', '@code', '@{', '@}'
are allowed to mark the code
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c
index 54add33b8912..4f6e0c5c44b8 100644
--- a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c
+++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c
@@ -106,7 +106,7 @@ STATIC CONST CHAR16 mAcpiAddrSpaceTypeStr[][4] = {
@param [out] Count Return the count of root bridge instances.
- @returns All the root bridge instances in an array.
+ @return All the root bridge instances in an array.
The array should be passed into PciHostBridgeFreeRootBridges()
when it's not used.
**/
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 09/10] Platform/ARM: Fix Ecc error 9005
2021-11-24 16:23 ` [PATCH edk2-platforms v1 09/10] Platform/ARM: Fix Ecc error 9005 PierreGondois
@ 2021-12-17 14:15 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:15 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> This patch fixes the following Ecc reported error:
> Only Doxygen commands '@bug', '@todo', '@example',
> '@file', '@attention', '@param', '@post', '@pre',
> '@retval', '@return', '@sa', '@since', '@test',
> '@note', '@par', '@endcode', '@code', '@{', '@}'
> are allowed to mark the code
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c
> index 54add33b8912..4f6e0c5c44b8 100644
> --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c
> +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.c
> @@ -106,7 +106,7 @@ STATIC CONST CHAR16 mAcpiAddrSpaceTypeStr[][4] = {
>
> @param [out] Count Return the count of root bridge instances.
>
> - @returns All the root bridge instances in an array.
> + @return All the root bridge instances in an array.
> The array should be passed into PciHostBridgeFreeRootBridges()
> when it's not used.
> **/
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH edk2-platforms v1 10/10] Platform/ARM: Fix Ecc error 5005
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (8 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 09/10] Platform/ARM: Fix Ecc error 9005 PierreGondois
@ 2021-11-24 16:23 ` PierreGondois
2021-12-17 14:16 ` Sami Mujawar
2021-11-24 18:34 ` [edk2-devel] [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors Chris Jones
10 siblings, 1 reply; 28+ messages in thread
From: PierreGondois @ 2021-11-24 16:23 UTC (permalink / raw)
To: devel; +Cc: Sami Mujawar
From: Pierre Gondois <Pierre.Gondois@arm.com>
This patch fixes the following Ecc reported error:
The body of a function should be contained by open
and close braces that must be in the first column.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
index 0ec53782835b..c54291220348 100644
--- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
+++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
@@ -23,7 +23,8 @@ GetSataDevice (
IN SATA_SI3132_INSTANCE* SataInstance,
IN UINT16 Port,
IN UINT16 PortMultiplierPort
-) {
+ )
+{
LIST_ENTRY *List;
SATA_SI3132_PORT *SataPort;
SATA_SI3132_DEVICE *SataDevice;
--
2.25.1
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH edk2-platforms v1 10/10] Platform/ARM: Fix Ecc error 5005
2021-11-24 16:23 ` [PATCH edk2-platforms v1 10/10] Platform/ARM: Fix Ecc error 5005 PierreGondois
@ 2021-12-17 14:16 ` Sami Mujawar
0 siblings, 0 replies; 28+ messages in thread
From: Sami Mujawar @ 2021-12-17 14:16 UTC (permalink / raw)
To: Pierre.Gondois, devel, nd
Hi Pierre,
Thank you for this patch.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 24/11/2021 04:23 PM, Pierre.Gondois@arm.com wrote:
> From: Pierre Gondois <Pierre.Gondois@arm.com>
>
> This patch fixes the following Ecc reported error:
> The body of a function should be contained by open
> and close braces that must be in the first column.
>
> Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
> ---
> .../ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
> index 0ec53782835b..c54291220348 100644
> --- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
> +++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c
> @@ -23,7 +23,8 @@ GetSataDevice (
> IN SATA_SI3132_INSTANCE* SataInstance,
> IN UINT16 Port,
> IN UINT16 PortMultiplierPort
> -) {
> + )
> +{
> LIST_ENTRY *List;
> SATA_SI3132_PORT *SataPort;
> SATA_SI3132_DEVICE *SataDevice;
> --
> 2.25.1
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [edk2-devel] [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors
2021-11-24 16:23 [PATCH edk2-platforms v1 00/10] Fix Arm platforms CI errors PierreGondois
` (9 preceding siblings ...)
2021-11-24 16:23 ` [PATCH edk2-platforms v1 10/10] Platform/ARM: Fix Ecc error 5005 PierreGondois
@ 2021-11-24 18:34 ` Chris Jones
2022-01-24 14:31 ` Sami Mujawar
10 siblings, 1 reply; 28+ messages in thread
From: Chris Jones @ 2021-11-24 18:34 UTC (permalink / raw)
To: PierreGondois, devel
[-- Attachment #1: Type: text/plain, Size: 111 bytes --]
This patch series looks good to me.
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Thanks,
Chris
[-- Attachment #2: Type: text/html, Size: 226 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread