[PATCH 4.16 060/196] powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()

From: Greg Kroah-Hartman
Date: Sun Apr 22 2018 - 09:57:10 EST

4.16-stable review patch. If anyone has any objections, please let me know.


From: Nicholas Piggin <npiggin@xxxxxxxxx>

commit 741de617661794246f84a21a02fc5e327bffc9ad upstream.

opal_nvram_write currently just assumes success if it encounters an
error other than OPAL_BUSY or OPAL_BUSY_EVENT. Have it return -EIO
on other errors instead.

Fixes: 628daa8d5abf ("powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks")
Cc: stable@xxxxxxxxxxxxxxx # v3.2+
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Reviewed-by: Vasant Hegde <hegdevasant@xxxxxxxxxxxxxxxxxx>
Acked-by: Stewart Smith <stewart@xxxxxxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

arch/powerpc/platforms/powernv/opal-nvram.c | 4 ++++
1 file changed, 4 insertions(+)

--- a/arch/powerpc/platforms/powernv/opal-nvram.c
+++ b/arch/powerpc/platforms/powernv/opal-nvram.c
@@ -59,6 +59,10 @@ static ssize_t opal_nvram_write(char *bu
if (rc == OPAL_BUSY_EVENT)
+ if (rc)
+ return -EIO;
*index += count;
return count;