Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 137257da authored by Poornima Vonti's avatar Poornima Vonti Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Re-register IRQ handler while retrying initialize of adapter 



Problem:
If initialization of adapter fails for some reason, then the interrupt handlers
are released. The interrupt handlers are not registered again when initialization
of adapter is retried.

Solution:
Re-register the interrupt handler when adapter initialization is retried.

Signed-off-by: default avatarPoornima Vonti <poornima.vonti@qlogic.com>
Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 5b1c1bff

drivers/scsi/qla4xxx/ql4_nx.c

+1 −1
Original line number Diff line number Diff line
@@ -2986,7 +2986,7 @@ int qla4_8xxx_load_risc(struct scsi_qla_host *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_IRQ_ATTACHED, &ha->flags))

		retval = qla4xxx_request_irqs(ha);



	return retval;

drivers/scsi/qla4xxx/ql4_os.c

+4 −23
Original line number Diff line number Diff line
@@ -6110,7 +6110,6 @@ qla4xxx_pci_mmio_enabled(struct pci_dev *pdev) 
static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)

{

	uint32_t rval = QLA_ERROR;

	uint32_t ret = 0;

	int fn;

	struct pci_dev *other_pdev = NULL;
@@ -6196,16 +6195,7 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha) 
			qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DRV_STATE, 0);

			qla4_8xxx_set_drv_active(ha);

			ha->isp_ops->idc_unlock(ha);

			ret = qla4xxx_request_irqs(ha);

			if (ret) {

				ql4_printk(KERN_WARNING, ha, "Failed to "

				    "reserve interrupt %d already in use.\n",

				    ha->pdev->irq);

				rval = QLA_ERROR;

			} else {

			ha->isp_ops->enable_intrs(ha);

				rval = QLA_SUCCESS;

			}

		}

	} else {

		ql4_printk(KERN_INFO, ha, "scsi%ld: %s: devfn 0x%x is not "
@@ -6215,18 +6205,9 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha) 
		     QLA8XXX_DEV_READY)) {

			clear_bit(AF_FW_RECOVERY, &ha->flags);

			rval = qla4xxx_initialize_adapter(ha, RESET_ADAPTER);

			if (rval == QLA_SUCCESS) {

				ret = qla4xxx_request_irqs(ha);

				if (ret) {

					ql4_printk(KERN_WARNING, ha, "Failed to"

					    " reserve interrupt %d already in"

					    " use.\n", ha->pdev->irq);

					rval = QLA_ERROR;

				} else {

			if (rval == QLA_SUCCESS)

				ha->isp_ops->enable_intrs(ha);

					rval = QLA_SUCCESS;

				}

			}



			ha->isp_ops->idc_lock(ha);

			qla4_8xxx_set_drv_active(ha);

			ha->isp_ops->idc_unlock(ha);