Hi

Would any one be able to review please?

Thank you

On Fri, 1 Apr 2022, 09:03 Sean Rhodes via groups.io, <sean=
starlabs.systems@groups.io> wrote:

> WorkSpaceAddress and SpareAreaAddress point into MMIO, which isn't
> always aligned. Remove the check for block alignment to avoid
> false assertions.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Sean Rhodes <sean@starlabs.systems>
> Change-Id: Ia1c1f44b6a0e7f32cac0d7806e74d729e5d83a6d
> ---
>  .../Universal/FaultTolerantWriteDxe/FtwMisc.c    | 16 ++++++----------
>  1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
> b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
> index 661e148767..3b9ff1c828 100644
> --- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
> +++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FtwMisc.c
> @@ -1121,12 +1121,10 @@ FindFvbForFtw (
>            FtwDevice->NumberOfWorkSpaceBlock = FTW_BLOCKS
> (FtwDevice->FtwWorkSpaceBase + FtwDevice->FtwWorkSpaceSize,
> FtwDevice->WorkBlockSize);
>            if (FtwDevice->FtwWorkSpaceSize >= FtwDevice->WorkBlockSize) {
>              //
> -            // Check the alignment of work space address and length, they
> should be block size aligned when work space size is larger than one block
> size.
> +            // Check the alignment of work space length, it should be
> block size aligned when work space size is larger than one block size.
>              //
> -            if (((FtwDevice->WorkSpaceAddress & (FtwDevice->WorkBlockSize
> - 1)) != 0) ||
> -                ((FtwDevice->WorkSpaceLength & (FtwDevice->WorkBlockSize
> - 1)) != 0))
> -            {
> -              DEBUG ((DEBUG_ERROR, "Ftw: Work space address or length is
> not block size aligned when work space size is larger than one block
> size\n"));
> +            if ((FtwDevice->WorkSpaceLength & (FtwDevice->WorkBlockSize -
> 1)) != 0) {
> +              DEBUG ((EFI_D_ERROR, "Ftw: Work space length is not block
> size aligned when work space size is larger than one block size\n"));
>                FreePool (HandleBuffer);
>                ASSERT (FALSE);
>                return EFI_ABORTED;
> @@ -1171,12 +1169,10 @@ FindFvbForFtw (
>            }
>
>            //
> -          // Check the alignment of spare area address and length, they
> should be block size aligned
> +          // Check the alignment of spare area length, it should be block
> size aligned
>            //
> -          if (((FtwDevice->SpareAreaAddress & (FtwDevice->SpareBlockSize
> - 1)) != 0) ||
> -              ((FtwDevice->SpareAreaLength & (FtwDevice->SpareBlockSize -
> 1)) != 0))
> -          {
> -            DEBUG ((DEBUG_ERROR, "Ftw: Spare area address or length is
> not block size aligned\n"));
> +          if ((FtwDevice->SpareAreaLength & (FtwDevice->SpareBlockSize -
> 1)) != 0) {
> +            DEBUG ((EFI_D_ERROR, "Ftw: Spare area address or length is
> not block size aligned\n"));
>              FreePool (HandleBuffer);
>              //
>              // Report Status Code EFI_SW_EC_ABORTED.
> --
> 2.32.0
>
>
>
> ------------
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#88320): https://edk2.groups.io/g/devel/message/88320
> Mute This Topic: https://groups.io/mt/90173290/6718866
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [sean@starlabs.systems]
> ------------
>
>
>