sparc: Remove console spam during kdump

Before executing the crash kernel, the panicking kernel cleans up the
irq state of the machine. This code contains a warning when cleaning up
unbound MSIs. Repeating this warning for each one floods the console and
can cause a waiting thread to time out before the other cpus have
completed.

This patch removes the warning and increases the time allowed for all
the cpus to complete the machine_capture_other_strands() function.

orabug: 23585248

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
(cherry picked from commit 30e77b09b134b3ec049b01cfd8754c774da493b9)
(cherry picked from commit 67657418d64c3cee2945370614c38d4516fb0ea1)
Signed-off-by: Allen Pais <allen.pais@oracle.com>

diff --git a/arch/sparc/kernel/machine_kexec.c b/arch/sparc/kernel/machine_kexec.c
index 0374f7116c13d3727967e155bf5c673655c1ac63..fda8b7524dc9788b32b74682e1a23f814a0dc803 100644 (file)
--- a/arch/sparc/kernel/machine_kexec.c
+++ b/arch/sparc/kernel/machine_kexec.c
@@ -201,7 +201,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
                stop_nmi_watchdog(NULL);
        atomic_set(&kexec_strand_wait, num_online_cpus() - 1);
        smp_call_function(machine_capture_other_strands, NULL, false);
-       msecs = 1000;
+       msecs = 60000;
        while ((atomic_read(&kexec_strand_wait) > 0) && msecs) {
                mdelay(1);
                msecs--;

diff --git a/arch/sparc/kernel/priq_sun4v.c b/arch/sparc/kernel/priq_sun4v.c
index e7554e07ffae819824800cffbc5d42bc8e949d14..51289452d6173b3463ba0f5ab84747ce5891fd6d 100644 (file)
--- a/arch/sparc/kernel/priq_sun4v.c
+++ b/arch/sparc/kernel/priq_sun4v.c
@@ -1021,10 +1021,8 @@ static void unbind_priq_msi(struct priq *priq, struct priq_irq *priq_msi)
        hverror = pci_priq_msi_info(priq_msi->devhandle, priq_msi->msidata,
                                    priq_msi->bdf, &info);
 
-       if (hverror == HV_EUNBOUND) {
-               pr_err("%s: attempt to unbind unbound MSI\n", __func__);
+       if (hverror == HV_EUNBOUND)
                return;
-       }
 
        if (hverror) {
                pr_err("%s: Failed to obtain priq msi info, hverror(%ld).\n",