Re: [staging/FmpDevicePkg-master][PATCH V2 2/2] FmpDevicePkg FmpDxe: Use Attributes to know whether reset is required

["Kinney, Michael D" <michael.d.kinney@intel.com>]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

Mike

> -----Original Message-----
> From: Zeng, Star
> Sent: Friday, July 20, 2018 12:16 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: [staging/FmpDevicePkg-master][PATCH V2 2/2]
> FmpDevicePkg FmpDxe: Use Attributes to know whether
> reset is required
> 
> REF:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1040
> 
> Use Attributes to know whether reset is required and
> remove
> PcdFmpDeviceSystemResetRequired.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  FmpDevicePkg/FmpDevicePkg.dec     | 7 -------
>  FmpDevicePkg/FmpDevicePkg.uni     | 5 -----
>  FmpDevicePkg/FmpDxe/FmpDxe.c      | 8 ++++++--
>  FmpDevicePkg/FmpDxe/FmpDxe.inf    | 1 -
>  FmpDevicePkg/FmpDxe/FmpDxeLib.inf | 1 -
>  5 files changed, 6 insertions(+), 16 deletions(-)
> 
> diff --git a/FmpDevicePkg/FmpDevicePkg.dec
> b/FmpDevicePkg/FmpDevicePkg.dec
> index 9ea0d7335901..ad0730a53263 100644
> --- a/FmpDevicePkg/FmpDevicePkg.dec
> +++ b/FmpDevicePkg/FmpDevicePkg.dec
> @@ -62,13 +62,6 @@ [Guids]
>    gFmpDevicePkgTokenSpaceGuid = { 0x40b2d964, 0xfe11,
> 0x40dc, { 0x82, 0x83, 0x2e, 0xfb, 0xda, 0x29, 0x53,
> 0x56 } }
> 
>  [PcdsFixedAtBuild]
> -  ## Indicates if a full system reset is required
> before a firmware update to a
> -  #  firmware devices takes effect.<BR><BR>
> -  #   TRUE  - System reset is required.<BR>
> -  #   FALSE - System reset is not required.<BR>
> -  # @Prompt FMP Device System Reset Required.
> -
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceSystemResetRequ
> ired|TRUE|BOOLEAN|0x40000008
> -
>    ## The SHA-256 hash of a PKCS7 test key that is used
> to detect if a test key
>    #  is being used to authenticate capsules.  Test key
> detection is disabled by
>    #  setting the value to {0}.
> diff --git a/FmpDevicePkg/FmpDevicePkg.uni
> b/FmpDevicePkg/FmpDevicePkg.uni
> index da31d0ac816a..fed1da48026e 100644
> --- a/FmpDevicePkg/FmpDevicePkg.uni
> +++ b/FmpDevicePkg/FmpDevicePkg.uni
> @@ -22,11 +22,6 @@
> 
>  #string STR_PACKAGE_DESCRIPTION  #language en-US
> "This package provides libraries that support the
> implementation of a module that produces the Firmware
> Management Protocol to support the update of a system
> firmware component."
> 
> -#string
> STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceSystemReset
> Required_PROMPT  #language en-US "FMP Device System
> Reset Required."
> -#string
> STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceSystemReset
> Required_HELP    #language en-US "Indicates if a full
> system reset is required before a firmware update to a
> firmware device takes effect.<BR><BR>\n"
> -
> "TRUE  - System reset is required.<BR>\n"
> -
> "FALSE - System reset is not required.<BR>"
> -
>  #string
> STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceTestKeySha2
> 56Digest_PROMPT  #language en-US "SHA-256 hash of PKCS7
> test key."
>  #string
> STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceTestKeySha2
> 56Digest_HELP    #language en-US "The SHA-256 hash of a
> PKCS7 test key that is used to detect if a test key"
> 
> "is being used to authenticate capsules.  Test key
> detection can be disabled"
> diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c
> b/FmpDevicePkg/FmpDxe/FmpDxe.c
> index 091f950b95b2..718054dea61e 100644
> --- a/FmpDevicePkg/FmpDxe/FmpDxe.c
> +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c
> @@ -898,6 +898,8 @@ SetTheImage (
>    UINT32      AllHeaderSize;
>    UINT32      IncommingFwVersion;
>    UINT32      LastAttemptStatus;
> +  UINT64      AttributesSupported;
> +  UINT64      AttributesSetting;
> 
>    Status             = EFI_SUCCESS;
>    Updateable         = 0;
> @@ -1110,9 +1112,11 @@ SetTheImage (
> 
>    //
>    // Set flag so the descriptor is repopulated
> -  // This only applied to devices that do not require
> system reboot
> +  // This is only applied to devices that do not
> require system reboot
>    //
> -  if (!PcdGetBool (PcdFmpDeviceSystemResetRequired)) {
> +  FmpDeviceGetAttributes (&AttributesSupported,
> &AttributesSetting);
> +  if (((AttributesSupported &
> IMAGE_ATTRIBUTE_RESET_REQUIRED) == 0) ||
> +      ((AttributesSetting &
> IMAGE_ATTRIBUTE_RESET_REQUIRED) == 0)) {
>      mDescriptorPopulated = FALSE;
>    }
> 
> diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.inf
> b/FmpDevicePkg/FmpDxe/FmpDxe.inf
> index 256c50bf0316..a5817f0a0dd0 100644
> --- a/FmpDevicePkg/FmpDxe/FmpDxe.inf
> +++ b/FmpDevicePkg/FmpDxe/FmpDxe.inf
> @@ -76,7 +76,6 @@ [Protocols]
>    gEdkiiFirmwareManagementProgressProtocolGuid  ##
> PRODUCES
> 
>  [Pcd]
> -
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceSystemResetRequ
> ired              ## CONSUMES
>    gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName
> ## CONSUMES
> 
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowest
> SupportedVersion  ## CONSUMES
> 
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid
> ## CONSUMES
> diff --git a/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
> b/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
> index c8fe49e0c0d7..a011dcf4f2a0 100644
> --- a/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
> +++ b/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
> @@ -76,7 +76,6 @@ [Protocols]
>    gEdkiiFirmwareManagementProgressProtocolGuid  ##
> PRODUCES
> 
>  [Pcd]
> -
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceSystemResetRequ
> ired              ## CONSUMES
>    gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName
> ## CONSUMES
> 
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowest
> SupportedVersion  ## CONSUMES
> 
> gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid
> ## CONSUMES
> --
> 2.7.0.windows.1