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

Commit efe63c22 authored by Amrani, Ram's avatar Amrani, Ram Committed by Doug Ledford
Browse files

RDMA/qedr: Parse VLAN ID correctly and ignore the value of zero 



Rename vlan_id field name to vlan as it contains more than the vlan_id.
Mask out non vlan id fields from vlan tag of the QED LL2 RX GSI
vlan output. As it is expected to be vlan id only.
Ignore vlan_id with value of zero.

Fixes: abd49676 ("qed: Add RoCE ll2 & GSI support")
Signed-off-by: default avatarRam Amrani <Ram.Amrani@cavium.com>
Signed-off-by: default avatarMichal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e19cd282

drivers/infiniband/hw/qedr/qedr.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ struct qedr_qp { 
		u8 wqe_size;



		u8 smac[ETH_ALEN];

		u16 vlan_id;

		u16 vlan;

		int rc;

	} *rqe_wr_id;

drivers/infiniband/hw/qedr/qedr_cm.c

+7 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void qedr_ll2_complete_rx_packet(void *cxt, 


	qp->rqe_wr_id[qp->rq.gsi_cons].rc = data->u.data_length_error ?

		-EINVAL : 0;

	qp->rqe_wr_id[qp->rq.gsi_cons].vlan_id = data->vlan;

	qp->rqe_wr_id[qp->rq.gsi_cons].vlan = data->vlan;

	/* note: length stands for data length i.e. GRH is excluded */

	qp->rqe_wr_id[qp->rq.gsi_cons].sg_list[0].length =

		data->length.data_length;
@@ -694,6 +694,7 @@ int qedr_gsi_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) 
	struct qedr_cq *cq = get_qedr_cq(ibcq);

	struct qedr_qp *qp = dev->gsi_qp;

	unsigned long flags;

	u16 vlan_id;

	int i = 0;



	spin_lock_irqsave(&cq->cq_lock, flags);
@@ -712,9 +713,12 @@ int qedr_gsi_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) 
		wc[i].wc_flags |= IB_WC_GRH | IB_WC_IP_CSUM_OK;

		ether_addr_copy(wc[i].smac, qp->rqe_wr_id[qp->rq.cons].smac);

		wc[i].wc_flags |= IB_WC_WITH_SMAC;

		if (qp->rqe_wr_id[qp->rq.cons].vlan_id) {



		vlan_id = qp->rqe_wr_id[qp->rq.cons].vlan &

			  VLAN_VID_MASK;

		if (vlan_id) {

			wc[i].wc_flags |= IB_WC_WITH_VLAN;

			wc[i].vlan_id = qp->rqe_wr_id[qp->rq.cons].vlan_id;

			wc[i].vlan_id = vlan_id;

		}



		qedr_inc_sw_cons(&qp->rq);