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

Commit b832c2f6 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Add code for DCB rebuild 



This patch introduces a new function ice_dcb_rebuild which reinitializes
DCB after a reset.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4b0fdceb

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

+78 −0
Original line number Diff line number Diff line
@@ -197,6 +197,84 @@ static int ice_pf_dcb_cfg(struct ice_pf *pf, struct ice_dcbx_cfg *new_cfg) 
	return ret;

}



/**

 * ice_dcb_rebuild - rebuild DCB post reset

 * @pf: physical function instance

 */

void ice_dcb_rebuild(struct ice_pf *pf)

{

	struct ice_aqc_port_ets_elem buf = { 0 };

	struct ice_dcbx_cfg *prev_cfg;

	enum ice_status ret;

	u8 willing;



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

		goto dcb_error;

	}



	/* If DCB was not enabled previously, we are done */

	if (!test_bit(ICE_FLAG_DCB_ENA, pf->flags))

		return;



	/* Save current willing state and force FW to unwilling */

	willing = pf->hw.port_info->local_dcbx_cfg.etscfg.willing;

	pf->hw.port_info->local_dcbx_cfg.etscfg.willing = 0x0;

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

	if (ret) {

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

		goto dcb_error;

	}



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

	prev_cfg = devm_kmemdup(&pf->pdev->dev,

				&pf->hw.port_info->local_dcbx_cfg,

				sizeof(*prev_cfg), GFP_KERNEL);

	if (!prev_cfg) {

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

		goto dcb_error;

	}



	ice_init_dcb(&pf->hw);

	if (memcmp(prev_cfg, &pf->hw.port_info->local_dcbx_cfg,

		   sizeof(*prev_cfg))) {

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

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

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

		goto dcb_error;

	}



	/* fetched config congruent to previous configuration */

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



	/* Configuration replayed - reset willing state to previous */

	pf->hw.port_info->local_dcbx_cfg.etscfg.willing = willing;

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

	if (ret) {

		dev_err(&pf->pdev->dev, "Fail restoring prev willing state\n");

		goto dcb_error;

	}

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

		goto dcb_error;

	}



	return;



dcb_error:

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

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

	prev_cfg->etscfg.willing = true;

	prev_cfg->etscfg.tcbwtable[0] = ICE_TC_MAX_BW;

	prev_cfg->etscfg.tsatable[0] = ICE_IEEE_TSA_ETS;

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

	ice_pf_dcb_cfg(pf, prev_cfg);

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

}



/**

 * ice_dcb_init_cfg - set the initial DCB config in SW

 * @pf: pf to apply config to

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

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
#include "ice_lib.h"



#ifdef CONFIG_DCB

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



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);

void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi);
@@ -25,6 +28,8 @@ ice_set_cgd_num(struct ice_tlan_ctx *tlan_ctx, struct ice_ring *ring) 
	tlan_ctx->cgd_num = ring->dcb_tc;

}

#else

#define ice_dcb_rebuild(pf) do {} while (0)



static inline u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg __always_unused *dcbcfg)

{

	return ICE_DFLT_TRAFFIC_CLASS;

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

+2 −0
Original line number Diff line number Diff line
@@ -3793,6 +3793,8 @@ static void ice_rebuild(struct ice_pf *pf) 
	if (err)

		goto err_sched_init_port;



	ice_dcb_rebuild(pf);



	/* reset search_hint of irq_trackers to 0 since interrupts are

	 * reclaimed and could be allocated from beginning during VSI rebuild

	 */