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

Commit 124f85e6 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Don't fallback to interrupt-polling during re-initialization with MSI-X enabled. 



ROMs in recent ISPs have MSI-X support, so it's no longer
necessary for the driver to fallback to interrupt polling during
ISP re-initialization.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 1ded85e2

drivers/scsi/qla2xxx/qla_def.h

+2 −0
Original line number Diff line number Diff line
@@ -2370,6 +2370,8 @@ struct qla_hw_data { 
				IS_QLA84XX(ha))

#define IS_QLA2XXX_MIDTYPE(ha)	(IS_QLA24XX(ha) || IS_QLA84XX(ha) || \

				IS_QLA25XX(ha))

#define IS_NOPOLLING_TYPE(ha)	(IS_QLA25XX(ha) && \

				(ha)->flags.msix_enabled)



#define IS_IIDMA_CAPABLE(ha)    ((ha)->device_type & DT_IIDMA)

#define IS_FWI2_CAPABLE(ha)     ((ha)->device_type & DT_FWI2)

drivers/scsi/qla2xxx/qla_init.c

+3 −0
Original line number Diff line number Diff line
@@ -570,6 +570,9 @@ qla24xx_reset_risc(scsi_qla_host_t *vha) 
	}



	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	if (IS_NOPOLLING_TYPE(ha))

		ha->isp_ops->enable_intrs(ha);

}



/**

drivers/scsi/qla2xxx/qla_mbx.c

+2 −3
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 


	/* Wait for mbx cmd completion until timeout */



	if (!abort_active && io_lock_on) {



	if ((!abort_active && io_lock_on) || IS_NOPOLLING_TYPE(ha)) {

		set_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);



		if (IS_FWI2_CAPABLE(ha))
@@ -218,7 +217,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 
	/* Clean up */

	ha->mcp = NULL;



	if (abort_active || !io_lock_on) {

	if ((abort_active || !io_lock_on) && !IS_NOPOLLING_TYPE(ha)) {

		DEBUG11(printk("%s(%ld): checking for additional resp "

		    "interrupt.\n", __func__, base_vha->host_no));

drivers/scsi/qla2xxx/qla_os.c

+2 −0
Original line number Diff line number Diff line
@@ -1329,6 +1329,8 @@ qla24xx_disable_intrs(struct qla_hw_data *ha) 
	unsigned long flags = 0;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;



	if (IS_NOPOLLING_TYPE(ha))

		return;

	spin_lock_irqsave(&ha->hardware_lock, flags);

	ha->interrupts_on = 0;

	WRT_REG_DWORD(&reg->ictrl, 0);