From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web08.1632.1642621575921120634 for ; Wed, 19 Jan 2022 11:46:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=JzCy/i/d; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from [10.0.0.19] (c-73-27-179-174.hsd1.fl.comcast.net [73.27.179.174]) by linux.microsoft.com (Postfix) with ESMTPSA id 96B0E20B928B; Wed, 19 Jan 2022 11:46:14 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 96B0E20B928B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1642621575; bh=w/APRaAuU91PRbhYrcz1ZJKWj46jOj9rS3gWaKsJhi0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=JzCy/i/d6IAd8rrdRzsOhUiW2pLDtMr9itrG2/hafDJlHsklDwFQicomQnXmJ3EOh fgsvgtY/VG0zss03tu/unXApVumpeOT/DxRBDPuN95SZdRfMuwmN0yM4JqI+M/OK5J 0bqKx/zAKmLCbC1rlbxfgMAud9++TksLqeyEGORo= Message-ID: Date: Wed, 19 Jan 2022 14:46:13 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [edk2-devel] [PATCH v1 1/1] FmpDevicePkg/FmpDxe: Update FmpDeviceCheckImageWithStatus() handling To: devel@edk2.groups.io, guomin.jiang@intel.com Cc: "Gao, Liming" , "Kinney, Michael D" , "Xu, Wei6" References: <20220104203824.2047-1-mikuback@linux.microsoft.com> From: "Michael Kubacki" In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Guomin, It has been a couple of weeks since your review and I have not seen the patch merged yet. Do you know when it will be merged? Thanks, Michael On 1/6/2022 10:45 PM, Guomin Jiang wrote: > Reviewed-by: Guomin Jiang > > Guomin > >> -----Original Message----- >> From: mikuback@linux.microsoft.com >> Sent: Wednesday, January 5, 2022 4:38 AM >> To: devel@edk2.groups.io >> Cc: Gao, Liming ; Kinney, Michael D >> ; Jiang, Guomin ; >> Xu, Wei6 >> Subject: [PATCH v1 1/1] FmpDevicePkg/FmpDxe: Update >> FmpDeviceCheckImageWithStatus() handling >> >> From: Michael Kubacki >> >> Update the logic handling last attempt status codes from >> FmpDeviceCheckImageWithStatus() implementations to account for cases >> when the function return status code is EFI_SUCCESS (since the image was >> checked successfully) but the ImageUpdatable value is not valid. >> >> In addition the following sentence is removed from the LastAttemptStatus >> parameter definition for >> FmpDeviceCheckImageWithStatus() since it can lead to confusion. >> The expected status code value range is sufficient to implement the library >> API. >> >> "This value will only be checked when this >> function returns an error." >> >> Cc: Liming Gao >> Cc: Michael D Kinney >> Cc: Guomin Jiang >> Cc: Wei6 Xu >> Signed-off-by: Michael Kubacki >> --- >> FmpDevicePkg/FmpDxe/FmpDxe.c | 23 +++++++++++++++----- >> FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c | 3 +-- >> FmpDevicePkg/Include/Library/FmpDeviceLib.h | 3 +-- >> 3 files changed, 19 insertions(+), 10 deletions(-) >> >> diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c >> b/FmpDevicePkg/FmpDxe/FmpDxe.c index 197df28c8dd6..1e7ec4a09e16 >> 100644 >> --- a/FmpDevicePkg/FmpDxe/FmpDxe.c >> +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c >> @@ -1040,8 +1040,19 @@ CheckTheImageInternal ( >> // >> Status = FmpDeviceCheckImageWithStatus ((((UINT8 *)Image) + >> AllHeaderSize), RawSize, ImageUpdatable, LastAttemptStatus); >> if (EFI_ERROR (Status)) { >> + // The image cannot be valid if an error occurred checking the image >> + if (*ImageUpdatable == IMAGE_UPDATABLE_VALID) { >> + *ImageUpdatable = IMAGE_UPDATABLE_INVALID; >> + } >> + >> DEBUG ((DEBUG_ERROR, "FmpDxe(%s): CheckTheImage() - FmpDeviceLib >> CheckImage failed. Status = %r\n", mImageIdName, Status)); >> + } >> >> + // >> + // Only validate the library last attempt status code if the image is not >> updatable. >> + // This specifically avoids converting LAST_ATTEMPT_STATUS_SUCCESS if it >> set for an updatable image. >> + // >> + if (*ImageUpdatable != IMAGE_UPDATABLE_VALID) { >> // >> // LastAttemptStatus returned from the device library should fall within >> the designated error range >> // [LAST_ATTEMPT_STATUS_DEVICE_LIBRARY_MIN_ERROR_CODE_VALUE, >> LAST_ATTEMPT_STATUS_DEVICE_LIBRARY_MAX_ERROR_CODE_VALUE] >> @@ -1049,12 +1060,12 @@ CheckTheImageInternal ( >> if ((*LastAttemptStatus < >> LAST_ATTEMPT_STATUS_DEVICE_LIBRARY_MIN_ERROR_CODE_VALUE) || >> (*LastAttemptStatus > >> LAST_ATTEMPT_STATUS_DEVICE_LIBRARY_MAX_ERROR_CODE_VALUE)) >> { >> - DEBUG ( >> - (DEBUG_ERROR, >> - "FmpDxe(%s): CheckTheImage() - LastAttemptStatus %d from >> FmpDeviceCheckImageWithStatus() is invalid.\n", >> - mImageIdName, >> - *LastAttemptStatus) >> - ); >> + DEBUG (( >> + DEBUG_ERROR, >> + "FmpDxe(%s): CheckTheImage() - LastAttemptStatus %d from >> FmpDeviceCheckImageWithStatus() is invalid.\n", >> + mImageIdName, >> + *LastAttemptStatus >> + )); >> *LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL; >> } >> } >> diff --git a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c >> b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c >> index 2e5c17b2b0f9..82219e87a430 100644 >> --- a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c >> +++ b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c >> @@ -434,8 +434,7 @@ FmpDeviceCheckImage ( >> IMAGE_UPDATABLE_VALID_WITH_VENDOR_CODE >> @param[out] LastAttemptStatus A pointer to a UINT32 that holds the last >> attempt >> status to report back to the ESRT table in case >> - of error. This value will only be checked when this >> - function returns an error. >> + of error. >> >> The return status code must fall in the range of >> >> LAST_ATTEMPT_STATUS_DEVICE_LIBRARY_MIN_ERROR_CODE_VALUE to >> diff --git a/FmpDevicePkg/Include/Library/FmpDeviceLib.h >> b/FmpDevicePkg/Include/Library/FmpDeviceLib.h >> index a14406abe8b5..f82ef64503fa 100644 >> --- a/FmpDevicePkg/Include/Library/FmpDeviceLib.h >> +++ b/FmpDevicePkg/Include/Library/FmpDeviceLib.h >> @@ -421,8 +421,7 @@ FmpDeviceCheckImage ( >> IMAGE_UPDATABLE_VALID_WITH_VENDOR_CODE >> @param[out] LastAttemptStatus A pointer to a UINT32 that holds the last >> attempt >> status to report back to the ESRT table in case >> - of error. This value will only be checked when this >> - function returns an error. >> + of error. >> >> The return status code must fall in the range of >> >> LAST_ATTEMPT_STATUS_DEVICE_LIBRARY_MIN_ERROR_CODE_VALUE to >> -- >> 2.28.0.windows.1 > > > > >