]>
Commit | Line | Data |
---|---|---|
0f23eb5b GKH |
1 | From 741de617661794246f84a21a02fc5e327bffc9ad Mon Sep 17 00:00:00 2001 |
2 | From: Nicholas Piggin <npiggin@gmail.com> | |
3 | Date: Tue, 27 Mar 2018 01:02:33 +1000 | |
4 | Subject: powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write() | |
5 | ||
6 | From: Nicholas Piggin <npiggin@gmail.com> | |
7 | ||
8 | commit 741de617661794246f84a21a02fc5e327bffc9ad upstream. | |
9 | ||
10 | opal_nvram_write currently just assumes success if it encounters an | |
11 | error other than OPAL_BUSY or OPAL_BUSY_EVENT. Have it return -EIO | |
12 | on other errors instead. | |
13 | ||
14 | Fixes: 628daa8d5abf ("powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks") | |
15 | Cc: stable@vger.kernel.org # v3.2+ | |
16 | Signed-off-by: Nicholas Piggin <npiggin@gmail.com> | |
17 | Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | |
18 | Acked-by: Stewart Smith <stewart@linux.ibm.com> | |
19 | Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> | |
20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
21 | ||
22 | --- | |
23 | arch/powerpc/platforms/powernv/opal-nvram.c | 4 ++++ | |
24 | 1 file changed, 4 insertions(+) | |
25 | ||
26 | --- a/arch/powerpc/platforms/powernv/opal-nvram.c | |
27 | +++ b/arch/powerpc/platforms/powernv/opal-nvram.c | |
28 | @@ -59,6 +59,10 @@ static ssize_t opal_nvram_write(char *bu | |
29 | if (rc == OPAL_BUSY_EVENT) | |
30 | opal_poll_events(NULL); | |
31 | } | |
32 | + | |
33 | + if (rc) | |
34 | + return -EIO; | |
35 | + | |
36 | *index += count; | |
37 | return count; | |
38 | } |