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

Commit 39a7e587 authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

ixgbe: DCB, remove round robin mode on 82598 devices 



Remove round robin configuration code for 82598 parts it
is not settable and is always false.

If we need/want this in the future we can add it back properly.

Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 53bb9f80

drivers/net/ixgbe/ixgbe_dcb.h

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ struct ixgbe_dcb_config { 
	struct tc_configuration tc_config[MAX_TRAFFIC_CLASS];

	u8     bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */

	bool   pfc_mode_enable;

	bool   round_robin_enable;



	enum dcb_rx_pba_cfg rx_pba_cfg;

drivers/net/ixgbe/ixgbe_dcb_82598.c

+2 −4
Original line number Diff line number Diff line
@@ -146,10 +146,8 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw, 


	/* Enable arbiter */

	reg &= ~IXGBE_DPMCS_ARBDIS;

	if (!(dcb_config->round_robin_enable)) {

	/* Enable DFP and Recycle mode */

	reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);

	}

	reg |= IXGBE_DPMCS_TSOEF;

	/* Configure Max TSO packet size 34KB including payload and headers */

	reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT);

drivers/net/ixgbe/ixgbe_main.c

+0 −1
Original line number Diff line number Diff line
@@ -5173,7 +5173,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
	adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;

	adapter->dcb_cfg.rx_pba_cfg = pba_equal;

	adapter->dcb_cfg.pfc_mode_enable = false;

	adapter->dcb_cfg.round_robin_enable = false;

	adapter->dcb_set_bitmap = 0x00;

	ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,

			   adapter->ring_feature[RING_F_DCB].indices);