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

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

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2016-08-20

This series contains updates to ixgbe and ixgbevf.

Veola fixes how the backplane reports the media in ethtool, as KR, KX or
KX4 based on the backplane interface present.

Emil fixes ixgbevf since an incorrect size parameter for
ixgbevf_write_msg_read_ack() ended up only giving the PF the first 4
bytes of the MAC address, so correct the size by calculating it on the
fly for all instances where we call ixgbevf_write_msg_read_ack().  Added
geneve receive offload support for x550em_a.

Don fixes the LED interface for x557 since it uses a different interface.
Added support for the new x557 copper device.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8238ac0c 92ed8430

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

+3 −1
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG_RX_HWTSTAMP_ENABLED		BIT(25)

#define IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER	BIT(26)

#define IXGBE_FLAG_DCB_CAPABLE			BIT(27)

#define IXGBE_FLAG_GENEVE_OFFLOAD_CAPABLE	BIT(28)



	u32 flags2;

#define IXGBE_FLAG2_RSC_CAPABLE			BIT(0)
@@ -658,7 +659,7 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP		BIT(9)

#define IXGBE_FLAG2_PTP_PPS_ENABLED		BIT(10)

#define IXGBE_FLAG2_PHY_INTERRUPT		BIT(11)

#define IXGBE_FLAG2_VXLAN_REREG_NEEDED		BIT(12)

#define IXGBE_FLAG2_UDP_TUN_REREG_NEEDED	BIT(12)

#define IXGBE_FLAG2_VLAN_PROMISC		BIT(13)



	/* Tx fast path data */
@@ -672,6 +673,7 @@ struct ixgbe_adapter { 


	/* Port number used to identify VXLAN traffic */

	__be16 vxlan_port;

	__be16 geneve_port;



	/* TX */

	struct ixgbe_ring *tx_ring[MAX_TX_QUEUES] ____cacheline_aligned_in_smp;

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

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) 
		case IXGBE_DEV_ID_X550T:

		case IXGBE_DEV_ID_X550T1:

		case IXGBE_DEV_ID_X550EM_X_10G_T:

		case IXGBE_DEV_ID_X550EM_A_10G_T:

			supported = true;

			break;

		default:

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

+3 −1
Original line number Diff line number Diff line
@@ -193,7 +193,9 @@ static int ixgbe_get_settings(struct net_device *netdev, 
	if (supported_link & IXGBE_LINK_SPEED_10GB_FULL)

		ecmd->supported |= ixgbe_get_supported_10gtypes(hw);

	if (supported_link & IXGBE_LINK_SPEED_1GB_FULL)

		ecmd->supported |= SUPPORTED_1000baseT_Full;

		ecmd->supported |= (ixgbe_isbackplane(hw->phy.media_type)) ?

				   SUPPORTED_1000baseKX_Full :

				   SUPPORTED_1000baseT_Full;

	if (supported_link & IXGBE_LINK_SPEED_100_FULL)

		ecmd->supported |= ixgbe_isbackplane(hw->phy.media_type) ?

				   SUPPORTED_1000baseKX_Full :

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

+125 −50
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static const struct pci_device_id ixgbe_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP_N), board_x550em_a },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII), board_x550em_a },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SGMII_L), board_x550em_a },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_10G_T), board_x550em_a},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_A_SFP), board_x550em_a },

	/* required last entry */

	{0, }
@@ -1495,7 +1496,6 @@ static inline void ixgbe_rx_checksum(struct ixgbe_ring *ring, 
				     struct sk_buff *skb)

{

	__le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;

	__le16 hdr_info = rx_desc->wb.lower.lo_dword.hs_rss.hdr_info;

	bool encap_pkt = false;



	skb_checksum_none_assert(skb);
@@ -1504,8 +1504,8 @@ static inline void ixgbe_rx_checksum(struct ixgbe_ring *ring, 
	if (!(ring->netdev->features & NETIF_F_RXCSUM))

		return;



	if ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_VXLAN)) &&

	    (hdr_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_TUNNEL >> 16))) {

	/* check for VXLAN and Geneve packets */

	if (pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_VXLAN)) {

		encap_pkt = true;

		skb->encapsulation = 1;

	}
@@ -3922,6 +3922,9 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
	rfctl &= ~IXGBE_RFCTL_RSC_DIS;

	if (!(adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED))

		rfctl |= IXGBE_RFCTL_RSC_DIS;



	/* disable NFS filtering */

	rfctl |= (IXGBE_RFCTL_NFSW_DIS | IXGBE_RFCTL_NFSR_DIS);

	IXGBE_WRITE_REG(hw, IXGBE_RFCTL, rfctl);



	/* Program registers for the distribution of queues */
@@ -4586,18 +4589,23 @@ static void ixgbe_napi_disable_all(struct ixgbe_adapter *adapter) 
	}

}



static void ixgbe_clear_vxlan_port(struct ixgbe_adapter *adapter)

static void ixgbe_clear_udp_tunnel_port(struct ixgbe_adapter *adapter, u32 mask)

{

	switch (adapter->hw.mac.type) {

	case ixgbe_mac_X550:

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_VXLANCTRL, 0);

	struct ixgbe_hw *hw = &adapter->hw;

	u32 vxlanctrl;



	if (!(adapter->flags & (IXGBE_FLAG_VXLAN_OFFLOAD_CAPABLE |

				IXGBE_FLAG_GENEVE_OFFLOAD_CAPABLE)))

		return;



	vxlanctrl = IXGBE_READ_REG(hw, IXGBE_VXLANCTRL) && ~mask;

	IXGBE_WRITE_REG(hw, IXGBE_VXLANCTRL, vxlanctrl);



	if (mask & IXGBE_VXLANCTRL_VXLAN_UDPPORT_MASK)

		adapter->vxlan_port = 0;

		break;

	default:

		break;

	}



	if (mask & IXGBE_VXLANCTRL_GENEVE_UDPPORT_MASK)

		adapter->geneve_port = 0;

}



#ifdef CONFIG_IXGBE_DCB
@@ -5711,8 +5719,10 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter) 
		if (fwsm & IXGBE_FWSM_TS_ENABLED)

			adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE;

		break;

	case ixgbe_mac_X550EM_x:

	case ixgbe_mac_x550em_a:

		adapter->flags |= IXGBE_FLAG_GENEVE_OFFLOAD_CAPABLE;

	/* fall through */

	case ixgbe_mac_X550EM_x:

#ifdef CONFIG_IXGBE_DCB

		adapter->flags &= ~IXGBE_FLAG_DCB_CAPABLE;

#endif
@@ -6144,7 +6154,7 @@ int ixgbe_open(struct net_device *netdev) 


	ixgbe_up_complete(adapter);



	ixgbe_clear_vxlan_port(adapter);

	ixgbe_clear_udp_tunnel_port(adapter, IXGBE_VXLANCTRL_ALL_UDPPORT_MASK);

	udp_tunnel_get_rx_info(netdev);



	return 0;
@@ -7223,9 +7233,9 @@ static void ixgbe_service_task(struct work_struct *work) 
		ixgbe_service_event_complete(adapter);

		return;

	}

	if (adapter->flags2 & IXGBE_FLAG2_VXLAN_REREG_NEEDED) {

	if (adapter->flags2 & IXGBE_FLAG2_UDP_TUN_REREG_NEEDED) {

		rtnl_lock();

		adapter->flags2 &= ~IXGBE_FLAG2_VXLAN_REREG_NEEDED;

		adapter->flags2 &= ~IXGBE_FLAG2_UDP_TUN_REREG_NEEDED;

		udp_tunnel_get_rx_info(adapter->netdev);

		rtnl_unlock();

	}
@@ -7665,6 +7675,10 @@ static void ixgbe_atr(struct ixgbe_ring *ring, 
		if (adapter->vxlan_port &&

		    udp_hdr(skb)->dest == adapter->vxlan_port)

			hdr.network = skb_inner_network_header(skb);



		if (adapter->geneve_port &&

		    udp_hdr(skb)->dest == adapter->geneve_port)

			hdr.network = skb_inner_network_header(skb);

	}



	/* Currently only IPv4/IPv6 with TCP is supported */
@@ -8800,10 +8814,23 @@ static int ixgbe_set_features(struct net_device *netdev, 
	netdev->features = features;



	if ((adapter->flags & IXGBE_FLAG_VXLAN_OFFLOAD_CAPABLE)) {

		if (features & NETIF_F_RXCSUM)

			adapter->flags2 |= IXGBE_FLAG2_VXLAN_REREG_NEEDED;

		else

			ixgbe_clear_vxlan_port(adapter);

		if (features & NETIF_F_RXCSUM) {

			adapter->flags2 |= IXGBE_FLAG2_UDP_TUN_REREG_NEEDED;

		} else {

			u32 port_mask = IXGBE_VXLANCTRL_VXLAN_UDPPORT_MASK;



			ixgbe_clear_udp_tunnel_port(adapter, port_mask);

		}

	}



	if ((adapter->flags & IXGBE_FLAG_GENEVE_OFFLOAD_CAPABLE)) {

		if (features & NETIF_F_RXCSUM) {

			adapter->flags2 |= IXGBE_FLAG2_UDP_TUN_REREG_NEEDED;

		} else {

			u32 port_mask = IXGBE_VXLANCTRL_GENEVE_UDPPORT_MASK;



			ixgbe_clear_udp_tunnel_port(adapter, port_mask);

		}

	}



	if (need_reset)
@@ -8816,23 +8843,24 @@ static int ixgbe_set_features(struct net_device *netdev, 
}



/**

 * ixgbe_add_vxlan_port - Get notifications about VXLAN ports that come up

 * ixgbe_add_udp_tunnel_port - Get notifications about adding UDP tunnel ports

 * @dev: The port's netdev

 * @ti: Tunnel endpoint information

 **/

static void ixgbe_add_vxlan_port(struct net_device *dev,

static void ixgbe_add_udp_tunnel_port(struct net_device *dev,

				      struct udp_tunnel_info *ti)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	__be16 port = ti->port;



	if (ti->type != UDP_TUNNEL_TYPE_VXLAN)

		return;

	u32 port_shift = 0;

	u32 reg;



	if (ti->sa_family != AF_INET)

		return;



	switch (ti->type) {

	case UDP_TUNNEL_TYPE_VXLAN:

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

			return;
@@ -8841,42 +8869,89 @@ static void ixgbe_add_vxlan_port(struct net_device *dev, 


		if (adapter->vxlan_port) {

			netdev_info(dev,

			    "Hit Max num of VXLAN ports, not adding port %d\n",

				    "VXLAN port %d set, not adding port %d\n",

				    ntohs(adapter->vxlan_port),

				    ntohs(port));

			return;

		}



		adapter->vxlan_port = port;

	IXGBE_WRITE_REG(hw, IXGBE_VXLANCTRL, ntohs(port));

		break;

	case UDP_TUNNEL_TYPE_GENEVE:

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

			return;



		if (adapter->geneve_port == port)

			return;



		if (adapter->geneve_port) {

			netdev_info(dev,

				    "GENEVE port %d set, not adding port %d\n",

				    ntohs(adapter->geneve_port),

				    ntohs(port));

			return;

		}



		port_shift = IXGBE_VXLANCTRL_GENEVE_UDPPORT_SHIFT;

		adapter->geneve_port = port;

		break;

	default:

		return;

	}



	reg = IXGBE_READ_REG(hw, IXGBE_VXLANCTRL) | ntohs(port) << port_shift;

	IXGBE_WRITE_REG(hw, IXGBE_VXLANCTRL, reg);

}



/**

 * ixgbe_del_vxlan_port - Get notifications about VXLAN ports that go away

 * ixgbe_del_udp_tunnel_port - Get notifications about removing UDP tunnel ports

 * @dev: The port's netdev

 * @ti: Tunnel endpoint information

 **/

static void ixgbe_del_vxlan_port(struct net_device *dev,

static void ixgbe_del_udp_tunnel_port(struct net_device *dev,

				      struct udp_tunnel_info *ti)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	u32 port_mask;



	if (ti->type != UDP_TUNNEL_TYPE_VXLAN)

	if (ti->type != UDP_TUNNEL_TYPE_VXLAN &&

	    ti->type != UDP_TUNNEL_TYPE_GENEVE)

		return;



	if (ti->sa_family != AF_INET)

		return;



	switch (ti->type) {

	case UDP_TUNNEL_TYPE_VXLAN:

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

			return;



		if (adapter->vxlan_port != ti->port) {

		netdev_info(dev, "Port %d was not found, not deleting\n",

			netdev_info(dev, "VXLAN port %d not found\n",

				    ntohs(ti->port));

			return;

		}



		port_mask = IXGBE_VXLANCTRL_VXLAN_UDPPORT_MASK;

		break;

	case UDP_TUNNEL_TYPE_GENEVE:

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

			return;



		if (adapter->geneve_port != ti->port) {

			netdev_info(dev, "GENEVE port %d not found\n",

				    ntohs(ti->port));

			return;

		}



	ixgbe_clear_vxlan_port(adapter);

	adapter->flags2 |= IXGBE_FLAG2_VXLAN_REREG_NEEDED;

		port_mask = IXGBE_VXLANCTRL_GENEVE_UDPPORT_MASK;

		break;

	default:

		return;

	}



	ixgbe_clear_udp_tunnel_port(adapter, port_mask);

	adapter->flags2 |= IXGBE_FLAG2_UDP_TUN_REREG_NEEDED;

}



static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
@@ -9190,8 +9265,8 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_bridge_getlink	= ixgbe_ndo_bridge_getlink,

	.ndo_dfwd_add_station	= ixgbe_fwd_add,

	.ndo_dfwd_del_station	= ixgbe_fwd_del,

	.ndo_udp_tunnel_add	= ixgbe_add_vxlan_port,

	.ndo_udp_tunnel_del	= ixgbe_del_vxlan_port,

	.ndo_udp_tunnel_add	= ixgbe_add_udp_tunnel_port,

	.ndo_udp_tunnel_del	= ixgbe_del_udp_tunnel_port,

	.ndo_features_check	= ixgbe_features_check,

};

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

+11 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define IXGBE_DEV_ID_X550EM_A_SFP_N	0x15C4

#define IXGBE_DEV_ID_X550EM_A_SGMII	0x15C6

#define IXGBE_DEV_ID_X550EM_A_SGMII_L	0x15C7

#define IXGBE_DEV_ID_X550EM_A_10G_T	0x15C8

#define IXGBE_DEV_ID_X550EM_A_SFP	0x15CE



/* VF Device IDs */
@@ -487,6 +488,13 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_FHFT_EXT(_n)	(0x09800 + ((_n) * 0x100)) /* Ext Flexible Host

							    * Filter Table */



/* masks for accessing VXLAN and GENEVE UDP ports */

#define IXGBE_VXLANCTRL_VXLAN_UDPPORT_MASK     0x0000ffff /* VXLAN port */

#define IXGBE_VXLANCTRL_GENEVE_UDPPORT_MASK    0xffff0000 /* GENEVE port */

#define IXGBE_VXLANCTRL_ALL_UDPPORT_MASK       0xffffffff /* GENEVE/VXLAN */



#define IXGBE_VXLANCTRL_GENEVE_UDPPORT_SHIFT   16



#define IXGBE_FLEXIBLE_FILTER_COUNT_MAX         4

#define IXGBE_EXT_FLEXIBLE_FILTER_COUNT_MAX     2
@@ -1823,6 +1831,9 @@ enum { 
#define IXGBE_LED_IVRT(_i)       IXGBE_LED_OFFSET(IXGBE_LED_IVRT_BASE, _i)

#define IXGBE_LED_BLINK(_i)      IXGBE_LED_OFFSET(IXGBE_LED_BLINK_BASE, _i)

#define IXGBE_LED_MODE_MASK(_i)  IXGBE_LED_OFFSET(IXGBE_LED_MODE_MASK_BASE, _i)

#define IXGBE_X557_LED_MANUAL_SET_MASK	BIT(8)

#define IXGBE_X557_MAX_LED_INDEX	3

#define IXGBE_X557_LED_PROVISIONING	0xC430



/* LED modes */

#define IXGBE_LED_LINK_UP       0x0