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

Commit 1608cc4a authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix NPIV host enable after chip reset 



For NPIV ports, call configure_hba() so that NPIV ports can proceed to
loop initialization.

Signed-off-by: default avatarQuinn Tran <quinn.tran@qlogic.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fcc5b5cd

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
 * |                              |                    | 0x70ad-0x70ae  |

 * |                              |                    | 0x70d0-0x70d6	|

 * |                              |                    | 0x70d7-0x70db  |

 * | Task Management              |       0x8042       | 0x8000,0x800b  |

 * | Task Management              |       0x8042       | 0x8000         |

 * |                              |                    | 0x8019         |

 * |                              |                    | 0x8025,0x8026  |

 * |                              |                    | 0x8031,0x8032  |

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -5913,7 +5913,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) 


	if (!status) {

		ql_dbg(ql_dbg_taskm, vha, 0x8022, "%s succeeded.\n", __func__);



		qla2x00_configure_hba(vha);

		spin_lock_irqsave(&ha->vport_slock, flags);

		list_for_each_entry(vp, &ha->vp_list, list) {

			if (vp->vp_idx) {

drivers/scsi/qla2xxx/qla_mbx.c

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ static struct rom_cmd { 
	{ MBC_GET_RETRY_COUNT },

	{ MBC_TRACE_CONTROL },

	{ MBC_INITIALIZE_MULTIQ },

	{ MBC_IOCB_COMMAND_A64 },

	{ MBC_GET_ADAPTER_LOOP_ID },

};



static int is_rom_cmd(uint16_t cmd)

drivers/scsi/qla2xxx/qla_mid.c

+5 −0
Original line number Diff line number Diff line
@@ -187,6 +187,11 @@ qla24xx_enable_vp(scsi_qla_host_t *vha) 
		!(ha->current_topology & ISP_CFG_F)) {

		vha->vp_err_state =  VP_ERR_PORTDWN;

		fc_vport_set_state(vha->fc_vport, FC_VPORT_LINKDOWN);

		ql_dbg(ql_dbg_taskm, vha, 0x800b,

		    "%s skip enable. loop_state %x topo %x\n",

		    __func__, base_vha->loop_state.counter,

		    ha->current_topology);



		goto enable_failed;

	}