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

Commit 0ea87262 authored by Devesh Sharma's avatar Devesh Sharma Committed by Roland Dreier
Browse files

RDMA/ocrdma: Obtain SL from device structure 



Currently, driver obtains service level value from ah_attr->sl field.
However, this field is set to zero all the times from rdma-cm.  This
patch allows create_ah to obtain service level from dev->sl.

Signed-off-by: default avatarDevesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 741742ed

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include "ocrdma_ah.h"

#include "ocrdma_hw.h"



#define OCRDMA_VID_PCP_SHIFT	0xD



static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,

				struct ib_ah_attr *attr, int pdid)

{
@@ -55,7 +57,7 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah, 
	if (vlan_tag && (vlan_tag < 0x1000)) {

		eth.eth_type = cpu_to_be16(0x8100);

		eth.roce_eth_type = cpu_to_be16(OCRDMA_ROCE_ETH_TYPE);

		vlan_tag |= (attr->sl & 7) << 13;

		vlan_tag |= (dev->sl & 0x07) << OCRDMA_VID_PCP_SHIFT;

		eth.vlan_tag = cpu_to_be16(vlan_tag);

		eth_sz = sizeof(struct ocrdma_eth_vlan);

		vlan_enabled = true;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+1 −3
Original line number Diff line number Diff line
@@ -2314,10 +2314,8 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, 
		cmd->params.vlan_dmac_b4_to_b5 |=

		    vlan_id << OCRDMA_QP_PARAMS_VLAN_SHIFT;

		cmd->flags |= OCRDMA_QP_PARA_VLAN_EN_VALID;

		/* override the sl with default priority if 0 */

		cmd->params.rnt_rc_sl_fl |=

			(ah_attr->sl ? ah_attr->sl :

				qp->dev->sl) << OCRDMA_QP_PARAMS_SL_SHIFT;

			(qp->dev->sl & 0x07) << OCRDMA_QP_PARAMS_SL_SHIFT;

	}

	return 0;

}