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

Commit 5288ec15 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/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-04-10

This series contains updates to ixgbe and documentation for igb,
ixgbe and ixgb.

Stephen cleans up documentation to igb, ixgbe and ixgb.

Don updates how bridge mode is stored to minimize obfuscation and
makes updates for future silicon easier.  Adds a new bridge mode
support function which gathers all the logic needed to configure
bridge modes.  Adds Source Address Prunning for VEPA bridge mode
for x550 devices.

Vasu adds specific FCoE offloads for x550 for DDP context programming
and increased DDP exchanges.

Alex Duyck cleans up the use of HW_VLAN_CTAG_FILTER in hw_features,
where the driver was actually ignoring the value of the bit and was
just assuming it was always set.  Also cleans up the use of rcu_barrier()
since the driver has not used call_rcu() to free the rings for some
time now.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 78ebb0d0 020f1d9d

Documentation/networking/igb.txt

+2 −2
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ Additional Configurations 
  Jumbo Frames

  ------------

  Jumbo Frames support is enabled by changing the MTU to a value larger than

  the default of 1500.  Use the ifconfig command to increase the MTU size.

  the default of 1500.  Use the ip command to increase the MTU size.

  For example:



       ifconfig eth<x> mtu 9000 up

       ip link set dev eth<x> mtu 9000



  This setting is not saved across reboots.

Documentation/networking/ixgb.txt

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Channel Bonding documentation can be found in the Linux kernel source: 


The driver information previously displayed in the /proc filesystem is not

supported in this release.  Alternatively, you can use ethtool (version 1.6

or later), lspci, and ifconfig to obtain the same information.

or later), lspci, and iproute2 to obtain the same information.



Instructions on updating ethtool can be found in the section "Additional

Configurations" later in this document.
@@ -90,7 +90,7 @@ select m for "Intel(R) PRO/10GbE support" located at: 
3. Assign an IP address to the interface by entering the following, where

   x is the interface number:



     ifconfig ethx <IP_address>

     ip addr add ethx <IP_address>



4. Verify that the interface works. Enter the following, where <IP_address>

   is the IP address for another machine on the same subnet as the interface
@@ -177,7 +177,7 @@ NOTE: These changes are only suggestions, and serve as a starting point for 
      tuning your network performance.



The changes are made in three major ways, listed in order of greatest effect:

- Use ifconfig to modify the mtu (maximum transmission unit) and the txqueuelen

- Use ip link to modify the mtu (maximum transmission unit) and the txqueuelen

  parameter.

- Use sysctl to modify /proc parameters (essentially kernel tuning)

- Use setpci to modify the MMRBC field in PCI-X configuration space to increase
@@ -202,7 +202,7 @@ setpci -d 8086:1a48 e6.b=2e 
# to change as well.

# set the txqueuelen

# your ixgb adapter should be loaded as eth1 for this to work, change if needed

ifconfig eth1 mtu 9000 txqueuelen 1000 up

ip li set dev eth1 mtu 9000 txqueuelen 1000 up

# call the sysctl utility to modify /proc/sys entries

sysctl -p ./sysctl_ixgb.conf

- END ixgb_perf.sh
@@ -297,10 +297,10 @@ Additional Configurations 
  ------------

  The driver supports Jumbo Frames for all adapters. Jumbo Frames support is

  enabled by changing the MTU to a value larger than the default of 1500.

  The maximum value for the MTU is 16114.  Use the ifconfig command to

  The maximum value for the MTU is 16114.  Use the ip command to

  increase the MTU size.  For example:



        ifconfig ethx mtu 9000 up

        ip li set dev ethx mtu 9000



  The maximum MTU setting for Jumbo Frames is 16114.  This value coincides

  with the maximum Jumbo Frames size of 16128.

Documentation/networking/ixgbe.txt

+7 −7
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ Avago 1000BASE-T SFP ABCU-5710RZ 
82599-based adapters support all passive and active limiting direct attach

cables that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications.



Laser turns off for SFP+ when ifconfig down

Laser turns off for SFP+ when device is down

-------------------------------------------

"ifconfig down" turns off the laser for 82599-based SFP+ fiber adapters.

"ifconfig up" turns on the laser.

"ip link set down" turns off the laser for 82599-based SFP+ fiber adapters.

"ip link set up" turns on the laser.





82598-BASED ADAPTERS
@@ -213,13 +213,13 @@ Additional Configurations 
  ------------

  The driver supports Jumbo Frames for all adapters. Jumbo Frames support is

  enabled by changing the MTU to a value larger than the default of 1500.

  The maximum value for the MTU is 16110.  Use the ifconfig command to

  The maximum value for the MTU is 16110.  Use the ip command to

  increase the MTU size.  For example:



        ifconfig ethx mtu 9000 up

        ip link set dev ethx mtu 9000



  The maximum MTU setting for Jumbo Frames is 16110.  This value coincides

  with the maximum Jumbo Frames size of 16128.

  The maximum MTU setting for Jumbo Frames is 9710.  This value coincides

  with the maximum Jumbo Frames size of 9728.



  Generic Receive Offload, aka GRO

  --------------------------------

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

+2 −1
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG2_RSS_FIELD_IPV4_UDP		(u32)(1 << 8)

#define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP		(u32)(1 << 9)

#define IXGBE_FLAG2_PTP_PPS_ENABLED		(u32)(1 << 10)

#define IXGBE_FLAG2_BRIDGE_MODE_VEB		(u32)(1 << 11)



	/* Tx fast path data */

	int num_tx_queues;
@@ -722,6 +721,8 @@ struct ixgbe_adapter { 
	u8 __iomem *io_addr; /* Mainly for iounmap use */

	u32 wol;



	u16 bridge_mode;



	u16 eeprom_verh;

	u16 eeprom_verl;

	u16 eeprom_cap;

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

+96 −26
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid) 
	struct ixgbe_fcoe *fcoe;

	struct ixgbe_adapter *adapter;

	struct ixgbe_fcoe_ddp *ddp;

	struct ixgbe_hw *hw;

	u32 fcbuff;



	if (!netdev)
@@ -85,25 +86,51 @@ int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid) 
	if (!ddp->udl)

		return 0;



	hw = &adapter->hw;

	len = ddp->len;

	/* if there an error, force to invalidate ddp context */

	if (ddp->err) {

	/* if no error then skip ddp context invalidation */

	if (!ddp->err)

		goto skip_ddpinv;



	if (hw->mac.type == ixgbe_mac_X550) {

		/* X550 does not require DDP FCoE lock */



		IXGBE_WRITE_REG(hw, IXGBE_FCDFC(0, xid), 0);

		IXGBE_WRITE_REG(hw, IXGBE_FCDFC(3, xid),

				(xid | IXGBE_FCFLTRW_WE));



		/* program FCBUFF */

		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(2, xid), 0);



		/* program FCDMARW */

		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(3, xid),

				(xid | IXGBE_FCDMARW_WE));



		/* read FCBUFF to check context invalidated */

		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(3, xid),

				(xid | IXGBE_FCDMARW_RE));

		fcbuff = IXGBE_READ_REG(hw, IXGBE_FCDDC(2, xid));

	} else {

		/* other hardware requires DDP FCoE lock */

		spin_lock_bh(&fcoe->lock);

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

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCFLTRW,

		IXGBE_WRITE_REG(hw, IXGBE_FCFLT, 0);

		IXGBE_WRITE_REG(hw, IXGBE_FCFLTRW,

				(xid | IXGBE_FCFLTRW_WE));

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

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCDMARW,

		IXGBE_WRITE_REG(hw, IXGBE_FCBUFF, 0);

		IXGBE_WRITE_REG(hw, IXGBE_FCDMARW,

				(xid | IXGBE_FCDMARW_WE));



		/* guaranteed to be invalidated after 100us */

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCDMARW,

		IXGBE_WRITE_REG(hw, IXGBE_FCDMARW,

				(xid | IXGBE_FCDMARW_RE));

		fcbuff = IXGBE_READ_REG(&adapter->hw, IXGBE_FCBUFF);

		fcbuff = IXGBE_READ_REG(hw, IXGBE_FCBUFF);

		spin_unlock_bh(&fcoe->lock);

		if (fcbuff & IXGBE_FCBUFF_VALID)

			udelay(100);

		}



	if (fcbuff & IXGBE_FCBUFF_VALID)

		usleep_range(100, 150);



skip_ddpinv:

	if (ddp->sgl)

		dma_unmap_sg(&adapter->pdev->dev, ddp->sgl, ddp->sgc,

			     DMA_FROM_DEVICE);
@@ -272,7 +299,6 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 


	/* program DMA context */

	hw = &adapter->hw;

	spin_lock_bh(&fcoe->lock);



	/* turn on last frame indication for target mode as FCP_RSPtarget is

	 * supposed to send FCP_RSP when it is done. */
@@ -283,6 +309,22 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
		IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL, fcrxctl);

	}



	if (hw->mac.type == ixgbe_mac_X550) {

		/* X550 does not require DDP lock */



		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(0, xid),

				ddp->udp & DMA_BIT_MASK(32));

		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(1, xid), (u64)ddp->udp >> 32);

		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(2, xid), fcbuff);

		IXGBE_WRITE_REG(hw, IXGBE_FCDDC(3, xid), fcdmarw);

		/* program filter context */

		IXGBE_WRITE_REG(hw, IXGBE_FCDFC(0, xid), IXGBE_FCFLT_VALID);

		IXGBE_WRITE_REG(hw, IXGBE_FCDFC(1, xid), 0);

		IXGBE_WRITE_REG(hw, IXGBE_FCDFC(3, xid), fcfltrw);

	} else {

		/* DDP lock for indirect DDP context access */

		spin_lock_bh(&fcoe->lock);



		IXGBE_WRITE_REG(hw, IXGBE_FCPTRL, ddp->udp & DMA_BIT_MASK(32));

		IXGBE_WRITE_REG(hw, IXGBE_FCPTRH, (u64)ddp->udp >> 32);

		IXGBE_WRITE_REG(hw, IXGBE_FCBUFF, fcbuff);
@@ -293,6 +335,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
		IXGBE_WRITE_REG(hw, IXGBE_FCFLTRW, fcfltrw);



		spin_unlock_bh(&fcoe->lock);

	}



	return 1;
@@ -371,6 +414,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter, 
	struct fcoe_crc_eof *crc;

	__le32 fcerr = ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_ERR_FCERR);

	__le32 ddp_err;

	int ddp_max;

	u32 fctl;

	u16 xid;
@@ -392,7 +436,11 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter, 
	else

		xid =  be16_to_cpu(fh->fh_rx_id);



	if (xid >= IXGBE_FCOE_DDP_MAX)

	ddp_max = IXGBE_FCOE_DDP_MAX;

	/* X550 has different DDP Max limit */

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

		ddp_max = IXGBE_FCOE_DDP_MAX_X550;

	if (xid >= ddp_max)

		return -EINVAL;



	fcoe = &adapter->fcoe;
@@ -612,7 +660,8 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter) 
{

	struct ixgbe_ring_feature *fcoe = &adapter->ring_feature[RING_F_FCOE];

	struct ixgbe_hw *hw = &adapter->hw;

	int i, fcoe_q, fcoe_i;

	int i, fcoe_q, fcoe_i, fcoe_q_h = 0;

	int fcreta_size;

	u32 etqf;



	/* Minimal functionality for FCoE requires at least CRC offloads */
@@ -633,10 +682,23 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter) 
		return;



	/* Use one or more Rx queues for FCoE by redirection table */

	for (i = 0; i < IXGBE_FCRETA_SIZE; i++) {

	fcreta_size = IXGBE_FCRETA_SIZE;

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

		fcreta_size = IXGBE_FCRETA_SIZE_X550;



	for (i = 0; i < fcreta_size; i++) {

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

			int fcoe_i_h = fcoe->offset + ((i + fcreta_size) %

							fcoe->indices);

			fcoe_q_h = adapter->rx_ring[fcoe_i_h]->reg_idx;

			fcoe_q_h = (fcoe_q_h << IXGBE_FCRETA_ENTRY_HIGH_SHIFT) &

				   IXGBE_FCRETA_ENTRY_HIGH_MASK;

		}



		fcoe_i = fcoe->offset + (i % fcoe->indices);

		fcoe_i &= IXGBE_FCRETA_ENTRY_MASK;

		fcoe_q = adapter->rx_ring[fcoe_i]->reg_idx;

		fcoe_q |= fcoe_q_h;

		IXGBE_WRITE_REG(hw, IXGBE_FCRETA(i), fcoe_q);

	}

	IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, IXGBE_FCRECTL_ENA);
@@ -672,13 +734,18 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter) 
void ixgbe_free_fcoe_ddp_resources(struct ixgbe_adapter *adapter)

{

	struct ixgbe_fcoe *fcoe = &adapter->fcoe;

	int cpu, i;

	int cpu, i, ddp_max;



	/* do nothing if no DDP pools were allocated */

	if (!fcoe->ddp_pool)

		return;



	for (i = 0; i < IXGBE_FCOE_DDP_MAX; i++)

	ddp_max = IXGBE_FCOE_DDP_MAX;

	/* X550 has different DDP Max limit */

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

		ddp_max = IXGBE_FCOE_DDP_MAX_X550;



	for (i = 0; i < ddp_max; i++)

		ixgbe_fcoe_ddp_put(adapter->netdev, i);



	for_each_possible_cpu(cpu)
@@ -758,6 +825,9 @@ static int ixgbe_fcoe_ddp_enable(struct ixgbe_adapter *adapter) 
	}



	adapter->netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX - 1;

	/* X550 has different DDP Max limit */

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

		adapter->netdev->fcoe_ddp_xid = IXGBE_FCOE_DDP_MAX_X550 - 1;



	return 0;

}