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

Commit 264857b8 authored by Peter P Waskiewicz Jr's avatar Peter P Waskiewicz Jr Committed by David S. Miller
Browse files

ixgbe: Allow link flow control in DCB mode for 82599 adapters 



82599 supports using either link flow control or priority flow control when
in DCB mode.  The dcbnl interface already supports sending down
configurations through rtnetlink that can enable LFC when DCB is enabled,
so the driver should take advantage of this.

82598 does not support using LFC when DCB is enabled, so explicitly disable
it when we're in DCB mode.  This means we always run in PFC mode when DCB
is enabled.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70b77628

drivers/net/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ struct ixgbe_adapter { 
	struct ixgbe_dcb_config dcb_cfg;

	struct ixgbe_dcb_config temp_dcb_cfg;

	u8 dcb_set_bitmap;

	enum ixgbe_fc_mode last_lfc_mode;



	/* Interrupt Throttle Rate */

	u32 itr_setting;

drivers/net/ixgbe/ixgbe_82598.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num) 
	}



	/* Configure pause time (2 TCs per register) */

	reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num));

	reg = IXGBE_READ_REG(hw, IXGBE_FCTTV(packetbuf_num / 2));

	if ((packetbuf_num & 1) == 0)

		reg = (reg & 0xFFFF0000) | hw->fc.pause_time;

	else

drivers/net/ixgbe/ixgbe_common.c

+3 −2
Original line number Diff line number Diff line
@@ -1661,9 +1661,10 @@ s32 ixgbe_fc_enable(struct ixgbe_hw *hw, s32 packetbuf_num) 
	reg = IXGBE_READ_REG(hw, IXGBE_MTQC);

	/* Thresholds are different for link flow control when in DCB mode */

	if (reg & IXGBE_MTQC_RT_ENA) {

		rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num));



		/* Always disable XON for LFC when in DCB mode */

		IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(packetbuf_num), 0);



		rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(packetbuf_num));

		reg = (rx_pba_size >> 2) & 0xFFE0;

		if (hw->fc.current_mode & ixgbe_fc_tx_pause)

			reg |= IXGBE_FCRTH_FCEN;

drivers/net/ixgbe/ixgbe_dcb_82598.c

+4 −0
Original line number Diff line number Diff line
@@ -294,6 +294,9 @@ s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, 
	u32 reg, rx_pba_size;

	u8  i;



	if (!dcb_config->pfc_mode_enable)

		goto out;



	/* Enable Transmit Priority Flow Control */

	reg = IXGBE_READ_REG(hw, IXGBE_RMCS);

	reg &= ~IXGBE_RMCS_TFCE_802_3X;
@@ -341,6 +344,7 @@ s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, 
	/* Configure flow control refresh threshold value */

	IXGBE_WRITE_REG(hw, IXGBE_FCRTV, 0x3400);



out:

	return 0;

}

drivers/net/ixgbe/ixgbe_dcb_nl.c

+29 −3
Original line number Diff line number Diff line
@@ -126,7 +126,10 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
			netdev->netdev_ops->ndo_stop(netdev);

		ixgbe_clear_interrupt_scheme(adapter);



		adapter->hw.fc.requested_mode = ixgbe_fc_pfc;

		if (adapter->hw.mac.type == ixgbe_mac_82598EB) {

			adapter->last_lfc_mode = adapter->hw.fc.current_mode;

			adapter->hw.fc.requested_mode = ixgbe_fc_none;

		}

		adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;

		adapter->flags |= IXGBE_FLAG_DCB_ENABLED;

		ixgbe_init_interrupt_scheme(adapter);
@@ -135,11 +138,13 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
	} else {

		/* Turn off DCB */

		if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

			adapter->hw.fc.requested_mode = ixgbe_fc_default;

			if (netif_running(netdev))

				netdev->netdev_ops->ndo_stop(netdev);

			ixgbe_clear_interrupt_scheme(adapter);



			adapter->hw.fc.requested_mode = adapter->last_lfc_mode;

			adapter->temp_dcb_cfg.pfc_mode_enable = false;

			adapter->dcb_cfg.pfc_mode_enable = false;

			adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;

			adapter->flags |= IXGBE_FLAG_RSS_ENABLED;

			ixgbe_init_interrupt_scheme(adapter);
@@ -329,9 +334,24 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 
		return ret;

	}



	if (adapter->dcb_cfg.pfc_mode_enable) {

		if ((adapter->hw.mac.type != ixgbe_mac_82598EB) &&

			(adapter->hw.fc.current_mode != ixgbe_fc_pfc))

			adapter->last_lfc_mode = adapter->hw.fc.current_mode;

		adapter->hw.fc.requested_mode = ixgbe_fc_pfc;

	} else {

		if (adapter->hw.mac.type != ixgbe_mac_82598EB)

			adapter->hw.fc.requested_mode = adapter->last_lfc_mode;

		else

			adapter->hw.fc.requested_mode = ixgbe_fc_none;

	}



	if (netif_running(netdev))

		ixgbe_up(adapter);



	if (adapter->dcb_cfg.pfc_mode_enable)

		adapter->hw.fc.current_mode = ixgbe_fc_pfc;



	adapter->dcb_set_bitmap = 0x00;

	clear_bit(__IXGBE_RESETTING, &adapter->state);

	return ret;
@@ -409,11 +429,17 @@ static u8 ixgbe_dcbnl_getpfcstate(struct net_device *netdev) 
{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);



	return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED);

	return adapter->dcb_cfg.pfc_mode_enable;

}



static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);



	adapter->temp_dcb_cfg.pfc_mode_enable = state;

	if (adapter->temp_dcb_cfg.pfc_mode_enable !=

		adapter->dcb_cfg.pfc_mode_enable)

		adapter->dcb_set_bitmap |= BIT_PFC;

	return;

}