[PATCH] powerpc/powernv: Check image loaded or not before calling flash

[Benjamin Herrenschmidt]

On Thu, 2015-02-12 at 15:23 +0530, Vasant Hegde wrote:
> Present code checks for update_flash_data in opal_flash_term_callback().
> update_flash_data has been statically initialized to zero, and that
> is the value of FLASH_IMG_READY. Also code update initialization happens
> during subsys init.

Please statically initialize it to a sane value instead.

> So if reboot is issued before the subsys init stage then we endup displaying
> "Flashing new firmware" message.. which may confuse end user.
> 
> This patch adds additional validation to make sure image is actually loaded
> or not.
> 
> Reported-by: Sam Bobroff <sam.bobroff at au1.ibm.com>
> Signed-off-by: Vasant Hegde <hegdevasant at linux.vnet.ibm.com>
> ---
>  arch/powerpc/platforms/powernv/opal-flash.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/platforms/powernv/opal-flash.c
> index 5c21d9c..5455cd4 100644
> --- a/arch/powerpc/platforms/powernv/opal-flash.c
> +++ b/arch/powerpc/platforms/powernv/opal-flash.c
> @@ -319,7 +319,8 @@ void opal_flash_term_callback(void)
>  {
>  	struct cpumask mask;
>  
> -	if (update_flash_data.status != FLASH_IMG_READY)
> +	if (update_flash_data.status != FLASH_IMG_READY ||
> +	    image_data.status != IMAGE_READY)
>  		return;
>  
>  	pr_alert("FLASH: Flashing new firmware\n");