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

Commit fd183f6a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

--------------------
This series contains updates to ixgbe and ixgbevf.
 ...
Akeem G. Abodunrin (1):
  igb: reset PHY in the link_up process to recover PHY setting after
    power down.

Alexander Duyck (8):
  ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriov
  ixgbe: Change how we check for pre-existing and assigned VFs
  ixgbevf: Add lock around mailbox ops to prevent simultaneous access
  ixgbevf: Add support for PCI error handling
  ixgbe: Fix handling of FDIR_HASH flag
  ixgbe: Reduce Rx header size to what is actually used
  ixgbe: Use num_tcs.pg_tcs as upper limit for TC when checking based
    on UP
  ixgbe: Use 1TC DCB instead of disabling DCB for MSI and legacy
    interrupts

Don Skidmore (1):
  ixgbe: add support for new 82599 device

Greg Rose (1):
  ixgbevf: Fix namespace issue with ixgbe_write_eitr

John Fastabend (2):
  ixgbe: fix RAR entry counting for generic and fdb_add()
  ixgbe: remove extra unused queues in DCB + FCoE case
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5dc7c779 76886596

drivers/net/ethernet/intel/igb/igb_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1500,11 +1500,12 @@ static void igb_configure(struct igb_adapter *adapter) 
 **/

void igb_power_up_link(struct igb_adapter *adapter)

{

	igb_reset_phy(&adapter->hw);



	if (adapter->hw.phy.media_type == e1000_media_type_copper)

		igb_power_up_phy_copper(&adapter->hw);

	else

		igb_power_up_serdes_link_82575(&adapter->hw);

	igb_reset_phy(&adapter->hw);

}



/**

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+8 −8
Original line number Diff line number Diff line
@@ -77,17 +77,18 @@ 
#define IXGBE_MAX_FCPAUSE		 0xFFFF



/* Supported Rx Buffer Sizes */

#define IXGBE_RXBUFFER_512   512    /* Used for packet split */

#define IXGBE_RXBUFFER_256    256  /* Used for skb receive header */

#define IXGBE_MAX_RXBUFFER  16384  /* largest size for a single descriptor */



/*

 * NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN mans we

 * reserve 2 more, and skb_shared_info adds an additional 384 bytes more,

 * this adds up to 512 bytes of extra data meaning the smallest allocation

 * we could have is 1K.

 * i.e. RXBUFFER_512 --> size-1024 slab

 * NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN means we

 * reserve 64 more, and skb_shared_info adds an additional 320 bytes more,

 * this adds up to 448 bytes of extra data.

 *

 * Since netdev_alloc_skb now allocates a page fragment we can use a value

 * of 256 and the resultant skb will have a truesize of 960 or less.

 */

#define IXGBE_RX_HDR_SIZE IXGBE_RXBUFFER_512

#define IXGBE_RX_HDR_SIZE IXGBE_RXBUFFER_256



#define MAXIMUM_ETHERNET_VLAN_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
@@ -130,7 +131,6 @@ struct vf_data_storage { 
	u16 tx_rate;

	u16 vlan_count;

	u8 spoofchk_enabled;

	struct pci_dev *vfdev;

};



struct vf_macvlans {

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c

+8 −4
Original line number Diff line number Diff line
@@ -232,18 +232,22 @@ u8 ixgbe_dcb_get_tc_from_up(struct ixgbe_dcb_config *cfg, int direction, u8 up) 
{

	struct tc_configuration *tc_config = &cfg->tc_config[0];

	u8 prio_mask = 1 << up;

	u8 tc;

	u8 tc = cfg->num_tcs.pg_tcs;



	/* If tc is 0 then DCB is likely not enabled or supported */

	if (!tc)

		goto out;



	/*

	 * Test for TCs 7 through 1 and report the first match we find.  If

	 * Test from maximum TC to 1 and report the first match we find.  If

	 * we find no match we can assume that the TC is 0 since the TC must

	 * be set for all user priorities

	 */

	for (tc = MAX_TRAFFIC_CLASS - 1; tc; tc--) {

	for (tc--; tc; tc--) {

		if (prio_mask & tc_config[tc].path[direction].up_to_tc_bitmap)

			break;

	}



out:

	return tc;

}

drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

+31 −10
Original line number Diff line number Diff line
@@ -370,6 +370,9 @@ static bool ixgbe_set_dcb_sriov_queues(struct ixgbe_adapter *adapter) 
	adapter->ring_feature[RING_F_RSS].indices = 1;

	adapter->ring_feature[RING_F_RSS].mask = IXGBE_RSS_DISABLED_MASK;



	/* disable ATR as it is not supported when VMDq is enabled */

	adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;



	adapter->num_rx_pools = vmdq_i;

	adapter->num_rx_queues_per_pool = tcs;
@@ -450,6 +453,9 @@ static bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter) 
	f->indices = rss_i;

	f->mask = rss_m;



	/* disable ATR as it is not supported when multiple TCs are enabled */

	adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;



#ifdef IXGBE_FCOE

	/* FCoE enabled queues require special configuration indexed

	 * by feature specific indices and offset. Here we map FCoE
@@ -606,16 +612,22 @@ static bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter) 
	f->indices = rss_i;

	f->mask = IXGBE_RSS_16Q_MASK;



	/* disable ATR by default, it will be configured below */

	adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;



	/*

	 * Use Flow Director in addition to RSS to ensure the best

	 * distribution of flows across cores, even when an FDIR flow

	 * isn't matched.

	 */

	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {

	if (rss_i > 1 && adapter->atr_sample_rate) {

		f = &adapter->ring_feature[RING_F_FDIR];



		f->indices = min_t(u16, num_online_cpus(), f->limit);

		rss_i = max_t(u16, rss_i, f->indices);



		if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))

			adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;

	}



#ifdef IXGBE_FCOE
@@ -1053,18 +1065,27 @@ static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) 
			return;

	}



	/* disable DCB if number of TCs exceeds 1 */

	if (netdev_get_num_tc(adapter->netdev) > 1) {

		e_err(probe, "num TCs exceeds number of queues - disabling DCB\n");

		netdev_reset_tc(adapter->netdev);



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

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



		adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;

	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {

		e_err(probe,

		      "ATR is not supported while multiple "

		      "queues are disabled.  Disabling Flow Director\n");

		adapter->temp_dcb_cfg.pfc_mode_enable = false;

		adapter->dcb_cfg.pfc_mode_enable = false;

	}

	adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;

	adapter->atr_sample_rate = 0;

	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

	adapter->dcb_cfg.num_tcs.pg_tcs = 1;

	adapter->dcb_cfg.num_tcs.pfc_tcs = 1;



	/* disable SR-IOV */

	ixgbe_disable_sriov(adapter);



	/* disable RSS */

	adapter->ring_feature[RING_F_RSS].limit = 1;



	ixgbe_set_num_queues(adapter);

	adapter->num_q_vectors = 1;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+73 −67
Original line number Diff line number Diff line
@@ -1517,8 +1517,8 @@ static bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring, 
	 * 60 bytes if the skb->len is less than 60 for skb_pad.

	 */

	pull_len = skb_frag_size(frag);

	if (pull_len > 256)

		pull_len = ixgbe_get_headlen(va, pull_len);

	if (pull_len > IXGBE_RX_HDR_SIZE)

		pull_len = ixgbe_get_headlen(va, IXGBE_RX_HDR_SIZE);



	/* align pull length to size of long to optimize memcpy performance */

	skb_copy_to_linear_data(skb, va, ALIGN(pull_len, sizeof(long)));
@@ -2688,8 +2688,7 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter, 
		   32;		/* PTHRESH = 32 */



	/* reinitialize flowdirector state */

	if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) &&

	    adapter->atr_sample_rate) {

	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {

		ring->atr_sample_rate = adapter->atr_sample_rate;

		ring->atr_count = 0;

		set_bit(__IXGBE_TX_FDIR_INIT_DONE, &ring->state);
@@ -3442,14 +3441,18 @@ static int ixgbe_write_uc_addr_list(struct net_device *netdev) 
{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	unsigned int rar_entries = IXGBE_MAX_PF_MACVLANS;

	unsigned int rar_entries = hw->mac.num_rar_entries - 1;

	int count = 0;



	/* In SR-IOV mode significantly less RAR entries are available */

	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

		rar_entries = IXGBE_MAX_PF_MACVLANS - 1;



	/* return ENOMEM indicating insufficient memory for addresses */

	if (netdev_uc_count(netdev) > rar_entries)

		return -ENOMEM;



	if (!netdev_uc_empty(netdev) && rar_entries) {

	if (!netdev_uc_empty(netdev)) {

		struct netdev_hw_addr *ha;

		/* return error if we do not support writing to RAR table */

		if (!hw->mac.ops.set_rar)
@@ -4419,7 +4422,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
		if (hw->device_id == IXGBE_DEV_ID_82599_T3_LOM)

			adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE;

		/* Flow Director hash filters enabled */

		adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;

		adapter->atr_sample_rate = 20;

		adapter->ring_feature[RING_F_FDIR].limit =

							 IXGBE_MAX_FDIR_INDICES;
@@ -4490,6 +4492,12 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
	hw->fc.send_xon = true;

	hw->fc.disable_fc_autoneg = false;



#ifdef CONFIG_PCI_IOV

	/* assign number of SR-IOV VFs */

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

		adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;



#endif

	/* enable itr by default in dynamic mode */

	adapter->rx_itr_setting = 1;

	adapter->tx_itr_setting = 1;
@@ -6695,12 +6703,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) 
	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_hw *hw = &adapter->hw;



	/* Multiple traffic classes requires multiple queues */

	if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {

		e_err(drv, "Enable failed, needs MSI-X\n");

		return -EINVAL;

	}



	/* Hardware supports up to 8 traffic classes */

	if (tc > adapter->dcb_cfg.num_tcs.pg_tcs ||

	    (hw->mac.type == ixgbe_mac_82598EB &&
@@ -6720,7 +6722,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) 
		ixgbe_set_prio_tc_map(adapter);



		adapter->flags |= IXGBE_FLAG_DCB_ENABLED;

		adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;



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

			adapter->last_lfc_mode = adapter->hw.fc.requested_mode;
@@ -6733,7 +6734,6 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc) 
			adapter->hw.fc.requested_mode = adapter->last_lfc_mode;



		adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;

		adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;



		adapter->temp_dcb_cfg.pfc_mode_enable = false;

		adapter->dcb_cfg.pfc_mode_enable = false;
@@ -6802,20 +6802,40 @@ static int ixgbe_set_features(struct net_device *netdev, 
	 * Check if Flow Director n-tuple support was enabled or disabled.  If

	 * the state changed, we need to reset.

	 */

	if (!(features & NETIF_F_NTUPLE)) {

		if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE) {

			/* turn off Flow Director, set ATR and reset */

			if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) &&

			    !(adapter->flags & IXGBE_FLAG_DCB_ENABLED))

				adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;

			need_reset = true;

		}

		adapter->flags &= ~IXGBE_FLAG_FDIR_PERFECT_CAPABLE;

	} else if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)) {

	switch (features & NETIF_F_NTUPLE) {

	case NETIF_F_NTUPLE:

		/* turn off ATR, enable perfect filters and reset */

		if (!(adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))

			need_reset = true;



		adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;

		adapter->flags |= IXGBE_FLAG_FDIR_PERFECT_CAPABLE;

		break;

	default:

		/* turn off perfect filters, enable ATR and reset */

		if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)

			need_reset = true;



		adapter->flags &= ~IXGBE_FLAG_FDIR_PERFECT_CAPABLE;



		/* We cannot enable ATR if SR-IOV is enabled */

		if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

			break;



		/* We cannot enable ATR if we have 2 or more traffic classes */

		if (netdev_get_num_tc(netdev) > 1)

			break;



		/* We cannot enable ATR if RSS is disabled */

		if (adapter->ring_feature[RING_F_RSS].limit <= 1)

			break;



		/* A sample rate of 0 indicates ATR disabled */

		if (!adapter->atr_sample_rate)

			break;



		adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;

		break;

	}



	if (features & NETIF_F_HW_VLAN_RX)
@@ -6839,7 +6859,10 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, 
			     u16 flags)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	int err = -EOPNOTSUPP;

	int err;



	if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

		return -EOPNOTSUPP;



	if (ndm->ndm_state & NUD_PERMANENT) {

		pr_info("%s: FDB only supports static addresses\n",
@@ -6847,12 +6870,16 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, 
		return -EINVAL;

	}



	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {

		if (is_unicast_ether_addr(addr))

	if (is_unicast_ether_addr(addr)) {

		u32 rar_uc_entries = IXGBE_MAX_PF_MACVLANS;



		if (netdev_uc_count(dev) < rar_uc_entries)

			err = dev_uc_add_excl(dev, addr);

		else if (is_multicast_ether_addr(addr))

			err = dev_mc_add_excl(dev, addr);

		else

			err = -ENOMEM;

	} else if (is_multicast_ether_addr(addr)) {

		err = dev_mc_add_excl(dev, addr);

	} else {

		err = -EINVAL;

	}
@@ -6942,26 +6969,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_fdb_dump		= ixgbe_ndo_fdb_dump,

};



static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,

				     const struct ixgbe_info *ii)

{

#ifdef CONFIG_PCI_IOV

	struct ixgbe_hw *hw = &adapter->hw;



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

		return;



	/* The 82599 supports up to 64 VFs per physical function

	 * but this implementation limits allocation to 63 so that

	 * basic networking resources are still available to the

	 * physical function.  If the user requests greater thn

	 * 63 VFs then it is an error - reset to default of zero.

	 */

	adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;

	ixgbe_enable_sriov(adapter, ii);

#endif /* CONFIG_PCI_IOV */

}



/**

 * ixgbe_wol_supported - Check whether device supports WoL

 * @hw: hw specific details
@@ -6988,6 +6995,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id, 
			if (hw->bus.func != 0)

				break;

		case IXGBE_SUBDEV_ID_82599_SFP:

		case IXGBE_SUBDEV_ID_82599_RNDC:

			is_wol_supported = 1;

			break;

		}
@@ -7035,6 +7043,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	int i, err, pci_using_dac;

	u8 part_str[IXGBE_PBANUM_LENGTH];

	unsigned int indices = num_possible_cpus();

	unsigned int dcb_max = 0;

#ifdef IXGBE_FCOE

	u16 device_caps;

#endif
@@ -7084,15 +7093,16 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	pci_save_state(pdev);



#ifdef CONFIG_IXGBE_DCB

	indices *= MAX_TRAFFIC_CLASS;

	if (ii->mac == ixgbe_mac_82598EB)

		dcb_max = min_t(unsigned int, indices * MAX_TRAFFIC_CLASS,

				IXGBE_MAX_RSS_INDICES);

	else

		dcb_max = min_t(unsigned int, indices * MAX_TRAFFIC_CLASS,

				IXGBE_MAX_FDIR_INDICES);

#endif



	if (ii->mac == ixgbe_mac_82598EB)

#ifdef CONFIG_IXGBE_DCB

		indices = min_t(unsigned int, indices, MAX_TRAFFIC_CLASS * 4);

#else

		indices = min_t(unsigned int, indices, IXGBE_MAX_RSS_INDICES);

#endif

	else

		indices = min_t(unsigned int, indices, IXGBE_MAX_FDIR_INDICES);
@@ -7100,6 +7110,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	indices += min_t(unsigned int, num_possible_cpus(),

			 IXGBE_MAX_FCOE_INDICES);

#endif

	indices = max_t(unsigned int, dcb_max, indices);

	netdev = alloc_etherdev_mq(sizeof(struct ixgbe_adapter), indices);

	if (!netdev) {

		err = -ENOMEM;
@@ -7206,8 +7217,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
		goto err_sw_init;

	}



	ixgbe_probe_vf(adapter, ii);

#ifdef CONFIG_PCI_IOV

	ixgbe_enable_sriov(adapter, ii);



#endif

	netdev->features = NETIF_F_SG |

			   NETIF_F_IP_CSUM |

			   NETIF_F_IPV6_CSUM |
@@ -7411,7 +7424,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, 
	ixgbe_release_hw_control(adapter);

	ixgbe_clear_interrupt_scheme(adapter);

err_sw_init:

	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

	ixgbe_disable_sriov(adapter);

	adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;

	iounmap(hw->hw_addr);
@@ -7465,13 +7477,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 
	if (netdev->reg_state == NETREG_REGISTERED)

		unregister_netdev(netdev);



	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {

		if (!(ixgbe_check_vf_assignment(adapter)))

	ixgbe_disable_sriov(adapter);

		else

			e_dev_warn("Unloading driver while VFs are assigned "

				   "- VFs will not be deallocated\n");

	}



	ixgbe_clear_interrupt_scheme(adapter);