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

Commit 5a4dcdca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-bug-fixes' 



Yuval Mintz says:

====================
qed*: Bug fixes

This is a respin of the series with same name for net-next
instead of net [only patch #10 is changed].

The 3 first patches here are a repost of
("qed: RoCE infrastructure fixes"). The fourth is an additional
RoCE-related infrastructure fix, and the latter contain various fixes
to qed/qede.

Please consider applying these to `net-next'.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8676ea8f 65ed2ffd

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

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ qed_hw_init_pf_doorbell_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
		/* Either EDPM is mandatory, or we are attempting to allocate a

		 * WID per CPU.

		 */

		n_cpus = num_active_cpus();

		n_cpus = num_present_cpus();

		rc = qed_hw_init_dpi_size(p_hwfn, p_ptt, pwm_regsize, n_cpus);

	}

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

+22 −5
Original line number Diff line number Diff line
@@ -1072,6 +1072,7 @@ static u32 qed_sb_init(struct qed_dev *cdev, 
		       enum qed_sb_type type)

{

	struct qed_hwfn *p_hwfn;

	struct qed_ptt *p_ptt;

	int hwfn_index;

	u16 rel_sb_id;

	u8 n_hwfns;
@@ -1093,8 +1094,18 @@ static u32 qed_sb_init(struct qed_dev *cdev, 
		   "hwfn [%d] <--[init]-- SB %04x [0x%04x upper]\n",

		   hwfn_index, rel_sb_id, sb_id);



	rc = qed_int_sb_init(p_hwfn, p_hwfn->p_main_ptt, sb_info,

			     sb_virt_addr, sb_phy_addr, rel_sb_id);

	if (IS_PF(p_hwfn->cdev)) {

		p_ptt = qed_ptt_acquire(p_hwfn);

		if (!p_ptt)

			return -EBUSY;



		rc = qed_int_sb_init(p_hwfn, p_ptt, sb_info, sb_virt_addr,

				     sb_phy_addr, rel_sb_id);

		qed_ptt_release(p_hwfn, p_ptt);

	} else {

		rc = qed_int_sb_init(p_hwfn, NULL, sb_info, sb_virt_addr,

				     sb_phy_addr, rel_sb_id);

	}



	return rc;

}
@@ -1135,12 +1146,18 @@ static int qed_set_link(struct qed_dev *cdev, struct qed_link_params *params) 
	if (!cdev)

		return -ENODEV;



	if (IS_VF(cdev))

		return 0;



	/* The link should be set only once per PF */

	hwfn = &cdev->hwfns[0];



	/* When VF wants to set link, force it to read the bulletin instead.

	 * This mimics the PF behavior, where a noitification [both immediate

	 * and possible later] would be generated when changing properties.

	 */

	if (IS_VF(cdev)) {

		qed_schedule_iov(hwfn, QED_IOV_WQ_VF_FORCE_LINK_QUERY_FLAG);

		return 0;

	}



	ptt = qed_ptt_acquire(hwfn);

	if (!ptt)

		return -EBUSY;

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

+14 −4
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 


	/* Initialize the MFW spinlock */

	spin_lock_init(&p_info->lock);

	spin_lock_init(&p_info->link_lock);



	return 0;
@@ -610,6 +611,9 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn, 
	u8 max_bw, min_bw;

	u32 status = 0;



	/* Prevent SW/attentions from doing this at the same time */

	spin_lock_bh(&p_hwfn->mcp_info->link_lock);



	p_link = &p_hwfn->mcp_info->link_output;

	memset(p_link, 0, sizeof(*p_link));

	if (!b_reset) {
@@ -624,7 +628,7 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn, 
	} else {

		DP_VERBOSE(p_hwfn, NETIF_MSG_LINK,

			   "Resetting link indications\n");

		return;

		goto out;

	}



	if (p_hwfn->b_drv_link_init)
@@ -731,6 +735,8 @@ static void qed_mcp_handle_link_change(struct qed_hwfn *p_hwfn, 
	p_link->sfp_tx_fault = !!(status & LINK_STATUS_SFP_TX_FAULT);



	qed_link_update(p_hwfn);

out:

	spin_unlock_bh(&p_hwfn->mcp_info->link_lock);

}



int qed_mcp_set_link(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, bool b_up)
@@ -780,9 +786,13 @@ int qed_mcp_set_link(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, bool b_up) 
		return rc;

	}



	/* Reset the link status if needed */

	if (!b_up)

		qed_mcp_handle_link_change(p_hwfn, p_ptt, true);

	/* Mimic link-change attention, done for several reasons:

	 *  - On reset, there's no guarantee MFW would trigger

	 *    an attention.

	 *  - On initialization, older MFWs might not indicate link change

	 *    during LFA, so we'll never get an UP indication.

	 */

	qed_mcp_handle_link_change(p_hwfn, p_ptt, !b_up);



	return 0;

}

drivers/net/ethernet/qlogic/qed/qed_mcp.h

+6 −0
Original line number Diff line number Diff line
@@ -485,7 +485,13 @@ int qed_mcp_bist_nvm_test_get_image_att(struct qed_hwfn *p_hwfn, 
#define MFW_PORT(_p_hwfn)       ((_p_hwfn)->abs_pf_id %	\

				 ((_p_hwfn)->cdev->num_ports_in_engines * 2))

struct qed_mcp_info {

	/* Spinlock used for protecting the access to the MFW mailbox */

	spinlock_t				lock;



	/* Spinlock used for syncing SW link-changes and link-changes

	 * originating from attention context.

	 */

	spinlock_t				link_lock;

	bool					block_mb_sending;

	u32					public_base;

	u32					drv_mb_addr;

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

+35 −28
Original line number Diff line number Diff line
@@ -948,7 +948,9 @@ static int qed_rdma_create_cq(void *rdma_cxt, 


err:

	/* release allocated icid */

	spin_lock_bh(&p_info->lock);

	qed_bmap_release_id(p_hwfn, &p_info->cq_map, returned_id);

	spin_unlock_bh(&p_info->lock);

	DP_NOTICE(p_hwfn, "Create CQ failed, rc = %d\n", rc);



	return rc;
@@ -1766,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;
@@ -1813,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);
@@ -1823,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)
@@ -1847,6 +1849,7 @@ static int qed_roce_query_qp(struct qed_hwfn *p_hwfn, 


static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)

{

	struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info;

	u32 num_invalidated_mw = 0;

	u32 num_bound_mw = 0;

	u32 start_cid;
@@ -1861,12 +1864,15 @@ static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) 
		return -EINVAL;

	}



	rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp, &num_invalidated_mw);

	if (qp->cur_state != QED_ROCE_QP_STATE_RESET) {

		rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp,

						      &num_invalidated_mw);

		if (rc)

			return rc;



		/* Send destroy requester ramrod */

	rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp, &num_bound_mw);

		rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp,

						      &num_bound_mw);

		if (rc)

			return rc;
@@ -1876,20 +1882,21 @@ static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) 
			return -EINVAL;

		}



	spin_lock_bh(&p_hwfn->p_rdma_info->lock);

		spin_lock_bh(&p_rdma_info->lock);



		start_cid = qed_cxt_get_proto_cid_start(p_hwfn,

						p_hwfn->p_rdma_info->proto);

							p_rdma_info->proto);



		/* Release responder's icid */

	qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map,

		qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map,

				    qp->icid - start_cid);



		/* Release requester's icid */

	qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map,

		qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map,

				    qp->icid + 1 - start_cid);



	spin_unlock_bh(&p_hwfn->p_rdma_info->lock);

		spin_unlock_bh(&p_rdma_info->lock);

	}



	return 0;

}