1 files changed, 58 insertions, 101 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 4d0e0aea72bf..61696637a21e 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -159,7 +159,7 @@
 
 #define DRV_NAME                "e100"
 #define DRV_EXT                 "-NAPI"
-#define DRV_VERSION             "3.5.17-k2"DRV_EXT
+#define DRV_VERSION             "3.5.17-k4"DRV_EXT
 #define DRV_DESCRIPTION         "Intel(R) PRO/100 Network Driver"
 #define DRV_COPYRIGHT           "Copyright(c) 1999-2006 Intel Corporation"
 #define PFX                     DRV_NAME ": "
@@ -174,10 +174,13 @@ MODULE_VERSION(DRV_VERSION);
 
 static int debug = 3;
 static int eeprom_bad_csum_allow = 0;
+static int use_io = 0;
 module_param(debug, int, 0);
 module_param(eeprom_bad_csum_allow, int, 0);
+module_param(use_io, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
+MODULE_PARM_DESC(use_io, "Force use of i/o access mode");
 #define DPRINTK(nlevel, klevel, fmt, args...) \
         (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \
         printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \
@@ -282,12 +285,6 @@ enum scb_status {
         rus_mask         = 0x3C,
 };
 
-enum ru_state  {
-        RU_SUSPENDED = 0,
-        RU_RUNNING       = 1,
-        RU_UNINITIALIZED = -1,
-};
-
 enum scb_stat_ack {
         stat_ack_not_ours    = 0x00,
         stat_ack_sw_gen      = 0x04,
@@ -529,7 +526,6 @@ struct nic {
         struct rx *rx_to_use;
         struct rx *rx_to_clean;
         struct rfd blank_rfd;
-        enum ru_state ru_running;
 
         spinlock_t cb_lock                      ____cacheline_aligned;
         spinlock_t cmd_lock;
@@ -591,7 +587,7 @@ static inline void e100_write_flush(struct nic *nic)
 {
         /* Flush previous PCI writes through intermediate bridges
          * by doing a benign read */
-        (void)readb(&nic->csr->scb.status);
+        (void)ioread8(&nic->csr->scb.status);
 }
 
 static void e100_enable_irq(struct nic *nic)
@@ -599,7 +595,7 @@ static void e100_enable_irq(struct nic *nic)
         unsigned long flags;
 
         spin_lock_irqsave(&nic->cmd_lock, flags);
-        writeb(irq_mask_none, &nic->csr->scb.cmd_hi);
+        iowrite8(irq_mask_none, &nic->csr->scb.cmd_hi);
         e100_write_flush(nic);
         spin_unlock_irqrestore(&nic->cmd_lock, flags);
 }
@@ -609,7 +605,7 @@ static void e100_disable_irq(struct nic *nic)
         unsigned long flags;
 
         spin_lock_irqsave(&nic->cmd_lock, flags);
-        writeb(irq_mask_all, &nic->csr->scb.cmd_hi);
+        iowrite8(irq_mask_all, &nic->csr->scb.cmd_hi);
         e100_write_flush(nic);
         spin_unlock_irqrestore(&nic->cmd_lock, flags);
 }
@@ -618,11 +614,11 @@ static void e100_hw_reset(struct nic *nic)
 {
         /* Put CU and RU into idle with a selective reset to get
          * device off of PCI bus */
-        writel(selective_reset, &nic->csr->port);
+        iowrite32(selective_reset, &nic->csr->port);
         e100_write_flush(nic); udelay(20);
 
         /* Now fully reset device */
-        writel(software_reset, &nic->csr->port);
+        iowrite32(software_reset, &nic->csr->port);
         e100_write_flush(nic); udelay(20);
 
         /* Mask off our interrupt line - it's unmasked after reset */
@@ -639,7 +635,7 @@ static int e100_self_test(struct nic *nic)
         nic->mem->selftest.signature = 0;
         nic->mem->selftest.result = 0xFFFFFFFF;
 
-        writel(selftest | dma_addr, &nic->csr->port);
+        iowrite32(selftest | dma_addr, &nic->csr->port);
         e100_write_flush(nic);
         /* Wait 10 msec for self-test to complete */
         msleep(10);
@@ -677,23 +673,23 @@ static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, u16 data)
         for(j = 0; j < 3; j++) {
 
                 /* Chip select */
-                writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
 
                 for(i = 31; i >= 0; i--) {
                         ctrl = (cmd_addr_data[j] & (1 << i)) ?
                                 eecs | eedi : eecs;
-                        writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
+                        iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
                         e100_write_flush(nic); udelay(4);
 
-                        writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
+                        iowrite8(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
                         e100_write_flush(nic); udelay(4);
                 }
                 /* Wait 10 msec for cmd to complete */
                 msleep(10);
 
                 /* Chip deselect */
-                writeb(0, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(0, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
         }
 };
@@ -709,21 +705,21 @@ static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
         cmd_addr_data = ((op_read << *addr_len) | addr) << 16;
 
         /* Chip select */
-        writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
+        iowrite8(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
         e100_write_flush(nic); udelay(4);
 
         /* Bit-bang to read word from eeprom */
         for(i = 31; i >= 0; i--) {
                 ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
-                writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(ctrl, &nic->csr->eeprom_ctrl_lo);
                 e100_write_flush(nic); udelay(4);
 
-                writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
+                iowrite8(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);
+                ctrl = ioread8(&nic->csr->eeprom_ctrl_lo);
                 if(!(ctrl & eedo) && i > 16) {
                         *addr_len -= (i - 16);
                         i = 17;
@@ -733,7 +729,7 @@ static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
         }
 
         /* Chip deselect */
-        writeb(0, &nic->csr->eeprom_ctrl_lo);
+        iowrite8(0, &nic->csr->eeprom_ctrl_lo);
         e100_write_flush(nic); udelay(4);
 
         return le16_to_cpu(data);
@@ -804,7 +800,7 @@ static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
 
         /* Previous command is accepted when SCB clears */
         for(i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) {
-                if(likely(!readb(&nic->csr->scb.cmd_lo)))
+                if(likely(!ioread8(&nic->csr->scb.cmd_lo)))
                         break;
                 cpu_relax();
                 if(unlikely(i > E100_WAIT_SCB_FAST))
@@ -816,8 +812,8 @@ static int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
         }
 
         if(unlikely(cmd != cuc_resume))
-                writel(dma_addr, &nic->csr->scb.gen_ptr);
-        writeb(cmd, &nic->csr->scb.cmd_lo);
+                iowrite32(dma_addr, &nic->csr->scb.gen_ptr);
+        iowrite8(cmd, &nic->csr->scb.cmd_lo);
 
 err_unlock:
         spin_unlock_irqrestore(&nic->cmd_lock, flags);
@@ -895,7 +891,7 @@ static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
          */
         spin_lock_irqsave(&nic->mdio_lock, flags);
         for (i = 100; i; --i) {
-                if (readl(&nic->csr->mdi_ctrl) & mdi_ready)
+                if (ioread32(&nic->csr->mdi_ctrl) & mdi_ready)
                         break;
                 udelay(20);
         }
@@ -905,11 +901,11 @@ static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
                 spin_unlock_irqrestore(&nic->mdio_lock, flags);
                 return 0;               /* No way to indicate timeout error */
         }
-        writel((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
+        iowrite32((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
 
         for (i = 0; i < 100; i++) {
                 udelay(20);
-                if ((data_out = readl(&nic->csr->mdi_ctrl)) & mdi_ready)
+                if ((data_out = ioread32(&nic->csr->mdi_ctrl)) & mdi_ready)
                         break;
         }
         spin_unlock_irqrestore(&nic->mdio_lock, flags);
@@ -951,7 +947,7 @@ static void e100_get_defaults(struct nic *nic)
                 ((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
 
         /* Template for a freshly allocated RFD */
-        nic->blank_rfd.command = cpu_to_le16(cb_el);
+        nic->blank_rfd.command = cpu_to_le16(cb_el & cb_s);
         nic->blank_rfd.rbd = 0xFFFFFFFF;
         nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
 
@@ -1318,7 +1314,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
         }
 
         /* ack any interupts, something could have been set */
-        writeb(~0, &nic->csr->scb.stat_ack);
+        iowrite8(~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))) {
@@ -1580,7 +1576,7 @@ static void e100_watchdog(unsigned long data)
          * 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);
+        iowrite8(ioread8(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);
         e100_write_flush(nic);
         spin_unlock_irq(&nic->cmd_lock);
 
@@ -1746,19 +1742,11 @@ static int e100_alloc_cbs(struct nic *nic)
         return 0;
 }
 
-static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
+static inline void e100_start_receiver(struct nic *nic)
 {
-        if(!nic->rxs) return;
-        if(RU_SUSPENDED != nic->ru_running) return;
-
-        /* handle init time starts */
-        if(!rx) rx = nic->rxs;
-
-        /* (Re)start RU if suspended or idle and RFA is non-NULL */
-        if(rx->skb) {
-                e100_exec_cmd(nic, ruc_start, rx->dma_addr);
-                nic->ru_running = RU_RUNNING;
-        }
+        /* Start if RFA is non-NULL */
+        if(nic->rx_to_clean->skb)
+                e100_exec_cmd(nic, ruc_start, nic->rx_to_clean->dma_addr);
 }
 
 #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
@@ -1787,7 +1775,7 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
                 put_unaligned(cpu_to_le32(rx->dma_addr),
                         (u32 *)&prev_rfd->link);
                 wmb();
-                prev_rfd->command &= ~cpu_to_le16(cb_el);
+                prev_rfd->command &= ~cpu_to_le16(cb_el & cb_s);
                 pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr,
                         sizeof(struct rfd), PCI_DMA_TODEVICE);
         }
@@ -1825,10 +1813,6 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
         pci_unmap_single(nic->pdev, rx->dma_addr,
                 RFD_BUF_LEN, PCI_DMA_FROMDEVICE);
 
-        /* this allows for a fast restart without re-enabling interrupts */
-        if(le16_to_cpu(rfd->command) & cb_el)
-                nic->ru_running = RU_SUSPENDED;
-
         /* Pull off the RFD and put the actual data (minus eth hdr) */
         skb_reserve(skb, sizeof(struct rfd));
         skb_put(skb, actual_size);
@@ -1859,45 +1843,18 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
         unsigned int work_to_do)
 {
         struct rx *rx;
-        int restart_required = 0;
-        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
-         * partially cleaned list, avoiding a race between hardware
-         * and rx_to_clean when in NAPI mode */
-        if(RU_SUSPENDED == nic->ru_running)
-                restart_required = 1;
 
         /* Indicate newly arrived packets */
         for(rx = nic->rx_to_clean; rx->skb; rx = nic->rx_to_clean = rx->next) {
-                int err = e100_rx_indicate(nic, rx, work_done, work_to_do);
-                if(-EAGAIN == err) {
-                        /* hit quota so have more work to do, restart once
-                         * cleanup is complete */
-                        restart_required = 0;
-                        break;
-                } else if(-ENODATA == err)
+                if(e100_rx_indicate(nic, rx, work_done, work_to_do))
                         break; /* No more to clean */
         }
 
-        /* save our starting point as the place we'll restart the receiver */
-        if(restart_required)
-                rx_to_start = nic->rx_to_clean;
-
         /* Alloc new skbs to refill list */
         for(rx = nic->rx_to_use; !rx->skb; rx = nic->rx_to_use = rx->next) {
                 if(unlikely(e100_rx_alloc_skb(nic, rx)))
                         break; /* Better luck next time (see watchdog) */
         }
-
-        if(restart_required) {
-                // ack the rnr?
-                writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
-                e100_start_receiver(nic, rx_to_start);
-                if(work_done)
-                        (*work_done)++;
-        }
 }
 
 static void e100_rx_clean_list(struct nic *nic)
@@ -1905,8 +1862,6 @@ static void e100_rx_clean_list(struct nic *nic)
         struct rx *rx;
         unsigned int i, count = nic->params.rfds.count;
 
-        nic->ru_running = RU_UNINITIALIZED;
-
         if(nic->rxs) {
                 for(rx = nic->rxs, i = 0; i < count; rx++, i++) {
                         if(rx->skb) {
@@ -1928,7 +1883,6 @@ static int e100_rx_alloc_list(struct nic *nic)
         unsigned int i, count = nic->params.rfds.count;
 
         nic->rx_to_use = nic->rx_to_clean = NULL;
-        nic->ru_running = RU_UNINITIALIZED;
 
         if(!(nic->rxs = kcalloc(count, sizeof(struct rx), GFP_ATOMIC)))
                 return -ENOMEM;
@@ -1943,7 +1897,6 @@ static int e100_rx_alloc_list(struct nic *nic)
         }
 
         nic->rx_to_use = nic->rx_to_clean = nic->rxs;
-        nic->ru_running = RU_SUSPENDED;
 
         return 0;
 }
@@ -1952,7 +1905,7 @@ static irqreturn_t e100_intr(int irq, void *dev_id)
 {
         struct net_device *netdev = dev_id;
         struct nic *nic = netdev_priv(netdev);
-        u8 stat_ack = readb(&nic->csr->scb.stat_ack);
+        u8 stat_ack = ioread8(&nic->csr->scb.stat_ack);
 
         DPRINTK(INTR, DEBUG, "stat_ack = 0x%02X\n", stat_ack);
 
@@ -1961,11 +1914,7 @@ static irqreturn_t e100_intr(int irq, void *dev_id)
                 return IRQ_NONE;
 
         /* Ack interrupt(s) */
-        writeb(stat_ack, &nic->csr->scb.stat_ack);
-
-        /* We hit Receive No Resource (RNR); restart RU after cleaning */
-        if(stat_ack & stat_ack_rnr)
-                nic->ru_running = RU_SUSPENDED;
+        iowrite8(stat_ack, &nic->csr->scb.stat_ack);
 
         if(likely(netif_rx_schedule_prep(netdev))) {
                 e100_disable_irq(nic);
@@ -2058,7 +2007,7 @@ static int e100_up(struct nic *nic)
         if((err = e100_hw_init(nic)))
                 goto err_clean_cbs;
         e100_set_multicast_list(nic->netdev);
-        e100_start_receiver(nic, NULL);
+        e100_start_receiver(nic);
         mod_timer(&nic->watchdog, jiffies);
         if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
                 nic->netdev->name, nic->netdev)))
@@ -2107,7 +2056,7 @@ static void e100_tx_timeout_task(struct work_struct *work)
         struct net_device *netdev = nic->netdev;
 
         DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
-                readb(&nic->csr->scb.status));
+                ioread8(&nic->csr->scb.status));
         e100_down(netdev_priv(netdev));
         e100_up(netdev_priv(netdev));
 }
@@ -2139,7 +2088,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
                 mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR,
                         BMCR_LOOPBACK);
 
-        e100_start_receiver(nic, NULL);
+        e100_start_receiver(nic);
 
         if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
                 err = -ENOMEM;
@@ -2230,9 +2179,9 @@ static void e100_get_regs(struct net_device *netdev,
         int i;
 
         regs->version = (1 << 24) | nic->rev_id;
-        buff[0] = readb(&nic->csr->scb.cmd_hi) << 24 |
-                readb(&nic->csr->scb.cmd_lo) << 16 |
-                readw(&nic->csr->scb.status);
+        buff[0] = ioread8(&nic->csr->scb.cmd_hi) << 24 |
+                ioread8(&nic->csr->scb.cmd_lo) << 16 |
+                ioread16(&nic->csr->scb.status);
         for(i = E100_PHY_REGS; i >= 0; i--)
                 buff[1 + E100_PHY_REGS - i] =
                         mdio_read(netdev, nic->mii.phy_id, i);
@@ -2604,7 +2553,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
         SET_MODULE_OWNER(netdev);
         SET_NETDEV_DEV(netdev, &pdev->dev);
 
-        nic->csr = ioremap(pci_resource_start(pdev, 0), sizeof(struct csr));
+        if (use_io)
+                DPRINTK(PROBE, INFO, "using i/o access mode\n");
+
+        nic->csr = pci_iomap(pdev, (use_io ? 1 : 0), sizeof(struct csr));
         if(!nic->csr) {
                 DPRINTK(PROBE, ERR, "Cannot map device registers, aborting.\n");
                 err = -ENOMEM;
@@ -2651,11 +2603,16 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN);
         memcpy(netdev->perm_addr, nic->eeprom, ETH_ALEN);
-        if(!is_valid_ether_addr(netdev->perm_addr)) {
-                DPRINTK(PROBE, ERR, "Invalid MAC address from "
-                        "EEPROM, aborting.\n");
-                err = -EAGAIN;
-                goto err_out_free;
+        if (!is_valid_ether_addr(netdev->perm_addr)) {
+                if (!eeprom_bad_csum_allow) {
+                        DPRINTK(PROBE, ERR, "Invalid MAC address from "
+                                "EEPROM, aborting.\n");
+                        err = -EAGAIN;
+                        goto err_out_free;
+                } else {
+                        DPRINTK(PROBE, ERR, "Invalid MAC address from EEPROM, "
+                                "you MUST configure one.\n");
+                }
         }
 
         /* Wol magic packet can be enabled from eeprom */
@@ -2676,7 +2633,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "
                 "MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                (unsigned long long)pci_resource_start(pdev, 0), pdev->irq,
+                (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), pdev->irq,
                 netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
                 netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
 
@@ -2685,7 +2642,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 err_out_free:
         e100_free(nic);
 err_out_iounmap:
-        iounmap(nic->csr);
+        pci_iounmap(pdev, nic->csr);
 err_out_free_res:
         pci_release_regions(pdev);
 err_out_disable_pdev: