1 files changed, 68 insertions, 26 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index c5f65a29865a..f5081cf898aa 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1767,8 +1767,6 @@ void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter)
                 pci_disable_msi(adapter->pdev);
                 adapter->flags &= ~FLAG_MSI_ENABLED;
         }
-
-        return;
 }
 
 /**
@@ -1820,8 +1818,6 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
                 /* Don't do anything; this is the system default */
                 break;
         }
-
-        return;
 }
 
 /**
@@ -2526,10 +2522,10 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
         }
 }
 
-static void e1000_init_manageability(struct e1000_adapter *adapter)
+static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
-        u32 manc, manc2h;
+        u32 manc, manc2h, mdef, i, j;
 
         if (!(adapter->flags & FLAG_MNG_PT_ENABLED))
                 return;
@@ -2543,10 +2539,49 @@ static void e1000_init_manageability(struct e1000_adapter *adapter)
          */
         manc |= E1000_MANC_EN_MNG2HOST;
         manc2h = er32(MANC2H);
-#define E1000_MNG2HOST_PORT_623 (1 << 5)
-#define E1000_MNG2HOST_PORT_664 (1 << 6)
-        manc2h |= E1000_MNG2HOST_PORT_623;
-        manc2h |= E1000_MNG2HOST_PORT_664;
+
+        switch (hw->mac.type) {
+        default:
+                manc2h |= (E1000_MANC2H_PORT_623 | E1000_MANC2H_PORT_664);
+                break;
+        case e1000_82574:
+        case e1000_82583:
+                /*
+                 * Check if IPMI pass-through decision filter already exists;
+                 * if so, enable it.
+                 */
+                for (i = 0, j = 0; i < 8; i++) {
+                        mdef = er32(MDEF(i));
+
+                        /* Ignore filters with anything other than IPMI ports */
+                        if (mdef & !(E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
+                                continue;
+
+                        /* Enable this decision filter in MANC2H */
+                        if (mdef)
+                                manc2h |= (1 << i);
+
+                        j |= mdef;
+                }
+
+                if (j == (E1000_MDEF_PORT_623 | E1000_MDEF_PORT_664))
+                        break;
+
+                /* Create new decision filter in an empty filter */
+                for (i = 0, j = 0; i < 8; i++)
+                        if (er32(MDEF(i)) == 0) {
+                                ew32(MDEF(i), (E1000_MDEF_PORT_623 |
+                                               E1000_MDEF_PORT_664));
+                                manc2h |= (1 << 1);
+                                j++;
+                                break;
+                        }
+
+                if (!j)
+                        e_warn("Unable to create IPMI pass-through filter\n");
+                break;
+        }
+
         ew32(MANC2H, manc2h);
         ew32(MANC, manc);
 }
@@ -2961,7 +2996,7 @@ static void e1000_configure(struct e1000_adapter *adapter)
         e1000_set_multi(adapter->netdev);
 
         e1000_restore_vlan(adapter);
-        e1000_init_manageability(adapter);
+        e1000_init_manageability_pt(adapter);
 
         e1000_configure_tx(adapter);
         e1000_setup_rctl(adapter);
@@ -3095,6 +3130,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                         fc->high_water = 0x5000;
                         fc->low_water  = 0x3000;
                 }
+                fc->refresh_time = 0x1000;
         } else {
                 if ((adapter->flags & FLAG_HAS_ERT) &&
                     (adapter->netdev->mtu > ETH_DATA_LEN))
@@ -3132,10 +3168,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
         if (mac->ops.init_hw(hw))
                 e_err("Hardware Error\n");
 
-        /* additional part of the flow-control workaround above */
-        if (hw->mac.type == e1000_pchlan)
-                ew32(FCRTV_PCH, 0x1000);
-
         e1000_update_mng_vlan(adapter);
 
         /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
@@ -3181,7 +3213,11 @@ int e1000e_up(struct e1000_adapter *adapter)
         netif_wake_queue(adapter->netdev);
 
         /* fire a link change interrupt to start the watchdog */
-        ew32(ICS, E1000_ICS_LSC);
+        if (adapter->msix_entries)
+                ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);
+        else
+                ew32(ICS, E1000_ICS_LSC);
+
         return 0;
 }
 
@@ -3444,6 +3480,15 @@ static int e1000_open(struct net_device *netdev)
         if (err)
                 goto err_setup_rx;
 
+        /*
+         * If AMT is enabled, let the firmware know that the network
+         * interface is now open and reset the part to a known state.
+         */
+        if (adapter->flags & FLAG_HAS_AMT) {
+                e1000_get_hw_control(adapter);
+                e1000e_reset(adapter);
+        }
+
         e1000e_power_up_phy(adapter);
 
         adapter->mng_vlan_id = E1000_MNG_VLAN_NONE;
@@ -3452,13 +3497,6 @@ static int e1000_open(struct net_device *netdev)
                 e1000_update_mng_vlan(adapter);
 
         /*
-         * If AMT is enabled, let the firmware know that the network
-         * interface is now open
-         */
-        if (adapter->flags & FLAG_HAS_AMT)
-                e1000_get_hw_control(adapter);
-
-        /*
          * before we allocate an interrupt, we must be ready to handle it.
          * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
          * as soon as we call pci_request_irq, so we have to setup our
@@ -3496,7 +3534,10 @@ static int e1000_open(struct net_device *netdev)
         pm_runtime_put(&pdev->dev);
 
         /* fire a link status change interrupt to start the watchdog */
-        ew32(ICS, E1000_ICS_LSC);
+        if (adapter->msix_entries)
+                ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);
+        else
+                ew32(ICS, E1000_ICS_LSC);
 
         return 0;
 
@@ -5102,7 +5143,7 @@ static int __e1000_resume(struct pci_dev *pdev)
 
         e1000e_reset(adapter);
 
-        e1000_init_manageability(adapter);
+        e1000_init_manageability_pt(adapter);
 
         if (netif_running(netdev))
                 e1000e_up(adapter);
@@ -5303,7 +5344,7 @@ static void e1000_io_resume(struct pci_dev *pdev)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
-        e1000_init_manageability(adapter);
+        e1000_init_manageability_pt(adapter);
 
         if (netif_running(netdev)) {
                 if (e1000e_up(adapter)) {
@@ -5849,6 +5890,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
 
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_V), board_ich10lan },
 
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LM), board_pchlan },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LC), board_pchlan },