Commit 78764999 authored by Sarang Radke's avatar Sarang Radke Committed by James Bottomley
Browse files

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



This patch fix kernel panic during kdump.

Signed-off-by: default avatarSarang Radke <sarang.radke@qlogic.com>
Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 527c8b2e

drivers/scsi/qla4xxx/ql4_init.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -697,6 +697,9 @@ int qla4xxx_start_firmware(struct scsi_qla_host *ha) 
			writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),

			writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),

			       &ha->reg->ctrl_status);

			       &ha->reg->ctrl_status);

			readl(&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);

			spin_unlock_irqrestore(&ha->hardware_lock, flags);

			if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS) {

			if (qla4xxx_get_firmware_state(ha) == QLA_SUCCESS) {

				DEBUG2(printk("scsi%ld: %s: Get firmware "

				DEBUG2(printk("scsi%ld: %s: Get firmware "

drivers/scsi/qla4xxx/ql4_nx.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1875,6 +1875,11 @@ exit: 
int qla4_8xxx_load_risc(struct scsi_qla_host *ha)

int qla4_8xxx_load_risc(struct scsi_qla_host *ha)

{

{

	int retval;

	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);

	retval = qla4_8xxx_device_state_handler(ha);





	if (retval == QLA_SUCCESS && !test_bit(AF_INIT_DONE, &ha->flags))

	if (retval == QLA_SUCCESS && !test_bit(AF_INIT_DONE, &ha->flags))

CRA Git | Maintained and supported by SUSTech CRA and CCSE