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

Commit c5212b94 authored by Ram Amrani's avatar Ram Amrani Committed by David S. Miller
Browse files

qed: Read queue state before releasing buffer 



Currently the state is read only after the buffers are relesed.

Signed-off-by: default avatarRam Amrani <Ram.Amrani@cavium.com>
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 670dde55

drivers/net/ethernet/qlogic/qed/qed_roce.c

+6 −6
Original line number Diff line number Diff line
@@ -1768,13 +1768,13 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, 
	if (rc)

		goto err_resp;



	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res),

			  p_resp_ramrod_res, resp_ramrod_res_phys);



	out_params->rq_psn = le32_to_cpu(p_resp_ramrod_res->psn);

	rq_err_state = GET_FIELD(le32_to_cpu(p_resp_ramrod_res->err_flag),

				 ROCE_QUERY_QP_RESP_OUTPUT_PARAMS_ERROR_FLG);



	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_resp_ramrod_res),

			  p_resp_ramrod_res, resp_ramrod_res_phys);



	if (!(qp->req_offloaded)) {

		/* Don't send query qp for the requester */

		out_params->sq_psn = qp->sq_psn;
@@ -1815,9 +1815,6 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, 
	if (rc)

		goto err_req;



	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res),

			  p_req_ramrod_res, req_ramrod_res_phys);



	out_params->sq_psn = le32_to_cpu(p_req_ramrod_res->psn);

	sq_err_state = GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags),

				 ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_ERR_FLG);
@@ -1825,6 +1822,9 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, 
		GET_FIELD(le32_to_cpu(p_req_ramrod_res->flags),

			  ROCE_QUERY_QP_REQ_OUTPUT_PARAMS_SQ_DRAINING_FLG);



	dma_free_coherent(&p_hwfn->cdev->pdev->dev, sizeof(*p_req_ramrod_res),

			  p_req_ramrod_res, req_ramrod_res_phys);



	out_params->draining = false;



	if (rq_err_state)