3 files changed, 95 insertions, 75 deletions

diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index c68265bd0d1a..8afff07ff559 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -367,16 +367,6 @@ static int igbvf_link_test(struct igbvf_adapter *adapter, u64 *data)
         return *data;
 }
 
-static int igbvf_get_self_test_count(struct net_device *netdev)
-{
-        return IGBVF_TEST_LEN;
-}
-
-static int igbvf_get_stats_count(struct net_device *netdev)
-{
-        return IGBVF_GLOBAL_STATS_LEN;
-}
-
 static void igbvf_diag_test(struct net_device *netdev,
                             struct ethtool_test *eth_test, u64 *data)
 {
@@ -484,6 +474,18 @@ static void igbvf_get_ethtool_stats(struct net_device *netdev,
 
 }
 
+static int igbvf_get_sset_count(struct net_device *dev, int stringset)
+{
+        switch(stringset) {
+        case ETH_SS_TEST:
+                return IGBVF_TEST_LEN;
+        case ETH_SS_STATS:
+                return IGBVF_GLOBAL_STATS_LEN;
+        default:
+                return -EINVAL;
+        }
+}
+
 static void igbvf_get_strings(struct net_device *netdev, u32 stringset,
                               u8 *data)
 {
@@ -532,11 +534,10 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
         .get_tso                = ethtool_op_get_tso,
         .set_tso                = igbvf_set_tso,
         .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,
-        .self_test_count        = igbvf_get_self_test_count,
-        .get_stats_count        = igbvf_get_stats_count,
         .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 8e9b67ebbf8b..debeee2dc717 100644
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/igbvf/igbvf.h
@@ -117,6 +117,7 @@ struct igbvf_buffer {
                         unsigned long time_stamp;
                         u16 length;
                         u16 next_to_watch;
+                        u16 mapped_as_page;
                 };
                 /* Rx */
                 struct {
@@ -197,7 +198,6 @@ struct igbvf_adapter {
         struct igbvf_ring *tx_ring /* One per active queue */
         ____cacheline_aligned_in_smp;
 
-        unsigned long tx_queue_len;
         unsigned int restart_queue;
         u32 txd_cmd;
 
@@ -275,6 +275,7 @@ struct igbvf_adapter {
         unsigned long led_status;
 
         unsigned int flags;
+        unsigned long last_reset;
 };
 
 struct igbvf_info {
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 91024a3cdad3..1b1edad1eb5e 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -35,6 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/tcp.h>
 #include <linux/ipv6.h>
+#include <linux/slab.h>
 #include <net/checksum.h>
 #include <net/ip6_checksum.h>
 #include <linux/mii.h>
@@ -170,18 +171,12 @@ static void igbvf_alloc_rx_buffers(struct igbvf_ring *rx_ring,
                 }
 
                 if (!buffer_info->skb) {
-                        skb = netdev_alloc_skb(netdev, bufsz + NET_IP_ALIGN);
+                        skb = netdev_alloc_skb_ip_align(netdev, bufsz);
                         if (!skb) {
                                 adapter->alloc_rx_buff_failed++;
                                 goto no_buffers;
                         }
 
-                        /* Make buffer alignment 2 beyond a 16 byte boundary
-                         * this will result in a 16 byte aligned IP header after
-                         * the 14 byte MAC header is removed
-                         */
-                        skb_reserve(skb, NET_IP_ALIGN);
-
                         buffer_info->skb = skb;
                         buffer_info->dma = pci_map_single(pdev, skb->data,
                                                           bufsz,
@@ -372,10 +367,20 @@ next_desc:
 static void igbvf_put_txbuf(struct igbvf_adapter *adapter,
                             struct igbvf_buffer *buffer_info)
 {
-        buffer_info->dma = 0;
+        if (buffer_info->dma) {
+                if (buffer_info->mapped_as_page)
+                        pci_unmap_page(adapter->pdev,
+                                       buffer_info->dma,
+                                       buffer_info->length,
+                                       PCI_DMA_TODEVICE);
+                else
+                        pci_unmap_single(adapter->pdev,
+                                         buffer_info->dma,
+                                         buffer_info->length,
+                                         PCI_DMA_TODEVICE);
+                buffer_info->dma = 0;
+        }
         if (buffer_info->skb) {
-                skb_dma_unmap(&adapter->pdev->dev, buffer_info->skb,
-                              DMA_TO_DEVICE);
                 dev_kfree_skb_any(buffer_info->skb);
                 buffer_info->skb = NULL;
         }
@@ -823,8 +828,8 @@ static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
                 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)) {
+                               (adapter->tx_timeout_factor * HZ)) &&
+                    !(er32(STATUS) & E1000_STATUS_TXOFF)) {
 
                         tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
                         /* detected Tx unit hang */
@@ -1049,7 +1054,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
         }
 
         err = request_irq(adapter->msix_entries[vector].vector,
-                          &igbvf_intr_msix_tx, 0, adapter->tx_ring->name,
+                          igbvf_intr_msix_tx, 0, adapter->tx_ring->name,
                           netdev);
         if (err)
                 goto out;
@@ -1059,7 +1064,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
         vector++;
 
         err = request_irq(adapter->msix_entries[vector].vector,
-                          &igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
+                          igbvf_intr_msix_rx, 0, adapter->rx_ring->name,
                           netdev);
         if (err)
                 goto out;
@@ -1069,7 +1074,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter)
         vector++;
 
         err = request_irq(adapter->msix_entries[vector].vector,
-                          &igbvf_msix_other, 0, netdev->name, netdev);
+                          igbvf_msix_other, 0, netdev->name, netdev);
         if (err)
                 goto out;
 
@@ -1300,8 +1305,6 @@ static void igbvf_configure_tx(struct igbvf_adapter *adapter)
 
         /* enable Report Status bit */
         adapter->txd_cmd |= E1000_ADVTXD_DCMD_RS;
-
-        adapter->tx_queue_len = adapter->netdev->tx_queue_len;
 }
 
 /**
@@ -1399,8 +1402,8 @@ static void igbvf_set_multi(struct net_device *netdev)
         u8  *mta_list = NULL;
         int i;
 
-        if (netdev->mc_count) {
-                mta_list = kmalloc(netdev->mc_count * 6, GFP_ATOMIC);
+        if (!netdev_mc_empty(netdev)) {
+                mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
                 if (!mta_list) {
                         dev_err(&adapter->pdev->dev,
                                 "failed to allocate multicast filter list\n");
@@ -1409,15 +1412,9 @@ static void igbvf_set_multi(struct net_device *netdev)
         }
 
         /* prepare a packed array of only addresses. */
-        mc_ptr = netdev->mc_list;
-
-        for (i = 0; i < netdev->mc_count; i++) {
-                if (!mc_ptr)
-                        break;
-                memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr,
-                       ETH_ALEN);
-                mc_ptr = mc_ptr->next;
-        }
+        i = 0;
+        netdev_for_each_mc_addr(mc_ptr, netdev)
+                memcpy(mta_list + (i++ * ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN);
 
         hw->mac.ops.update_mc_addr_list(hw, mta_list, i, 0, 0);
         kfree(mta_list);
@@ -1465,6 +1462,8 @@ static void igbvf_reset(struct igbvf_adapter *adapter)
                 memcpy(netdev->perm_addr, adapter->hw.mac.addr,
                        netdev->addr_len);
         }
+
+        adapter->last_reset = jiffies;
 }
 
 int igbvf_up(struct igbvf_adapter *adapter)
@@ -1524,7 +1523,6 @@ void igbvf_down(struct igbvf_adapter *adapter)
 
         del_timer_sync(&adapter->watchdog_timer);
 
-        netdev->tx_queue_len = adapter->tx_queue_len;
         netif_carrier_off(netdev);
 
         /* record the stats before reset*/
@@ -1808,11 +1806,15 @@ static bool igbvf_has_link(struct igbvf_adapter *adapter)
         s32 ret_val = E1000_SUCCESS;
         bool link_active;
 
+        /* If interface is down, stay link down */
+        if (test_bit(__IGBVF_DOWN, &adapter->state))
+                return false;
+
         ret_val = hw->mac.ops.check_for_link(hw);
         link_active = !hw->mac.get_link_status;
 
         /* if check for link returns error we will need to reset */
-        if (ret_val)
+        if (ret_val && time_after(jiffies, adapter->last_reset + (10 * HZ)))
                 schedule_work(&adapter->reset_task);
 
         return link_active;
@@ -1853,21 +1855,15 @@ static void igbvf_watchdog_task(struct work_struct *work)
                                                   &adapter->link_duplex);
                         igbvf_print_link_info(adapter);
 
-                        /*
-                         * tweak tx_queue_len according to speed/duplex
-                         * and adjust the timeout factor
-                         */
-                        netdev->tx_queue_len = adapter->tx_queue_len;
+                        /* adjust timeout factor according to speed/duplex */
                         adapter->tx_timeout_factor = 1;
                         switch (adapter->link_speed) {
                         case SPEED_10:
                                 txb2b = 0;
-                                netdev->tx_queue_len = 10;
                                 adapter->tx_timeout_factor = 16;
                                 break;
                         case SPEED_100:
                                 txb2b = 0;
-                                netdev->tx_queue_len = 100;
                                 /* maybe add some timeout factor ? */
                                 break;
                         }
@@ -1953,7 +1949,7 @@ static int igbvf_tso(struct igbvf_adapter *adapter,
                                                          iph->daddr, 0,
                                                          IPPROTO_TCP,
                                                          0);
-        } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
+        } else if (skb_is_gso_v6(skb)) {
                 ipv6_hdr(skb)->payload_len = 0;
                 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
                                                        &ipv6_hdr(skb)->daddr,
@@ -2094,31 +2090,30 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
                                    unsigned int first)
 {
         struct igbvf_buffer *buffer_info;
+        struct pci_dev *pdev = adapter->pdev;
         unsigned int len = skb_headlen(skb);
         unsigned int count = 0, i;
         unsigned int f;
-        dma_addr_t *map;
 
         i = tx_ring->next_to_use;
 
-        if (skb_dma_map(&adapter->pdev->dev, skb, DMA_TO_DEVICE)) {
-                dev_err(&adapter->pdev->dev, "TX DMA map failed\n");
-                return 0;
-        }
-
-        map = skb_shinfo(skb)->dma_maps;
-
         buffer_info = &tx_ring->buffer_info[i];
         BUG_ON(len >= IGBVF_MAX_DATA_PER_TXD);
         buffer_info->length = len;
         /* set time_stamp *before* dma to help avoid a possible race */
         buffer_info->time_stamp = jiffies;
         buffer_info->next_to_watch = i;
-        buffer_info->dma = skb_shinfo(skb)->dma_head;
+        buffer_info->mapped_as_page = false;
+        buffer_info->dma = pci_map_single(pdev, skb->data, len,
+                                          PCI_DMA_TODEVICE);
+        if (pci_dma_mapping_error(pdev, buffer_info->dma))
+                goto dma_error;
+
 
         for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
                 struct skb_frag_struct *frag;
 
+                count++;
                 i++;
                 if (i == tx_ring->count)
                         i = 0;
@@ -2131,14 +2126,43 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
                 buffer_info->length = len;
                 buffer_info->time_stamp = jiffies;
                 buffer_info->next_to_watch = i;
-                buffer_info->dma = map[count];
-                count++;
+                buffer_info->mapped_as_page = true;
+                buffer_info->dma = pci_map_page(pdev,
+                                                frag->page,
+                                                frag->page_offset,
+                                                len,
+                                                PCI_DMA_TODEVICE);
+                if (pci_dma_mapping_error(pdev, buffer_info->dma))
+                        goto dma_error;
         }
 
         tx_ring->buffer_info[i].skb = skb;
         tx_ring->buffer_info[first].next_to_watch = i;
 
-        return count + 1;
+        return ++count;
+
+dma_error:
+        dev_err(&pdev->dev, "TX DMA map failed\n");
+
+        /* clear timestamp and dma mappings for failed buffer_info mapping */
+        buffer_info->dma = 0;
+        buffer_info->time_stamp = 0;
+        buffer_info->length = 0;
+        buffer_info->next_to_watch = 0;
+        buffer_info->mapped_as_page = false;
+        if (count)
+                count--;
+
+        /* clear timestamp and dma mappings for remaining portion of packet */
+        while (count--) {
+                if (i==0)
+                        i += tx_ring->count;
+                i--;
+                buffer_info = &tx_ring->buffer_info[i];
+                igbvf_put_txbuf(adapter, buffer_info);
+        }
+
+        return 0;
 }
 
 static inline void igbvf_tx_queue_adv(struct igbvf_adapter *adapter,
@@ -2571,11 +2595,7 @@ static void igbvf_print_device_info(struct igbvf_adapter *adapter)
         struct pci_dev *pdev = adapter->pdev;
 
         dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n");
-        dev_info(&pdev->dev, "Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                 /* 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]);
+        dev_info(&pdev->dev, "Address: %pM\n", netdev->dev_addr);
         dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type);
 }
 
@@ -2726,7 +2746,8 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         err = hw->mac.ops.reset_hw(hw);
         if (err) {
                 dev_info(&pdev->dev,
-                         "PF still in reset state, assigning new address\n");
+                         "PF still in reset state, assigning new address."
+                         " Is the PF interface up?\n");
                 random_ether_addr(hw->mac.addr);
         } else {
                 err = hw->mac.ops.read_mac_addr(hw);
@@ -2740,11 +2761,8 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr)) {
-                dev_err(&pdev->dev, "Invalid MAC Address: "
-                        "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        netdev->dev_addr[0], netdev->dev_addr[1],
-                        netdev->dev_addr[2], netdev->dev_addr[3],
-                        netdev->dev_addr[4], netdev->dev_addr[5]);
+                dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
+                        netdev->dev_addr);
                 err = -EIO;
                 goto err_hw_init;
         }
@@ -2846,7 +2864,7 @@ static struct pci_error_handlers igbvf_err_handler = {
         .resume = igbvf_io_resume,
 };
 
-static struct pci_device_id igbvf_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf },
         { } /* terminate list */
 };