Commit ec7193e2 authored by Quinn Tran's avatar Quinn Tran Committed by Nicholas Bellinger

qla2xxx: Fix delayed response to command for loop mode/direct connect.

Current driver wait for FW to be in the ready state before
processing in-coming commands. For Arbitrated Loop or
Point-to- Point (not switch), FW Ready state can take a while.
FW will transition to ready state after all Nports have been
logged in. In the mean time, certain initiators have completed
the login and starts IO. Driver needs to start processing all
queues if FW is already started.
Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 482c9dc7
...@@ -3322,6 +3322,10 @@ struct qlt_hw_data { ...@@ -3322,6 +3322,10 @@ struct qlt_hw_data {
#define LEAK_EXCHG_THRESH_HOLD_PERCENT 75 /* 75 percent */ #define LEAK_EXCHG_THRESH_HOLD_PERCENT 75 /* 75 percent */
#define QLA_EARLY_LINKUP(_ha) \
((_ha->flags.n2n_ae || _ha->flags.lip_ae) && \
_ha->flags.fw_started && !_ha->flags.fw_init_done)
/* /*
* Qlogic host adapter specific data structure. * Qlogic host adapter specific data structure.
*/ */
...@@ -3371,9 +3375,11 @@ struct qla_hw_data { ...@@ -3371,9 +3375,11 @@ struct qla_hw_data {
uint32_t fawwpn_enabled:1; uint32_t fawwpn_enabled:1;
uint32_t exlogins_enabled:1; uint32_t exlogins_enabled:1;
uint32_t exchoffld_enabled:1; uint32_t exchoffld_enabled:1;
/* 35 bits */
uint32_t lip_ae:1;
uint32_t n2n_ae:1;
uint32_t fw_started:1; uint32_t fw_started:1;
uint32_t fw_init_done:1;
} flags; } flags;
/* This spinlock is used to protect "io transactions", you must /* This spinlock is used to protect "io transactions", you must
...@@ -3466,7 +3472,6 @@ struct qla_hw_data { ...@@ -3466,7 +3472,6 @@ struct qla_hw_data {
#define P2P_LOOP 3 #define P2P_LOOP 3
uint8_t interrupts_on; uint8_t interrupts_on;
uint32_t isp_abort_cnt; uint32_t isp_abort_cnt;
#define PCI_DEVICE_ID_QLOGIC_ISP2532 0x2532 #define PCI_DEVICE_ID_QLOGIC_ISP2532 0x2532
#define PCI_DEVICE_ID_QLOGIC_ISP8432 0x8432 #define PCI_DEVICE_ID_QLOGIC_ISP8432 0x8432
#define PCI_DEVICE_ID_QLOGIC_ISP8001 0x8001 #define PCI_DEVICE_ID_QLOGIC_ISP8001 0x8001
...@@ -3947,6 +3952,7 @@ typedef struct scsi_qla_host { ...@@ -3947,6 +3952,7 @@ typedef struct scsi_qla_host {
struct list_head vp_fcports; /* list of fcports */ struct list_head vp_fcports; /* list of fcports */
struct list_head work_list; struct list_head work_list;
spinlock_t work_lock; spinlock_t work_lock;
struct work_struct iocb_work;
/* Commonly used flags and state information. */ /* Commonly used flags and state information. */
struct Scsi_Host *host; struct Scsi_Host *host;
......
...@@ -3178,6 +3178,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) ...@@ -3178,6 +3178,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
} else { } else {
ql_dbg(ql_dbg_init, vha, 0x00d3, ql_dbg(ql_dbg_init, vha, 0x00d3,
"Init Firmware -- success.\n"); "Init Firmware -- success.\n");
ha->flags.fw_started = 1;
} }
return (rval); return (rval);
...@@ -4000,6 +4001,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) ...@@ -4000,6 +4001,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
atomic_set(&vha->loop_state, LOOP_READY); atomic_set(&vha->loop_state, LOOP_READY);
ql_dbg(ql_dbg_disc, vha, 0x2069, ql_dbg(ql_dbg_disc, vha, 0x2069,
"LOOP READY.\n"); "LOOP READY.\n");
ha->flags.fw_init_done = 1;
/* /*
* Process any ATIO queue entries that came in * Process any ATIO queue entries that came in
...@@ -5491,6 +5493,11 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha) ...@@ -5491,6 +5493,11 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
if (!(IS_P3P_TYPE(ha))) if (!(IS_P3P_TYPE(ha)))
ha->isp_ops->reset_chip(vha); ha->isp_ops->reset_chip(vha);
ha->flags.n2n_ae = 0;
ha->flags.lip_ae = 0;
ha->current_topology = 0;
ha->flags.fw_started = 0;
ha->flags.fw_init_done = 0;
ha->chip_reset++; ha->chip_reset++;
atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME); atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
...@@ -6767,6 +6774,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha) ...@@ -6767,6 +6774,8 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha)
return; return;
if (!ha->fw_major_version) if (!ha->fw_major_version)
return; return;
if (!ha->flags.fw_started)
return;
ret = qla2x00_stop_firmware(vha); ret = qla2x00_stop_firmware(vha);
for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT && for (retries = 5; ret != QLA_SUCCESS && ret != QLA_FUNCTION_TIMEOUT &&
...@@ -6780,6 +6789,9 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha) ...@@ -6780,6 +6789,9 @@ qla2x00_try_to_stop_firmware(scsi_qla_host_t *vha)
"Attempting retry of stop-firmware command.\n"); "Attempting retry of stop-firmware command.\n");
ret = qla2x00_stop_firmware(vha); ret = qla2x00_stop_firmware(vha);
} }
ha->flags.fw_started = 0;
ha->flags.fw_init_done = 0;
} }
int int
......
...@@ -708,6 +708,8 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) ...@@ -708,6 +708,8 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
"mbx7=%xh.\n", mb[1], mb[2], mb[3], mbx); "mbx7=%xh.\n", mb[1], mb[2], mb[3], mbx);
ha->isp_ops->fw_dump(vha, 1); ha->isp_ops->fw_dump(vha, 1);
ha->flags.fw_init_done = 0;
ha->flags.fw_started = 0;
if (IS_FWI2_CAPABLE(ha)) { if (IS_FWI2_CAPABLE(ha)) {
if (mb[1] == 0 && mb[2] == 0) { if (mb[1] == 0 && mb[2] == 0) {
...@@ -761,6 +763,9 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) ...@@ -761,6 +763,9 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
break; break;
case MBA_LIP_OCCURRED: /* Loop Initialization Procedure */ case MBA_LIP_OCCURRED: /* Loop Initialization Procedure */
ha->flags.lip_ae = 1;
ha->flags.n2n_ae = 0;
ql_dbg(ql_dbg_async, vha, 0x5009, ql_dbg(ql_dbg_async, vha, 0x5009,
"LIP occurred (%x).\n", mb[1]); "LIP occurred (%x).\n", mb[1]);
...@@ -797,6 +802,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) ...@@ -797,6 +802,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
break; break;
case MBA_LOOP_DOWN: /* Loop Down Event */ case MBA_LOOP_DOWN: /* Loop Down Event */
ha->flags.n2n_ae = 0;
ha->flags.lip_ae = 0;
ha->current_topology = 0;
mbx = (IS_QLA81XX(ha) || IS_QLA8031(ha)) mbx = (IS_QLA81XX(ha) || IS_QLA8031(ha))
? RD_REG_WORD(&reg24->mailbox4) : 0; ? RD_REG_WORD(&reg24->mailbox4) : 0;
mbx = (IS_P3P_TYPE(ha)) ? RD_REG_WORD(&reg82->mailbox_out[4]) mbx = (IS_P3P_TYPE(ha)) ? RD_REG_WORD(&reg82->mailbox_out[4])
...@@ -866,6 +875,9 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) ...@@ -866,6 +875,9 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
/* case MBA_DCBX_COMPLETE: */ /* case MBA_DCBX_COMPLETE: */
case MBA_POINT_TO_POINT: /* Point-to-Point */ case MBA_POINT_TO_POINT: /* Point-to-Point */
ha->flags.lip_ae = 0;
ha->flags.n2n_ae = 1;
if (IS_QLA2100(ha)) if (IS_QLA2100(ha))
break; break;
...@@ -2706,7 +2718,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha, ...@@ -2706,7 +2718,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
struct sts_entry_24xx *pkt; struct sts_entry_24xx *pkt;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
if (!vha->flags.online) if (!ha->flags.fw_started)
return; return;
while (rsp->ring_ptr->signature != RESPONSE_PROCESSED) { while (rsp->ring_ptr->signature != RESPONSE_PROCESSED) {
......
...@@ -3638,11 +3638,11 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha, ...@@ -3638,11 +3638,11 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
if (rptid_entry->format == 0) { if (rptid_entry->format == 0) {
/* loop */ /* loop */
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b7, ql_dbg(ql_dbg_async, vha, 0x10b7,
"Format 0 : Number of VPs setup %d, number of " "Format 0 : Number of VPs setup %d, number of "
"VPs acquired %d.\n", rptid_entry->vp_setup, "VPs acquired %d.\n", rptid_entry->vp_setup,
rptid_entry->vp_acquired); rptid_entry->vp_acquired);
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b8, ql_dbg(ql_dbg_async, vha, 0x10b8,
"Primary port id %02x%02x%02x.\n", "Primary port id %02x%02x%02x.\n",
rptid_entry->port_id[2], rptid_entry->port_id[1], rptid_entry->port_id[2], rptid_entry->port_id[1],
rptid_entry->port_id[0]); rptid_entry->port_id[0]);
...@@ -3651,7 +3651,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha, ...@@ -3651,7 +3651,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
} else if (rptid_entry->format == 1) { } else if (rptid_entry->format == 1) {
/* fabric */ /* fabric */
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10b9, ql_dbg(ql_dbg_async, vha, 0x10b9,
"Format 1: VP[%d] enabled - status %d - with " "Format 1: VP[%d] enabled - status %d - with "
"port id %02x%02x%02x.\n", rptid_entry->vp_idx, "port id %02x%02x%02x.\n", rptid_entry->vp_idx,
rptid_entry->vp_status, rptid_entry->vp_status,
......
...@@ -2560,6 +2560,20 @@ qla2xxx_scan_finished(struct Scsi_Host *shost, unsigned long time) ...@@ -2560,6 +2560,20 @@ qla2xxx_scan_finished(struct Scsi_Host *shost, unsigned long time)
return atomic_read(&vha->loop_state) == LOOP_READY; return atomic_read(&vha->loop_state) == LOOP_READY;
} }
static void qla2x00_iocb_work_fn(struct work_struct *work)
{
struct scsi_qla_host *vha = container_of(work,
struct scsi_qla_host, iocb_work);
int cnt = 0;
while (!list_empty(&vha->work_list)) {
qla2x00_do_work(vha);
cnt++;
if (cnt > 10)
break;
}
}
/* /*
* PCI driver interface * PCI driver interface
*/ */
...@@ -3078,6 +3092,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -3078,6 +3092,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
*/ */
qla2xxx_wake_dpc(base_vha); qla2xxx_wake_dpc(base_vha);
INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn);
INIT_WORK(&ha->board_disable, qla2x00_disable_board_on_pci_error); INIT_WORK(&ha->board_disable, qla2x00_disable_board_on_pci_error);
if (IS_QLA8031(ha) || IS_MCTP_CAPABLE(ha)) { if (IS_QLA8031(ha) || IS_MCTP_CAPABLE(ha)) {
...@@ -4321,7 +4336,11 @@ qla2x00_post_work(struct scsi_qla_host *vha, struct qla_work_evt *e) ...@@ -4321,7 +4336,11 @@ qla2x00_post_work(struct scsi_qla_host *vha, struct qla_work_evt *e)
spin_lock_irqsave(&vha->work_lock, flags); spin_lock_irqsave(&vha->work_lock, flags);
list_add_tail(&e->list, &vha->work_list); list_add_tail(&e->list, &vha->work_list);
spin_unlock_irqrestore(&vha->work_lock, flags); spin_unlock_irqrestore(&vha->work_lock, flags);
qla2xxx_wake_dpc(vha);
if (QLA_EARLY_LINKUP(vha->hw))
schedule_work(&vha->iocb_work);
else
qla2xxx_wake_dpc(vha);
return QLA_SUCCESS; return QLA_SUCCESS;
} }
......
...@@ -638,6 +638,7 @@ int qla24xx_async_notify_ack(scsi_qla_host_t *vha, fc_port_t *fcport, ...@@ -638,6 +638,7 @@ int qla24xx_async_notify_ack(scsi_qla_host_t *vha, fc_port_t *fcport,
break; break;
case SRB_NACK_PRLI: case SRB_NACK_PRLI:
fcport->fw_login_state = DSC_LS_PRLI_PEND; fcport->fw_login_state = DSC_LS_PRLI_PEND;
fcport->deleted = 0;
c = "PRLI"; c = "PRLI";
break; break;
case SRB_NACK_LOGO: case SRB_NACK_LOGO:
...@@ -1576,6 +1577,9 @@ static void qlt_send_notify_ack(struct scsi_qla_host *vha, ...@@ -1576,6 +1577,9 @@ static void qlt_send_notify_ack(struct scsi_qla_host *vha,
request_t *pkt; request_t *pkt;
struct nack_to_isp *nack; struct nack_to_isp *nack;
if (!ha->flags.fw_started)
return;
ql_dbg(ql_dbg_tgt, vha, 0xe004, "Sending NOTIFY_ACK (ha=%p)\n", ha); ql_dbg(ql_dbg_tgt, vha, 0xe004, "Sending NOTIFY_ACK (ha=%p)\n", ha);
/* Send marker if required */ /* Send marker if required */
...@@ -3053,7 +3057,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, ...@@ -3053,7 +3057,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
else else
vha->tgt_counters.core_qla_que_buf++; vha->tgt_counters.core_qla_que_buf++;
if (!vha->flags.online || cmd->reset_count != ha->chip_reset) { if (!ha->flags.fw_started || cmd->reset_count != ha->chip_reset) {
/* /*
* Either the port is not online or this request was from * Either the port is not online or this request was from
* previous life, just abort the processing. * previous life, just abort the processing.
...@@ -3194,7 +3198,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) ...@@ -3194,7 +3198,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
spin_lock_irqsave(&ha->hardware_lock, flags); spin_lock_irqsave(&ha->hardware_lock, flags);
if (!vha->flags.online || (cmd->reset_count != ha->chip_reset) || if (!ha->flags.fw_started || (cmd->reset_count != ha->chip_reset) ||
(cmd->sess && cmd->sess->deleted)) { (cmd->sess && cmd->sess->deleted)) {
/* /*
* Either the port is not online or this request was from * Either the port is not online or this request was from
...@@ -3372,7 +3376,7 @@ static int __qlt_send_term_imm_notif(struct scsi_qla_host *vha, ...@@ -3372,7 +3376,7 @@ static int __qlt_send_term_imm_notif(struct scsi_qla_host *vha,
ql_dbg(ql_dbg_tgt_tmr, vha, 0xe01c, ql_dbg(ql_dbg_tgt_tmr, vha, 0xe01c,
"Sending TERM ELS CTIO (ha=%p)\n", ha); "Sending TERM ELS CTIO (ha=%p)\n", ha);
pkt = (request_t *)qla2x00_alloc_iocbs_ready(vha, NULL); pkt = (request_t *)qla2x00_alloc_iocbs(vha, NULL);
if (pkt == NULL) { if (pkt == NULL) {
ql_dbg(ql_dbg_tgt, vha, 0xe080, ql_dbg(ql_dbg_tgt, vha, 0xe080,
"qla_target(%d): %s failed: unable to allocate " "qla_target(%d): %s failed: unable to allocate "
...@@ -4697,7 +4701,8 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, ...@@ -4697,7 +4701,8 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
} }
if (sess != NULL) { if (sess != NULL) {
if (sess->fw_login_state == DSC_LS_PLOGI_PEND) { if (sess->fw_login_state != DSC_LS_PLOGI_PEND &&
sess->fw_login_state != DSC_LS_PLOGI_COMP) {
/* /*
* Impatient initiator sent PRLI before last * Impatient initiator sent PRLI before last
* PLOGI could finish. Will force him to re-try, * PLOGI could finish. Will force him to re-try,
...@@ -4736,15 +4741,23 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, ...@@ -4736,15 +4741,23 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
/* Make session global (not used in fabric mode) */ /* Make session global (not used in fabric mode) */
if (ha->current_topology != ISP_CFG_F) { if (ha->current_topology != ISP_CFG_F) {
set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); if (sess) {
set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); ql_dbg(ql_dbg_disc, vha, 0xffff,
qla2xxx_wake_dpc(vha); "%s %d %8phC post nack\n",
__func__, __LINE__, sess->port_name);
qla24xx_post_nack_work(vha, sess, iocb,
SRB_NACK_PRLI);
res = 0;
} else {
set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
qla2xxx_wake_dpc(vha);
}
} else { } else {
if (sess) { if (sess) {
ql_dbg(ql_dbg_disc, vha, 0xffff, ql_dbg(ql_dbg_disc, vha, 0xffff,
"%s %d %8phC post nack\n", "%s %d %8phC post nack\n",
__func__, __LINE__, sess->port_name); __func__, __LINE__, sess->port_name);
qla24xx_post_nack_work(vha, sess, iocb, qla24xx_post_nack_work(vha, sess, iocb,
SRB_NACK_PRLI); SRB_NACK_PRLI);
res = 0; res = 0;
...@@ -4752,7 +4765,6 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, ...@@ -4752,7 +4765,6 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
} }
break; break;
case ELS_TPRLO: case ELS_TPRLO:
if (le16_to_cpu(iocb->u.isp24.flags) & if (le16_to_cpu(iocb->u.isp24.flags) &
NOTIFY24XX_FLAGS_GLOBAL_TPRLO) { NOTIFY24XX_FLAGS_GLOBAL_TPRLO) {
...@@ -5222,7 +5234,7 @@ static void qlt_24xx_atio_pkt(struct scsi_qla_host *vha, ...@@ -5222,7 +5234,7 @@ static void qlt_24xx_atio_pkt(struct scsi_qla_host *vha,
unsigned long flags; unsigned long flags;
if (unlikely(tgt == NULL)) { if (unlikely(tgt == NULL)) {
ql_dbg(ql_dbg_io, vha, 0x3064, ql_dbg(ql_dbg_tgt, vha, 0x3064,
"ATIO pkt, but no tgt (ha %p)", ha); "ATIO pkt, but no tgt (ha %p)", ha);
return; return;
} }
...@@ -6359,7 +6371,7 @@ qlt_24xx_process_atio_queue(struct scsi_qla_host *vha, uint8_t ha_locked) ...@@ -6359,7 +6371,7 @@ qlt_24xx_process_atio_queue(struct scsi_qla_host *vha, uint8_t ha_locked)
struct atio_from_isp *pkt; struct atio_from_isp *pkt;
int cnt, i; int cnt, i;
if (!vha->flags.online) if (!ha->flags.fw_started)
return; return;
while ((ha->tgt.atio_ring_ptr->signature != ATIO_PROCESSED) || while ((ha->tgt.atio_ring_ptr->signature != ATIO_PROCESSED) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment