From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7CA81211F8897 for ; Fri, 20 Jul 2018 00:02:03 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jul 2018 00:02:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,377,1526367600"; d="scan'208";a="59205817" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by orsmga006.jf.intel.com with ESMTP; 20 Jul 2018 00:02:02 -0700 Received: from orsmsx115.amr.corp.intel.com (10.22.240.11) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 20 Jul 2018 00:02:02 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.96]) by ORSMSX115.amr.corp.intel.com ([169.254.4.162]) with mapi id 14.03.0319.002; Fri, 20 Jul 2018 00:02:02 -0700 From: "Kinney, Michael D" To: "Zeng, Star" , "edk2-devel@lists.01.org" , "Kinney, Michael D" CC: "Zeng, Star" Thread-Topic: [edk2] [staging/FmpDevicePkg-master][PATCH 2/2] FmpDevicePkg FmpDxe: Use Attributes to know whether reset is required Thread-Index: AQHUH/akvR+pPr54UUG1wR6WTMywSaSXrolg Date: Fri, 20 Jul 2018 07:02:01 +0000 Message-ID: References: <1532069710-32608-1-git-send-email-star.zeng@intel.com> <1532069710-32608-3-git-send-email-star.zeng@intel.com> In-Reply-To: <1532069710-32608-3-git-send-email-star.zeng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [staging/FmpDevicePkg-master][PATCH 2/2] FmpDevicePkg FmpDxe: Use Attributes to know whether reset is required X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 07:02:03 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Star, I think the logic may be reversed. The original logic tested !Pcd value. The new logic checks if the attribute and setting are !=3D 0. I think it should check if the attribute and setting are 0. Mike > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] > On Behalf Of Star Zeng > Sent: Thursday, July 19, 2018 11:55 PM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Zeng, > Star > Subject: [edk2] [staging/FmpDevicePkg-master][PATCH 2/2] > FmpDevicePkg FmpDxe: Use Attributes to know whether reset > is required >=20 > Use Attributes to know whether reset is required and > remove > PcdFmpDeviceSystemResetRequired. >=20 > Cc: Michael D Kinney > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > 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(-) >=20 > 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 =3D { 0x40b2d964, 0xfe11, > 0x40dc, { 0x82, 0x83, 0x2e, 0xfb, 0xda, 0x29, 0x53, 0x56 } > } >=20 > [PcdsFixedAtBuild] > - ## Indicates if a full system reset is required before > a firmware update to a > - # firmware devices takes effect.

> - # TRUE - System reset is required.
> - # FALSE - System reset is not required.
> - # @Prompt FMP Device System Reset Required. > - > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceSystemResetRequire > d|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 @@ >=20 > #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." >=20 > -#string > STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceSystemResetReq > uired_PROMPT #language en-US "FMP Device System Reset > Required." > -#string > STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceSystemResetReq > uired_HELP #language en-US "Indicates if a full system > reset is required before a firmware update to a firmware > device takes effect.

\n" > - > "TRUE - System reset is required.
\n" > - > "FALSE - System reset is not required.
" > - > #string > STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceTestKeySha256D > igest_PROMPT #language en-US "SHA-256 hash of PKCS7 test > key." > #string > STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceTestKeySha256D > igest_HELP #language en-US "The SHA-256 hash of a PKCS7 > test key that is used to detect if a test key" >=20 > "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..8fe459405c28 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; >=20 > Status =3D EFI_SUCCESS; > Updateable =3D 0; > @@ -1110,9 +1112,11 @@ SetTheImage ( >=20 > // > // 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) !=3D 0) && > + ((AttributesSetting & > IMAGE_ATTRIBUTE_RESET_REQUIRED) !=3D 0)) { > mDescriptorPopulated =3D FALSE; > } >=20 > 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 >=20 > [Pcd] > - > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceSystemResetRequire > d ## CONSUMES > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName > ## CONSUMES >=20 > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowestSup > portedVersion ## 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 >=20 > [Pcd] > - > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceSystemResetRequire > d ## CONSUMES > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName > ## CONSUMES >=20 > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowestSup > portedVersion ## CONSUMES > gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid > ## CONSUMES > -- > 2.7.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel