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

Commit 4c4fa793 authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller
Browse files

qed: Deprecate VF multiple queue-stop 



The PF<->VF interface allows for the VF to request
multiple queues closure via a single message, but this has
never been used by any official driver.

We now deprecate this option, forcing each queue close
to arrive via a different command; This would be required
for future TLVs that are going to extend the queue TLVs with
additional information on a per-queue basis.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f109c240

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

+58 −46
Original line number Original line Diff line number Diff line
@@ -2118,20 +2118,21 @@ static void qed_iov_vf_mbx_start_txq(struct qed_hwfn *p_hwfn, 




static int qed_iov_vf_stop_rxqs(struct qed_hwfn *p_hwfn,

static int qed_iov_vf_stop_rxqs(struct qed_hwfn *p_hwfn,

				struct qed_vf_info *vf,

				struct qed_vf_info *vf,

				u16 rxq_id, u8 num_rxqs, bool cqe_completion)

				u16 rxq_id, bool cqe_completion)

{

{

	struct qed_vf_q_info *p_queue;

	struct qed_vf_q_info *p_queue;

	int rc = 0;

	int rc = 0;

	int qid;





	if (rxq_id + num_rxqs > ARRAY_SIZE(vf->vf_queues))

	if (!qed_iov_validate_rxq(p_hwfn, vf, rxq_id,

				  QED_IOV_VALIDATE_Q_ENABLE)) {

		DP_VERBOSE(p_hwfn,

			   QED_MSG_IOV,

			   "VF[%d] Tried Closing Rx 0x%04x which is inactive\n",

			   vf->relative_vf_id, rxq_id);

		return -EINVAL;

		return -EINVAL;

	}





	for (qid = rxq_id; qid < rxq_id + num_rxqs; qid++) {

	p_queue = &vf->vf_queues[rxq_id];

		p_queue = &vf->vf_queues[qid];



		if (!p_queue->p_rx_cid)

			continue;





	rc = qed_eth_rx_queue_stop(p_hwfn,

	rc = qed_eth_rx_queue_stop(p_hwfn,

				   p_queue->p_rx_cid,

				   p_queue->p_rx_cid,
@@ -2139,36 +2140,31 @@ static int qed_iov_vf_stop_rxqs(struct qed_hwfn *p_hwfn, 
	if (rc)

	if (rc)

		return rc;

		return rc;





		vf->vf_queues[qid].p_rx_cid = NULL;

	p_queue->p_rx_cid = NULL;

	vf->num_active_rxqs--;

	vf->num_active_rxqs--;

	}





	return rc;

	return 0;

}

}





static int qed_iov_vf_stop_txqs(struct qed_hwfn *p_hwfn,

static int qed_iov_vf_stop_txqs(struct qed_hwfn *p_hwfn,

				struct qed_vf_info *vf, u16 txq_id, u8 num_txqs)

				struct qed_vf_info *vf, u16 txq_id)

{

{

	int rc = 0;

	struct qed_vf_q_info *p_queue;

	struct qed_vf_q_info *p_queue;

	int qid;

	int rc = 0;





	if (txq_id + num_txqs > ARRAY_SIZE(vf->vf_queues))

	if (!qed_iov_validate_txq(p_hwfn, vf, txq_id,

				  QED_IOV_VALIDATE_Q_ENABLE))

		return -EINVAL;

		return -EINVAL;





	for (qid = txq_id; qid < txq_id + num_txqs; qid++) {

	p_queue = &vf->vf_queues[txq_id];

		p_queue = &vf->vf_queues[qid];

		if (!p_queue->p_tx_cid)

			continue;





	rc = qed_eth_tx_queue_stop(p_hwfn, p_queue->p_tx_cid);

	rc = qed_eth_tx_queue_stop(p_hwfn, p_queue->p_tx_cid);

	if (rc)

	if (rc)

		return rc;

		return rc;





	p_queue->p_tx_cid = NULL;

	p_queue->p_tx_cid = NULL;

	}





	return rc;

	return 0;

}

}





static void qed_iov_vf_mbx_stop_rxqs(struct qed_hwfn *p_hwfn,

static void qed_iov_vf_mbx_stop_rxqs(struct qed_hwfn *p_hwfn,
@@ -2177,20 +2173,28 @@ static void qed_iov_vf_mbx_stop_rxqs(struct qed_hwfn *p_hwfn, 
{

{

	u16 length = sizeof(struct pfvf_def_resp_tlv);

	u16 length = sizeof(struct pfvf_def_resp_tlv);

	struct qed_iov_vf_mbx *mbx = &vf->vf_mbx;

	struct qed_iov_vf_mbx *mbx = &vf->vf_mbx;

	u8 status = PFVF_STATUS_SUCCESS;

	u8 status = PFVF_STATUS_FAILURE;

	struct vfpf_stop_rxqs_tlv *req;

	struct vfpf_stop_rxqs_tlv *req;

	int rc;

	int rc;





	/* We give the option of starting from qid != 0, in this case we

	/* There has never been an official driver that used this interface

	 * need to make sure that qid + num_qs doesn't exceed the actual

	 * for stopping multiple queues, and it is now considered deprecated.

	 * amount of queues that exist.

	 * Validate this isn't used here.

	 */

	 */

	req = &mbx->req_virt->stop_rxqs;

	req = &mbx->req_virt->stop_rxqs;

	rc = qed_iov_vf_stop_rxqs(p_hwfn, vf, req->rx_qid,

	if (req->num_rxqs != 1) {

				  req->num_rxqs, req->cqe_completion);

		DP_VERBOSE(p_hwfn, QED_MSG_IOV,

	if (rc)

			   "Odd; VF[%d] tried stopping multiple Rx queues\n",

		status = PFVF_STATUS_FAILURE;

			   vf->relative_vf_id);

		status = PFVF_STATUS_NOT_SUPPORTED;

		goto out;

	}





	rc = qed_iov_vf_stop_rxqs(p_hwfn, vf, req->rx_qid,

				  req->cqe_completion);

	if (!rc)

		status = PFVF_STATUS_SUCCESS;

out:

	qed_iov_prepare_resp(p_hwfn, p_ptt, vf, CHANNEL_TLV_STOP_RXQS,

	qed_iov_prepare_resp(p_hwfn, p_ptt, vf, CHANNEL_TLV_STOP_RXQS,

			     length, status);

			     length, status);

}

}
@@ -2201,19 +2205,27 @@ static void qed_iov_vf_mbx_stop_txqs(struct qed_hwfn *p_hwfn, 
{

{

	u16 length = sizeof(struct pfvf_def_resp_tlv);

	u16 length = sizeof(struct pfvf_def_resp_tlv);

	struct qed_iov_vf_mbx *mbx = &vf->vf_mbx;

	struct qed_iov_vf_mbx *mbx = &vf->vf_mbx;

	u8 status = PFVF_STATUS_SUCCESS;

	u8 status = PFVF_STATUS_FAILURE;

	struct vfpf_stop_txqs_tlv *req;

	struct vfpf_stop_txqs_tlv *req;

	int rc;

	int rc;





	/* We give the option of starting from qid != 0, in this case we

	/* There has never been an official driver that used this interface

	 * need to make sure that qid + num_qs doesn't exceed the actual

	 * for stopping multiple queues, and it is now considered deprecated.

	 * amount of queues that exist.

	 * Validate this isn't used here.

	 */

	 */

	req = &mbx->req_virt->stop_txqs;

	req = &mbx->req_virt->stop_txqs;

	rc = qed_iov_vf_stop_txqs(p_hwfn, vf, req->tx_qid, req->num_txqs);

	if (req->num_txqs != 1) {

	if (rc)

		DP_VERBOSE(p_hwfn, QED_MSG_IOV,

		status = PFVF_STATUS_FAILURE;

			   "Odd; VF[%d] tried stopping multiple Tx queues\n",

			   vf->relative_vf_id);

		status = PFVF_STATUS_NOT_SUPPORTED;

		goto out;

	}

	rc = qed_iov_vf_stop_txqs(p_hwfn, vf, req->tx_qid);

	if (!rc)

		status = PFVF_STATUS_SUCCESS;





out:

	qed_iov_prepare_resp(p_hwfn, p_ptt, vf, CHANNEL_TLV_STOP_TXQS,

	qed_iov_prepare_resp(p_hwfn, p_ptt, vf, CHANNEL_TLV_STOP_TXQS,

			     length, status);

			     length, status);

}

}

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -275,6 +275,8 @@ struct vfpf_stop_rxqs_tlv { 
	struct vfpf_first_tlv first_tlv;

	struct vfpf_first_tlv first_tlv;





	u16 rx_qid;

	u16 rx_qid;



	/* this field is deprecated and should *always* be set to '1' */

	u8 num_rxqs;

	u8 num_rxqs;

	u8 cqe_completion;

	u8 cqe_completion;

	u8 padding[4];

	u8 padding[4];
@@ -285,6 +287,8 @@ struct vfpf_stop_txqs_tlv { 
	struct vfpf_first_tlv first_tlv;

	struct vfpf_first_tlv first_tlv;





	u16 tx_qid;

	u16 tx_qid;



	/* this field is deprecated and should *always* be set to '1' */

	u8 num_txqs;

	u8 num_txqs;

	u8 padding[5];

	u8 padding[5];

};

};