From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id CAB451A0279 for ; Thu, 12 Feb 2015 20:54:22 +1100 (AEDT) Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Feb 2015 19:54:20 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 3B9932BB006A for ; Thu, 12 Feb 2015 20:54:18 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1C9s94346006402 for ; Thu, 12 Feb 2015 20:54:18 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1C9rimP004270 for ; Thu, 12 Feb 2015 20:53:44 +1100 Subject: [PATCH] powerpc/powernv: Check image loaded or not before calling flash From: Vasant Hegde To: linuxppc-dev@lists.ozlabs.org Date: Thu, 12 Feb 2015 15:23:27 +0530 Message-ID: <20150212095323.1829.45732.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Cc: benh@au1.ibm.com, sam.bobroff@au1.ibm.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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. 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 Signed-off-by: Vasant Hegde --- 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");