SCSI fixes on 20130626
This is a set of seven bug fixes. Several fcoe fixes for locking problems, initiator issues and a VLAN API change, all of which could eventually lead to data corruption, one fix for a qla2xxx locking problem which could lead to multiple completions of the same request (and subsequent data corruption) and a use after free in the ipr driver. Plus one minor MAINTAINERS file update Signed-off-by: James Bottomley <JBottomley@Parallels.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRy9qEAAoJEDeqqVYsXL0MIoUH/RkCyVWZqj2utTMXg0olPxm/ GE2OC5X944mBrMeY0wSfEj58NQoo9cRiXGTxZLl+X0lRHbTU4CCGUAAEu/0o5N/M Gqtmk3Gn+iY819F0gYqs/En4IjLPsifonXaamHA1341NlNjDqb6IQdOQN8qjlfQT aDebRuzS/z5jFO8pviem+GD2FDVSCdkM24SeJLxqxoyuOR77W/3n6bjlVY1jkCoI lFA5k9OeqQRiEGqR+Da2nLWmCPt85R+qjNzxTqFmF2gh+Z/VW1hwAcjWz+/xSc4O V7d/ZN9Qhk31PY3oQ1Q1jJU0fW95bqOo6dZvGrLkOVc1FkaFgjMF7RQuA8rVxRI= =xWnQ -----END PGP SIGNATURE----- Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI fixes from James Bottomley: "This is a set of seven bug fixes. Several fcoe fixes for locking problems, initiator issues and a VLAN API change, all of which could eventually lead to data corruption, one fix for a qla2xxx locking problem which could lead to multiple completions of the same request (and subsequent data corruption) and a use after free in the ipr driver. Plus one minor MAINTAINERS file update" (only six bugfixes in this pull, since I had already pulled the fcoe API fix directly from Robert Love) * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: [SCSI] ipr: Avoid target_destroy accessing memory after it was freed [SCSI] qla2xxx: Fix for locking issue between driver ISR and mailbox routines MAINTAINERS: Fix fcoe mailing list libfc: extend ex_lock to protect all of fc_seq_send libfc: Correct check for initiator role libfcoe: Fix Conflicting FCFs issue in the fabric
This commit is contained in:
commit
4b483802fd
|
@ -3220,7 +3220,7 @@ F: lib/fault-inject.c
|
||||||
|
|
||||||
FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
|
FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
|
||||||
M: Robert Love <robert.w.love@intel.com>
|
M: Robert Love <robert.w.love@intel.com>
|
||||||
L: devel@open-fcoe.org
|
L: fcoe-devel@open-fcoe.org
|
||||||
W: www.Open-FCoE.org
|
W: www.Open-FCoE.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/scsi/libfc/
|
F: drivers/scsi/libfc/
|
||||||
|
|
|
@ -1548,9 +1548,6 @@ static struct fcoe_fcf *fcoe_ctlr_select(struct fcoe_ctlr *fip)
|
||||||
{
|
{
|
||||||
struct fcoe_fcf *fcf;
|
struct fcoe_fcf *fcf;
|
||||||
struct fcoe_fcf *best = fip->sel_fcf;
|
struct fcoe_fcf *best = fip->sel_fcf;
|
||||||
struct fcoe_fcf *first;
|
|
||||||
|
|
||||||
first = list_first_entry(&fip->fcfs, struct fcoe_fcf, list);
|
|
||||||
|
|
||||||
list_for_each_entry(fcf, &fip->fcfs, list) {
|
list_for_each_entry(fcf, &fip->fcfs, list) {
|
||||||
LIBFCOE_FIP_DBG(fip, "consider FCF fab %16.16llx "
|
LIBFCOE_FIP_DBG(fip, "consider FCF fab %16.16llx "
|
||||||
|
@ -1568,17 +1565,15 @@ static struct fcoe_fcf *fcoe_ctlr_select(struct fcoe_ctlr *fip)
|
||||||
"" : "un");
|
"" : "un");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (fcf->fabric_name != first->fabric_name ||
|
if (!best || fcf->pri < best->pri || best->flogi_sent)
|
||||||
fcf->vfid != first->vfid ||
|
best = fcf;
|
||||||
fcf->fc_map != first->fc_map) {
|
if (fcf->fabric_name != best->fabric_name ||
|
||||||
|
fcf->vfid != best->vfid ||
|
||||||
|
fcf->fc_map != best->fc_map) {
|
||||||
LIBFCOE_FIP_DBG(fip, "Conflicting fabric, VFID, "
|
LIBFCOE_FIP_DBG(fip, "Conflicting fabric, VFID, "
|
||||||
"or FC-MAP\n");
|
"or FC-MAP\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (fcf->flogi_sent)
|
|
||||||
continue;
|
|
||||||
if (!best || fcf->pri < best->pri || best->flogi_sent)
|
|
||||||
best = fcf;
|
|
||||||
}
|
}
|
||||||
fip->sel_fcf = best;
|
fip->sel_fcf = best;
|
||||||
if (best) {
|
if (best) {
|
||||||
|
|
|
@ -8980,19 +8980,6 @@ static int ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
|
||||||
if (!ioa_cfg->res_entries)
|
if (!ioa_cfg->res_entries)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (ioa_cfg->sis64) {
|
|
||||||
ioa_cfg->target_ids = kzalloc(sizeof(unsigned long) *
|
|
||||||
BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL);
|
|
||||||
ioa_cfg->array_ids = kzalloc(sizeof(unsigned long) *
|
|
||||||
BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL);
|
|
||||||
ioa_cfg->vset_ids = kzalloc(sizeof(unsigned long) *
|
|
||||||
BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL);
|
|
||||||
|
|
||||||
if (!ioa_cfg->target_ids || !ioa_cfg->array_ids
|
|
||||||
|| !ioa_cfg->vset_ids)
|
|
||||||
goto out_free_res_entries;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < ioa_cfg->max_devs_supported; i++) {
|
for (i = 0; i < ioa_cfg->max_devs_supported; i++) {
|
||||||
list_add_tail(&ioa_cfg->res_entries[i].queue, &ioa_cfg->free_res_q);
|
list_add_tail(&ioa_cfg->res_entries[i].queue, &ioa_cfg->free_res_q);
|
||||||
ioa_cfg->res_entries[i].ioa_cfg = ioa_cfg;
|
ioa_cfg->res_entries[i].ioa_cfg = ioa_cfg;
|
||||||
|
@ -9089,9 +9076,6 @@ out_free_vpd_cbs:
|
||||||
ioa_cfg->vpd_cbs, ioa_cfg->vpd_cbs_dma);
|
ioa_cfg->vpd_cbs, ioa_cfg->vpd_cbs_dma);
|
||||||
out_free_res_entries:
|
out_free_res_entries:
|
||||||
kfree(ioa_cfg->res_entries);
|
kfree(ioa_cfg->res_entries);
|
||||||
kfree(ioa_cfg->target_ids);
|
|
||||||
kfree(ioa_cfg->array_ids);
|
|
||||||
kfree(ioa_cfg->vset_ids);
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1440,9 +1440,9 @@ struct ipr_ioa_cfg {
|
||||||
/*
|
/*
|
||||||
* Bitmaps for SIS64 generated target values
|
* Bitmaps for SIS64 generated target values
|
||||||
*/
|
*/
|
||||||
unsigned long *target_ids;
|
unsigned long target_ids[BITS_TO_LONGS(IPR_MAX_SIS64_DEVS)];
|
||||||
unsigned long *array_ids;
|
unsigned long array_ids[BITS_TO_LONGS(IPR_MAX_SIS64_DEVS)];
|
||||||
unsigned long *vset_ids;
|
unsigned long vset_ids[BITS_TO_LONGS(IPR_MAX_SIS64_DEVS)];
|
||||||
|
|
||||||
u16 type; /* CCIN of the card */
|
u16 type; /* CCIN of the card */
|
||||||
|
|
||||||
|
|
|
@ -463,13 +463,7 @@ static void fc_exch_delete(struct fc_exch *ep)
|
||||||
fc_exch_release(ep); /* drop hold for exch in mp */
|
fc_exch_release(ep); /* drop hold for exch in mp */
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
static int fc_seq_send_locked(struct fc_lport *lport, struct fc_seq *sp,
|
||||||
* fc_seq_send() - Send a frame using existing sequence/exchange pair
|
|
||||||
* @lport: The local port that the exchange will be sent on
|
|
||||||
* @sp: The sequence to be sent
|
|
||||||
* @fp: The frame to be sent on the exchange
|
|
||||||
*/
|
|
||||||
static int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp,
|
|
||||||
struct fc_frame *fp)
|
struct fc_frame *fp)
|
||||||
{
|
{
|
||||||
struct fc_exch *ep;
|
struct fc_exch *ep;
|
||||||
|
@ -479,7 +473,7 @@ static int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp,
|
||||||
u8 fh_type = fh->fh_type;
|
u8 fh_type = fh->fh_type;
|
||||||
|
|
||||||
ep = fc_seq_exch(sp);
|
ep = fc_seq_exch(sp);
|
||||||
WARN_ON((ep->esb_stat & ESB_ST_SEQ_INIT) != ESB_ST_SEQ_INIT);
|
WARN_ON(!(ep->esb_stat & ESB_ST_SEQ_INIT));
|
||||||
|
|
||||||
f_ctl = ntoh24(fh->fh_f_ctl);
|
f_ctl = ntoh24(fh->fh_f_ctl);
|
||||||
fc_exch_setup_hdr(ep, fp, f_ctl);
|
fc_exch_setup_hdr(ep, fp, f_ctl);
|
||||||
|
@ -502,17 +496,34 @@ static int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp,
|
||||||
error = lport->tt.frame_send(lport, fp);
|
error = lport->tt.frame_send(lport, fp);
|
||||||
|
|
||||||
if (fh_type == FC_TYPE_BLS)
|
if (fh_type == FC_TYPE_BLS)
|
||||||
return error;
|
goto out;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Update the exchange and sequence flags,
|
* Update the exchange and sequence flags,
|
||||||
* assuming all frames for the sequence have been sent.
|
* assuming all frames for the sequence have been sent.
|
||||||
* We can only be called to send once for each sequence.
|
* We can only be called to send once for each sequence.
|
||||||
*/
|
*/
|
||||||
spin_lock_bh(&ep->ex_lock);
|
|
||||||
ep->f_ctl = f_ctl & ~FC_FC_FIRST_SEQ; /* not first seq */
|
ep->f_ctl = f_ctl & ~FC_FC_FIRST_SEQ; /* not first seq */
|
||||||
if (f_ctl & FC_FC_SEQ_INIT)
|
if (f_ctl & FC_FC_SEQ_INIT)
|
||||||
ep->esb_stat &= ~ESB_ST_SEQ_INIT;
|
ep->esb_stat &= ~ESB_ST_SEQ_INIT;
|
||||||
|
out:
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fc_seq_send() - Send a frame using existing sequence/exchange pair
|
||||||
|
* @lport: The local port that the exchange will be sent on
|
||||||
|
* @sp: The sequence to be sent
|
||||||
|
* @fp: The frame to be sent on the exchange
|
||||||
|
*/
|
||||||
|
static int fc_seq_send(struct fc_lport *lport, struct fc_seq *sp,
|
||||||
|
struct fc_frame *fp)
|
||||||
|
{
|
||||||
|
struct fc_exch *ep;
|
||||||
|
int error;
|
||||||
|
ep = fc_seq_exch(sp);
|
||||||
|
spin_lock_bh(&ep->ex_lock);
|
||||||
|
error = fc_seq_send_locked(lport, sp, fp);
|
||||||
spin_unlock_bh(&ep->ex_lock);
|
spin_unlock_bh(&ep->ex_lock);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
@ -629,7 +640,7 @@ static int fc_exch_abort_locked(struct fc_exch *ep,
|
||||||
if (fp) {
|
if (fp) {
|
||||||
fc_fill_fc_hdr(fp, FC_RCTL_BA_ABTS, ep->did, ep->sid,
|
fc_fill_fc_hdr(fp, FC_RCTL_BA_ABTS, ep->did, ep->sid,
|
||||||
FC_TYPE_BLS, FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
|
FC_TYPE_BLS, FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
|
||||||
error = fc_seq_send(ep->lp, sp, fp);
|
error = fc_seq_send_locked(ep->lp, sp, fp);
|
||||||
} else
|
} else
|
||||||
error = -ENOBUFS;
|
error = -ENOBUFS;
|
||||||
return error;
|
return error;
|
||||||
|
@ -1132,7 +1143,7 @@ static void fc_seq_send_last(struct fc_seq *sp, struct fc_frame *fp,
|
||||||
f_ctl = FC_FC_LAST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT;
|
f_ctl = FC_FC_LAST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT;
|
||||||
f_ctl |= ep->f_ctl;
|
f_ctl |= ep->f_ctl;
|
||||||
fc_fill_fc_hdr(fp, rctl, ep->did, ep->sid, fh_type, f_ctl, 0);
|
fc_fill_fc_hdr(fp, rctl, ep->did, ep->sid, fh_type, f_ctl, 0);
|
||||||
fc_seq_send(ep->lp, sp, fp);
|
fc_seq_send_locked(ep->lp, sp, fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1307,8 +1318,8 @@ static void fc_exch_recv_abts(struct fc_exch *ep, struct fc_frame *rx_fp)
|
||||||
ap->ba_low_seq_cnt = htons(sp->cnt);
|
ap->ba_low_seq_cnt = htons(sp->cnt);
|
||||||
}
|
}
|
||||||
sp = fc_seq_start_next_locked(sp);
|
sp = fc_seq_start_next_locked(sp);
|
||||||
spin_unlock_bh(&ep->ex_lock);
|
|
||||||
fc_seq_send_last(sp, fp, FC_RCTL_BA_ACC, FC_TYPE_BLS);
|
fc_seq_send_last(sp, fp, FC_RCTL_BA_ACC, FC_TYPE_BLS);
|
||||||
|
spin_unlock_bh(&ep->ex_lock);
|
||||||
fc_frame_free(rx_fp);
|
fc_frame_free(rx_fp);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -1962,7 +1962,7 @@ static int fc_rport_fcp_prli(struct fc_rport_priv *rdata, u32 spp_len,
|
||||||
rdata->flags |= FC_RP_FLAGS_RETRY;
|
rdata->flags |= FC_RP_FLAGS_RETRY;
|
||||||
rdata->supported_classes = FC_COS_CLASS3;
|
rdata->supported_classes = FC_COS_CLASS3;
|
||||||
|
|
||||||
if (!(lport->service_params & FC_RPORT_ROLE_FCP_INITIATOR))
|
if (!(lport->service_params & FCP_SPPF_INIT_FCN))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
spp->spp_flags |= rspp->spp_flags & FC_SPP_EST_IMG_PAIR;
|
spp->spp_flags |= rspp->spp_flags & FC_SPP_EST_IMG_PAIR;
|
||||||
|
|
|
@ -278,3 +278,14 @@ qla2x00_do_host_ramp_up(scsi_qla_host_t *vha)
|
||||||
|
|
||||||
set_bit(HOST_RAMP_UP_QUEUE_DEPTH, &vha->dpc_flags);
|
set_bit(HOST_RAMP_UP_QUEUE_DEPTH, &vha->dpc_flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
qla2x00_handle_mbx_completion(struct qla_hw_data *ha, int status)
|
||||||
|
{
|
||||||
|
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
||||||
|
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
||||||
|
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
||||||
|
clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
|
||||||
|
complete(&ha->mbx_intr_comp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -104,14 +104,9 @@ qla2100_intr_handler(int irq, void *dev_id)
|
||||||
RD_REG_WORD(®->hccr);
|
RD_REG_WORD(®->hccr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (IRQ_HANDLED);
|
return (IRQ_HANDLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -221,14 +216,9 @@ qla2300_intr_handler(int irq, void *dev_id)
|
||||||
WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT);
|
WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT);
|
||||||
RD_REG_WORD_RELAXED(®->hccr);
|
RD_REG_WORD_RELAXED(®->hccr);
|
||||||
}
|
}
|
||||||
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (IRQ_HANDLED);
|
return (IRQ_HANDLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2613,14 +2603,9 @@ qla24xx_intr_handler(int irq, void *dev_id)
|
||||||
if (unlikely(IS_QLA83XX(ha) && (ha->pdev->revision == 1)))
|
if (unlikely(IS_QLA83XX(ha) && (ha->pdev->revision == 1)))
|
||||||
ndelay(3500);
|
ndelay(3500);
|
||||||
}
|
}
|
||||||
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
|
||||||
}
|
|
||||||
|
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2763,13 +2748,9 @@ qla24xx_msix_default(int irq, void *dev_id)
|
||||||
}
|
}
|
||||||
WRT_REG_DWORD(®->hccr, HCCRX_CLR_RISC_INT);
|
WRT_REG_DWORD(®->hccr, HCCRX_CLR_RISC_INT);
|
||||||
} while (0);
|
} while (0);
|
||||||
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
|
||||||
}
|
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -179,8 +179,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
|
||||||
|
|
||||||
wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ);
|
wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ);
|
||||||
|
|
||||||
clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
ql_dbg(ql_dbg_mbx, vha, 0x1011,
|
ql_dbg(ql_dbg_mbx, vha, 0x1011,
|
||||||
"Cmd=%x Polling Mode.\n", command);
|
"Cmd=%x Polling Mode.\n", command);
|
||||||
|
|
|
@ -148,9 +148,6 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
|
|
||||||
wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ);
|
wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ);
|
||||||
|
|
||||||
clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
ql_dbg(ql_dbg_mbx, vha, 0x112c,
|
ql_dbg(ql_dbg_mbx, vha, 0x112c,
|
||||||
"Cmd=%x Polling Mode.\n", command);
|
"Cmd=%x Polling Mode.\n", command);
|
||||||
|
@ -2934,13 +2931,10 @@ qlafx00_intr_handler(int irq, void *dev_id)
|
||||||
QLAFX00_CLR_INTR_REG(ha, clr_intr);
|
QLAFX00_CLR_INTR_REG(ha, clr_intr);
|
||||||
QLAFX00_RD_INTR_REG(ha);
|
QLAFX00_RD_INTR_REG(ha);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
|
||||||
}
|
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2074,9 +2074,6 @@ qla82xx_intr_handler(int irq, void *dev_id)
|
||||||
}
|
}
|
||||||
WRT_REG_DWORD(®->host_int, 0);
|
WRT_REG_DWORD(®->host_int, 0);
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
|
||||||
if (!ha->flags.msi_enabled)
|
|
||||||
qla82xx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg, 0xfbff);
|
|
||||||
|
|
||||||
#ifdef QL_DEBUG_LEVEL_17
|
#ifdef QL_DEBUG_LEVEL_17
|
||||||
if (!irq && ha->flags.eeh_busy)
|
if (!irq && ha->flags.eeh_busy)
|
||||||
|
@ -2085,11 +2082,12 @@ qla82xx_intr_handler(int irq, void *dev_id)
|
||||||
status, ha->mbx_cmd_flags, ha->flags.mbox_int, stat);
|
status, ha->mbx_cmd_flags, ha->flags.mbox_int, stat);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
if (!ha->flags.msi_enabled)
|
||||||
}
|
qla82xx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg, 0xfbff);
|
||||||
|
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2149,8 +2147,6 @@ qla82xx_msix_default(int irq, void *dev_id)
|
||||||
WRT_REG_DWORD(®->host_int, 0);
|
WRT_REG_DWORD(®->host_int, 0);
|
||||||
} while (0);
|
} while (0);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
|
||||||
|
|
||||||
#ifdef QL_DEBUG_LEVEL_17
|
#ifdef QL_DEBUG_LEVEL_17
|
||||||
if (!irq && ha->flags.eeh_busy)
|
if (!irq && ha->flags.eeh_busy)
|
||||||
ql_log(ql_log_warn, vha, 0x5044,
|
ql_log(ql_log_warn, vha, 0x5044,
|
||||||
|
@ -2158,11 +2154,9 @@ qla82xx_msix_default(int irq, void *dev_id)
|
||||||
status, ha->mbx_cmd_flags, ha->flags.mbox_int, stat);
|
status, ha->mbx_cmd_flags, ha->flags.mbox_int, stat);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
|
qla2x00_handle_mbx_completion(ha, status);
|
||||||
(status & MBX_INTERRUPT) && ha->flags.mbox_int) {
|
spin_unlock_irqrestore(&ha->hardware_lock, flags);
|
||||||
set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
|
|
||||||
complete(&ha->mbx_intr_comp);
|
|
||||||
}
|
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3345,7 +3339,7 @@ void qla82xx_clear_pending_mbx(scsi_qla_host_t *vha)
|
||||||
ha->flags.mbox_busy = 0;
|
ha->flags.mbox_busy = 0;
|
||||||
ql_log(ql_log_warn, vha, 0x6010,
|
ql_log(ql_log_warn, vha, 0x6010,
|
||||||
"Doing premature completion of mbx command.\n");
|
"Doing premature completion of mbx command.\n");
|
||||||
if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags))
|
if (test_and_clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags))
|
||||||
complete(&ha->mbx_intr_comp);
|
complete(&ha->mbx_intr_comp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue