Commit fe203715 authored Feb 23, 2022 by Mateusz Palczewski Committed by Jakub Kicinski Feb 24, 2022

Revert "i40e: Fix reset bw limit when DCB enabled with 1 TC"



Revert of a patch that instead of fixing a AQ error when trying
to reset BW limit introduced several regressions related to
creation and managing TC. Currently there are errors when creating
a TC on both PF and VF.

Error log:
[17428.783095] i40e 0000:3b:00.1: AQ command Config VSI BW allocation per TC failed = 14
[17428.783107] i40e 0000:3b:00.1: Failed configuring TC map 0 for VSI 391
[17428.783254] i40e 0000:3b:00.1: AQ command Config VSI BW allocation per TC failed = 14
[17428.783259] i40e 0000:3b:00.1: Unable to  configure TC map 0 for VSI 391

This reverts commit 3d250466.

Fixes: 3d250466 (i40e: Fix reset bw limit when DCB enabled with 1 TC)
Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://lore.kernel.org/r/20220223175347.1690692-1-anthony.l.nguyen@intel.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent d9b5ae5c

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -5372,15 +5372,7 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc,
		/* There is no need to reset BW when mqprio mode is on. */
		if (pf->flags & I40E_FLAG_TC_MQPRIO)
		return 0;

		if (!vsi->mqprio_qopt.qopt.hw) {
		if (pf->flags & I40E_FLAG_DCB_ENABLED)
		goto skip_reset;

		if (IS_ENABLED(CONFIG_I40E_DCB) &&
		i40e_dcb_hw_get_num_tc(&pf->hw) == 1)
		goto skip_reset;

		if (!vsi->mqprio_qopt.qopt.hw && !(pf->flags & I40E_FLAG_DCB_ENABLED)) {
		ret = i40e_set_bw_limit(vsi, vsi->seid, 0);
		if (ret)
		dev_info(&pf->pdev->dev,
		@@ -5388,8 +5380,6 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc,
		vsi->seid);
		return ret;
		}

		skip_reset:
		memset(&bw_data, 0, sizeof(bw_data));
		bw_data.tc_valid_bits = enabled_tc;
		for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)