Commit 4015d11e authored by Brett Creeley's avatar Brett Creeley Committed by Jeff Kirsher
Browse files

ice: Add ice_pf_to_dev(pf) macro 



We use &pf->dev->pdev all over the code. Add a simple
macro to do this for us. When multiple de-references
like this are being done add a local struct device
variable.

Signed-off-by: default avatarBrett Creeley <brett.creeley@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 9efe35d0

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

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ extern const char ice_drv_ver[]; 
				     ICE_PROMISC_VLAN_TX  | \

				     ICE_PROMISC_VLAN_RX)



#define ice_pf_to_dev(pf) (&((pf)->pdev->dev))



struct ice_txq_meta {

	u32 q_teid;	/* Tx-scheduler element identifier */

	u16 q_id;	/* Entry in VSI's txq_map bitmap */

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

+12 −10
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx) 
	struct ice_q_vector *q_vector;



	/* allocate q_vector */

	q_vector = devm_kzalloc(&pf->pdev->dev, sizeof(*q_vector), GFP_KERNEL);

	q_vector = devm_kzalloc(ice_pf_to_dev(pf), sizeof(*q_vector),

				GFP_KERNEL);

	if (!q_vector)

		return -ENOMEM;
@@ -138,10 +139,11 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx) 
	struct ice_q_vector *q_vector;

	struct ice_pf *pf = vsi->back;

	struct ice_ring *ring;

	struct device *dev;



	dev = ice_pf_to_dev(pf);

	if (!vsi->q_vectors[v_idx]) {

		dev_dbg(&pf->pdev->dev, "Queue vector at index %d not found\n",

			v_idx);

		dev_dbg(dev, "Queue vector at index %d not found\n", v_idx);

		return;

	}

	q_vector = vsi->q_vectors[v_idx];
@@ -155,7 +157,7 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx) 
	if (vsi->netdev)

		netif_napi_del(&q_vector->napi);



	devm_kfree(&pf->pdev->dev, q_vector);

	devm_kfree(dev, q_vector);

	vsi->q_vectors[v_idx] = NULL;

}
@@ -482,7 +484,7 @@ int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx) 
	/* wait for the change to finish */

	ret = ice_pf_rxq_wait(pf, pf_q, ena);

	if (ret)

		dev_err(&pf->pdev->dev,

		dev_err(ice_pf_to_dev(pf),

			"VSI idx %d Rx ring %d %sable timeout\n",

			vsi->idx, pf_q, (ena ? "en" : "dis"));
@@ -500,11 +502,12 @@ int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi) 
{

	struct ice_pf *pf = vsi->back;

	int v_idx = 0, num_q_vectors;

	struct device *dev;

	int err;



	dev = ice_pf_to_dev(pf);

	if (vsi->q_vectors[0]) {

		dev_dbg(&pf->pdev->dev, "VSI %d has existing q_vectors\n",

			vsi->vsi_num);

		dev_dbg(dev, "VSI %d has existing q_vectors\n", vsi->vsi_num);

		return -EEXIST;

	}
@@ -522,8 +525,7 @@ err_out: 
	while (v_idx--)

		ice_free_q_vector(vsi, v_idx);



	dev_err(&pf->pdev->dev,

		"Failed to allocate %d q_vector for VSI %d, ret=%d\n",

	dev_err(dev, "Failed to allocate %d q_vector for VSI %d, ret=%d\n",

		vsi->num_q_vectors, vsi->vsi_num, err);

	vsi->num_q_vectors = 0;

	return err;
@@ -640,7 +642,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, 
	status = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc, ring->q_handle,

				 1, qg_buf, buf_len, NULL);

	if (status) {

		dev_err(&pf->pdev->dev,

		dev_err(ice_pf_to_dev(pf),

			"Failed to set LAN Tx queue context, error: %d\n",

			status);

		return -ENODEV;

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

+55 −57
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 
{

	struct ice_aqc_port_ets_elem buf = { 0 };

	struct ice_dcbx_cfg *old_cfg, *curr_cfg;

	struct device *dev = ice_pf_to_dev(pf);

	int ret = ICE_DCB_NO_HW_CHG;

	struct ice_vsi *pf_vsi;
@@ -171,15 +172,15 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 


	/* 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");

		dev_dbg(dev, "DCB tagging enabled (num TC > 1)\n");

		set_bit(ICE_FLAG_DCB_ENA, pf->flags);

	} else {

		dev_dbg(&pf->pdev->dev, "DCB tagging disabled (num TC = 1)\n");

		dev_dbg(dev, "DCB tagging disabled (num TC = 1)\n");

		clear_bit(ICE_FLAG_DCB_ENA, pf->flags);

	}



	if (!memcmp(new_cfg, curr_cfg, sizeof(*new_cfg))) {

		dev_dbg(&pf->pdev->dev, "No change in DCB config required\n");

		dev_dbg(dev, "No change in DCB config required\n");

		return ret;

	}
@@ -188,10 +189,10 @@ 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");

	dev_info(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");

		dev_dbg(dev, "PF VSI doesn't exist\n");

		ret = -EINVAL;

		goto free_cfg;

	}
@@ -213,7 +214,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 
	if (pf->hw.port_info->is_sw_lldp) {

		ret = ice_set_dcb_cfg(pf->hw.port_info);

		if (ret) {

			dev_err(&pf->pdev->dev, "Set DCB Config failed\n");

			dev_err(dev, "Set DCB Config failed\n");

			/* Restore previous settings to local config */

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

			goto out;
@@ -222,7 +223,7 @@ int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg, bool locked) 


	ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);

	if (ret) {

		dev_err(&pf->pdev->dev, "Query Port ETS failed\n");

		dev_err(dev, "Query Port ETS failed\n");

		goto out;

	}
@@ -269,6 +270,7 @@ static bool 
ice_dcb_need_recfg(struct ice_pf *pf, struct ice_dcbx_cfg *old_cfg,

		   struct ice_dcbx_cfg *new_cfg)

{

	struct device *dev = ice_pf_to_dev(pf);

	bool need_reconfig = false;



	/* Check if ETS configuration has changed */
@@ -279,33 +281,33 @@ ice_dcb_need_recfg(struct ice_pf *pf, struct ice_dcbx_cfg *old_cfg, 
			   &old_cfg->etscfg.prio_table,

			   sizeof(new_cfg->etscfg.prio_table))) {

			need_reconfig = true;

			dev_dbg(&pf->pdev->dev, "ETS UP2TC changed.\n");

			dev_dbg(dev, "ETS UP2TC changed.\n");

		}



		if (memcmp(&new_cfg->etscfg.tcbwtable,

			   &old_cfg->etscfg.tcbwtable,

			   sizeof(new_cfg->etscfg.tcbwtable)))

			dev_dbg(&pf->pdev->dev, "ETS TC BW Table changed.\n");

			dev_dbg(dev, "ETS TC BW Table changed.\n");



		if (memcmp(&new_cfg->etscfg.tsatable,

			   &old_cfg->etscfg.tsatable,

			   sizeof(new_cfg->etscfg.tsatable)))

			dev_dbg(&pf->pdev->dev, "ETS TSA Table changed.\n");

			dev_dbg(dev, "ETS TSA Table changed.\n");

	}



	/* Check if PFC configuration has changed */

	if (memcmp(&new_cfg->pfc, &old_cfg->pfc, sizeof(new_cfg->pfc))) {

		need_reconfig = true;

		dev_dbg(&pf->pdev->dev, "PFC config change detected.\n");

		dev_dbg(dev, "PFC config change detected.\n");

	}



	/* Check if APP Table has changed */

	if (memcmp(&new_cfg->app, &old_cfg->app, sizeof(new_cfg->app))) {

		need_reconfig = true;

		dev_dbg(&pf->pdev->dev, "APP Table change detected.\n");

		dev_dbg(dev, "APP Table change detected.\n");

	}



	dev_dbg(&pf->pdev->dev, "dcb need_reconfig=%d\n", need_reconfig);

	dev_dbg(dev, "dcb need_reconfig=%d\n", need_reconfig);

	return need_reconfig;

}
@@ -317,11 +319,12 @@ void ice_dcb_rebuild(struct ice_pf *pf) 
{

	struct ice_dcbx_cfg *local_dcbx_cfg, *desired_dcbx_cfg, *prev_cfg;

	struct ice_aqc_port_ets_elem buf = { 0 };

	struct device *dev = ice_pf_to_dev(pf);

	enum ice_status ret;



	ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);

	if (ret) {

		dev_err(&pf->pdev->dev, "Query Port ETS failed\n");

		dev_err(dev, "Query Port ETS failed\n");

		goto dcb_error;

	}
@@ -340,16 +343,14 @@ void ice_dcb_rebuild(struct ice_pf *pf) 
	ice_cfg_etsrec_defaults(pf->hw.port_info);

	ret = ice_set_dcb_cfg(pf->hw.port_info);

	if (ret) {

		dev_err(&pf->pdev->dev, "Failed to set DCB to unwilling\n");

		dev_err(dev, "Failed to set DCB to unwilling\n");

		goto dcb_error;

	}



	/* Retrieve DCB config and ensure same as current in SW */

	prev_cfg = kmemdup(local_dcbx_cfg, sizeof(*prev_cfg), GFP_KERNEL);

	if (!prev_cfg) {

		dev_err(&pf->pdev->dev, "Failed to alloc space for DCB cfg\n");

	if (!prev_cfg)

		goto dcb_error;

	}



	ice_init_dcb(&pf->hw, true);

	if (pf->hw.port_info->dcbx_status == ICE_DCBX_STATUS_DIS)
@@ -359,7 +360,7 @@ void ice_dcb_rebuild(struct ice_pf *pf) 


	if (ice_dcb_need_recfg(pf, prev_cfg, local_dcbx_cfg)) {

		/* difference in cfg detected - disable DCB till next MIB */

		dev_err(&pf->pdev->dev, "Set local MIB not accurate\n");

		dev_err(dev, "Set local MIB not accurate\n");

		kfree(prev_cfg);

		goto dcb_error;

	}
@@ -375,20 +376,20 @@ void ice_dcb_rebuild(struct ice_pf *pf) 
	ice_cfg_etsrec_defaults(pf->hw.port_info);

	ret = ice_set_dcb_cfg(pf->hw.port_info);

	if (ret) {

		dev_err(&pf->pdev->dev, "Failed to set desired config\n");

		dev_err(dev, "Failed to set desired config\n");

		goto dcb_error;

	}

	dev_info(&pf->pdev->dev, "DCB restored after reset\n");

	dev_info(dev, "DCB restored after reset\n");

	ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);

	if (ret) {

		dev_err(&pf->pdev->dev, "Query Port ETS failed\n");

		dev_err(dev, "Query Port ETS failed\n");

		goto dcb_error;

	}



	return;



dcb_error:

	dev_err(&pf->pdev->dev, "Disabling DCB until new settings occur\n");

	dev_err(dev, "Disabling DCB until new settings occur\n");

	prev_cfg = kzalloc(sizeof(*prev_cfg), GFP_KERNEL);

	if (!prev_cfg)

		return;
@@ -419,7 +420,7 @@ static int ice_dcb_init_cfg(struct ice_pf *pf, bool locked) 


	memset(&pi->local_dcbx_cfg, 0, sizeof(*newcfg));



	dev_info(&pf->pdev->dev, "Configuring initial DCB values\n");

	dev_info(ice_pf_to_dev(pf), "Configuring initial DCB values\n");

	if (ice_pf_dcb_cfg(pf, newcfg, locked))

		ret = -EINVAL;
@@ -507,13 +508,13 @@ static bool ice_dcb_tc_contig(u8 *prio_table) 
static int ice_dcb_noncontig_cfg(struct ice_pf *pf)

{

	struct ice_dcbx_cfg *dcbcfg = &pf->hw.port_info->local_dcbx_cfg;

	struct device *dev = ice_pf_to_dev(pf);

	int ret;



	/* Configure SW DCB default with ETS non-willing */

	ret = ice_dcb_sw_dflt_cfg(pf, false, true);

	if (ret) {

		dev_err(&pf->pdev->dev,

			"Failed to set local DCB config %d\n", ret);

		dev_err(dev, "Failed to set local DCB config %d\n", ret);

		return ret;

	}
@@ -521,7 +522,7 @@ static int ice_dcb_noncontig_cfg(struct ice_pf *pf) 
	dcbcfg->etscfg.willing = 1;

	ret = ice_set_dcb_cfg(pf->hw.port_info);

	if (ret)

		dev_err(&pf->pdev->dev, "Failed to set DCB to unwilling\n");

		dev_err(dev, "Failed to set DCB to unwilling\n");



	return ret;

}
@@ -542,10 +543,12 @@ static void ice_pf_dcb_recfg(struct ice_pf *pf) 


	/* Update each VSI */

	ice_for_each_vsi(pf, v) {

		if (!pf->vsi[v])

		struct ice_vsi *vsi = pf->vsi[v];



		if (!vsi)

			continue;



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

		if (vsi->type == ICE_VSI_PF) {

			tc_map = ice_dcb_get_ena_tc(dcbcfg);



			/* If DCBX request non-contiguous TC, then configure
@@ -559,17 +562,16 @@ static void ice_pf_dcb_recfg(struct ice_pf *pf) 
			tc_map = ICE_DFLT_TRAFFIC_CLASS;

		}



		ret = ice_vsi_cfg_tc(pf->vsi[v], tc_map);

		ret = ice_vsi_cfg_tc(vsi, tc_map);

		if (ret) {

			dev_err(&pf->pdev->dev,

				"Failed to config TC for VSI index: %d\n",

				pf->vsi[v]->idx);

			dev_err(ice_pf_to_dev(pf), "Failed to config TC for VSI index: %d\n",

				vsi->idx);

			continue;

		}



		ice_vsi_map_rings_to_vectors(pf->vsi[v]);

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

			ice_dcbnl_set_all(pf->vsi[v]);

		ice_vsi_map_rings_to_vectors(vsi);

		if (vsi->type == ICE_VSI_PF)

			ice_dcbnl_set_all(vsi);

	}

}
@@ -580,7 +582,7 @@ static void ice_pf_dcb_recfg(struct ice_pf *pf) 
 */

int ice_init_pf_dcb(struct ice_pf *pf, bool locked)

{

	struct device *dev = &pf->pdev->dev;

	struct device *dev = ice_pf_to_dev(pf);

	struct ice_port_info *port_info;

	struct ice_hw *hw = &pf->hw;

	int err;
@@ -589,23 +591,22 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked) 


	err = ice_init_dcb(hw, false);

	if (err && !port_info->is_sw_lldp) {

		dev_err(&pf->pdev->dev, "Error initializing DCB %d\n", err);

		dev_err(dev, "Error initializing DCB %d\n", err);

		goto dcb_init_err;

	}



	dev_info(&pf->pdev->dev,

	dev_info(dev,

		 "DCB is enabled in the hardware, max number of TCs supported on this port are %d\n",

		 pf->hw.func_caps.common_cap.maxtc);

	if (err) {

		struct ice_vsi *pf_vsi;



		/* FW LLDP is disabled, activate SW DCBX/LLDP mode */

		dev_info(&pf->pdev->dev,

			 "FW LLDP is disabled, DCBx/LLDP in SW mode.\n");

		dev_info(dev, "FW LLDP is disabled, DCBx/LLDP in SW mode.\n");

		clear_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags);

		err = ice_dcb_sw_dflt_cfg(pf, true, locked);

		if (err) {

			dev_err(&pf->pdev->dev,

			dev_err(dev,

				"Failed to set local DCB config %d\n", err);

			err = -EIO;

			goto dcb_init_err;
@@ -616,8 +617,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked) 
		 */

		pf_vsi = ice_get_main_vsi(pf);

		if (!pf_vsi) {

			dev_err(&pf->pdev->dev,

				"Failed to set local DCB config\n");

			dev_err(dev, "Failed to set local DCB config\n");

			err = -EIO;

			goto dcb_init_err;

		}
@@ -732,6 +732,7 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 
				    struct ice_rq_event_info *event)

{

	struct ice_aqc_port_ets_elem buf = { 0 };

	struct device *dev = ice_pf_to_dev(pf);

	struct ice_aqc_lldp_get_mib *mib;

	struct ice_dcbx_cfg tmp_dcbx_cfg;

	bool need_reconfig = false;
@@ -745,8 +746,7 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 
		return;



	if (pf->dcbx_cap & DCB_CAP_DCBX_HOST) {

		dev_dbg(&pf->pdev->dev,

			"MIB Change Event in HOST mode\n");

		dev_dbg(dev, "MIB Change Event in HOST mode\n");

		return;

	}
@@ -755,21 +755,20 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 
	/* Ignore if event is not for Nearest Bridge */

	type = ((mib->type >> ICE_AQ_LLDP_BRID_TYPE_S) &

		ICE_AQ_LLDP_BRID_TYPE_M);

	dev_dbg(&pf->pdev->dev, "LLDP event MIB bridge type 0x%x\n", type);

	dev_dbg(dev, "LLDP event MIB bridge type 0x%x\n", type);

	if (type != ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID)

		return;



	/* Check MIB Type and return if event for Remote MIB update */

	type = mib->type & ICE_AQ_LLDP_MIB_TYPE_M;

	dev_dbg(&pf->pdev->dev,

		"LLDP event mib type %s\n", type ? "remote" : "local");

	dev_dbg(dev, "LLDP event mib type %s\n", type ? "remote" : "local");

	if (type == ICE_AQ_LLDP_MIB_REMOTE) {

		/* Update the remote cached instance and return */

		ret = ice_aq_get_dcb_cfg(pi->hw, ICE_AQ_LLDP_MIB_REMOTE,

					 ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID,

					 &pi->remote_dcbx_cfg);

		if (ret) {

			dev_err(&pf->pdev->dev, "Failed to get remote DCB config\n");

			dev_err(dev, "Failed to get remote DCB config\n");

			return;

		}

	}
@@ -783,14 +782,13 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 
	/* Get updated DCBX data from firmware */

	ret = ice_get_dcb_cfg(pf->hw.port_info);

	if (ret) {

		dev_err(&pf->pdev->dev, "Failed to get DCB config\n");

		dev_err(dev, "Failed to get DCB config\n");

		return;

	}



	/* No change detected in DCBX configs */

	if (!memcmp(&tmp_dcbx_cfg, &pi->local_dcbx_cfg, sizeof(tmp_dcbx_cfg))) {

		dev_dbg(&pf->pdev->dev,

			"No change detected in DCBX configuration.\n");

		dev_dbg(dev, "No change detected in DCBX configuration.\n");

		return;

	}
@@ -802,16 +800,16 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 


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

	if (ice_dcb_get_num_tc(&pi->local_dcbx_cfg) > 1) {

		dev_dbg(&pf->pdev->dev, "DCB tagging enabled (num TC > 1)\n");

		dev_dbg(dev, "DCB tagging enabled (num TC > 1)\n");

		set_bit(ICE_FLAG_DCB_ENA, pf->flags);

	} else {

		dev_dbg(&pf->pdev->dev, "DCB tagging disabled (num TC = 1)\n");

		dev_dbg(dev, "DCB tagging disabled (num TC = 1)\n");

		clear_bit(ICE_FLAG_DCB_ENA, pf->flags);

	}



	pf_vsi = ice_get_main_vsi(pf);

	if (!pf_vsi) {

		dev_dbg(&pf->pdev->dev, "PF VSI doesn't exist\n");

		dev_dbg(dev, "PF VSI doesn't exist\n");

		return;

	}
@@ -820,7 +818,7 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf, 


	ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);

	if (ret) {

		dev_err(&pf->pdev->dev, "Query Port ETS failed\n");

		dev_err(dev, "Query Port ETS failed\n");

		rtnl_unlock();

		return;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ ice_dcb_get_tc(struct ice_vsi __always_unused *vsi, 
static inline int

ice_init_pf_dcb(struct ice_pf *pf, bool __always_unused locked)

{

	dev_dbg(&pf->pdev->dev, "DCB not supported\n");

	dev_dbg(ice_pf_to_dev(pf), "DCB not supported\n");

	return -EOPNOTSUPP;

}

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

+7 −7
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static u8 ice_dcbnl_setdcbx(struct net_device *netdev, u8 mode) 
	else

		pf->hw.port_info->local_dcbx_cfg.dcbx_mode = ICE_DCBX_MODE_IEEE;



	dev_info(&pf->pdev->dev, "DCBx mode = 0x%x\n", mode);

	dev_info(ice_pf_to_dev(pf), "DCBx mode = 0x%x\n", mode);

	return ICE_DCB_HW_CHG_RST;

}
@@ -297,7 +297,7 @@ ice_dcbnl_get_pfc_cfg(struct net_device *netdev, int prio, u8 *setting) 
		return;



	*setting = (pi->local_dcbx_cfg.pfc.pfcena >> prio) & 0x1;

	dev_dbg(&pf->pdev->dev,

	dev_dbg(ice_pf_to_dev(pf),

		"Get PFC Config up=%d, setting=%d, pfcenable=0x%x\n",

		prio, *setting, pi->local_dcbx_cfg.pfc.pfcena);

}
@@ -328,7 +328,7 @@ static void ice_dcbnl_set_pfc_cfg(struct net_device *netdev, int prio, u8 set) 
	else

		new_cfg->pfc.pfcena &= ~BIT(prio);



	dev_dbg(&pf->pdev->dev, "Set PFC config UP:%d set:%d pfcena:0x%x\n",

	dev_dbg(ice_pf_to_dev(pf), "Set PFC config UP:%d set:%d pfcena:0x%x\n",

		prio, set, new_cfg->pfc.pfcena);

}
@@ -359,7 +359,7 @@ static u8 ice_dcbnl_getstate(struct net_device *netdev) 


	state = test_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);



	dev_dbg(&pf->pdev->dev, "DCB enabled state = %d\n", state);

	dev_dbg(ice_pf_to_dev(pf), "DCB enabled state = %d\n", state);

	return state;

}
@@ -418,7 +418,7 @@ ice_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int prio, 
		return;



	*pgid = pi->local_dcbx_cfg.etscfg.prio_table[prio];

	dev_dbg(&pf->pdev->dev,

	dev_dbg(ice_pf_to_dev(pf),

		"Get PG config prio=%d tc=%d\n", prio, *pgid);

}
@@ -479,7 +479,7 @@ ice_dcbnl_get_pg_bwg_cfg_tx(struct net_device *netdev, int pgid, u8 *bw_pct) 
		return;



	*bw_pct = pi->local_dcbx_cfg.etscfg.tcbwtable[pgid];

	dev_dbg(&pf->pdev->dev, "Get PG BW config tc=%d bw_pct=%d\n",

	dev_dbg(ice_pf_to_dev(pf), "Get PG BW config tc=%d bw_pct=%d\n",

		pgid, *bw_pct);

}
@@ -597,7 +597,7 @@ static u8 ice_dcbnl_get_cap(struct net_device *netdev, int capid, u8 *cap) 
		break;

	}



	dev_dbg(&pf->pdev->dev, "DCBX Get Capability cap=%d capval=0x%x\n",

	dev_dbg(ice_pf_to_dev(pf), "DCBX Get Capability cap=%d capval=0x%x\n",

		capid, *cap);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE