Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.

1 files changed, 133 insertions, 19 deletions

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 9405b44f3214..2e0f4b950a90 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -36,7 +36,7 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION             "1.0.109-k2"DRIVERNAPI
+#define DRV_VERSION             "1.0.112-k2"DRIVERNAPI
 char ixgb_driver_version[] = DRV_VERSION;
 static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
@@ -118,15 +118,26 @@ static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
 static void ixgb_netpoll(struct net_device *dev);
 #endif
 
-/* Exported from other modules */
+static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
+                             enum pci_channel_state state);
+static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev);
+static void ixgb_io_resume (struct pci_dev *pdev);
 
+/* Exported from other modules */
 extern void ixgb_check_options(struct ixgb_adapter *adapter);
 
+static struct pci_error_handlers ixgb_err_handler = {
+        .error_detected = ixgb_io_error_detected,
+        .slot_reset = ixgb_io_slot_reset,
+        .resume = ixgb_io_resume,
+};
+
 static struct pci_driver ixgb_driver = {
         .name     = ixgb_driver_name,
         .id_table = ixgb_pci_tbl,
         .probe    = ixgb_probe,
         .remove   = __devexit_p(ixgb_remove),
+        .err_handler = &ixgb_err_handler
 };
 
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
@@ -140,12 +151,12 @@ module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 
 /* some defines for controlling descriptor fetches in h/w */
-#define RXDCTL_WTHRESH_DEFAULT 16       /* chip writes back at this many or RXT0 */
-#define RXDCTL_PTHRESH_DEFAULT 0                /* chip considers prefech below
-                                                 * this */
-#define RXDCTL_HTHRESH_DEFAULT 0                /* chip will only prefetch if tail
-                                                 * is pushed this many descriptors
-                                                 * from head */
+#define RXDCTL_WTHRESH_DEFAULT 15  /* chip writes back at this many or RXT0 */
+#define RXDCTL_PTHRESH_DEFAULT 0   /* chip considers prefech below
+                                    * this */
+#define RXDCTL_HTHRESH_DEFAULT 0   /* chip will only prefetch if tail
+                                    * is pushed this many descriptors
+                                    * from head */
 
 /**
  * ixgb_init_module - Driver Registration Routine
@@ -162,7 +173,7 @@ ixgb_init_module(void)
 
         printk(KERN_INFO "%s\n", ixgb_copyright);
 
-        return pci_module_init(&ixgb_driver);
+        return pci_register_driver(&ixgb_driver);
 }
 
 module_init(ixgb_init_module);
@@ -1174,6 +1185,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
         int err;
 
         if (likely(skb_is_gso(skb))) {
+                struct ixgb_buffer *buffer_info;
                 if (skb_header_cloned(skb)) {
                         err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
                         if (err)
@@ -1196,6 +1208,8 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
 
                 i = adapter->tx_ring.next_to_use;
                 context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
+                buffer_info = &adapter->tx_ring.buffer_info[i];
+                WARN_ON(buffer_info->dma != 0);
 
                 context_desc->ipcss = ipcss;
                 context_desc->ipcso = ipcso;
@@ -1233,11 +1247,14 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
         uint8_t css, cso;
 
         if(likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
+                struct ixgb_buffer *buffer_info;
                 css = skb->h.raw - skb->data;
                 cso = (skb->h.raw + skb->csum) - skb->data;
 
                 i = adapter->tx_ring.next_to_use;
                 context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
+                buffer_info = &adapter->tx_ring.buffer_info[i];
+                WARN_ON(buffer_info->dma != 0);
 
                 context_desc->tucss = css;
                 context_desc->tucso = cso;
@@ -1283,6 +1300,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
                 buffer_info = &tx_ring->buffer_info[i];
                 size = min(len, IXGB_MAX_DATA_PER_TXD);
                 buffer_info->length = size;
+                WARN_ON(buffer_info->dma != 0);
                 buffer_info->dma =
                         pci_map_single(adapter->pdev,
                                 skb->data + offset,
@@ -1543,6 +1561,11 @@ void
 ixgb_update_stats(struct ixgb_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
+        struct pci_dev *pdev = adapter->pdev;
+
+        /* Prevent stats update while adapter is being reset */
+        if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+                return;
 
         if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||
            (netdev->mc_count > IXGB_MAX_NUM_MULTICAST_ADDRESSES)) {
@@ -1787,7 +1810,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
         if (unlikely(netif_queue_stopped(netdev))) {
                 spin_lock(&adapter->tx_lock);
                 if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev) &&
-                    (IXGB_DESC_UNUSED(tx_ring) > IXGB_TX_QUEUE_WAKE))
+                    (IXGB_DESC_UNUSED(tx_ring) >= DESC_NEEDED))
                         netif_wake_queue(netdev);
                 spin_unlock(&adapter->tx_lock);
         }
@@ -1948,10 +1971,9 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
 #define IXGB_CB_LENGTH 256
                 if (length < IXGB_CB_LENGTH) {
                         struct sk_buff *new_skb =
-                            dev_alloc_skb(length + NET_IP_ALIGN);
+                            netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
                         if (new_skb) {
                                 skb_reserve(new_skb, NET_IP_ALIGN);
-                                new_skb->dev = netdev;
                                 memcpy(new_skb->data - NET_IP_ALIGN,
                                        skb->data - NET_IP_ALIGN,
                                        length + NET_IP_ALIGN);
@@ -2031,14 +2053,14 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
         /* leave three descriptors unused */
         while(--cleancount > 2) {
                 /* recycle! its good for you */
-                if (!(skb = buffer_info->skb))
-                        skb = dev_alloc_skb(adapter->rx_buffer_len
-                                            + NET_IP_ALIGN);
-                else {
+                skb = buffer_info->skb;
+                if (skb) {
                         skb_trim(skb, 0);
                         goto map_skb;
                 }
 
+                skb = netdev_alloc_skb(netdev, adapter->rx_buffer_len
+                                       + NET_IP_ALIGN);
                 if (unlikely(!skb)) {
                         /* Better luck next round */
                         adapter->alloc_rx_buff_failed++;
@@ -2051,8 +2073,6 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
                  */
                 skb_reserve(skb, NET_IP_ALIGN);
 
-                skb->dev = netdev;
-
                 buffer_info->skb = skb;
                 buffer_info->length = adapter->rx_buffer_len;
 map_skb:
@@ -2190,7 +2210,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter)
 
 static void ixgb_netpoll(struct net_device *dev)
 {
-        struct ixgb_adapter *adapter = dev->priv;
+        struct ixgb_adapter *adapter = netdev_priv(dev);
 
         disable_irq(adapter->pdev->irq);
         ixgb_intr(adapter->pdev->irq, dev, NULL);
@@ -2198,4 +2218,98 @@ static void ixgb_netpoll(struct net_device *dev)
 }
 #endif
 
+/**
+ * ixgb_io_error_detected() - called when PCI error is detected
+ * @pdev    pointer to pci device with error
+ * @state   pci channel state after error
+ *
+ * This callback is called by the PCI subsystem whenever
+ * a PCI bus error is detected.
+ */
+static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
+                                     enum pci_channel_state state)
+{
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct ixgb_adapter *adapter = netdev->priv;
+
+        if(netif_running(netdev))
+                ixgb_down(adapter, TRUE);
+
+        pci_disable_device(pdev);
+
+        /* Request a slot reset. */
+        return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * ixgb_io_slot_reset - called after the pci bus has been reset.
+ * @pdev    pointer to pci device with error
+ *
+ * This callback is called after the PCI buss has been reset.
+ * Basically, this tries to restart the card from scratch.
+ * This is a shortened version of the device probe/discovery code,
+ * it resembles the first-half of the ixgb_probe() routine.
+ */
+static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev)
+{
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct ixgb_adapter *adapter = netdev->priv;
+
+        if(pci_enable_device(pdev)) {
+                DPRINTK(PROBE, ERR, "Cannot re-enable PCI device after reset.\n");
+                return PCI_ERS_RESULT_DISCONNECT;
+        }
+
+        /* Perform card reset only on one instance of the card */
+        if (0 != PCI_FUNC (pdev->devfn))
+                return PCI_ERS_RESULT_RECOVERED;
+
+        pci_set_master(pdev);
+
+        netif_carrier_off(netdev);
+        netif_stop_queue(netdev);
+        ixgb_reset(adapter);
+
+        /* Make sure the EEPROM is good */
+        if(!ixgb_validate_eeprom_checksum(&adapter->hw)) {
+                DPRINTK(PROBE, ERR, "After reset, the EEPROM checksum is not valid.\n");
+                return PCI_ERS_RESULT_DISCONNECT;
+        }
+        ixgb_get_ee_mac_addr(&adapter->hw, netdev->dev_addr);
+        memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len);
+
+        if(!is_valid_ether_addr(netdev->perm_addr)) {
+                DPRINTK(PROBE, ERR, "After reset, invalid MAC address.\n");
+                return PCI_ERS_RESULT_DISCONNECT;
+        }
+
+        return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * ixgb_io_resume - called when its OK to resume normal operations
+ * @pdev    pointer to pci device with error
+ *
+ * The error recovery driver tells us that its OK to resume
+ * normal operation. Implementation resembles the second-half
+ * of the ixgb_probe() routine.
+ */
+static void ixgb_io_resume (struct pci_dev *pdev)
+{
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct ixgb_adapter *adapter = netdev->priv;
+
+        pci_set_master(pdev);
+
+        if(netif_running(netdev)) {
+                if(ixgb_up(adapter)) {
+                        printk ("ixgb: can't bring device back up after reset\n");
+                        return;
+                }
+        }
+
+        netif_device_attach(netdev);
+        mod_timer(&adapter->watchdog_timer, jiffies);
+}
+
 /* ixgb_main.c */