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

Commit 32a13df2 authored Aug 30, 2019 by Himanshu Madhani Committed by Martin K. Petersen Sep 07, 2019

scsi: qla2xxx: Fix driver reload for ISP82xx



HINT_MBX_INT_PENDING is not guaranteed to be cleared by firmware. Remove
check that prevent driver load with ISP82XX.

Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Link: https://lore.kernel.org/r/20190830222402.23688-4-hmadhani@marvell.com


Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent cb92cb16

drivers/scsi/qla2xxx/qla_mbx.c

+2 −14

Original line number	Diff line number	Diff line
		@@ -253,21 +253,9 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)
		if ((!abort_active && io_lock_on) \|\| IS_NOPOLLING_TYPE(ha)) {
		set_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);

		if (IS_P3P_TYPE(ha)) {
		if (RD_REG_DWORD(&reg->isp82.hint) &
		HINT_MBX_INT_PENDING) {
		ha->flags.mbox_busy = 0;
		spin_unlock_irqrestore(&ha->hardware_lock,
		flags);

		atomic_dec(&ha->num_pend_mbx_stage2);
		ql_dbg(ql_dbg_mbx, vha, 0x1010,
		"Pending mailbox timeout, exiting.\n");
		rval = QLA_FUNCTION_TIMEOUT;
		goto premature_exit;
		}
		if (IS_P3P_TYPE(ha))
		WRT_REG_DWORD(&reg->isp82.hint, HINT_MBX_INT_PENDING);
		} else if (IS_FWI2_CAPABLE(ha))
		else if (IS_FWI2_CAPABLE(ha))
		WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_SET_HOST_INT);
		else
		WRT_REG_WORD(&reg->isp.hccr, HCCR_SET_HOST_INT);

drivers/scsi/qla2xxx/qla_nx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2287,6 +2287,7 @@ qla82xx_disable_intrs(struct qla_hw_data *ha)
		{
		scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);

		if (ha->interrupts_on)
		qla82xx_mbx_intr_disable(vha);

		spin_lock_irq(&ha->hardware_lock);