* [edk2-platforms Patch V2 1/6] Styx/PlatformFlashAccessLib: Add progress API
2018-04-12 1:01 [edk2-platforms Patch V2 0/6] Add DisplayUpdateProgressLib for capsules Kinney, Michael D
@ 2018-04-12 1:01 ` Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 2/6] Hisilicon/PlatformFlashAccessLib: " Kinney, Michael D
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 1:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
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.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
---
.../StyxPlatformFlashAccessLib.c | 70 +++++++++++++++++++---
1 file changed, 63 insertions(+), 7 deletions(-)
diff --git a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c
index a94373bb4b..38f1830b5c 100644
--- a/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c
+++ b/Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.c
@@ -2,6 +2,7 @@
Platform flash device access library for AMD Styx
Copyright (c) 2017, Linaro, Ltd. All rights reserved.<BR>
+ Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -27,13 +28,29 @@ STATIC CONST UINT64 mFlashMaxSize = FixedPcdGet64 (PcdFdSize);
STATIC CONST UINTN mBlockSize = SIZE_64KB;
/**
- 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.
@@ -42,12 +59,15 @@ STATIC CONST UINTN mBlockSize = SIZE_64KB;
**/
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_STATUS Status;
@@ -122,3 +142,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
^ permalink raw reply related [flat|nested] 9+ messages in thread* [edk2-platforms Patch V2 2/6] Hisilicon/PlatformFlashAccessLib: Add progress API
2018-04-12 1:01 [edk2-platforms Patch V2 0/6] Add DisplayUpdateProgressLib for capsules Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 1/6] Styx/PlatformFlashAccessLib: Add progress API Kinney, Michael D
@ 2018-04-12 1:01 ` Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 3/6] SynQuacer/PlatformFlashAccessLib: " Kinney, Michael D
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 1:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
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.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
---
.../PlatformFlashAccessLibDxe.c | 71 +++++++++++++++++++---
1 file changed, 63 insertions(+), 8 deletions(-)
diff --git a/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c b/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c
index 62da61c79b..585f7ef0e8 100644
--- a/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c
+++ b/Silicon/Hisilicon/Library/PlatformFlashAccessLib/PlatformFlashAccessLibDxe.c
@@ -3,7 +3,7 @@
Copyright (c) 2018, Hisilicon Limited. All rights reserved.
Copyright (c) 2018, Linaro Limited. All rights reserved.
- Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -30,13 +30,29 @@ STATIC EFI_PHYSICAL_ADDRESS mSFCMEM0BaseAddress;
STATIC HISI_SPI_FLASH_PROTOCOL *mSpiProtocol;
/**
- Perform flash write opreation.
+ 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.
@@ -45,12 +61,15 @@ STATIC HISI_SPI_FLASH_PROTOCOL *mSpiProtocol;
**/
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
)
{
UINT32 RomAddress;
@@ -83,6 +102,42 @@ PerformFlashWrite (
return Status;
}
+/**
+ 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
+ );
+}
+
/**
Platform Flash Access Lib Constructor.
--
2.14.2.windows.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [edk2-platforms Patch V2 3/6] SynQuacer/PlatformFlashAccessLib: Add progress API
2018-04-12 1:01 [edk2-platforms Patch V2 0/6] Add DisplayUpdateProgressLib for capsules Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 1/6] Styx/PlatformFlashAccessLib: Add progress API Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 2/6] Hisilicon/PlatformFlashAccessLib: " Kinney, Michael D
@ 2018-04-12 1:01 ` Kinney, Michael D
2018-04-12 6:17 ` Ard Biesheuvel
2018-04-12 1:01 ` [edk2-platforms Patch V2 4/6] AMD/OverdriveBoard: Add DisplayUpdateProgressLib mapping Kinney, Michael D
` (2 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 1:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
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.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
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.<BR>
+ Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [edk2-platforms Patch V2 3/6] SynQuacer/PlatformFlashAccessLib: Add progress API
2018-04-12 1:01 ` [edk2-platforms Patch V2 3/6] SynQuacer/PlatformFlashAccessLib: " Kinney, Michael D
@ 2018-04-12 6:17 ` Ard Biesheuvel
2018-04-12 6:54 ` Kinney, Michael D
0 siblings, 1 reply; 9+ messages in thread
From: Ard Biesheuvel @ 2018-04-12 6:17 UTC (permalink / raw)
To: Kinney, Michael D; +Cc: edk2-devel@lists.01.org, Leif Lindholm
On 12 April 2018 at 03:01, Kinney, Michael D <michael.d.kinney@intel.com> wrote:
> 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.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
IIUC, this is the bare minimum to get it building again, and we'll
need to replace the existing progress indicator implementation with
calls into the generic on, right? That's fine, but it would be useful
to mention this in the commit log.
> ---
> .../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.<BR>
> + Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
>
> 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
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [edk2-platforms Patch V2 3/6] SynQuacer/PlatformFlashAccessLib: Add progress API
2018-04-12 6:17 ` Ard Biesheuvel
@ 2018-04-12 6:54 ` Kinney, Michael D
0 siblings, 0 replies; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 6:54 UTC (permalink / raw)
To: Ard Biesheuvel, Kinney, Michael D; +Cc: edk2-devel@lists.01.org, Leif Lindholm
Ard,
I agree. I mentioned it in the patch summary. I will
add it to the commit log for each patch.
Thanks,
Mike
> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Wednesday, April 11, 2018 11:18 PM
> To: Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: edk2-devel@lists.01.org; Leif Lindholm
> <leif.lindholm@linaro.org>
> Subject: Re: [edk2-platforms Patch V2 3/6]
> SynQuacer/PlatformFlashAccessLib: Add progress API
>
> On 12 April 2018 at 03:01, Kinney, Michael D
> <michael.d.kinney@intel.com> wrote:
> > 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.
> >
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Signed-off-by: Michael D Kinney
> <michael.d.kinney@intel.com>
> > Contributed-under: TianoCore Contribution Agreement
> 1.1
>
> IIUC, this is the bare minimum to get it building again,
> and we'll
> need to replace the existing progress indicator
> implementation with
> calls into the generic on, right? That's fine, but it
> would be useful
> to mention this in the commit log.
>
>
> > ---
> > .../SynQuacerPlatformFlashAccessLib.c |
> 78 +++++++++++++++++++---
> > 1 file changed, 67 insertions(+), 11 deletions(-)
> >
> > diff --git
> a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformF
> lashAccessLib/SynQuacerPlatformFlashAccessLib.c
> b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformF
> lashAccessLib/SynQuacerPlatformFlashAccessLib.c
> > index fbb8f1f9e4..4cf8318a93 100644
> > ---
> a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformF
> lashAccessLib/SynQuacerPlatformFlashAccessLib.c
> > +++
> b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformF
> lashAccessLib/SynQuacerPlatformFlashAccessLib.c
> > @@ -2,6 +2,7 @@
> > Platform flash device access library for Socionext
> SynQuacer
> >
> > Copyright (c) 2016, Linaro, Ltd. All rights
> reserved.<BR>
> > + Copyright (c) 2018, Intel Corporation. All rights
> reserved.<BR>
> >
> > 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
> >
^ permalink raw reply [flat|nested] 9+ messages in thread
* [edk2-platforms Patch V2 4/6] AMD/OverdriveBoard: Add DisplayUpdateProgressLib mapping
2018-04-12 1:01 [edk2-platforms Patch V2 0/6] Add DisplayUpdateProgressLib for capsules Kinney, Michael D
` (2 preceding siblings ...)
2018-04-12 1:01 ` [edk2-platforms Patch V2 3/6] SynQuacer/PlatformFlashAccessLib: " Kinney, Michael D
@ 2018-04-12 1:01 ` Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 5/6] Socionext/DeveloperBox: " Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 6/6] Socionext/SynQuacerEvalBoard: " Kinney, Michael D
5 siblings, 0 replies; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 1:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
https://bugzilla.tianocore.org/show_bug.cgi?id=801
Based on content from the following branch/commits:
https://github.com/Microsoft/MS_UEFI/tree/share/MsCapsuleSupport
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
---
Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 1 +
1 file changed, 1 insertion(+)
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 348828e18d..f86b42e1c1 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -127,6 +127,7 @@ [LibraryClasses.common]
RealTimeClockLib|Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+ DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
!if $(DO_CAPSULE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
--
2.14.2.windows.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [edk2-platforms Patch V2 5/6] Socionext/DeveloperBox: Add DisplayUpdateProgressLib mapping
2018-04-12 1:01 [edk2-platforms Patch V2 0/6] Add DisplayUpdateProgressLib for capsules Kinney, Michael D
` (3 preceding siblings ...)
2018-04-12 1:01 ` [edk2-platforms Patch V2 4/6] AMD/OverdriveBoard: Add DisplayUpdateProgressLib mapping Kinney, Michael D
@ 2018-04-12 1:01 ` Kinney, Michael D
2018-04-12 1:01 ` [edk2-platforms Patch V2 6/6] Socionext/SynQuacerEvalBoard: " Kinney, Michael D
5 siblings, 0 replies; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 1:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
https://bugzilla.tianocore.org/show_bug.cgi?id=801
Based on content from the following branch/commits:
https://github.com/Microsoft/MS_UEFI/tree/share/MsCapsuleSupport
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
---
Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 1 +
1 file changed, 1 insertion(+)
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index cc36c2ed17..80eb84d551 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -174,6 +174,7 @@ [LibraryClasses.common.DXE_DRIVER]
# Firmware update
#
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+ DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf
FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
PlatformFlashAccessLib|Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.inf
--
2.14.2.windows.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [edk2-platforms Patch V2 6/6] Socionext/SynQuacerEvalBoard: Add DisplayUpdateProgressLib mapping
2018-04-12 1:01 [edk2-platforms Patch V2 0/6] Add DisplayUpdateProgressLib for capsules Kinney, Michael D
` (4 preceding siblings ...)
2018-04-12 1:01 ` [edk2-platforms Patch V2 5/6] Socionext/DeveloperBox: " Kinney, Michael D
@ 2018-04-12 1:01 ` Kinney, Michael D
5 siblings, 0 replies; 9+ messages in thread
From: Kinney, Michael D @ 2018-04-12 1:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
https://bugzilla.tianocore.org/show_bug.cgi?id=801
Based on content from the following branch/commits:
https://github.com/Microsoft/MS_UEFI/tree/share/MsCapsuleSupport
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
---
Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 1 +
1 file changed, 1 insertion(+)
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index f2c6aa15fe..9ee5a838ad 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -171,6 +171,7 @@ [LibraryClasses.common.DXE_DRIVER]
# Firmware update
#
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
+ DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf
FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
PlatformFlashAccessLib|Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.inf
--
2.14.2.windows.3
^ permalink raw reply related [flat|nested] 9+ messages in thread