10 files changed, 24 insertions, 21 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index 341889a4ef7f..08b207df1459 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -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;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 27058dfe418b..660971f304b2 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -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.
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index f85be6695e44..11ffdbae9f92 100644
--- a/drivers/net/ethernet/intel/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
@@ -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
 
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h
index 833bbb948d97..1cc4b1a7e597 100644
--- a/drivers/net/ethernet/intel/igb/e1000_regs.h
+++ b/drivers/net/ethernet/intel/igb/e1000_regs.h
@@ -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 */
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index d8bbcf1873ca..80e376377c3d 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -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) |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index ea2868b22c2d..33b3a16dabe1 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2433,6 +2433,12 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* get firmware version for ethtool -i */
         igb_set_fw_version(adapter);
 
+        /* configure RXPBSIZE and TXPBSIZE */
+        if (hw->mac.type == e1000_i210) {
+                wr32(E1000_RXPBS, I210_RXPBSIZE_DEFAULT);
+                wr32(E1000_TXPBS, I210_TXPBSIZE_DEFAULT);
+        }
+
         setup_timer(&adapter->watchdog_timer, igb_watchdog,
                     (unsigned long) adapter);
         setup_timer(&adapter->phy_info_timer, igb_update_phy_info,
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index ab25e49365f7..e291be20dc98 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -360,8 +360,8 @@ static int igb_ptp_settime_i210(struct ptp_clock_info *ptp,
         return 0;
 }
 
-static int igb_ptp_enable(struct ptp_clock_info *ptp,
-                          struct ptp_clock_request *rq, int on)
+static int igb_ptp_feature_enable(struct ptp_clock_info *ptp,
+                                  struct ptp_clock_request *rq, int on)
 {
         return -EOPNOTSUPP;
 }
@@ -745,7 +745,7 @@ void igb_ptp_init(struct igb_adapter *adapter)
                 adapter->ptp_caps.adjtime = igb_ptp_adjtime_82576;
                 adapter->ptp_caps.gettime = igb_ptp_gettime_82576;
                 adapter->ptp_caps.settime = igb_ptp_settime_82576;
-                adapter->ptp_caps.enable = igb_ptp_enable;
+                adapter->ptp_caps.enable = igb_ptp_feature_enable;
                 adapter->cc.read = igb_ptp_read_82576;
                 adapter->cc.mask = CLOCKSOURCE_MASK(64);
                 adapter->cc.mult = 1;
@@ -765,7 +765,7 @@ void igb_ptp_init(struct igb_adapter *adapter)
                 adapter->ptp_caps.adjtime = igb_ptp_adjtime_82576;
                 adapter->ptp_caps.gettime = igb_ptp_gettime_82576;
                 adapter->ptp_caps.settime = igb_ptp_settime_82576;
-                adapter->ptp_caps.enable = igb_ptp_enable;
+                adapter->ptp_caps.enable = igb_ptp_feature_enable;
                 adapter->cc.read = igb_ptp_read_82580;
                 adapter->cc.mask = CLOCKSOURCE_MASK(IGB_NBITS_82580);
                 adapter->cc.mult = 1;
@@ -784,7 +784,7 @@ void igb_ptp_init(struct igb_adapter *adapter)
                 adapter->ptp_caps.adjtime = igb_ptp_adjtime_i210;
                 adapter->ptp_caps.gettime = igb_ptp_gettime_i210;
                 adapter->ptp_caps.settime = igb_ptp_settime_i210;
-                adapter->ptp_caps.enable = igb_ptp_enable;
+                adapter->ptp_caps.enable = igb_ptp_feature_enable;
                 /* Enable the timer functions by clearing bit 31. */
                 wr32(E1000_TSAUXC, 0x0);
                 break;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index cc70de259829..23e4e6a4b4b1 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -161,13 +161,6 @@ static int ixgbe_get_settings(struct net_device *netdev,
         bool autoneg = false;
         bool link_up;
 
-        /* SFP type is needed for get_link_capabilities */
-        if (hw->phy.media_type & (ixgbe_media_type_fiber |
-                                  ixgbe_media_type_fiber_qsfp)) {
-                if (hw->phy.sfp_type == ixgbe_sfp_type_not_present)
-                                hw->phy.ops.identify_sfp(hw);
-        }
-
         hw->mac.ops.get_link_capabilities(hw, &supported_link, &autoneg);
 
         /* set the supported link speeds */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index ea11e2c8ee8c..e22278a5cbfa 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4656,6 +4656,8 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
         case ixgbe_phy_qsfp_active_unknown:
         case ixgbe_phy_qsfp_intel:
         case ixgbe_phy_qsfp_unknown:
+        /* ixgbe_phy_none is set when no SFP module is present */
+        case ixgbe_phy_none:
                 return true;
         case ixgbe_phy_nl:
                 if (hw->mac.type == ixgbe_mac_82598EB)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index b3266b7536d5..68f87ecb8a76 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -26,7 +26,6 @@
 
 *******************************************************************************/
 #include "ixgbe.h"
-#include <linux/export.h>
 #include <linux/ptp_classify.h>
 
 /*