Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / igb / igb_main.c

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index a9537ba7a5a072630acc8842b875d98428922bb5..cb14bbdfb0562df213253d18c83eaf78c6a63f2c 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -57,8 +57,8 @@
 #include "igb.h"
 
 #define MAJ 5
-#define MIN 0
-#define BUILD 5
+#define MIN 2
+#define BUILD 13
 #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
 __stringify(BUILD) "-k"
 char igb_driver_name[] = "igb";
@@ -1630,6 +1630,8 @@ void igb_power_up_link(struct igb_adapter *adapter)
                igb_power_up_phy_copper(&adapter->hw);
        else
                igb_power_up_serdes_link_82575(&adapter->hw);
+
+       igb_setup_link(&adapter->hw);
 }
 
 /**
@@ -4164,6 +4166,26 @@ static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
        return ret;
 }
 
+/**
+ *  igb_check_lvmmc - check for malformed packets received
+ *  and indicated in LVMMC register
+ *  @adapter: pointer to adapter
+ **/
+static void igb_check_lvmmc(struct igb_adapter *adapter)
+{
+       struct e1000_hw *hw = &adapter->hw;
+       u32 lvmmc;
+
+       lvmmc = rd32(E1000_LVMMC);
+       if (lvmmc) {
+               if (unlikely(net_ratelimit())) {
+                       netdev_warn(adapter->netdev,
+                                   "malformed Tx packet detected and dropped, LVMMC:0x%08x\n",
+                                   lvmmc);
+               }
+       }
+}
+
 /**
  *  igb_watchdog - Timer Call-back
  *  @data: pointer to adapter cast into an unsigned long
@@ -4359,6 +4381,11 @@ static void igb_watchdog_task(struct work_struct *work)
        igb_spoof_check(adapter);
        igb_ptp_rx_hang(adapter);
 
+       /* Check LVMMC register on i350/i354 only */
+       if ((adapter->hw.mac.type == e1000_i350) ||
+           (adapter->hw.mac.type == e1000_i354))
+               igb_check_lvmmc(adapter);
+
        /* Reset the timer */
        if (!test_bit(__IGB_DOWN, &adapter->state)) {
                if (adapter->flags & IGB_FLAG_NEED_LINK_UPDATE)