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

Commit dec943f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 six fixes and a MAINTAINER update.

  The fixes are two multipath (one in Test Unit Ready handling for the
  path checkers and one in the section of code that sends a start unit
  after failover; both of these were perturbed by the scsi-mq update), a
  CD-ROM door locking fix that was likewise introduced by scsi-mq and
  three driver fixes for a previous code update in cxgb4i, megaraid_sas
  and bnx2fc"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  bnx2fc: fix tgt spinlock locking
  megaraid_sas: fix bug in handling return value of pci_enable_msix_range()
  cxgb4i: send abort_rpl correctly
  cxgbi: add maintainer for cxgb3i/cxgb4i
  scsi: TUR path is down after adapter gets reset with multipath
  scsi: call device handler for failed TUR command
  scsi: only re-lock door after EH on devices that were reset
parents de55bbbf dc6311dd

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -2744,6 +2744,13 @@ W: http://www.chelsio.com 
S:	Supported

F:	drivers/net/ethernet/chelsio/cxgb3/



CXGB3 ISCSI DRIVER (CXGB3I)

M:      Karen Xie <kxie@chelsio.com>

L:      linux-scsi@vger.kernel.org

W:      http://www.chelsio.com

S:      Supported

F:      drivers/scsi/cxgbi/cxgb3i



CXGB3 IWARP RNIC DRIVER (IW_CXGB3)

M:	Steve Wise <swise@chelsio.com>

L:	linux-rdma@vger.kernel.org
@@ -2758,6 +2765,13 @@ W: http://www.chelsio.com 
S:	Supported

F:	drivers/net/ethernet/chelsio/cxgb4/



CXGB4 ISCSI DRIVER (CXGB4I)

M:      Karen Xie <kxie@chelsio.com>

L:      linux-scsi@vger.kernel.org

W:      http://www.chelsio.com

S:      Supported

F:      drivers/scsi/cxgbi/cxgb4i



CXGB4 IWARP RNIC DRIVER (IW_CXGB4)

M:	Steve Wise <swise@chelsio.com>

L:	linux-rdma@vger.kernel.org

drivers/scsi/bnx2fc/bnx2fc_els.c

+0 −2
Original line number Diff line number Diff line
@@ -480,9 +480,7 @@ void bnx2fc_rec_compl(struct bnx2fc_els_cb_arg *cb_arg) 
			bnx2fc_initiate_cleanup(orig_io_req);

			/* Post a new IO req with the same sc_cmd */

			BNX2FC_IO_DBG(rec_req, "Post IO request again\n");

			spin_unlock_bh(&tgt->tgt_lock);

			rc = bnx2fc_post_io_req(tgt, new_io_req);

			spin_lock_bh(&tgt->tgt_lock);

			if (!rc)

				goto free_frame;

			BNX2FC_IO_DBG(rec_req, "REC: io post err\n");

drivers/scsi/bnx2fc/bnx2fc_io.c

+10 −9
Original line number Diff line number Diff line
@@ -1894,18 +1894,24 @@ int bnx2fc_queuecommand(struct Scsi_Host *host, 
			goto exit_qcmd;

		}

	}



	spin_lock_bh(&tgt->tgt_lock);



	io_req = bnx2fc_cmd_alloc(tgt);

	if (!io_req) {

		rc = SCSI_MLQUEUE_HOST_BUSY;

		goto exit_qcmd;

		goto exit_qcmd_tgtlock;

	}

	io_req->sc_cmd = sc_cmd;



	if (bnx2fc_post_io_req(tgt, io_req)) {

		printk(KERN_ERR PFX "Unable to post io_req\n");

		rc = SCSI_MLQUEUE_HOST_BUSY;

		goto exit_qcmd;

		goto exit_qcmd_tgtlock;

	}



exit_qcmd_tgtlock:

	spin_unlock_bh(&tgt->tgt_lock);

exit_qcmd:

	return rc;

}
@@ -2020,6 +2026,8 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, 
	int task_idx, index;

	u16 xid;



	/* bnx2fc_post_io_req() is called with the tgt_lock held */



	/* Initialize rest of io_req fields */

	io_req->cmd_type = BNX2FC_SCSI_CMD;

	io_req->port = port;
@@ -2047,9 +2055,7 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, 
	/* Build buffer descriptor list for firmware from sg list */

	if (bnx2fc_build_bd_list_from_sg(io_req)) {

		printk(KERN_ERR PFX "BD list creation failed\n");

		spin_lock_bh(&tgt->tgt_lock);

		kref_put(&io_req->refcount, bnx2fc_cmd_release);

		spin_unlock_bh(&tgt->tgt_lock);

		return -EAGAIN;

	}
@@ -2061,19 +2067,15 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, 
	task = &(task_page[index]);

	bnx2fc_init_task(io_req, task);



	spin_lock_bh(&tgt->tgt_lock);



	if (tgt->flush_in_prog) {

		printk(KERN_ERR PFX "Flush in progress..Host Busy\n");

		kref_put(&io_req->refcount, bnx2fc_cmd_release);

		spin_unlock_bh(&tgt->tgt_lock);

		return -EAGAIN;

	}



	if (!test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags)) {

		printk(KERN_ERR PFX "Session not ready...post_io\n");

		kref_put(&io_req->refcount, bnx2fc_cmd_release);

		spin_unlock_bh(&tgt->tgt_lock);

		return -EAGAIN;

	}
@@ -2091,6 +2093,5 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, 


	/* Ring doorbell */

	bnx2fc_ring_doorbell(tgt);

	spin_unlock_bh(&tgt->tgt_lock);

	return 0;

}

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

+9 −6
Original line number Diff line number Diff line
@@ -936,20 +936,23 @@ static void do_abort_req_rss(struct cxgbi_device *cdev, struct sk_buff *skb) 
	cxgbi_sock_get(csk);

	spin_lock_bh(&csk->lock);



	if (!cxgbi_sock_flag(csk, CTPF_ABORT_REQ_RCVD)) {

	cxgbi_sock_clear_flag(csk, CTPF_ABORT_REQ_RCVD);



	if (!cxgbi_sock_flag(csk, CTPF_TX_DATA_SENT)) {

		send_tx_flowc_wr(csk);

		cxgbi_sock_set_flag(csk, CTPF_TX_DATA_SENT);

	}



	cxgbi_sock_set_flag(csk, CTPF_ABORT_REQ_RCVD);

	cxgbi_sock_set_state(csk, CTP_ABORTING);

		goto done;

	}



	cxgbi_sock_clear_flag(csk, CTPF_ABORT_REQ_RCVD);

	send_abort_rpl(csk, rst_status);



	if (!cxgbi_sock_flag(csk, CTPF_ABORT_RPL_PENDING)) {

		csk->err = abort_status_to_errno(csk, req->status, &rst_status);

		cxgbi_sock_closed(csk);

	}

done:



	spin_unlock_bh(&csk->lock);

	cxgbi_sock_put(csk);

rel_skb:

drivers/scsi/cxgbi/libcxgbi.c

+8 −10
Original line number Diff line number Diff line
@@ -905,18 +905,16 @@ void cxgbi_sock_rcv_abort_rpl(struct cxgbi_sock *csk) 
{

	cxgbi_sock_get(csk);

	spin_lock_bh(&csk->lock);

	if (cxgbi_sock_flag(csk, CTPF_ABORT_RPL_PENDING)) {

		if (!cxgbi_sock_flag(csk, CTPF_ABORT_RPL_RCVD))



	cxgbi_sock_set_flag(csk, CTPF_ABORT_RPL_RCVD);

		else {

			cxgbi_sock_clear_flag(csk, CTPF_ABORT_RPL_RCVD);

	if (cxgbi_sock_flag(csk, CTPF_ABORT_RPL_PENDING)) {

		cxgbi_sock_clear_flag(csk, CTPF_ABORT_RPL_PENDING);

		if (cxgbi_sock_flag(csk, CTPF_ABORT_REQ_RCVD))

			pr_err("csk 0x%p,%u,0x%lx,%u,ABT_RPL_RSS.\n",

			       csk, csk->state, csk->flags, csk->tid);

		cxgbi_sock_closed(csk);

	}

	}



	spin_unlock_bh(&csk->lock);

	cxgbi_sock_put(csk);

}