1 files changed, 96 insertions, 46 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 4726722a0635..bf1fd2b98bf8 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1,25 +1,25 @@
 /*******************************************************************************
 
-  
+
   Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
-  
-  This program is free software; you can redistribute it and/or modify it 
-  under the terms of the GNU General Public License as published by the Free 
-  Software Foundation; either version 2 of the License, or (at your option) 
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by the Free
+  Software Foundation; either version 2 of the License, or (at your option)
   any later version.
-  
-  This program is distributed in the hope that it will be useful, but WITHOUT 
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
   more details.
-  
+
   You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc., 59 
+  this program; if not, write to the Free Software Foundation, Inc., 59
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  
+
   The full GNU General Public License is included in this distribution in the
   file called LICENSE.
-  
+
   Contact Information:
   Linux NICS <linux.nics@intel.com>
   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
@@ -160,7 +160,7 @@
 
 #define DRV_NAME                "e100"
 #define DRV_EXT         "-NAPI"
-#define DRV_VERSION             "3.4.14-k4"DRV_EXT
+#define DRV_VERSION             "3.5.10-k2"DRV_EXT
 #define DRV_DESCRIPTION         "Intel(R) PRO/100 Network Driver"
 #define DRV_COPYRIGHT           "Copyright(c) 1999-2005 Intel Corporation"
 #define PFX                     DRV_NAME ": "
@@ -320,7 +320,7 @@ enum cuc_dump {
         cuc_dump_complete       = 0x0000A005,
         cuc_dump_reset_complete = 0x0000A007,
 };
-                
+
 enum port {
         software_reset  = 0x0000,
         selftest        = 0x0001,
@@ -715,10 +715,10 @@ static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
                 ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
                 writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
-                
+
                 writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
-                
+
                 /* Eeprom drives a dummy zero to EEDO after receiving
                  * complete address.  Use this to adjust addr_len. */
                 ctrl = readb(&nic->csr->eeprom_ctrl_lo);
@@ -726,7 +726,7 @@ static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
                         *addr_len -= (i - 16);
                         i = 17;
                 }
-                
+
                 data = (data << 1) | (ctrl & eedo ? 1 : 0);
         }
 
@@ -1170,7 +1170,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 0x00000000, 0x00000000, 0x00000000, 0x00000000, \
 }
 
-static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
+static void e100_setup_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 {
 /* *INDENT-OFF* */
         static struct {
@@ -1213,13 +1213,13 @@ static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 *  driver can change the algorithm.
 *
 *  INTDELAY - This loads the dead-man timer with its inital value.
-*    When this timer expires the interrupt is asserted, and the 
+*    When this timer expires the interrupt is asserted, and the
 *    timer is reset each time a new packet is received.  (see
 *    BUNDLEMAX below to set the limit on number of chained packets)
 *    The current default is 0x600 or 1536.  Experiments show that
 *    the value should probably stay within the 0x200 - 0x1000.
 *
-*  BUNDLEMAX - 
+*  BUNDLEMAX -
 *    This sets the maximum number of frames that will be bundled.  In
 *    some situations, such as the TCP windowing algorithm, it may be
 *    better to limit the growth of the bundle size than let it go as
@@ -1229,7 +1229,7 @@ static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 *    an interrupt for every frame received.  If you do not want to put
 *    a limit on the bundle size, set this value to xFFFF.
 *
-*  BUNDLESMALL - 
+*  BUNDLESMALL -
 *    This contains a bit-mask describing the minimum size frame that
 *    will be bundled.  The default masks the lower 7 bits, which means
 *    that any frame less than 128 bytes in length will not be bundled,
@@ -1244,7 +1244,7 @@ static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 *
 *    The current default is 0xFF80, which masks out the lower 7 bits.
 *    This means that any frame which is x7F (127) bytes or smaller
-*    will cause an immediate interrupt.  Because this value must be a 
+*    will cause an immediate interrupt.  Because this value must be a
 *    bit mask, there are only a few valid values that can be used.  To
 *    turn this feature off, the driver can write the value xFFFF to the
 *    lower word of this instruction (in the same way that the other
@@ -1253,7 +1253,7 @@ static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 *    standard Ethernet frames are <= 2047 bytes in length.
 *************************************************************************/
 
-/* if you wish to disable the ucode functionality, while maintaining the 
+/* if you wish to disable the ucode functionality, while maintaining the
  * workarounds it provides, set the following defines to:
  * BUNDLESMALL 0
  * BUNDLEMAX 1
@@ -1284,12 +1284,46 @@ static void e100_load_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb)
 
                 for (i = 0; i < UCODE_SIZE; i++)
                         cb->u.ucode[i] = cpu_to_le32(ucode[i]);
-                cb->command = cpu_to_le16(cb_ucode);
+                cb->command = cpu_to_le16(cb_ucode | cb_el);
                 return;
         }
 
 noloaducode:
-        cb->command = cpu_to_le16(cb_nop);
+        cb->command = cpu_to_le16(cb_nop | cb_el);
+}
+
+static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
+        void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *))
+{
+        int err = 0, counter = 50;
+        struct cb *cb = nic->cb_to_clean;
+
+        if ((err = e100_exec_cb(nic, NULL, e100_setup_ucode)))
+                DPRINTK(PROBE,ERR, "ucode cmd failed with error %d\n", err);
+
+        /* must restart cuc */
+        nic->cuc_cmd = cuc_start;
+
+        /* wait for completion */
+        e100_write_flush(nic);
+        udelay(10);
+
+        /* wait for possibly (ouch) 500ms */
+        while (!(cb->status & cpu_to_le16(cb_complete))) {
+                msleep(10);
+                if (!--counter) break;
+        }
+
+        /* ack any interupts, something could have been set */
+        writeb(~0, &nic->csr->scb.stat_ack);
+
+        /* if the command failed, or is not OK, notify and return */
+        if (!counter || !(cb->status & cpu_to_le16(cb_ok))) {
+                DPRINTK(PROBE,ERR, "ucode load failed\n");
+                err = -EPERM;
+        }
+
+        return err;
 }
 
 static void e100_setup_iaaddr(struct nic *nic, struct cb *cb,
@@ -1357,13 +1391,13 @@ static int e100_phy_init(struct nic *nic)
                 mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong);
         }
 
-        if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) && 
+        if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&
            (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000))) {
                 /* enable/disable MDI/MDI-X auto-switching.
                    MDI/MDI-X auto-switching is disabled for 82551ER/QM chips */
                 if((nic->mac == mac_82551_E) || (nic->mac == mac_82551_F) ||
-                   (nic->mac == mac_82551_10) || (nic->mii.force_media) || 
-                   !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled)) 
+                   (nic->mac == mac_82551_10) || (nic->mii.force_media) ||
+                   !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))
                         mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, 0);
                 else
                         mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, NCONFIG_AUTO_SWITCH);
@@ -1388,7 +1422,7 @@ static int e100_hw_init(struct nic *nic)
                 return err;
         if((err = e100_exec_cmd(nic, ruc_load_base, 0)))
                 return err;
-        if((err = e100_exec_cb(nic, NULL, e100_load_ucode)))
+        if ((err = e100_exec_cb_wait(nic, NULL, e100_setup_ucode)))
                 return err;
         if((err = e100_exec_cb(nic, NULL, e100_configure)))
                 return err;
@@ -1493,7 +1527,7 @@ static void e100_update_stats(struct nic *nic)
                 }
         }
 
-        
+
         if(e100_exec_cmd(nic, cuc_dump_reset, 0))
                 DPRINTK(TX_ERR, DEBUG, "exec cuc_dump_reset failed\n");
 }
@@ -1542,10 +1576,10 @@ static void e100_watchdog(unsigned long data)
         mii_check_link(&nic->mii);
 
         /* Software generated interrupt to recover from (rare) Rx
-        * allocation failure.
-        * Unfortunately have to use a spinlock to not re-enable interrupts
-        * accidentally, due to hardware that shares a register between the
-        * interrupt mask bit and the SW Interrupt generation bit */
+         * allocation failure.
+         * Unfortunately have to use a spinlock to not re-enable interrupts
+         * accidentally, due to hardware that shares a register between the
+         * interrupt mask bit and the SW Interrupt generation bit */
         spin_lock_irq(&nic->cmd_lock);
         writeb(readb(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);
         spin_unlock_irq(&nic->cmd_lock);
@@ -1830,7 +1864,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
         struct rx *rx_to_start = NULL;
 
         /* are we already rnr? then pay attention!!! this ensures that
-         * the state machine progression never allows a start with a 
+         * the state machine progression never allows a start with a
          * partially cleaned list, avoiding a race between hardware
          * and rx_to_clean when in NAPI mode */
         if(RU_SUSPENDED == nic->ru_running)
@@ -2066,7 +2100,7 @@ static void e100_tx_timeout(struct net_device *netdev)
 {
         struct nic *nic = netdev_priv(netdev);
 
-        /* Reset outside of interrupt context, to avoid request_irq 
+        /* Reset outside of interrupt context, to avoid request_irq
          * in interrupt context */
         schedule_work(&nic->tx_timeout_task);
 }
@@ -2313,7 +2347,7 @@ static int e100_set_ringparam(struct net_device *netdev,
         struct param_range *rfds = &nic->params.rfds;
         struct param_range *cbs = &nic->params.cbs;
 
-        if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending)) 
+        if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                 return -EINVAL;
 
         if(netif_running(netdev))
@@ -2631,7 +2665,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 nic->flags |= wol_magic;
 
         /* ack any pending wake events, disable PME */
-        pci_enable_wake(pdev, 0, 0);
+        err = pci_enable_wake(pdev, 0, 0);
+        if (err)
+                DPRINTK(PROBE, ERR, "Error clearing wake event\n");
 
         strcpy(netdev->name, "eth%d");
         if((err = register_netdev(netdev))) {
@@ -2682,6 +2718,7 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct nic *nic = netdev_priv(netdev);
+        int retval;
 
         if(netif_running(netdev))
                 e100_down(nic);
@@ -2689,9 +2726,14 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
         netif_device_detach(netdev);
 
         pci_save_state(pdev);
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), nic->flags & (wol_magic | e100_asf(nic)));
+        retval = pci_enable_wake(pdev, pci_choose_state(pdev, state),
+                                 nic->flags & (wol_magic | e100_asf(nic)));
+        if (retval)
+                DPRINTK(PROBE,ERR, "Error enabling wake\n");
         pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        retval = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+        if (retval)
+                DPRINTK(PROBE,ERR, "Error %d setting power state\n", retval);
 
         return 0;
 }
@@ -2700,11 +2742,16 @@ static int e100_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct nic *nic = netdev_priv(netdev);
+        int retval;
 
-        pci_set_power_state(pdev, PCI_D0);
+        retval = pci_set_power_state(pdev, PCI_D0);
+        if (retval)
+                DPRINTK(PROBE,ERR, "Error waking adapter\n");
         pci_restore_state(pdev);
         /* ack any pending wake events, disable PME */
-        pci_enable_wake(pdev, 0, 0);
+        retval = pci_enable_wake(pdev, 0, 0);
+        if (retval)
+                DPRINTK(PROBE,ERR, "Error clearing wake events\n");
         if(e100_hw_init(nic))
                 DPRINTK(HW, ERR, "e100_hw_init failed\n");
 
@@ -2721,12 +2768,15 @@ static void e100_shutdown(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct nic *nic = netdev_priv(netdev);
+        int retval;
 
 #ifdef CONFIG_PM
-        pci_enable_wake(pdev, 0, nic->flags & (wol_magic | e100_asf(nic)));
+        retval = pci_enable_wake(pdev, 0, nic->flags & (wol_magic | e100_asf(nic)));
 #else
-        pci_enable_wake(pdev, 0, nic->flags & (wol_magic));
+        retval = pci_enable_wake(pdev, 0, nic->flags & (wol_magic));
 #endif
+        if (retval)
+                DPRINTK(PROBE,ERR, "Error enabling wake\n");
 }
 
 
@@ -2739,7 +2789,7 @@ static struct pci_driver e100_driver = {
         .suspend =      e100_suspend,
         .resume =       e100_resume,
 #endif
-        .shutdown =     e100_shutdown,
+        .shutdown =     e100_shutdown,
 };
 
 static int __init e100_init_module(void)