10 files changed, 52 insertions, 126 deletions

diff --git a/drivers/net/igbvf/Makefile b/drivers/net/igbvf/Makefile
index c2f150d8f2d9..0fa3db3dd8b6 100644
--- a/drivers/net/igbvf/Makefile
+++ b/drivers/net/igbvf/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel(R) 82576 Virtual Function Linux driver
-# Copyright(c) 2009 Intel Corporation.
+# Copyright(c) 2009 - 2010 Intel Corporation.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/igbvf/defines.h
index 88a47537518a..79f2604673fe 100644
--- a/drivers/net/igbvf/defines.h
+++ b/drivers/net/igbvf/defines.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index 103b3aa1afc2..b0b14d63dfbf 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -90,18 +90,18 @@ static int igbvf_get_settings(struct net_device *netdev,
         status = er32(STATUS);
         if (status & E1000_STATUS_LU) {
                 if (status & E1000_STATUS_SPEED_1000)
-                        ecmd->speed = 1000;
+                        ethtool_cmd_speed_set(ecmd, SPEED_1000);
                 else if (status & E1000_STATUS_SPEED_100)
-                        ecmd->speed = 100;
+                        ethtool_cmd_speed_set(ecmd, SPEED_100);
                 else
-                        ecmd->speed = 10;
+                        ethtool_cmd_speed_set(ecmd, SPEED_10);
 
                 if (status & E1000_STATUS_FD)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -110,11 +110,6 @@ static int igbvf_get_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 igbvf_get_link(struct net_device *netdev)
-{
-        return netif_carrier_ok(netdev);
-}
-
 static int igbvf_set_settings(struct net_device *netdev,
                               struct ethtool_cmd *ecmd)
 {
@@ -153,7 +148,7 @@ static int igbvf_set_rx_csum(struct net_device *netdev, u32 data)
 
 static u32 igbvf_get_tx_csum(struct net_device *netdev)
 {
-        return ((netdev->features & NETIF_F_IP_CSUM) != 0);
+        return (netdev->features & NETIF_F_IP_CSUM) != 0;
 }
 
 static int igbvf_set_tx_csum(struct net_device *netdev, u32 data)
@@ -206,13 +201,11 @@ static void igbvf_get_regs(struct net_device *netdev,
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         u32 *regs_buff = p;
-        u8 revision_id;
 
         memset(p, 0, IGBVF_REGS_LEN * sizeof(u32));
 
-        pci_read_config_byte(adapter->pdev, PCI_REVISION_ID, &revision_id);
-
-        regs->version = (1 << 24) | (revision_id << 16) | adapter->pdev->device;
+        regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
+                        adapter->pdev->device;
 
         regs_buff[0] = er32(CTRL);
         regs_buff[1] = er32(STATUS);
@@ -398,11 +391,6 @@ static int igbvf_set_wol(struct net_device *netdev,
         return -EOPNOTSUPP;
 }
 
-static int igbvf_phys_id(struct net_device *netdev, u32 data)
-{
-        return 0;
-}
-
 static int igbvf_get_coalesce(struct net_device *netdev,
                               struct ethtool_coalesce *ec)
 {
@@ -515,7 +503,7 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
         .get_msglevel           = igbvf_get_msglevel,
         .set_msglevel           = igbvf_set_msglevel,
         .nway_reset             = igbvf_nway_reset,
-        .get_link               = igbvf_get_link,
+        .get_link               = ethtool_op_get_link,
         .get_eeprom_len         = igbvf_get_eeprom_len,
         .get_eeprom             = igbvf_get_eeprom,
         .set_eeprom             = igbvf_set_eeprom,
@@ -534,7 +522,6 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
         .self_test              = igbvf_diag_test,
         .get_sset_count         = igbvf_get_sset_count,
         .get_strings            = igbvf_get_strings,
-        .phys_id                = igbvf_phys_id,
         .get_ethtool_stats      = igbvf_get_ethtool_stats,
         .get_coalesce           = igbvf_get_coalesce,
         .set_coalesce           = igbvf_set_coalesce,
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
index debeee2dc717..d5dad5d607d6 100644
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/igbvf/igbvf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -97,6 +97,7 @@ struct igbvf_adapter;
 
 enum igbvf_boards {
         board_vf,
+        board_i350_vf,
 };
 
 struct igbvf_queue_stats {
@@ -126,7 +127,6 @@ struct igbvf_buffer {
                         unsigned int page_offset;
                 };
         };
-        struct page *page;
 };
 
 union igbvf_desc {
@@ -201,9 +201,6 @@ struct igbvf_adapter {
         unsigned int restart_queue;
         u32 txd_cmd;
 
-        bool detect_tx_hung;
-        u8 tx_timeout_factor;
-
         u32 tx_int_delay;
         u32 tx_abs_int_delay;
 
diff --git a/drivers/net/igbvf/mbx.c b/drivers/net/igbvf/mbx.c
index 819a8ec901dc..3d6f4cc3998a 100644
--- a/drivers/net/igbvf/mbx.c
+++ b/drivers/net/igbvf/mbx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/igbvf/mbx.h b/drivers/net/igbvf/mbx.h
index 4938609dbfb5..c2883c45d477 100644
--- a/drivers/net/igbvf/mbx.h
+++ b/drivers/net/igbvf/mbx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2009 Intel Corporation.
+  Copyright(c) 1999 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index c539f7c9c3e0..1c77fb3bf4ae 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -41,17 +41,17 @@
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
-#include <linux/pm_qos_params.h>
+#include <linux/prefetch.h>
 
 #include "igbvf.h"
 
-#define DRV_VERSION "1.0.0-k0"
+#define DRV_VERSION "1.0.8-k0"
 char igbvf_driver_name[] = "igbvf";
 const char igbvf_driver_version[] = DRV_VERSION;
-static struct pm_qos_request_list igbvf_driver_pm_qos_req;
 static const char igbvf_driver_string[] =
                                 "Intel(R) Virtual Function Network Driver";
-static const char igbvf_copyright[] = "Copyright (c) 2009 Intel Corporation.";
+static const char igbvf_copyright[] =
+                                "Copyright (c) 2009 - 2010 Intel Corporation.";
 
 static int igbvf_poll(struct napi_struct *napi, int budget);
 static void igbvf_reset(struct igbvf_adapter *);
@@ -65,8 +65,16 @@ static struct igbvf_info igbvf_vf_info = {
         .init_ops               = e1000_init_function_pointers_vf,
 };
 
+static struct igbvf_info igbvf_i350_vf_info = {
+        .mac                    = e1000_vfadapt_i350,
+        .flags                  = 0,
+        .pba                    = 10,
+        .init_ops               = e1000_init_function_pointers_vf,
+};
+
 static const struct igbvf_info *igbvf_info_tbl[] = {
         [board_vf]              = &igbvf_vf_info,
+        [board_i350_vf]         = &igbvf_i350_vf_info,
 };
 
 /**
@@ -103,7 +111,7 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
 static inline void igbvf_rx_checksum_adv(struct igbvf_adapter *adapter,
                                          u32 status_err, struct sk_buff *skb)
 {
-        skb->ip_summed = CHECKSUM_NONE;
+        skb_checksum_none_assert(skb);
 
         /* Ignore Checksum bit is set or checksum is disabled through ethtool */
         if ((status_err & E1000_RXD_STAT_IXSM) ||
@@ -389,35 +397,6 @@ static void igbvf_put_txbuf(struct igbvf_adapter *adapter,
         buffer_info->time_stamp = 0;
 }
 
-static void igbvf_print_tx_hang(struct igbvf_adapter *adapter)
-{
-        struct igbvf_ring *tx_ring = adapter->tx_ring;
-        unsigned int i = tx_ring->next_to_clean;
-        unsigned int eop = tx_ring->buffer_info[i].next_to_watch;
-        union e1000_adv_tx_desc *eop_desc = IGBVF_TX_DESC_ADV(*tx_ring, eop);
-
-        /* detected Tx unit hang */
-        dev_err(&adapter->pdev->dev,
-                "Detected Tx Unit Hang:\n"
-                "  TDH                  <%x>\n"
-                "  TDT                  <%x>\n"
-                "  next_to_use          <%x>\n"
-                "  next_to_clean        <%x>\n"
-                "buffer_info[next_to_clean]:\n"
-                "  time_stamp           <%lx>\n"
-                "  next_to_watch        <%x>\n"
-                "  jiffies              <%lx>\n"
-                "  next_to_watch.status <%x>\n",
-                readl(adapter->hw.hw_addr + tx_ring->head),
-                readl(adapter->hw.hw_addr + tx_ring->tail),
-                tx_ring->next_to_use,
-                tx_ring->next_to_clean,
-                tx_ring->buffer_info[eop].time_stamp,
-                eop,
-                jiffies,
-                eop_desc->wb.status);
-}
-
 /**
  * igbvf_setup_tx_resources - allocate Tx resources (Descriptors)
  * @adapter: board private structure
@@ -431,10 +410,9 @@ int igbvf_setup_tx_resources(struct igbvf_adapter *adapter,
         int size;
 
         size = sizeof(struct igbvf_buffer) * tx_ring->count;
-        tx_ring->buffer_info = vmalloc(size);
+        tx_ring->buffer_info = vzalloc(size);
         if (!tx_ring->buffer_info)
                 goto err;
-        memset(tx_ring->buffer_info, 0, size);
 
         /* round up to nearest 4K */
         tx_ring->size = tx_ring->count * sizeof(union e1000_adv_tx_desc);
@@ -471,10 +449,9 @@ int igbvf_setup_rx_resources(struct igbvf_adapter *adapter,
         int size, desc_len;
 
         size = sizeof(struct igbvf_buffer) * rx_ring->count;
-        rx_ring->buffer_info = vmalloc(size);
+        rx_ring->buffer_info = vzalloc(size);
         if (!rx_ring->buffer_info)
                 goto err;
-        memset(rx_ring->buffer_info, 0, size);
 
         desc_len = sizeof(union e1000_adv_rx_desc);
 
@@ -766,7 +743,6 @@ static void igbvf_set_itr(struct igbvf_adapter *adapter)
 static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
 {
         struct igbvf_adapter *adapter = tx_ring->adapter;
-        struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
         struct igbvf_buffer *buffer_info;
         struct sk_buff *skb;
@@ -827,25 +803,9 @@ static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
                 }
         }
 
-        if (adapter->detect_tx_hung) {
-                /* Detect a transmit hang in hardware, this serializes the
-                 * check with the clearing of time_stamp and movement of i */
-                adapter->detect_tx_hung = false;
-                if (tx_ring->buffer_info[i].time_stamp &&
-                    time_after(jiffies, tx_ring->buffer_info[i].time_stamp +
-                               (adapter->tx_timeout_factor * HZ)) &&
-                    !(er32(STATUS) & E1000_STATUS_TXOFF)) {
-
-                        tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
-                        /* detected Tx unit hang */
-                        igbvf_print_tx_hang(adapter);
-
-                        netif_stop_queue(netdev);
-                }
-        }
         adapter->net_stats.tx_bytes += total_bytes;
         adapter->net_stats.tx_packets += total_packets;
-        return (count < tx_ring->count);
+        return count < tx_ring->count;
 }
 
 static irqreturn_t igbvf_msix_other(int irq, void *data)
@@ -1256,7 +1216,7 @@ static void igbvf_restore_vlan(struct igbvf_adapter *adapter)
         if (!adapter->vlgrp)
                 return;
 
-        for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
+        for (vid = 0; vid < VLAN_N_VID; vid++) {
                 if (!vlan_group_get_device(adapter->vlgrp, vid))
                         continue;
                 igbvf_vlan_rx_add_vid(adapter->netdev, vid);
@@ -1853,26 +1813,11 @@ static void igbvf_watchdog_task(struct work_struct *work)
 
         if (link) {
                 if (!netif_carrier_ok(netdev)) {
-                        bool txb2b = 1;
-
                         mac->ops.get_link_up_info(&adapter->hw,
                                                   &adapter->link_speed,
                                                   &adapter->link_duplex);
                         igbvf_print_link_info(adapter);
 
-                        /* adjust timeout factor according to speed/duplex */
-                        adapter->tx_timeout_factor = 1;
-                        switch (adapter->link_speed) {
-                        case SPEED_10:
-                                txb2b = 0;
-                                adapter->tx_timeout_factor = 16;
-                                break;
-                        case SPEED_100:
-                                txb2b = 0;
-                                /* maybe add some timeout factor ? */
-                                break;
-                        }
-
                         netif_carrier_on(netdev);
                         netif_wake_queue(netdev);
                 }
@@ -1906,9 +1851,6 @@ static void igbvf_watchdog_task(struct work_struct *work)
         /* Cause software interrupt to ensure Rx ring is cleaned */
         ew32(EICS, adapter->rx_ring->eims_value);
 
-        /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = 1;
-
         /* Reset the timer */
         if (!test_bit(__IGBVF_DOWN, &adapter->state))
                 mod_timer(&adapter->watchdog_timer,
@@ -2286,7 +2228,7 @@ static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb,
 
         /*
          * count reflects descriptors mapped, if 0 then mapping error
-         * has occured and we need to rewind the descriptor queue
+         * has occurred and we need to rewind the descriptor queue
          */
         count = igbvf_tx_map_adv(adapter, tx_ring, skb, first);
 
@@ -2698,8 +2640,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_device_id = pdev->subsystem_device;
-
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
+        hw->revision_id = pdev->revision;
 
         err = -EIO;
         adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, 0),
@@ -2785,15 +2726,15 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         /* reset the hardware with the new settings */
         igbvf_reset(adapter);
 
-        /* tell the stack to leave us alone until igbvf_open() is called */
-        netif_carrier_off(netdev);
-        netif_stop_queue(netdev);
-
         strcpy(netdev->name, "eth%d");
         err = register_netdev(netdev);
         if (err)
                 goto err_hw_init;
 
+        /* tell the stack to leave us alone until igbvf_open() is called */
+        netif_carrier_off(netdev);
+        netif_stop_queue(netdev);
+
         igbvf_print_device_info(adapter);
 
         igbvf_initialize_last_counter_stats(adapter);
@@ -2832,13 +2773,14 @@ static void __devexit igbvf_remove(struct pci_dev *pdev)
         struct e1000_hw *hw = &adapter->hw;
 
         /*
-         * flush_scheduled work may reschedule our watchdog task, so
-         * explicitly disable watchdog tasks from being rescheduled
+         * The watchdog timer may be rescheduled, so explicitly
+         * disable it from being rescheduled.
          */
         set_bit(__IGBVF_DOWN, &adapter->state);
         del_timer_sync(&adapter->watchdog_timer);
 
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
+        cancel_work_sync(&adapter->watchdog_task);
 
         unregister_netdev(netdev);
 
@@ -2871,6 +2813,7 @@ static struct pci_error_handlers igbvf_err_handler = {
 
 static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), board_i350_vf },
         { } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, igbvf_pci_tbl);
@@ -2904,8 +2847,6 @@ static int __init igbvf_init_module(void)
         printk(KERN_INFO "%s\n", igbvf_copyright);
 
         ret = pci_register_driver(&igbvf_driver);
-        pm_qos_add_request(&igbvf_driver_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
-                           PM_QOS_DEFAULT_VALUE);
 
         return ret;
 }
@@ -2920,7 +2861,6 @@ module_init(igbvf_init_module);
 static void __exit igbvf_exit_module(void)
 {
         pci_unregister_driver(&igbvf_driver);
-        pm_qos_remove_request(&igbvf_driver_pm_qos_req);
 }
 module_exit(igbvf_exit_module);
 
diff --git a/drivers/net/igbvf/regs.h b/drivers/net/igbvf/regs.h
index b9e24ed70d0a..77e18d3d6b15 100644
--- a/drivers/net/igbvf/regs.h
+++ b/drivers/net/igbvf/regs.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/igbvf/vf.c
index a9a61efa964c..af3822f9ea9a 100644
--- a/drivers/net/igbvf/vf.c
+++ b/drivers/net/igbvf/vf.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -220,7 +220,7 @@ static u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr)
  *  The parameter rar_count will usually be hw->mac.rar_entry_count
  *  unless there are workarounds that change this.
  **/
-void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
+static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
                                   u8 *mc_addr_list, u32 mc_addr_count,
                                   u32 rar_used_count, u32 rar_count)
 {
@@ -362,8 +362,8 @@ static s32 e1000_check_for_link_vf(struct e1000_hw *hw)
          * or a virtual function reset
          */
 
-        /* If we were hit with a reset drop the link */
-        if (!mbx->ops.check_for_rst(hw))
+        /* If we were hit with a reset or timeout drop the link */
+        if (!mbx->ops.check_for_rst(hw) || !mbx->timeout)
                 mac->get_link_status = true;
 
         if (!mac->get_link_status)
diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h
index 1e8ce3741a67..d7ed58fcd9bb 100644
--- a/drivers/net/igbvf/vf.h
+++ b/drivers/net/igbvf/vf.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -39,6 +39,7 @@
 struct e1000_hw;
 
 #define E1000_DEV_ID_82576_VF                 0x10CA
+#define E1000_DEV_ID_I350_VF                  0x1520
 #define E1000_REVISION_0 0
 #define E1000_REVISION_1 1
 #define E1000_REVISION_2 2
@@ -133,6 +134,7 @@ struct e1000_adv_tx_context_desc {
 enum e1000_mac_type {
         e1000_undefined = 0,
         e1000_vfadapt,
+        e1000_vfadapt_i350,
         e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
 };