回复: [edk2-devel] [PATCH v2 1/1] Tools/FitGen: Fix microcode alignment support

[gaoliming]

Aaron:
  Thanks for your update. This version is good to me. Reviewed-by: Liming
Gao <gaoliming at byosoft.com.cn>

  If no more comment, I will merge this patch tomorrow. 

Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+65422+4905953+8761045 at groups.io
> <bounce+27952+65422+4905953+8761045 at groups.io> 代表 Aaron Li
> 发送时间: 2020年9月22日 10:29
> 收件人: devel at edk2.groups.io
> 抄送: Bob Feng <bob.c.feng at intel.com>; Liming Gao
> <gaoliming at byosoft.com.cn>
> 主题: [edk2-devel] [PATCH v2 1/1] Tools/FitGen: Fix microcode alignment
> support
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2971
> 
> v2: Add check for basic 16-byte alignment.
> 
> This patch is to fix a issue that "-A" option would only support
> 2^n Byte alignment of microcode.
> 
> Signed-off-by: Aaron Li <aaron.li at intel.com>
> Cc: Bob Feng <bob.c.feng at intel.com>
> Cc: Liming Gao <gaoliming at byosoft.com.cn>
> ---
>  Silicon/Intel/Tools/FitGen/FitGen.c | 8 ++++++--
>  Silicon/Intel/Tools/FitGen/FitGen.h | 4 +++-
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/Silicon/Intel/Tools/FitGen/FitGen.c
> b/Silicon/Intel/Tools/FitGen/FitGen.c
> index c4006e69c822..851d42cb4aca 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.c
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.c
> @@ -363,7 +363,7 @@ Returns:
>    printf ("\tMicrocodeSlotSize      - Occupied region size of each
> Microcode binary.\n");
> 
>    printf ("\tMicrocodeFfsGuid       - Guid of FFS which is used to save
> Microcode binary");
> 
>    printf ("\t-NA                    - No 0x800 aligned Microcode
> requirement. No -NA means Microcode is aligned with option
> MicrocodeAlignment value.\n");
> 
> -  printf ("\tMicrocodeAlignment     - HEX value of Microcode alignment.
> Ignored if \"-NA\" is specified. Default value is 0x800.\n");
> 
> +  printf ("\tMicrocodeAlignment     - HEX value of Microcode alignment.
> Ignored if \"-NA\" is specified. Default value is 0x800. The Microcode
update
> data must start at a 16-byte aligned linear address.\n");
> 
>    printf ("\tRecordType             - FIT entry record type. User should
> ensure it is ordered.\n");
> 
>    printf ("\tRecordDataAddress      - FIT entry record data address.\n");
> 
>    printf ("\tRecordDataSize         - FIT entry record data size.\n");
> 
> @@ -1176,7 +1176,11 @@ Returns:
>                  // MCU might be put at 2KB alignment, if so, we need to
> adjust the size as 2KB alignment.
> 
>                  //
> 
>                  if (gFitTableContext.MicrocodeIsAligned) {
> 
> -                  MicrocodeSize = (*(UINT32 *)(MicrocodeBuffer + 32) +
> (gFitTableContext.MicrocodeAlignValue - 1)) &
> ~(gFitTableContext.MicrocodeAlignValue - 1);
> 
> +                  if (gFitTableContext.MicrocodeAlignValue & 0xF) {
> 
> +                    printf ("-A Parameter incorrect, Microcode data
> must start at a 16-byte aligned linear address!\n");
> 
> +                    return 0;
> 
> +                  }
> 
> +                  MicrocodeSize = ROUNDUP (*(UINT32
> *)(MicrocodeBuffer + 32), gFitTableContext.MicrocodeAlignValue);
> 
>                  } else {
> 
>                    MicrocodeSize = (*(UINT32 *)(MicrocodeBuffer + 32));
> 
>                  }
> 
> diff --git a/Silicon/Intel/Tools/FitGen/FitGen.h
> b/Silicon/Intel/Tools/FitGen/FitGen.h
> index abad2d8799c8..435fc26209da 100644
> --- a/Silicon/Intel/Tools/FitGen/FitGen.h
> +++ b/Silicon/Intel/Tools/FitGen/FitGen.h
> @@ -31,7 +31,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  // Utility version information
> 
>  //
> 
>  #define UTILITY_MAJOR_VERSION 0
> 
> -#define UTILITY_MINOR_VERSION 62
> 
> +#define UTILITY_MINOR_VERSION 63
> 
>  #define UTILITY_DATE          __DATE__
> 
> 
> 
>  //
> 
> @@ -45,4 +45,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>    (ActualSize) + (((Alignment) - ((ActualSize) & ((Alignment) - 1))) &
> ((Alignment) - 1))
> 
>  ;
> 
> 
> 
> +#define ROUNDUP(Size, Alignment) (((Size) + (Alignment) - 1) /
(Alignment) *
> (Alignment))
> 
> +
> 
>  #endif
> 
> --
> 2.23.0.windows.1
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#65422): https://edk2.groups.io/g/devel/message/65422
> Mute This Topic: https://groups.io/mt/77005848/4905953
> Group Owner: devel+owner at edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming at byosoft.com.cn]
> -=-=-=-=-=-=
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#65428): https://edk2.groups.io/g/devel/message/65428
Mute This Topic: https://groups.io/mt/77008007/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-