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

Commit aff9e39d authored by Steve Wise's avatar Steve Wise Committed by Roland Dreier
Browse files

RDMA/cxgb3: Support for new abort logic 



The HW now posts 2 ABORT_RPL and/or PEER_ABORT_REQ messages.  We need
to handle them by silenty dropping the 1st but mark that we're ready
for the final message.  This plugs some close races between the uP and
HW.  Also update the minimum required firmware version.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 60be4b59

drivers/infiniband/hw/cxgb3/iwch_cm.c

+18 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,15 @@ static int abort_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx) 


	PDBG("%s ep %p\n", __FUNCTION__, ep);



	/*

	 * We get 2 abort replies from the HW.  The first one must

	 * be ignored except for scribbling that we need one more.

	 */

	if (!(ep->flags & ABORT_REQ_IN_PROGRESS)) {

		ep->flags |= ABORT_REQ_IN_PROGRESS;

		return CPL_RET_BUF_DONE;

	}



	close_complete_upcall(ep);

	state_set(&ep->com, DEAD);

	release_ep_resources(ep);
@@ -1476,6 +1485,15 @@ static int peer_abort(struct t3cdev *tdev, struct sk_buff *skb, void *ctx) 
	int ret;

	int state;



	/*

	 * We get 2 peer aborts from the HW.  The first one must

	 * be ignored except for scribbling that we need one more.

	 */

	if (!(ep->flags & PEER_ABORT_IN_PROGRESS)) {

		ep->flags |= PEER_ABORT_IN_PROGRESS;

		return CPL_RET_BUF_DONE;

	}



	if (is_neg_adv_abort(req->status)) {

		PDBG("%s neg_adv_abort ep %p tid %d\n", __FUNCTION__, ep,

		     ep->hwtid);

drivers/infiniband/hw/cxgb3/iwch_cm.h

+6 −0
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ enum iwch_ep_state { 
	DEAD,

};



enum iwch_ep_flags {

	PEER_ABORT_IN_PROGRESS	= (1 << 0),

	ABORT_REQ_IN_PROGRESS	= (1 << 1),

};



struct iwch_ep_common {

	struct iw_cm_id *cm_id;

	struct iwch_qp *qp;
@@ -181,6 +186,7 @@ struct iwch_ep { 
	u16 plen;

	u32 ird;

	u32 ord;

	u32 flags;

};



static inline struct iwch_ep *to_ep(struct iw_cm_id *cm_id)

drivers/net/cxgb3/version.h

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define DRV_VERSION "1.0-ko"



/* Firmware version */

#define FW_VERSION_MAJOR 3

#define FW_VERSION_MINOR 3

#define FW_VERSION_MAJOR 4

#define FW_VERSION_MINOR 0

#define FW_VERSION_MICRO 0

#endif				/* __CHELSIO_VERSION_H */