[PATCH] ia64: mca rendezvous fix

We are not setting the 'always rendezvous for mca' flag.  kdb needs it
set to get decent mca debugging on all cpus but I do not want kdb to
change sal behaviour.  Since we do not recover from mca without a
debugger, I see no reason why this flag should not be on for all
kernels.

The rendezvous timeout was set to 100 * HZ, but SAL expects the timeout
to be in milliseconds, HZ may not be 1 millisecond.  The patch makes
the timeout an explicit 20 seconds, semi-arbitrary value.

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 8595db01592b1677a1d1d87ff46b8d583ffbacce..b44dfa6fa25653c2def6e3b0b61db36e722ea52e 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -467,7 +467,7 @@ ia64_mca_init(void)
                                         SAL_MC_PARAM_MECHANISM_INT,
                                         IA64_MCA_RENDEZ_VECTOR,
                                         IA64_MCA_RENDEZ_TIMEOUT,
-                                        0)))
+                                        SAL_MC_PARAM_RZ_ALWAYS)))
        {
                printk(KERN_ERR "ia64_mca_init: Failed to register rendezvous interrupt "
                       "with SAL.  rc = %ld\n", rc);

diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index a42ec7f97a2157f1b81b9d99f74396196872d74e..e4ddfbe0b37bd06cb9dc0cd8f8828d9a314c1a6d 100644 (file)
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -24,7 +24,7 @@ enum {
        IA64_MCA_FAILURE        =       1
 };
 
-#define IA64_MCA_RENDEZ_TIMEOUT                (100 * HZ)      /* 1000 milliseconds */
+#define IA64_MCA_RENDEZ_TIMEOUT                (20 * 1000)     /* value in milliseconds - 20 seconds */
 
 #define IA64_CMC_INT_DISABLE           0
 #define IA64_CMC_INT_ENABLE            1