diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2018-03-27 01:02:33 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-24 09:36:27 +0200 |
| commit | c3baeca67d85e698201fca324368c3a704667e80 (patch) | |
| tree | 63b96e5423c86cbfca20b833be0949fa0cc288a6 /arch/powerpc/platforms | |
| parent | 693b03f9b185f14dded38a934c744a60e99363c3 (diff) | |
| download | linux-stable-c3baeca67d85e698201fca324368c3a704667e80.tar.gz linux-stable-c3baeca67d85e698201fca324368c3a704667e80.tar.bz2 linux-stable-c3baeca67d85e698201fca324368c3a704667e80.zip | |
powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
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@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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-nvram.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/opal-nvram.c b/arch/powerpc/platforms/powernv/opal-nvram.c index 9db4398ded5d..ba2ff06a2c98 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; } |