1 files changed, 74 insertions, 37 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 122539a0e1f..65fd9797d02 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -103,8 +103,6 @@ static void e1000_receive_skb(struct e1000_adapter *adapter,
                                          le16_to_cpu(vlan));
         else
                 netif_receive_skb(skb);
-
-        netdev->last_rx = jiffies;
 }
 
 /**
@@ -2003,8 +2001,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
         struct net_device *poll_dev = adapter->netdev;
         int tx_cleaned = 0, work_done = 0;
 
-        /* Must NOT use netdev_priv macro here. */
-        adapter = poll_dev->priv;
+        adapter = netdev_priv(poll_dev);
 
         if (adapter->msix_entries &&
             !(adapter->rx_ring->ims_val & adapter->tx_ring->ims_val))
@@ -2787,7 +2784,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
         else
                 fc->pause_time = E1000_FC_PAUSE_TIME;
         fc->send_xon = 1;
-        fc->type = fc->original_type;
+        fc->current_mode = fc->requested_mode;
 
         /* Allow time for pending master requests to run */
         mac->ops.reset_hw(hw);
@@ -3410,7 +3407,10 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
         struct e1000_hw *hw = &adapter->hw;
         u32 ctrl = er32(CTRL);
 
-        e_info("Link is Up %d Mbps %s, Flow Control: %s\n",
+        /* Link status message must follow this format for user tools */
+        printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s, "
+               "Flow Control: %s\n",
+               adapter->netdev->name,
                adapter->link_speed,
                (adapter->link_duplex == FULL_DUPLEX) ?
                                 "Full Duplex" : "Half Duplex",
@@ -3420,7 +3420,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter)
                ((ctrl & E1000_CTRL_TFCE) ? "TX" : "None" )));
 }
 
-static bool e1000_has_link(struct e1000_adapter *adapter)
+bool e1000_has_link(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         bool link_active = 0;
@@ -3495,6 +3495,7 @@ static void e1000_watchdog_task(struct work_struct *work)
                                         struct e1000_adapter, watchdog_task);
         struct net_device *netdev = adapter->netdev;
         struct e1000_mac_info *mac = &adapter->hw.mac;
+        struct e1000_phy_info *phy = &adapter->hw.phy;
         struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_hw *hw = &adapter->hw;
         u32 link, tctl;
@@ -3601,6 +3602,13 @@ static void e1000_watchdog_task(struct work_struct *work)
                         tctl |= E1000_TCTL_EN;
                         ew32(TCTL, tctl);
 
+                        /*
+                         * Perform any post-link-up configuration before
+                         * reporting link up.
+                         */
+                        if (phy->ops.cfg_on_link_up)
+                                phy->ops.cfg_on_link_up(hw);
+
                         netif_carrier_on(netdev);
                         netif_tx_wake_all_queues(netdev);
 
@@ -3612,7 +3620,9 @@ static void e1000_watchdog_task(struct work_struct *work)
                 if (netif_carrier_ok(netdev)) {
                         adapter->link_speed = 0;
                         adapter->link_duplex = 0;
-                        e_info("Link is Down\n");
+                        /* Link status message must follow this format */
+                        printk(KERN_INFO "e1000e: %s NIC Link is Down\n",
+                               adapter->netdev->name);
                         netif_carrier_off(netdev);
                         netif_tx_stop_all_queues(netdev);
                         if (!test_bit(__E1000_DOWN, &adapter->state))
@@ -4464,7 +4474,27 @@ static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 
         pci_disable_device(pdev);
 
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        /*
+         * The pci-e switch on some quad port adapters will report a
+         * correctable error when the MAC transitions from D0 to D3.  To
+         * prevent this we need to mask off the correctable errors on the
+         * downstream port of the pci-e switch.
+         */
+        if (adapter->flags & FLAG_IS_QUAD_PORT) {
+                struct pci_dev *us_dev = pdev->bus->self;
+                int pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP);
+                u16 devctl;
+
+                pci_read_config_word(us_dev, pos + PCI_EXP_DEVCTL, &devctl);
+                pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL,
+                                      (devctl & ~PCI_EXP_DEVCTL_CERE));
+
+                pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+                pci_write_config_word(us_dev, pos + PCI_EXP_DEVCTL, devctl);
+        } else {
+                pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        }
 
         return 0;
 }
@@ -4669,14 +4699,12 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         u32 pba_num;
 
         /* print bus type/speed/width info */
-        e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
+        e_info("(PCI Express:2.5GB/s:%s) %pM\n",
                /* bus width */
                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
                 "Width x1"),
                /* MAC address */
-               netdev->dev_addr[0], netdev->dev_addr[1],
-               netdev->dev_addr[2], netdev->dev_addr[3],
-               netdev->dev_addr[4], netdev->dev_addr[5]);
+               netdev->dev_addr);
         e_info("Intel(R) PRO/%s Network Connection\n",
                (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
         e1000e_read_pba_num(hw, &pba_num);
@@ -4694,20 +4722,40 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
                 return;
 
         ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &buf);
-        if (!(le16_to_cpu(buf) & (1 << 0))) {
+        if (!ret_val && (!(le16_to_cpu(buf) & (1 << 0)))) {
                 /* Deep Smart Power Down (DSPD) */
                 dev_warn(&adapter->pdev->dev,
                          "Warning: detected DSPD enabled in EEPROM\n");
         }
 
         ret_val = e1000_read_nvm(hw, NVM_INIT_3GIO_3, 1, &buf);
-        if (le16_to_cpu(buf) & (3 << 2)) {
+        if (!ret_val && (le16_to_cpu(buf) & (3 << 2))) {
                 /* ASPM enable */
                 dev_warn(&adapter->pdev->dev,
                          "Warning: detected ASPM enabled in EEPROM\n");
         }
 }
 
+static const struct net_device_ops e1000e_netdev_ops = {
+        .ndo_open               = e1000_open,
+        .ndo_stop               = e1000_close,
+        .ndo_start_xmit         = e1000_xmit_frame,
+        .ndo_get_stats          = e1000_get_stats,
+        .ndo_set_multicast_list = e1000_set_multi,
+        .ndo_set_mac_address    = e1000_set_mac,
+        .ndo_change_mtu         = e1000_change_mtu,
+        .ndo_do_ioctl           = e1000_ioctl,
+        .ndo_tx_timeout         = e1000_tx_timeout,
+        .ndo_validate_addr      = eth_validate_addr,
+
+        .ndo_vlan_rx_register   = e1000_vlan_rx_register,
+        .ndo_vlan_rx_add_vid    = e1000_vlan_rx_add_vid,
+        .ndo_vlan_rx_kill_vid   = e1000_vlan_rx_kill_vid,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = e1000_netpoll,
+#endif
+};
+
 /**
  * e1000_probe - Device Initialization Routine
  * @pdev: PCI device information struct
@@ -4766,7 +4814,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 goto err_pci_reg;
 
         pci_set_master(pdev);
-        pci_save_state(pdev);
+        /* PCI config space info */
+        err = pci_save_state(pdev);
+        if (err)
+                goto err_alloc_etherdev;
 
         err = -ENOMEM;
         netdev = alloc_etherdev(sizeof(struct e1000_adapter));
@@ -4806,24 +4857,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         }
 
         /* construct the net_device struct */
-        netdev->open                    = &e1000_open;
-        netdev->stop                    = &e1000_close;
-        netdev->hard_start_xmit         = &e1000_xmit_frame;
-        netdev->get_stats               = &e1000_get_stats;
-        netdev->set_multicast_list      = &e1000_set_multi;
-        netdev->set_mac_address         = &e1000_set_mac;
-        netdev->change_mtu              = &e1000_change_mtu;
-        netdev->do_ioctl                = &e1000_ioctl;
+        netdev->netdev_ops              = &e1000e_netdev_ops;
         e1000e_set_ethtool_ops(netdev);
-        netdev->tx_timeout              = &e1000_tx_timeout;
         netdev->watchdog_timeo          = 5 * HZ;
         netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
-        netdev->vlan_rx_register        = e1000_vlan_rx_register;
-        netdev->vlan_rx_add_vid         = e1000_vlan_rx_add_vid;
-        netdev->vlan_rx_kill_vid        = e1000_vlan_rx_kill_vid;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        netdev->poll_controller         = e1000_netpoll;
-#endif
         strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 
         netdev->mem_start = mmio_start;
@@ -4924,10 +4961,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr)) {
-                e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                      netdev->perm_addr[0], netdev->perm_addr[1],
-                      netdev->perm_addr[2], netdev->perm_addr[3],
-                      netdev->perm_addr[4], netdev->perm_addr[5]);
+                e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
                 err = -EIO;
                 goto err_eeprom;
         }
@@ -4948,8 +4982,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         /* Initialize link parameters. User can change them with ethtool */
         adapter->hw.mac.autoneg = 1;
         adapter->fc_autoneg = 1;
-        adapter->hw.fc.original_type = e1000_fc_default;
-        adapter->hw.fc.type = e1000_fc_default;
+        adapter->hw.fc.requested_mode = e1000_fc_default;
+        adapter->hw.fc.current_mode = e1000_fc_default;
         adapter->hw.phy.autoneg_advertised = 0x2f;
 
         /* ring size defaults */
@@ -4990,6 +5024,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         adapter->wol = adapter->eeprom_wol;
         device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
 
+        /* save off EEPROM version number */
+        e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
+
         /* reset the hardware with the new settings */
         e1000e_reset(adapter);