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

Commit 9bcc14d2 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:

====================
Intel Wired LAN Driver Updates

This series contains updates to e1000, igb and ixgbe.

Emil provides his version 2 fix for the detection of SFP+ capable interfaces.
In cases where the driver is loaded while there are no SFP+ modules in cage,
the interface was not being detected as SFP capable.  Resolve the issue by
identifying interfaces with no PHY type set as SFP capable which allows the
driver to detect the SFP module when the interface is brought up.  In this
version 2 of the patch, the 82599 specific check was removed since we only
have 82598 devices that are SFP capable.

Jacob removes the including of the export header in the ixgbe PTP core, since
it is not needed.  Renames igb_ptp_enable() to igb_ptp_feature_enable() to
better reflect the actual functions purpose.

Todd fixes the ethtool loopback test for i354 backplane devices since we
do not know what PHY is to be used for the devices, use MAC loopback for
ethtool tests.  Todd also sets the packet buffer size register defaults for
i210 devices.

Yongjian Xu removes the check for skb->len being negative or zero since there
is never a case where it would be zero or negative for e1000.

Manuel Schölling updates e1000 to use the time_after() helper function.

v2: Fix indentation on wrapped line in patch 3 of the series based on
    feedback from David Miller
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c99f7abf 1aa65f4d

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,8 @@ static int e1000_run_loopback_test(struct e1000_adapter *adapter) 
			 * enough time to complete the receives, if it's

			 * exceeded, break and error off

			 */

		} while (good_cnt < 64 && jiffies < (time + 20));

		} while (good_cnt < 64 && time_after(time + 20, jiffies));



		if (good_cnt != 64) {

			ret_val = 13; /* ret_val is the same as mis-compare */

			break;

drivers/net/ethernet/intel/e1000/e1000_main.c

+0 −5
Original line number Diff line number Diff line
@@ -3105,11 +3105,6 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, 
	 */

	tx_ring = adapter->tx_ring;



	if (unlikely(skb->len <= 0)) {

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}



	/* On PCI/PCI-X HW, if packet size is less than ETH_ZLEN,

	 * packets may get corrupted during padding by HW.

	 * To WA this issue, pad all small packets manually.

drivers/net/ethernet/intel/igb/e1000_defines.h

+3 −0
Original line number Diff line number Diff line
@@ -329,6 +329,9 @@ 
/* Timestamp in Rx buffer */

#define E1000_RXPBS_CFG_TS_EN           0x80000000



#define I210_RXPBSIZE_DEFAULT		0x000000A2 /* RXPBSIZE default */

#define I210_TXPBSIZE_DEFAULT		0x04000014 /* TXPBSIZE default */



/* SerDes Control */

#define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400

drivers/net/ethernet/intel/igb/e1000_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ 
				    : (0x0E038 + ((_n) * 0x40)))

#define E1000_TDWBAH(_n)  ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) \

				    : (0x0E03C + ((_n) * 0x40)))



#define E1000_RXPBS	0x02404  /* Rx Packet Buffer Size - RW */

#define E1000_TXPBS	0x03404  /* Tx Packet Buffer Size - RW */



#define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */

#define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */

#define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */

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

+2 −2
Original line number Diff line number Diff line
@@ -1665,8 +1665,8 @@ static int igb_setup_loopback_test(struct igb_adapter *adapter) 
		(hw->device_id == E1000_DEV_ID_DH89XXCC_SERDES) ||

		(hw->device_id == E1000_DEV_ID_DH89XXCC_BACKPLANE) ||

		(hw->device_id == E1000_DEV_ID_DH89XXCC_SFP) ||

		(hw->device_id == E1000_DEV_ID_I354_SGMII)) {



		(hw->device_id == E1000_DEV_ID_I354_SGMII) ||

		(hw->device_id == E1000_DEV_ID_I354_BACKPLANE_2_5GBPS)) {

			/* Enable DH89xxCC MPHY for near end loopback */

			reg = rd32(E1000_MPHY_ADDR_CTL);

			reg = (reg & E1000_MPHY_ADDR_CTL_OFFSET_MASK) |