powerpc/xics: Reset the CPPR if H_EOI fails

I have an intermittent kdump fail where the hypervisor fails an H_EOI.
As a result our CPPR is never reset to 0xff and we no longer accept
interrupts.

This patch calls icp_hv_set_cppr to reset the CPPR if H_EOI fails,
fixing the kdump fail.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c
index 784b3fc6f0712760c9bf94e08947d5b471670092..253dce98c16ef05aef07caad41af6a7ecdd78fa7 100644 (file)
--- a/arch/powerpc/sysdev/xics/icp-hv.c
+++ b/arch/powerpc/sysdev/xics/icp-hv.c
@@ -41,23 +41,24 @@ static inline unsigned int icp_hv_get_xirr(unsigned char cppr)
        return ret;
 }
 
-static inline void icp_hv_set_xirr(unsigned int value)
+static inline void icp_hv_set_cppr(u8 value)
 {
-       long rc = plpar_hcall_norets(H_EOI, value);
+       long rc = plpar_hcall_norets(H_CPPR, value);
        if (rc != H_SUCCESS) {
-               pr_err("%s: bad return code eoi xirr=0x%x returned %ld\n",
+               pr_err("%s: bad return code cppr cppr=0x%x returned %ld\n",
                        __func__, value, rc);
                WARN_ON_ONCE(1);
        }
 }
 
-static inline void icp_hv_set_cppr(u8 value)
+static inline void icp_hv_set_xirr(unsigned int value)
 {
-       long rc = plpar_hcall_norets(H_CPPR, value);
+       long rc = plpar_hcall_norets(H_EOI, value);
        if (rc != H_SUCCESS) {
-               pr_err("%s: bad return code cppr cppr=0x%x returned %ld\n",
+               pr_err("%s: bad return code eoi xirr=0x%x returned %ld\n",
                        __func__, value, rc);
                WARN_ON_ONCE(1);
+               icp_hv_set_cppr(value >> 24);
        }
 }