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

Commit 1cda28bb authored by Shiraz Saleem's avatar Shiraz Saleem Committed by Doug Ledford
Browse files

i40iw: Fix QP flush to not hang on empty queues or failure 



When flush QP and there are no pending work requests, signal completion
to unblock i40iw_drain_sq and i40iw_drain_rq which are waiting on
completion for iwqp->sq_drained and iwqp->sq_drained respectively.
Also, signal completion if flush QP fails to prevent the drain SQ or RQ
from being blocked indefintely.

Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent f4a87ca1

drivers/infiniband/hw/i40iw/i40iw.h

+6 −3
Original line number Original line Diff line number Diff line
@@ -115,6 +115,9 @@ 
#define IW_CFG_FPM_QP_COUNT               32768

#define IW_CFG_FPM_QP_COUNT               32768

#define I40IW_MAX_PAGES_PER_FMR           512

#define I40IW_MAX_PAGES_PER_FMR           512

#define I40IW_MIN_PAGES_PER_FMR           1

#define I40IW_MIN_PAGES_PER_FMR           1

#define I40IW_CQP_COMPL_RQ_WQE_FLUSHED    2

#define I40IW_CQP_COMPL_SQ_WQE_FLUSHED    3

#define I40IW_CQP_COMPL_RQ_SQ_WQE_FLUSHED 4





#define I40IW_MTU_TO_MSS		40

#define I40IW_MTU_TO_MSS		40

#define I40IW_DEFAULT_MSS		1460

#define I40IW_DEFAULT_MSS		1460

drivers/infiniband/hw/i40iw/i40iw_hw.c

+24 −2
Original line number Original line Diff line number Diff line
@@ -622,6 +622,7 @@ enum i40iw_status_code i40iw_hw_flush_wqes(struct i40iw_device *iwdev, 
	struct i40iw_qp_flush_info *hw_info;

	struct i40iw_qp_flush_info *hw_info;

	struct i40iw_cqp_request *cqp_request;

	struct i40iw_cqp_request *cqp_request;

	struct cqp_commands_info *cqp_info;

	struct cqp_commands_info *cqp_info;

	struct i40iw_qp *iwqp = (struct i40iw_qp *)qp->back_qp;





	cqp_request = i40iw_get_cqp_request(&iwdev->cqp, wait);

	cqp_request = i40iw_get_cqp_request(&iwdev->cqp, wait);

	if (!cqp_request)

	if (!cqp_request)
@@ -636,10 +637,31 @@ enum i40iw_status_code i40iw_hw_flush_wqes(struct i40iw_device *iwdev, 
	cqp_info->in.u.qp_flush_wqes.qp = qp;

	cqp_info->in.u.qp_flush_wqes.qp = qp;

	cqp_info->in.u.qp_flush_wqes.scratch = (uintptr_t)cqp_request;

	cqp_info->in.u.qp_flush_wqes.scratch = (uintptr_t)cqp_request;

	status = i40iw_handle_cqp_op(iwdev, cqp_request);

	status = i40iw_handle_cqp_op(iwdev, cqp_request);

	if (status)

	if (status) {

		i40iw_pr_err("CQP-OP Flush WQE's fail");

		i40iw_pr_err("CQP-OP Flush WQE's fail");

		complete(&iwqp->sq_drained);

		complete(&iwqp->rq_drained);

		return status;

		return status;

	}

	}

	if (!cqp_request->compl_info.maj_err_code) {

		switch (cqp_request->compl_info.min_err_code) {

		case I40IW_CQP_COMPL_RQ_WQE_FLUSHED:

			complete(&iwqp->sq_drained);

			break;

		case I40IW_CQP_COMPL_SQ_WQE_FLUSHED:

			complete(&iwqp->rq_drained);

			break;

		case I40IW_CQP_COMPL_RQ_SQ_WQE_FLUSHED:

			break;

		default:

			complete(&iwqp->sq_drained);

			complete(&iwqp->rq_drained);

			break;

		}

	}



	return 0;

}





/**

/**

 * i40iw_hw_manage_vf_pble_bp - manage vf pbles

 * i40iw_hw_manage_vf_pble_bp - manage vf pbles