Re: [PATCH] SignedCapsulePkg SystemFirmwareReportDxe: Try LocateProtocol

["Yao, Jiewen" <jiewen.yao@intel.com>]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Star
> Zeng
> Sent: Tuesday, July 31, 2018 8:58 AM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2] [PATCH] SignedCapsulePkg SystemFirmwareReportDxe: Try
> LocateProtocol
> 
> Try LocateProtocol after HandleProtocol fails to be compatible
> with old SystemFirmwareUpdateDxe.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  .../SystemFirmwareUpdate/SystemFirmwareReportDxe.c | 29
> ++++++++++++++--------
>  1 file changed, 18 insertions(+), 11 deletions(-)
> 
> diff --git
> a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo
> rtDxe.c
> b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo
> rtDxe.c
> index fb7b63be9d13..8802404c9a6b 100644
> ---
> a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo
> rtDxe.c
> +++
> b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo
> rtDxe.c
> @@ -202,17 +202,24 @@ FmpSetImage (
>                    (VOID **)&SystemFmp
>                    );
>    if (EFI_ERROR(Status)) {
> -    DEBUG((DEBUG_INFO, "(Agent)SetImage - SystemFmpProtocol - %r\n",
> Status));
> -    SystemFmpPrivate->LastAttempt.LastAttemptStatus =
> LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
> -    VarStatus = gRT->SetVariable(
> -                       SYSTEM_FMP_LAST_ATTEMPT_VARIABLE_NAME,
> -                       &gSystemFmpLastAttemptVariableGuid,
> -                       EFI_VARIABLE_NON_VOLATILE |
> EFI_VARIABLE_BOOTSERVICE_ACCESS,
> -                       sizeof(SystemFmpPrivate->LastAttempt),
> -                       &SystemFmpPrivate->LastAttempt
> -                       );
> -    DEBUG((DEBUG_INFO, "(Agent)SetLastAttemp - %r\n", VarStatus));
> -    return Status;
> +    Status = gBS->LocateProtocol (
> +                    &gSystemFmpProtocolGuid,
> +                    NULL,
> +                    (VOID **)&SystemFmp
> +                    );
> +    if (EFI_ERROR(Status)) {
> +      DEBUG((DEBUG_INFO, "(Agent)SetImage - SystemFmpProtocol - %r\n",
> Status));
> +      SystemFmpPrivate->LastAttempt.LastAttemptStatus =
> LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT;
> +      VarStatus = gRT->SetVariable(
> +
> SYSTEM_FMP_LAST_ATTEMPT_VARIABLE_NAME,
> +                         &gSystemFmpLastAttemptVariableGuid,
> +                         EFI_VARIABLE_NON_VOLATILE |
> EFI_VARIABLE_BOOTSERVICE_ACCESS,
> +                         sizeof(SystemFmpPrivate->LastAttempt),
> +                         &SystemFmpPrivate->LastAttempt
> +                         );
> +      DEBUG((DEBUG_INFO, "(Agent)SetLastAttemp - %r\n", VarStatus));
> +      return Status;
> +    }
>    }
> 
>    return SystemFmp->SetImage(SystemFmp, ImageIndex, Image, ImageSize,
> VendorCode, Progress, AbortReason);
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel