Commit 83483055 authored by Mustafa Ismail's avatar Mustafa Ismail Committed by Jason Gunthorpe
Browse files

RDMA/irdma: Refactor DCB bits in prep for DSCP support 

Rename dcb flag to dcb_vlan_mode in irdma_device struct.  Add a new helper
function, irdma_set_qos_info, to set the VSI QoS information passed by the
PCI driver.

Link: https://lore.kernel.org/r/20220202191921.1638-3-shiraz.saleem@intel.com


Signed-off-by: default avatarMustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent b794eecb

drivers/infiniband/hw/irdma/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -2200,7 +2200,7 @@ irdma_make_cm_node(struct irdma_cm_core *cm_core, struct irdma_device *iwdev, 
	/* set our node specific transport info */

	cm_node->ipv4 = cm_info->ipv4;

	cm_node->vlan_id = cm_info->vlan_id;

	if (cm_node->vlan_id >= VLAN_N_VID && iwdev->dcb)

	if (cm_node->vlan_id >= VLAN_N_VID && iwdev->dcb_vlan_mode)

		cm_node->vlan_id = 0;

	cm_node->tos = cm_info->tos;

	cm_node->user_pri = cm_info->user_pri;
@@ -3959,7 +3959,7 @@ int irdma_create_listen(struct iw_cm_id *cm_id, int backlog) 
		}

	}



	if (cm_info.vlan_id >= VLAN_N_VID && iwdev->dcb)

	if (cm_info.vlan_id >= VLAN_N_VID && iwdev->dcb_vlan_mode)

		cm_info.vlan_id = 0;

	cm_info.backlog = backlog;

	cm_info.cm_id = cm_id;

drivers/infiniband/hw/irdma/ctrl.c

+21 −12
Original line number Diff line number Diff line
@@ -70,6 +70,25 @@ void irdma_sc_suspend_resume_qps(struct irdma_sc_vsi *vsi, u8 op) 
	}

}



static void irdma_set_qos_info(struct irdma_sc_vsi  *vsi,

			       struct irdma_l2params *l2p)

{

	u8 i;



	vsi->qos_rel_bw = l2p->vsi_rel_bw;

	vsi->qos_prio_type = l2p->vsi_prio_type;

	for (i = 0; i < IRDMA_MAX_USER_PRIORITY; i++) {

		if (vsi->dev->hw_attrs.uk_attrs.hw_rev == IRDMA_GEN_1)

			vsi->qos[i].qs_handle = l2p->qs_handle_list[i];

		vsi->qos[i].traffic_class = l2p->up2tc[i];

		vsi->qos[i].rel_bw =

			l2p->tc_info[vsi->qos[i].traffic_class].rel_bw;

		vsi->qos[i].prio_type =

			l2p->tc_info[vsi->qos[i].traffic_class].prio_type;

		vsi->qos[i].valid = false;

	}

}



/**

 * irdma_change_l2params - given the new l2 parameters, change all qp

 * @vsi: RDMA VSI pointer
@@ -88,6 +107,7 @@ void irdma_change_l2params(struct irdma_sc_vsi *vsi, 
		return;



	vsi->tc_change_pending = false;

	irdma_set_qos_info(vsi, l2params);

	irdma_sc_suspend_resume_qps(vsi, IRDMA_OP_RESUME);

}
@@ -1845,7 +1865,6 @@ static void irdma_null_ws_reset(struct irdma_sc_vsi *vsi) 
void irdma_sc_vsi_init(struct irdma_sc_vsi  *vsi,

		       struct irdma_vsi_init_info *info)

{

	struct irdma_l2params *l2p;

	int i;



	vsi->dev = info->dev;
@@ -1858,18 +1877,8 @@ void irdma_sc_vsi_init(struct irdma_sc_vsi *vsi, 
	if (vsi->dev->hw_attrs.uk_attrs.hw_rev == IRDMA_GEN_1)

		vsi->fcn_id = info->dev->hmc_fn_id;



	l2p = info->params;

	vsi->qos_rel_bw = l2p->vsi_rel_bw;

	vsi->qos_prio_type = l2p->vsi_prio_type;

	irdma_set_qos_info(vsi, info->params);

	for (i = 0; i < IRDMA_MAX_USER_PRIORITY; i++) {

		if (vsi->dev->hw_attrs.uk_attrs.hw_rev == IRDMA_GEN_1)

			vsi->qos[i].qs_handle = l2p->qs_handle_list[i];

		vsi->qos[i].traffic_class = info->params->up2tc[i];

		vsi->qos[i].rel_bw =

			l2p->tc_info[vsi->qos[i].traffic_class].rel_bw;

		vsi->qos[i].prio_type =

			l2p->tc_info[vsi->qos[i].traffic_class].prio_type;

		vsi->qos[i].valid = false;

		mutex_init(&vsi->qos[i].qos_mutex);

		INIT_LIST_HEAD(&vsi->qos[i].qplist);

	}

drivers/infiniband/hw/irdma/i40iw_if.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int i40iw_open(struct i40e_info *cdev_info, struct i40e_client *client) 
		if (last_qset == IRDMA_NO_QSET)

			last_qset = qset;

		else if ((qset != last_qset) && (qset != IRDMA_NO_QSET))

			iwdev->dcb = true;

			iwdev->dcb_vlan_mode = true;

	}



	if (irdma_rt_init_hw(iwdev, &l2params)) {

drivers/infiniband/hw/irdma/main.c

+5 −1
Original line number Diff line number Diff line
@@ -108,8 +108,9 @@ static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event 
		l2params.tc_changed = true;

		ibdev_dbg(&iwdev->ibdev, "CLNT: TC Change\n");

		ice_get_qos_params(pf, &qos_info);

		iwdev->dcb = qos_info.num_tc > 1;

		irdma_fill_qos_info(&l2params, &qos_info);

		if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)

			iwdev->dcb_vlan_mode = qos_info.num_tc > 1;

		irdma_change_l2params(&iwdev->vsi, &l2params);

	} else if (*event->type & BIT(IIDC_EVENT_CRIT_ERR)) {

		ibdev_warn(&iwdev->ibdev, "ICE OICR event notification: oicr = 0x%08x\n",
@@ -283,6 +284,9 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_ 
	l2params.mtu = iwdev->netdev->mtu;

	ice_get_qos_params(pf, &qos_info);

	irdma_fill_qos_info(&l2params, &qos_info);

	if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)

		iwdev->dcb_vlan_mode = l2params.num_tc > 1;



	if (irdma_rt_init_hw(iwdev, &l2params)) {

		err = -EIO;

		goto err_rt_init;

drivers/infiniband/hw/irdma/main.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ struct irdma_device { 
	u8 iw_status;

	bool roce_mode:1;

	bool roce_dcqcn_en:1;

	bool dcb:1;

	bool dcb_vlan_mode:1;

	bool iw_ooo:1;

	enum init_completion_state init_state;