From: Nicholas Piggin <npiggin@gmail.com>
Date: Mon, 26 Mar 2018 15:02:33 +0000 (+1000)
Subject: powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
X-Git-Tag: v4.1.52~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56d7e5711089c7581f194989c12c85cf4fa78c5b;p=thirdparty%2Fkernel%2Fstable.git

powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()

[ Upstream commit 741de617661794246f84a21a02fc5e327bffc9ad ]

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@vger.kernel.org # v3.2+
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Acked-by: Stewart Smith <stewart@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---

diff --git a/arch/powerpc/platforms/powernv/opal-nvram.c b/arch/powerpc/platforms/powernv/opal-nvram.c
index 9db4398ded5de..ba2ff06a2c98b 100644
--- 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 *buf, size_t count, loff_t *index)
 		if (rc == OPAL_BUSY_EVENT)
 			opal_poll_events(NULL);
 	}
+
+	if (rc)
+		return -EIO;
+
 	*index += count;
 	return count;
 }