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.43; helo=mga05.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 24D022097172F for ; Mon, 28 May 2018 13:26:09 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 May 2018 13:26:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,453,1520924400"; d="scan'208";a="232619236" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.34]) by fmsmga006.fm.intel.com with ESMTP; 28 May 2018 13:26:08 -0700 From: Michael D Kinney To: edk2-devel@lists.01.org Cc: "Kinney, Michael D" , Ard Biesheuvel , Leif Lindholm Date: Mon, 28 May 2018 13:26:03 -0700 Message-Id: <20180528202603.11464-7-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180528202603.11464-1-michael.d.kinney@intel.com> References: <20180528202603.11464-1-michael.d.kinney@intel.com> Subject: [edk2-platforms Patch v4 6/6] SynQuacer/PlatformFlashAccessLib: Add progress API X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 May 2018 20:26:09 -0000 From: "Kinney, Michael D" https://bugzilla.tianocore.org/show_bug.cgi?id=801 Add PerformFlashWriteWithProgress() to the PlatformFlashAccessLib. This allows the platform to inform the user of progress when a firmware storage device is being updated with a new firmware image. This is the minimal update to this library implementation to keep everything building and preserve any existing progress indication. Additional updates are required to use the Progress() API passed into PerformFlashWriteWithProgress(). Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 --- .../SynQuacerPlatformFlashAccessLib.c | 78 +++++++++++++++++++--- 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c index fbb8f1f9e4..4cf8318a93 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c @@ -2,6 +2,7 @@ Platform flash device access library for Socionext SynQuacer Copyright (c) 2016, Linaro, Ltd. All rights reserved.
+ Copyright (c) 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -117,13 +118,29 @@ GetFvbByAddress ( } /** - Perform flash write operation. + Perform flash write operation with progress indicator. The start and end + completion percentage values are passed into this function. If the requested + flash write operation is broken up, then completion percentage between the + start and end values may be passed to the provided Progress function. The + caller of this function is required to call the Progress function for the + start and end completion percentage values. This allows the Progress, + StartPercentage, and EndPercentage parameters to be ignored if the requested + flash write operation can not be broken up @param[in] FirmwareType The type of firmware. @param[in] FlashAddress The address of flash device to be accessed. @param[in] FlashAddressType The type of flash device address. @param[in] Buffer The pointer to the data buffer. @param[in] Length The length of data buffer in bytes. + @param[in] Progress A function used report the progress of the + firmware update. This is an optional parameter + that may be NULL. + @param[in] StartPercentage The start completion percentage value that may + be used to report progress during the flash + write operation. + @param[in] EndPercentage The end completion percentage value that may + be used to report progress during the flash + write operation. @retval EFI_SUCCESS The operation returns successfully. @retval EFI_WRITE_PROTECTED The flash device is read only. @@ -132,12 +149,15 @@ GetFvbByAddress ( **/ EFI_STATUS EFIAPI -PerformFlashWrite ( - IN PLATFORM_FIRMWARE_TYPE FirmwareType, - IN EFI_PHYSICAL_ADDRESS FlashAddress, - IN FLASH_ADDRESS_TYPE FlashAddressType, - IN VOID *Buffer, - IN UINTN Length +PerformFlashWriteWithProgress ( + IN PLATFORM_FIRMWARE_TYPE FirmwareType, + IN EFI_PHYSICAL_ADDRESS FlashAddress, + IN FLASH_ADDRESS_TYPE FlashAddressType, + IN VOID *Buffer, + IN UINTN Length, + IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL + IN UINTN StartPercentage, + IN UINTN EndPercentage ) { EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; @@ -150,7 +170,7 @@ PerformFlashWrite ( EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White; UINTN Resolution; - UINTN Progress; + UINTN CurrentProgress; BOOLEAN HaveBootGraphics; Black.Raw = 0x00000000; @@ -228,7 +248,7 @@ PerformFlashWrite ( if (HaveBootGraphics) { Resolution = (BlockSize * 100) / Length + 1; - Progress = 0; + CurrentProgress = 0; Status = BootLogoUpdateProgress (White.Pixel, Black.Pixel, L"Updating firmware - please wait", Black.Pixel, 100, 0); @@ -268,8 +288,8 @@ PerformFlashWrite ( if (HaveBootGraphics) { Status = BootLogoUpdateProgress (White.Pixel, Black.Pixel, L"Updating firmware - please wait", White.Pixel, - Progress + Resolution, Progress); - Progress += Resolution; + CurrentProgress + Resolution, CurrentProgress); + CurrentProgress += Resolution; } else { Print (L"."); } @@ -284,3 +304,39 @@ PerformFlashWrite ( return EFI_SUCCESS; } + +/** + Perform flash write operation. + + @param[in] FirmwareType The type of firmware. + @param[in] FlashAddress The address of flash device to be accessed. + @param[in] FlashAddressType The type of flash device address. + @param[in] Buffer The pointer to the data buffer. + @param[in] Length The length of data buffer in bytes. + + @retval EFI_SUCCESS The operation returns successfully. + @retval EFI_WRITE_PROTECTED The flash device is read only. + @retval EFI_UNSUPPORTED The flash device access is unsupported. + @retval EFI_INVALID_PARAMETER The input parameter is not valid. +**/ +EFI_STATUS +EFIAPI +PerformFlashWrite ( + IN PLATFORM_FIRMWARE_TYPE FirmwareType, + IN EFI_PHYSICAL_ADDRESS FlashAddress, + IN FLASH_ADDRESS_TYPE FlashAddressType, + IN VOID *Buffer, + IN UINTN Length + ) +{ + return PerformFlashWriteWithProgress ( + FirmwareType, + FlashAddress, + FlashAddressType, + Buffer, + Length, + NULL, + 0, + 0 + ); +} -- 2.14.2.windows.3