Commit b94b013e authored by Dave Ertman's avatar Dave Ertman Committed by Jeff Kirsher
Browse files

ice: Implement DCBNL support 



Implement interface layer for the DCBNL subsystem. These are the functions
to support the callbacks defined in the dcbnl_rtnl_ops struct. These
callbacks are going to be used to interface with the DCB settings of the
device. Implementation of dcb_nl set functions and supporting SW DCB
functions.

Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1ddef455

drivers/net/ethernet/intel/ice/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ ice-y := ice_main.o \ 
	 ice_flex_pipe.o	\

	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_lib.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o

ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o

drivers/net/ethernet/intel/ice/ice.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ enum ice_state { 
	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	__ICE_DCBNL_DEVRESET,		/* set by dcbnl devreset */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */

	__ICE_GLOBR_REQ,		/* set by driver and peers */
@@ -365,6 +366,7 @@ struct ice_pf { 
	struct work_struct serv_task;

	struct mutex avail_q_mutex;	/* protects access to avail_[rx|tx]qs */

	struct mutex sw_mutex;		/* lock for protecting VSI alloc flow */

	struct mutex tc_mutex;		/* lock to protect TC changes */

	u32 msg_enable;

	u32 hw_csum_rx_error;

	u32 oicr_idx;		/* Other interrupt cause MSIX vector index */

drivers/net/ethernet/intel/ice/ice_dcb_lib.c

+12 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (c) 2019, Intel Corporation. */



#include "ice_dcb_lib.h"

#include "ice_dcb_nl.h"



static void ice_pf_dcb_recfg(struct ice_pf *pf);
@@ -155,16 +156,19 @@ void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi) 
 * @new_cfg: DCBX config to apply

 * @locked: is the RTNL held

 */

static

int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked)

{

	struct ice_dcbx_cfg *old_cfg, *curr_cfg;

	struct ice_aqc_port_ets_elem buf = { 0 };

	struct ice_dcbx_cfg *old_cfg, *curr_cfg;

	int ret = ICE_DCB_NO_HW_CHG;

	struct ice_vsi *pf_vsi;

	int ret = 0;



	curr_cfg = &pf->hw.port_info->local_dcbx_cfg;



	/* FW does not care if change happened */

	if (!pf->hw.port_info->is_sw_lldp)

		ret = ICE_DCB_HW_CHG_RST;



	/* Enable DCB tagging only when more than one TC */

	if (ice_dcb_get_num_tc(new_cfg) > 1) {

		dev_dbg(&pf->pdev->dev, "DCB tagging enabled (num TC > 1)\n");
@@ -184,6 +188,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 
	if (!old_cfg)

		return -ENOMEM;



	dev_info(&pf->pdev->dev, "Commit DCB Configuration to the hardware\n");

	pf_vsi = ice_get_main_vsi(pf);

	if (!pf_vsi) {

		dev_dbg(&pf->pdev->dev, "PF VSI doesn't exist\n");
@@ -200,6 +205,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 


	memcpy(curr_cfg, new_cfg, sizeof(*curr_cfg));

	memcpy(&curr_cfg->etsrec, &curr_cfg->etscfg, sizeof(curr_cfg->etsrec));

	memcpy(&new_cfg->etsrec, &curr_cfg->etscfg, sizeof(curr_cfg->etsrec));



	/* Only send new config to HW if we are in SW LLDP mode. Otherwise,

	 * the new config came from the HW in the first place.
@@ -559,6 +565,8 @@ static void ice_pf_dcb_recfg(struct ice_pf *pf) 
		}



		ice_vsi_map_rings_to_vectors(pf->vsi[v]);

		if (pf->vsi[v]->type == ICE_VSI_PF)

			ice_dcbnl_set_all(pf->vsi[v]);

	}

}
@@ -770,6 +778,7 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 


	need_reconfig = ice_dcb_need_recfg(pf, &tmp_dcbx_cfg,

					   &pi->local_dcbx_cfg);

	ice_dcbnl_flush_apps(pf, &tmp_dcbx_cfg, &pi->local_dcbx_cfg);

	if (!need_reconfig)

		return;

drivers/net/ethernet/intel/ice/ice_dcb_lib.h

+14 −1
Original line number Diff line number Diff line
@@ -10,11 +10,16 @@ 


#ifdef CONFIG_DCB

#define ICE_TC_MAX_BW		100 /* Default Max BW percentage */

#define ICE_DCB_HW_CHG_RST	0 /* DCB configuration changed with reset */

#define ICE_DCB_NO_HW_CHG	1 /* DCB configuration did not change */

#define ICE_DCB_HW_CHG		2 /* DCB configuration changed, no reset */



void ice_dcb_rebuild(struct ice_pf *pf);

u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg *dcbcfg);

u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg);

u8 ice_dcb_get_tc(struct ice_vsi *vsi, int queue_index);

int

ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked);

void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi);

int ice_init_pf_dcb(struct ice_pf *pf, bool locked);

void ice_update_dcb_stats(struct ice_pf *pf);
@@ -57,6 +62,14 @@ ice_init_pf_dcb(struct ice_pf *pf, bool __always_unused locked) 
	return -EOPNOTSUPP;

}



static inline int

ice_pf_dcb_cfg(struct ice_pf __always_unused *pf,

	       struct ice_dcbx_cfg __always_unused *new_cfg,

	       bool __always_unused locked)

{

	return -EOPNOTSUPP;

}



static inline int

ice_tx_prepare_vlan_flags_dcb(struct ice_ring __always_unused *tx_ring,

			      struct ice_tx_buf __always_unused *first)

drivers/net/ethernet/intel/ice/ice_dcb_nl.c

0 → 100644
+933 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE