Re: [edk2-devel] [PATCH] IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed.

2021-12-28 Thread Chiu, Chasel 


Patch pushed: 
https://github.com/tianocore/edk2/commit/7935be0fbd8f47266e5972f4cba1a1e58505061a

Thanks,
Chasel


> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Chiu, Chasel
> Sent: Tuesday, December 28, 2021 6:58 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel ; Ma, Maurice
> ; Desimone, Nathaniel L
> ; Zeng, Star 
> Subject: [edk2-devel] [PATCH] IntelFsp2Pkg/FspSecCore:
> ExtendedImageRevision was not printed.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3791
> 
> ExtendedImageRevision should be printed when Header revision >= 6.
> 
> Cc: Maurice Ma 
> Cc: Nate DeSimone 
> Cc: Star Zeng 
> Signed-off-by: Chasel Chiu 
> ---
>  IntelFsp2Pkg/FspSecCore/SecFsp.c | 10 +++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c
> b/IntelFsp2Pkg/FspSecCore/SecFsp.c
> index ae03fa228e..f79d45900e 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
> +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
> @@ -1,6 +1,6 @@
>  /** @file -  Copyright (c) 2014 - 2020, Intel Corporation. All rights
> reserved.+  Copyright (c) 2014 - 2021, Intel Corporation. All rights
> reserved.   SPDX-License-Identifier: BSD-2-Clause-Patent  **/@@ -199,8
> +199,12 @@ FspGlobalDataInit (
>  ImageId, \ (PeiFspData->FspInfoHeader->ImageRevision >> 24) & 0xFF, \
> (PeiFspData->FspInfoHeader->ImageRevision >> 16) & 0xFF, \-(PeiFspData-
> >FspInfoHeader->ImageRevision >> 8) & 0xFF, \-PeiFspData->FspInfoHeader-
> >ImageRevision & 0xFF+(PeiFspData->FspInfoHeader->HeaderRevision >= 6) ?
> \+  (((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF) | 
> (PeiFspData-
> >FspInfoHeader->ExtendedImageRevision & 0xFF00)) :\+((PeiFspData-
> >FspInfoHeader->ImageRevision >> 8) & 0xFF), \+(PeiFspData-
> >FspInfoHeader->HeaderRevision >= 6) ? \+  ((PeiFspData->FspInfoHeader-
> >ImageRevision & 0xFF) | ((PeiFspData->FspInfoHeader-
> >ExtendedImageRevision & 0xFF) << 8)): \+(PeiFspData->FspInfoHeader-
> >ImageRevision & 0xFF) )); } --
> 2.28.0.windows.1
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#85221): https://edk2.groups.io/g/devel/message/85221
> Mute This Topic: https://groups.io/mt/87993533/1777047
> Group Owner: devel+ow...@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.c...@intel.com] -=-
> =-=-=-=-=
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85224): https://edk2.groups.io/g/devel/message/85224
Mute This Topic: https://groups.io/mt/87993533/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed.

2021-12-28 Thread Zeng, Star 
Reviewed-by: Star Zeng 

-Original Message-
From: Chiu, Chasel  
Sent: 2021年12月28日 18:58
To: devel@edk2.groups.io
Cc: Chiu, Chasel ; Ma, Maurice ; 
Desimone, Nathaniel L ; Zeng, Star 

Subject: [PATCH] IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3791

ExtendedImageRevision should be printed when Header revision >= 6.

Cc: Maurice Ma 
Cc: Nate DeSimone 
Cc: Star Zeng 
Signed-off-by: Chasel Chiu 
---
 IntelFsp2Pkg/FspSecCore/SecFsp.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index ae03fa228e..f79d45900e 100644
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.

+  Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -199,8 +199,12 @@ FspGlobalDataInit (
 ImageId, \

 (PeiFspData->FspInfoHeader->ImageRevision >> 24) & 0xFF, \

 (PeiFspData->FspInfoHeader->ImageRevision >> 16) & 0xFF, \

-(PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF, \

-PeiFspData->FspInfoHeader->ImageRevision & 0xFF

+(PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \

+  (((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF) | 
(PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF00)) :\

+((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF), \

+(PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \

+  ((PeiFspData->FspInfoHeader->ImageRevision & 0xFF) | 
((PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF) << 8)): \

+(PeiFspData->FspInfoHeader->ImageRevision & 0xFF)

 ));

 }

 

-- 
2.28.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85223): https://edk2.groups.io/g/devel/message/85223
Mute This Topic: https://groups.io/mt/87993533/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-