e1000e: add support for 82577/82578 GbE LOM parts

This patch provides support for the next generation Intel desktop
and mobile gigabit ethernet LOM adapters.  These adapters are the
follow-on parts to the LOMs tied to the prior ICH chipsets and are
comprised of a MAC in the PCH chipset and an external PHY (82577 for
mobile and 82578 for desktop versions).  New features consist of PHY
wakeup to save power by completely turning off the MAC while in Sx
state, and 4K jumbo frames.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 23 insertions, 14 deletions

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 4d25ede88369..3d6435617527 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -776,6 +776,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         u32 after;
         u32 i;
         u32 toggle;
+        u32 mask;
 
         /*
          * The status register is Read Only, so a write should fail.
@@ -788,17 +789,9 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         case e1000_80003es2lan:
                 toggle = 0x7FFFF3FF;
                 break;
-        case e1000_82573:
-        case e1000_82574:
-        case e1000_82583:
-        case e1000_ich8lan:
-        case e1000_ich9lan:
-        case e1000_ich10lan:
+        default:
                 toggle = 0x7FFFF033;
                 break;
-        default:
-                toggle = 0xFFFFF833;
-                break;
         }
 
         before = er32(STATUS);
@@ -844,11 +837,18 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
                 REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF);
         REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
         REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
+        mask = 0x8003FFFF;
+        switch (mac->type) {
+        case e1000_ich10lan:
+        case e1000_pchlan:
+                mask |= (1 << 18);
+                break;
+        default:
+                break;
+        }
         for (i = 0; i < mac->rar_entry_count; i++)
                 REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
-                                       ((mac->type == e1000_ich10lan) ?
-                                           0x8007FFFF : 0x8003FFFF),
-                                       0xFFFFFFFF);
+                                       mask, 0xFFFFFFFF);
 
         for (i = 0; i < mac->mta_reg_count; i++)
                 REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
@@ -1786,15 +1786,22 @@ static int e1000_set_wol(struct net_device *netdev,
 /* bit defines for adapter->led_status */
 #define E1000_LED_ON            0
 
-static void e1000_led_blink_callback(unsigned long data)
+static void e1000e_led_blink_task(struct work_struct *work)
 {
-        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+        struct e1000_adapter *adapter = container_of(work,
+                                        struct e1000_adapter, led_blink_task);
 
         if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
                 adapter->hw.mac.ops.led_off(&adapter->hw);
         else
                 adapter->hw.mac.ops.led_on(&adapter->hw);
+}
+
+static void e1000_led_blink_callback(unsigned long data)
+{
+        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
 
+        schedule_work(&adapter->led_blink_task);
         mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
 }
 
@@ -1807,7 +1814,9 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
                 data = INT_MAX;
 
         if ((hw->phy.type == e1000_phy_ife) ||
+            (hw->mac.type == e1000_pchlan) ||
             (hw->mac.type == e1000_82574)) {
+                INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
                 if (!adapter->blink_timer.function) {
                         init_timer(&adapter->blink_timer);
                         adapter->blink_timer.function =