Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
  ipw2200: Call netif_*_queue() interfaces properly.
  netxen: Needs to include linux/vmalloc.h
  [netdrvr] atl1d: fix !CONFIG_PM build
  r6040: rework init_one error handling
  r6040: bump release number to 0.18
  r6040: handle RX fifo full and no descriptor interrupts
  r6040: change the default waiting time
  r6040: use definitions for magic values in descriptor status
  r6040: completely rework the RX path
  r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
  mv643xx_eth: fix NETPOLL build
  r6040: rework the RX buffers allocation routine
  r6040: fix scheduling while atomic in r6040_tx_timeout
  r6040: fix null pointer access and tx timeouts
  r6040: prefix all functions with r6040
  rndis_host: support WM6 devices as modems
  at91_ether: use netstats in net_device structure
  sfc: Create one RX queue and interrupt per CPU package by default
  sfc: Use a separate workqueue for resets
  sfc: I2C adapter initialisation fixes
  ...

1 files changed, 7 insertions, 55 deletions

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index b3981ed972bf..3ab0e5289f7a 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -125,7 +125,6 @@ struct myri10ge_cmd {
 
 struct myri10ge_rx_buf {
         struct mcp_kreq_ether_recv __iomem *lanai;      /* lanai ptr for recv ring */
-        u8 __iomem *wc_fifo;    /* w/c rx dma addr fifo address */
         struct mcp_kreq_ether_recv *shadow;     /* host shadow of recv ring */
         struct myri10ge_rx_buffer_state *info;
         struct page *page;
@@ -140,7 +139,6 @@ struct myri10ge_rx_buf {
 
 struct myri10ge_tx_buf {
         struct mcp_kreq_ether_send __iomem *lanai;      /* lanai ptr for sendq */
-        u8 __iomem *wc_fifo;    /* w/c send fifo address */
         struct mcp_kreq_ether_send *req_list;   /* host shadow of sendq */
         char *req_bytes;
         struct myri10ge_tx_buffer_state *info;
@@ -332,10 +330,6 @@ MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed");
 
 static int myri10ge_reset_recover = 1;
 
-static int myri10ge_wcfifo = 0;
-module_param(myri10ge_wcfifo, int, S_IRUGO);
-MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled");
-
 static int myri10ge_max_slices = 1;
 module_param(myri10ge_max_slices, int, S_IRUGO);
 MODULE_PARM_DESC(myri10ge_max_slices, "Max tx/rx queues");
@@ -1218,14 +1212,8 @@ myri10ge_alloc_rx_pages(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
 
                 /* copy 8 descriptors to the firmware at a time */
                 if ((idx & 7) == 7) {
-                        if (rx->wc_fifo == NULL)
-                                myri10ge_submit_8rx(&rx->lanai[idx - 7],
-                                                    &rx->shadow[idx - 7]);
-                        else {
-                                mb();
-                                myri10ge_pio_copy(rx->wc_fifo,
-                                                  &rx->shadow[idx - 7], 64);
-                        }
+                        myri10ge_submit_8rx(&rx->lanai[idx - 7],
+                                            &rx->shadow[idx - 7]);
                 }
         }
 }
@@ -2229,18 +2217,6 @@ static int myri10ge_get_txrx(struct myri10ge_priv *mgp, int slice)
         ss->rx_big.lanai = (struct mcp_kreq_ether_recv __iomem *)
             (mgp->sram + cmd.data0);
 
-        if (myri10ge_wcfifo && mgp->wc_enabled) {
-                ss->tx.wc_fifo = (u8 __iomem *)
-                    mgp->sram + MXGEFW_ETH_SEND_4 + 64 * slice;
-                ss->rx_small.wc_fifo = (u8 __iomem *)
-                    mgp->sram + MXGEFW_ETH_RECV_SMALL + 64 * slice;
-                ss->rx_big.wc_fifo = (u8 __iomem *)
-                    mgp->sram + MXGEFW_ETH_RECV_BIG + 64 * slice;
-        } else {
-                ss->tx.wc_fifo = NULL;
-                ss->rx_small.wc_fifo = NULL;
-                ss->rx_big.wc_fifo = NULL;
-        }
         return status;
 
 }
@@ -2573,27 +2549,6 @@ myri10ge_submit_req(struct myri10ge_tx_buf *tx, struct mcp_kreq_ether_send *src,
         mb();
 }
 
-static inline void
-myri10ge_submit_req_wc(struct myri10ge_tx_buf *tx,
-                       struct mcp_kreq_ether_send *src, int cnt)
-{
-        tx->req += cnt;
-        mb();
-        while (cnt >= 4) {
-                myri10ge_pio_copy(tx->wc_fifo, src, 64);
-                mb();
-                src += 4;
-                cnt -= 4;
-        }
-        if (cnt > 0) {
-                /* pad it to 64 bytes.  The src is 64 bytes bigger than it
-                 * needs to be so that we don't overrun it */
-                myri10ge_pio_copy(tx->wc_fifo + MXGEFW_ETH_SEND_OFFSET(cnt),
-                                  src, 64);
-                mb();
-        }
-}
-
 /*
  * Transmit a packet.  We need to split the packet so that a single
  * segment does not cross myri10ge->tx_boundary, so this makes segment
@@ -2830,10 +2785,7 @@ again:
                                          MXGEFW_FLAGS_FIRST)));
         idx = ((count - 1) + tx->req) & tx->mask;
         tx->info[idx].last = 1;
-        if (tx->wc_fifo == NULL)
-                myri10ge_submit_req(tx, tx->req_list, count);
-        else
-                myri10ge_submit_req_wc(tx, tx->req_list, count);
+        myri10ge_submit_req(tx, tx->req_list, count);
         tx->pkt_start++;
         if ((avail - count) < MXGEFW_MAX_SEND_DESC) {
                 tx->stop_queue++;
@@ -3768,14 +3720,14 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (mgp->sram_size > mgp->board_span) {
                 dev_err(&pdev->dev, "board span %ld bytes too small\n",
                         mgp->board_span);
-                goto abort_with_wc;
+                goto abort_with_mtrr;
         }
-        mgp->sram = ioremap(mgp->iomem_base, mgp->board_span);
+        mgp->sram = ioremap_wc(mgp->iomem_base, mgp->board_span);
         if (mgp->sram == NULL) {
                 dev_err(&pdev->dev, "ioremap failed for %ld bytes at 0x%lx\n",
                         mgp->board_span, mgp->iomem_base);
                 status = -ENXIO;
-                goto abort_with_wc;
+                goto abort_with_mtrr;
         }
         memcpy_fromio(mgp->eeprom_strings,
                       mgp->sram + mgp->sram_size - MYRI10GE_EEPROM_STRINGS_SIZE,
@@ -3876,7 +3828,7 @@ abort_with_firmware:
 abort_with_ioremap:
         iounmap(mgp->sram);
 
-abort_with_wc:
+abort_with_mtrr:
 #ifdef CONFIG_MTRR
         if (mgp->mtrr >= 0)
                 mtrr_del(mgp->mtrr, mgp->iomem_base, mgp->board_span);