* [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi
@ 2014-11-04 23:19 Anish Bhatt
2014-11-04 23:19 ` [PATCH scsi 1/2] cxgbi : Add Maintainer for cxgb3i/cxgb4i Anish Bhatt
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Anish Bhatt @ 2014-11-04 23:19 UTC (permalink / raw)
To: linux-scsi; +Cc: hch, jbottomley, michaelc, kxie, manojmalviya, Anish Bhatt
First patch adds missing maintainers for cxgb3i/cxgb4i.
Second is a bugfix
Please apply on drivers-for-3.18
Anish Bhatt (2):
cxgbi : Add Maintainer for cxgb3i/cxgb4i
cxgb4i : Send abort_rpl correctly
MAINTAINERS | 14 ++++++++++++++
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 15 +++++++++------
drivers/scsi/cxgbi/libcxgbi.c | 18 ++++++++----------
3 files changed, 31 insertions(+), 16 deletions(-)
--
2.1.3
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH scsi 1/2] cxgbi : Add Maintainer for cxgb3i/cxgb4i 2014-11-04 23:19 [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Anish Bhatt @ 2014-11-04 23:19 ` Anish Bhatt 2014-11-04 23:19 ` [PATCH scsi 2/2] cxgb4i : Send abort_rpl correctly Anish Bhatt 2014-11-06 16:52 ` [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Christoph Hellwig 2 siblings, 0 replies; 4+ messages in thread From: Anish Bhatt @ 2014-11-04 23:19 UTC (permalink / raw) To: linux-scsi; +Cc: hch, jbottomley, michaelc, kxie, manojmalviya, Anish Bhatt Signed-off-by: Anish Bhatt <anish@chelsio.com> --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 82d4ad2..254cb28 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2742,6 +2742,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 @@ -2756,6 +2763,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 -- 2.1.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH scsi 2/2] cxgb4i : Send abort_rpl correctly 2014-11-04 23:19 [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Anish Bhatt 2014-11-04 23:19 ` [PATCH scsi 1/2] cxgbi : Add Maintainer for cxgb3i/cxgb4i Anish Bhatt @ 2014-11-04 23:19 ` Anish Bhatt 2014-11-06 16:52 ` [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Christoph Hellwig 2 siblings, 0 replies; 4+ messages in thread From: Anish Bhatt @ 2014-11-04 23:19 UTC (permalink / raw) To: linux-scsi; +Cc: hch, jbottomley, michaelc, kxie, manojmalviya, Anish Bhatt Connection retries were not being cleaned up correctly if they failed as a result of link down. Applies on top of drivers-for-3.18 Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: Karen Xie <kxie@chelsio.com> --- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 15 +++++++++------ drivers/scsi/cxgbi/libcxgbi.c | 18 ++++++++---------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c index 3e0a0d3..2d2f3d0 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c @@ -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_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); + + if (!cxgbi_sock_flag(csk, CTPF_TX_DATA_SENT)) { + send_tx_flowc_wr(csk, 0); + cxgbi_sock_set_flag(csk, CTPF_TX_DATA_SENT); } - cxgbi_sock_clear_flag(csk, CTPF_ABORT_REQ_RCVD); + cxgbi_sock_set_flag(csk, CTPF_ABORT_REQ_RCVD); + cxgbi_sock_set_state(csk, CTP_ABORTING); + 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: diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c index 674d498..13d869a 100644 --- a/drivers/scsi/cxgbi/libcxgbi.c +++ b/drivers/scsi/cxgbi/libcxgbi.c @@ -905,18 +905,16 @@ void cxgbi_sock_rcv_abort_rpl(struct cxgbi_sock *csk) { cxgbi_sock_get(csk); spin_lock_bh(&csk->lock); + + cxgbi_sock_set_flag(csk, CTPF_ABORT_RPL_RCVD); 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); - 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); - } + 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); } -- 2.1.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi 2014-11-04 23:19 [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Anish Bhatt 2014-11-04 23:19 ` [PATCH scsi 1/2] cxgbi : Add Maintainer for cxgb3i/cxgb4i Anish Bhatt 2014-11-04 23:19 ` [PATCH scsi 2/2] cxgb4i : Send abort_rpl correctly Anish Bhatt @ 2014-11-06 16:52 ` Christoph Hellwig 2 siblings, 0 replies; 4+ messages in thread From: Christoph Hellwig @ 2014-11-06 16:52 UTC (permalink / raw) To: Anish Bhatt; +Cc: linux-scsi, hch, jbottomley, michaelc, kxie, manojmalviya Thanks, applied both patches to the drivers-for-3.18 branch. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-06 16:52 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-11-04 23:19 [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Anish Bhatt 2014-11-04 23:19 ` [PATCH scsi 1/2] cxgbi : Add Maintainer for cxgb3i/cxgb4i Anish Bhatt 2014-11-04 23:19 ` [PATCH scsi 2/2] cxgb4i : Send abort_rpl correctly Anish Bhatt 2014-11-06 16:52 ` [PATCH scsi 0/2] Bugfix & mainatainers update for cxgbi Christoph Hellwig
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.