[SCSI] qla4xxx: Clear the RISC interrupt bit during FW init

This patch fix kernel panic during kdump.

Signed-off-by: Sarang Radke <sarang.radke@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 1bdfa8120ac8..90614f38b55d 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -697,6 +697,9 @@ int qla4xxx_start_firmware(struct scsi_qla_host *ha)
                         writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),
                                &ha->reg->ctrl_status);
                         readl(&ha->reg->ctrl_status);
+                        writel(set_rmask(CSR_SCSI_COMPLETION_INTR),
+                               &ha->reg->ctrl_status);
+                        readl(&ha->reg->ctrl_status);
                         spin_unlock_irqrestore(&ha->hardware_lock, flags);
                         if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS) {
                                 DEBUG2(printk("scsi%ld: %s: Get firmware "
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index 8d6bc1b2ff17..78f1111158d7 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1875,6 +1875,11 @@ exit:
 int qla4_8xxx_load_risc(struct scsi_qla_host *ha)
 {
         int retval;
+
+        /* clear the interrupt */
+        writel(0, &ha->qla4_8xxx_reg->host_int);
+        readl(&ha->qla4_8xxx_reg->host_int);
+
         retval = qla4_8xxx_device_state_handler(ha);
 
         if (retval == QLA_SUCCESS && !test_bit(AF_INIT_DONE, &ha->flags))