diff -Naru linux-2.6.16.18.orig/drivers/net/netxen/netxen_nic_init.c 
linux-2.6.16.18/drivers/net/netxen/netxen_nic_init.c
--- linux-2.6.16.18.orig/drivers/net/netxen/netxen_nic_init.c   1969-12-31 
16:00:00.000000000 -0800
+++ linux-2.6.16.18/drivers/net/netxen/netxen_nic_init.c        2006-05-25 
02:43:22.000000000 -0700
@@ -0,0 +1,1219 @@
+/*
+ * Copyright (C) 2003 - 2006 NetXen, Inc.
+ * 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) 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 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 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:
+ *    [EMAIL PROTECTED]
+ * NetXen,
+ * 3965 Freedom Circle, Fourth floor,
+ * Santa Clara, CA 95054
+ *
+ *
+ * Source file for NIC routines to initialize the Phantom Hardware
+ *
+ */
+
+#include <linux/netdevice.h>
+#include <linux/delay.h>
+#include "netxen_nic.h"
+#include "netxen_nic_hw.h"
+#include "netxen_nic_ioctl.h"
+#include "netxen_nic_phan_reg.h"
+
+struct crb_addr_pair {
+       long addr;
+       long data;
+};
+
+#define NETXEN_MAX_CRB_XFORM 60
+static unsigned int crb_addr_xform[NETXEN_MAX_CRB_XFORM];
+#define NETXEN_ADDR_ERROR ((unsigned long ) 0xffffffff )
+
+#define crb_addr_transform(name) \
+        crb_addr_xform[NETXEN_HW_PX_MAP_CRB_##name] = \
+        NETXEN_HW_CRB_HUB_AGT_ADR_##name << 20
+
+#define NETXEN_FLASH_BASE      (BOOTLD_START)
+#define NETXEN_PHANTOM_MEM_BASE        (NETXEN_FLASH_BASE)
+
+static void crb_addr_transform_setup(void)
+{
+       crb_addr_transform(XDMA);
+       crb_addr_transform(TIMR);
+       crb_addr_transform(SRE);
+       crb_addr_transform(SQN3);
+       crb_addr_transform(SQN2);
+       crb_addr_transform(SQN1);
+       crb_addr_transform(SQN0);
+       crb_addr_transform(SQS3);
+       crb_addr_transform(SQS2);
+       crb_addr_transform(SQS1);
+       crb_addr_transform(SQS0);
+       crb_addr_transform(RPMX7);
+       crb_addr_transform(RPMX6);
+       crb_addr_transform(RPMX5);
+       crb_addr_transform(RPMX4);
+       crb_addr_transform(RPMX3);
+       crb_addr_transform(RPMX2);
+       crb_addr_transform(RPMX1);
+       crb_addr_transform(RPMX0);
+       crb_addr_transform(ROMUSB);
+       crb_addr_transform(SN);
+       crb_addr_transform(QMN);
+       crb_addr_transform(QMS);
+       crb_addr_transform(PGNI);
+       crb_addr_transform(PGND);
+       crb_addr_transform(PGN3);
+       crb_addr_transform(PGN2);
+       crb_addr_transform(PGN1);
+       crb_addr_transform(PGN0);
+       crb_addr_transform(PGSI);
+       crb_addr_transform(PGSD);
+       crb_addr_transform(PGS3);
+       crb_addr_transform(PGS2);
+       crb_addr_transform(PGS1);
+       crb_addr_transform(PGS0);
+       crb_addr_transform(PS);
+       crb_addr_transform(PH);
+       crb_addr_transform(NIU);
+       crb_addr_transform(I2Q);
+       crb_addr_transform(EG);
+       crb_addr_transform(MN);
+       crb_addr_transform(MS);
+       crb_addr_transform(CAS2);
+       crb_addr_transform(CAS1);
+       crb_addr_transform(CAS0);
+       crb_addr_transform(CAM);
+       crb_addr_transform(C2C1);
+       crb_addr_transform(C2C0);
+}
+
+int init_firmware(struct netxen_adapter *adapter)
+{
+       u32 state = 0, loops = 0, err = 0;
+
+       /* Window 1 call */
+       read_lock(&adapter->adapter_lock);
+       state = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
+       read_unlock(&adapter->adapter_lock);
+
+       while (state != PHAN_INITIALIZE_COMPLETE && loops < 200000) {
+               udelay(100);
+               /* Window 1 call */
+               read_lock(&adapter->adapter_lock);
+               state = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
+               read_unlock(&adapter->adapter_lock);
+
+               loops++;
+       }
+       if (loops >= 200000) {
+               printk(KERN_ERR "Cmd Peg initialization not complete:%x.\n",
+                      state);
+               err = -EIO;
+               return err;
+       }
+       /* Window 1 call */
+       read_lock(&adapter->adapter_lock);
+       writel(PHAN_INITIALIZE_ACK,
+              NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
+       read_unlock(&adapter->adapter_lock);
+
+       return err;
+}
+
+void initialize_adapter_sw(struct netxen_adapter *adapter)
+{
+       int ctx, ring;
+       u32 i;
+       u32 num_rx_bufs = 0;
+       struct netxen_rcv_desc_ctx *rcv_desc;
+
+       adapter->free_cmd_count = adapter->max_tx_desc_count;
+       DPRINTK(INFO, "initializing some queues: %p\n", adapter);
+       for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
+               for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
+                       struct netxen_rx_buffer *rx_buf;
+                       rcv_desc = &adapter->recv_ctx[ctx].rcv_desc[ring];
+                       rcv_desc->rcv_free = rcv_desc->max_rx_desc_count;
+                       rcv_desc->begin_alloc = 0;
+                       rx_buf = rcv_desc->rx_buf_arr;
+                       num_rx_bufs = rcv_desc->max_rx_desc_count;
+                       /*
+                        * Now go through all of them, set reference handles
+                        * and put them in the queues.
+                        */
+                       for (i = 0; i < num_rx_bufs; i++) {
+                               rx_buf->ref_handle = i;
+                               rx_buf->state = NETXEN_BUFFER_FREE;
+
+                               DPRINTK(INFO, "Rx buf:ctx%d i(%d) rx_buf:"
+                                       "%p\n", ctx, i, rx_buf);
+                               rx_buf++;
+                       }
+               }
+       }
+       DPRINTK(INFO, "initialized buffers for %s and %s\n",
+               "adapter->free_cmd_buf_list", "adapter->free_rxbuf");
+}
+
+int initialize_adapter_hw(struct netxen_adapter *adapter)
+{
+       u32 value = 0;
+
+       if (netxen_nic_get_board_info(adapter) != 0)
+               printk("%s: Error getting board config info.\n",
+                      netxen_nic_driver_name);
+
+       switch (adapter->ahw.board_type) {
+       case NETXEN_NIC_GBE:
+               adapter->ahw.max_ports = 4;
+               break;
+
+       case NETXEN_NIC_XGBE:
+               adapter->ahw.max_ports = 1;
+               break;
+
+       default:
+               printk(KERN_ERR "%s: Unknown board type\n",
+                      netxen_nic_driver_name);
+       }
+
+       return value;
+}
+
+/*
+ * netxen_decode_crb_addr(0 - utility to translate from internal Phantom
+ * CRB address to external PCI CRB address.
+ */
+unsigned long netxen_decode_crb_addr(unsigned long addr)
+{
+       int i;
+       unsigned long base_addr, offset, pci_base;
+
+       crb_addr_transform_setup();
+
+       pci_base = NETXEN_ADDR_ERROR;
+       base_addr = addr & 0xfff00000;
+       offset = addr & 0x000fffff;
+
+       for (i = 0; i < NETXEN_MAX_CRB_XFORM; i++) {
+               if (crb_addr_xform[i] == base_addr) {
+                       pci_base = i << 20;
+                       break;
+               }
+       }
+       if (pci_base == NETXEN_ADDR_ERROR)
+               return pci_base;
+       else
+               return (pci_base + offset);
+}
+
+static long rom_max_timeout = 10000;
+static long rom_lock_timeout = 100000000;
+
+int rom_lock(struct netxen_adapter *adapter)
+{
+       int iter;
+       int done = 0, timeout = 0;
+
+       while (!done) {
+               /* acquire semaphore2 from PCI HW block */
+               netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(PCIE_SEM2_LOCK),
+                                  &done);
+               if (done == 1)
+                       break;
+               if (timeout >= rom_lock_timeout)
+                       return -1;
+
+               timeout++;
+               /*
+                * Yield CPU
+                */
+               if (!in_atomic())
+                       schedule();
+               else {
+                       for (iter = 0; iter < 20; iter++)
+                               cpu_relax();    /*This a nop instr on i386 */
+               }
+       }
+       netxen_nic_reg_write(adapter, NETXEN_ROM_LOCK_ID, ROM_LOCK_DRIVER);
+       return 0;
+}
+
+void rom_unlock(struct netxen_adapter *adapter)
+{
+       int val;
+
+       /* release semaphore2 */
+       netxen_nic_read_w0(adapter, NETXEN_PCIE_REG(PCIE_SEM2_UNLOCK), &val);
+
+}
+
+int netxen_wait_rom_done(struct netxen_adapter *adapter)
+{
+       long timeout = 0;
+       long done = 0;
+
+       while (done == 0) {
+               done = netxen_nic_reg_read(adapter, NETXEN_ROMUSB_GLB_STATUS);
+               done &= 2;
+               timeout++;
+               if (timeout >= rom_max_timeout) {
+                       printk("Timeout reached  waiting for rom done");
+                       return -1;
+               }
+       }
+       return 0;
+}
+
+int do_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp)
+{
+       netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ADDRESS, addr);
+       netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ABYTE_CNT, 3);
+       udelay(100);            /* prevent bursting on CRB */
+       netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_DUMMY_BYTE_CNT, 0);
+       netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_INSTR_OPCODE, 0xb);
+       if (netxen_wait_rom_done(adapter)) {
+               printk("Error waiting for rom done\n");
+               return -1;
+       }
+       /* reset abyte_cnt and dummy_byte_cnt */
+       netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_ABYTE_CNT, 0);
+       udelay(100);            /* prevent bursting on CRB */
+       netxen_nic_reg_write(adapter, NETXEN_ROMUSB_ROM_DUMMY_BYTE_CNT, 0);
+
+       *valp = netxen_nic_reg_read(adapter, NETXEN_ROMUSB_ROM_RDATA);
+       return 0;
+}
+
+int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp)
+{
+       int ret;
+
+       if (rom_lock(adapter) != 0)
+               return -1;
+
+       ret = do_rom_fast_read(adapter, addr, valp);
+       rom_unlock(adapter);
+       return ret;
+}
+
+int pinit_from_rom(struct netxen_adapter *adapter, int verbose)
+{
+       int addr, val, status;
+       int n, i;
+       int init_delay = 0;
+       struct crb_addr_pair *buf;
+       unsigned long off;
+       unsigned long flags;
+
+       /* resetall */
+       status = netxen_nic_get_board_info(adapter);
+       if (status)
+               printk("%s: pinit_from_rom: Error getting board info\n",
+                      netxen_nic_driver_name);
+
+       netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_GLB_SW_RESET,
+                                   0xffffffff);
+
+       if (verbose) {
+               int val;
+               if (netxen_rom_fast_read(adapter, 0x4008, &val) == 0)
+                       printk("P2 ROM board type: 0x%08x\n", val);
+               else
+                       printk("Could not read board type\n");
+               if (netxen_rom_fast_read(adapter, 0x400c, &val) == 0)
+                       printk("P2 ROM board  num: 0x%08x\n", val);
+               else
+                       printk("Could not read board number\n");
+               if (netxen_rom_fast_read(adapter, 0x4010, &val) == 0)
+                       printk("P2 ROM chip   num: 0x%08x\n", val);
+               else
+                       printk("Could not read chip number\n");
+       }
+
+       if (netxen_rom_fast_read(adapter, 0, &n) == 0 && (n & 0x800000000ULL)) {
+               n &= ~0x80000000ULL;
+               if (n < 1024) {
+                       if (verbose)
+                               printk("%s: %d CRB init values found"
+                                      " in ROM.\n", netxen_nic_driver_name, n);
+               } else {
+                       printk("%s:n=0x%x Error! NetXen card flash not"
+                              " initialized.\n", __FUNCTION__, n);
+                       return -1;
+               }
+               buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL);
+               if (buf == NULL) {
+                       printk("%s: pinit_from_rom: Unable to calloc memory.\n",
+                              netxen_nic_driver_name);
+                       return -1;
+               }
+               for (i = 0; i < n; i++) {
+                       if (netxen_rom_fast_read(adapter, 8 * i + 4, &val) != 0
+                           || netxen_rom_fast_read(adapter, 8 * i + 8,
+                                                   &addr) != 0)
+                               goto error_ret;
+
+                       buf[i].addr = addr;
+                       buf[i].data = val;
+
+                       if (verbose)
+                               printk("%s: PCI:     0x%08x == 0x%08x\n",
+                                      netxen_nic_driver_name, (unsigned int)
+                                      netxen_decode_crb_addr((unsigned long)
+                                                             addr), val);
+               }
+               for (i = 0; i < n; i++) {
+
+                       off =
+                           netxen_decode_crb_addr((unsigned long)buf[i].addr) +
+                           NETXEN_PCI_CRBSPACE;
+                       /* skipping cold reboot MAGIC */
+                       if (off == NETXEN_CAM_RAM(0x1fc))
+                               continue;
+
+                       /* After writing this register, HW needs time for CRB */
+                       /* to quiet down (else crb_window returns 0xffffffff) */
+                       if (off == NETXEN_ROMUSB_GLB_SW_RESET) {
+                               init_delay = 1;
+                               /* hold xdma in reset also */
+                               buf[i].data = 0x8000ff;
+                       }
+
+                       if (ADDR_IN_WINDOW1(off)) {
+                               read_lock(&adapter->adapter_lock);
+                               writel(buf[i].data,
+                                      NETXEN_CRB_NORMALIZE(adapter, off));
+                               read_unlock(&adapter->adapter_lock);
+                       } else {
+                               write_lock_irqsave(&adapter->adapter_lock,
+                                                  flags);
+                               netxen_nic_pci_change_crbwindow(adapter, 0);
+                               off = adapter->ahw.pci_base + off;
+                               writel(buf[i].data, (void *)off);
+                               netxen_nic_pci_change_crbwindow(adapter, 1);
+                               write_unlock_irqrestore(&adapter->adapter_lock,
+                                                       flags);
+                       }
+                       if (init_delay == 1) {
+                               msleep(1000);
+                               init_delay = 0;
+                       }
+                       msleep(1);
+               }
+               kfree(buf);
+
+               /* disable_peg_cache_all */
+
+               /* unreset_net_cache */
+               netxen_nic_hw_read_wx(adapter, NETXEN_ROMUSB_GLB_SW_RESET, &val,
+                                     4);
+               netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_GLB_SW_RESET,
+                                           (val & 0xffffff0f));
+               /* p2dn replyCount */
+               netxen_crb_writelit_adapter(adapter,
+                                           NETXEN_CRB_PEG_NET_D + 0xec, 0x1e);
+               /* disable_peg_cache 0 */
+               netxen_crb_writelit_adapter(adapter,
+                                           NETXEN_CRB_PEG_NET_D + 0x4c, 8);
+               /* disable_peg_cache 1 */
+               netxen_crb_writelit_adapter(adapter,
+                                           NETXEN_CRB_PEG_NET_I + 0x4c, 8);
+
+               /* peg_clr_all */
+
+               /* peg_clr 0 */
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_0 + 0x8,
+                                           0);
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_0 + 0xc,
+                                           0);
+               /* peg_clr 1 */
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_1 + 0x8,
+                                           0);
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_1 + 0xc,
+                                           0);
+               /* peg_clr 2 */
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_2 + 0x8,
+                                           0);
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_2 + 0xc,
+                                           0);
+               /* peg_clr 3 */
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_3 + 0x8,
+                                           0);
+               netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_3 + 0xc,
+                                           0);
+       }
+       return 0;
+      error_ret:
+       return -1;
+}
+
+void phantom_init(struct netxen_adapter *adapter)
+{
+       u32 val = 0;
+       int loops = 0;
+
+       read_lock(&adapter->adapter_lock);
+       netxen_nic_hw_read_wx(adapter, NETXEN_ROMUSB_GLB_PEGTUNE_DONE, &val, 4);
+       writel(1,
+              NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
+
+       if (0 == val) {
+               while (val != PHAN_INITIALIZE_COMPLETE && loops < 2000000) {
+                       udelay(100);
+                       val =
+                           readl(NETXEN_CRB_NORMALIZE
+                                 (adapter, CRB_CMDPEG_STATE));
+                       loops++;
+               }
+               if (val != PHAN_INITIALIZE_COMPLETE)
+                       printk("WARNING: Initial boot wait loop failed...\n");
+       }
+       read_unlock(&adapter->adapter_lock);
+}
+
+void load_firmware(struct netxen_adapter *adapter)
+{
+       int i;
+       long data, size = 0;
+       long flashaddr = NETXEN_FLASH_BASE, memaddr = NETXEN_PHANTOM_MEM_BASE;
+
+       size = (16 * 1024) / 4;
+       read_lock(&adapter->adapter_lock);
+       writel(1, NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CAS_RST));
+       read_unlock(&adapter->adapter_lock);
+
+       for (i = 0; i < size; i++) {
+               if (netxen_rom_fast_read(adapter, flashaddr, (int *)&data) != 
0) {
+                       DPRINTK(ERR,
+                               "Error in netxen_rom_fast_read(). Will skip"
+                               "loading flash image\n");
+                       return;
+               }
+               netxen_nic_pci_mem_write(adapter, memaddr, &data, 4);
+               flashaddr += 4;
+               memaddr += 4;
+       }
+       udelay(100);
+       read_lock(&adapter->adapter_lock);
+       /* make sure Casper is powered on */
+       writel(0x3fff,
+              NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CHIP_CLK_CTRL));
+       writel(0, NETXEN_CRB_NORMALIZE(adapter, NETXEN_ROMUSB_GLB_CAS_RST));
+       read_unlock(&adapter->adapter_lock);
+
+       udelay(10000);
+}
+
+int netxen_nic_rx_has_work(struct netxen_adapter *adapter)
+{
+       int ctx;
+
+       for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
+               struct netxen_recv_context *recv_ctx =
+                   &(adapter->recv_ctx[ctx]);
+               u32 consumer;
+               struct status_desc_t *desc_head;
+               struct status_desc_t *desc;     /* used to read status desc 
here */
+
+               consumer = recv_ctx->status_rx_consumer;
+               desc_head = recv_ctx->rcv_status_desc_head;
+               desc = &desc_head[consumer];
+
+               if ((desc->owner & STATUS_OWNER_HOST))
+                       return 1;
+       }
+
+       return 0;
+}
+
+void netxen_watchdog_task(unsigned long v)
+{
+       int port_num;
+       struct netxen_port *port;
+       struct net_device *netdev;
+       struct netxen_adapter *adapter = (struct netxen_adapter *)v;
+       unsigned long flags;
+
+       if (adapter->driver_mismatch) {
+               /* We return without turning on the netdev queue as there
+                * was a mismatch in driver and firmware version
+                */
+               return;
+       }
+       for (port_num = 0; port_num < adapter->ahw.max_ports; port_num++) {
+               port = adapter->port[port_num];
+               netdev = port->netdev;
+
+               if ((netdev->flags & IFF_UP) && !netif_carrier_ok(netdev)) {
+                       printk(KERN_INFO "%s port %d, %s carrier is now ok\n",
+                              netxen_nic_driver_name, port_num, netdev->name);
+                       netif_carrier_on(netdev);
+               }
+
+               if (netif_queue_stopped(netdev))
+                       netif_wake_queue(netdev);
+       }
+
+       write_lock_irqsave(&adapter->adapter_lock, flags);
+       netxen_nic_pci_change_crbwindow(adapter, 1);
+       write_unlock_irqrestore(&adapter->adapter_lock, flags);
+
+       netxen_nic_handle_phy_intr(adapter);
+       mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+}
+
+/*
+ * netxen_process_rcv() send the received packet to the protocol stack.
+ * and if the number of receives exceeds RX_BUFFERS_REFILL, then we
+ * invoke the routine to send more rx buffers to the Phantom...
+ */
+inline void
+netxen_process_rcv(struct netxen_adapter *adapter, int ctx,
+                  struct status_desc_t *desc)
+{
+       struct netxen_port *port = adapter->port[desc->port];
+       struct pci_dev *pdev = port->pdev;
+       struct net_device *netdev = port->netdev;
+       int index = desc->reference_handle;
+       struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);
+       struct netxen_rx_buffer *buffer;
+       struct sk_buff *skb;
+       u32 length = desc->total_length;
+       u32 desc_ctx;
+       struct netxen_rcv_desc_ctx *rcv_desc;
+       int ret;
+
+       desc_ctx = desc->type;
+       if (unlikely(desc_ctx >= NUM_RCV_DESC_RINGS)) {
+               printk("%s: %s Bad Rcv descriptor ring\n",
+                      netxen_nic_driver_name, netdev->name);
+               return;
+       }
+
+       rcv_desc = &recv_ctx->rcv_desc[desc_ctx];
+       buffer = &rcv_desc->rx_buf_arr[index];
+
+       pci_unmap_single(pdev, buffer->dma, rcv_desc->dma_size,
+                        PCI_DMA_FROMDEVICE);
+
+       skb = (struct sk_buff *)buffer->skb;
+
+       if (unlikely(skb == NULL)) {
+               /*
+                * This should not happen and if it does, it is serious,
+                * catch it
+                */
+               u32 temp1, temp2;
+               /* Window = 0 or 1 */
+               read_lock(&adapter->adapter_lock);
+               temp1 = readl((void *)(adapter->ahw.pci_base
+                                      + (NETXEN_CRB_PCIE + 0x20000)));
+               temp2 = readl((void *)(adapter->ahw.pci_base
+                                      + (NETXEN_CRB_PCIE + 0x20008)));
+
+               read_unlock(&adapter->adapter_lock);
+
+               /* Window = 0 */
+               netxen_nic_write_w0(adapter, NETXEN_CRB_PEG_NET_0 + 0x3c, 1);
+               netxen_nic_write_w0(adapter, NETXEN_CRB_PEG_NET_1 + 0x3c, 1);
+               netxen_nic_write_w0(adapter, NETXEN_CRB_PEG_NET_2 + 0x3c, 1);
+               netxen_nic_write_w0(adapter, NETXEN_CRB_PEG_NET_3 + 0x3c, 1);
+               netxen_nic_write_w0(adapter, NETXEN_CRB_NIU + 0x70000, 0);
+
+               printk("%s: %s Halted the pegs and stopped the NIU consumer\n",
+                      netxen_nic_driver_name, netdev->name);
+               printk("Curr DMA Addr: 0x%x, status:0x%x\n", temp1, temp2);
+               printk("got NULL skb for index %d  desc %p\n", index, desc);
+               printk("prev desc %p: refh:%x\n", desc - 1,
+                      (desc - 1)->reference_handle);
+               printk("next desc %p: refh:%x\n", desc + 1,
+                      (desc + 1)->reference_handle);
+               printk("next desc %p: refh:%x\n", desc + 2,
+                      (desc + 2)->reference_handle);
+               printk("and mine again %p: refh:%x\n", desc,
+                      (desc)->reference_handle);
+
+               port->stats.rcvdbadskb++;
+               return;
+       }
+
+       if (likely(desc->status == STATUS_CKSUM_OK)) {
+               port->stats.csummed++;
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
+       } else
+               skb->ip_summed = CHECKSUM_NONE;
+       skb->dev = netdev;
+       skb_put(skb, length);
+       skb->protocol = eth_type_trans(skb, netdev);
+
+       ret = netif_receive_skb(skb);
+
+       /*
+        * RH: Do we need these stats on a regular basis. Can we get it from
+        * Linux stats.
+        */
+       switch (ret) {
+       case NET_RX_SUCCESS:
+               port->stats.uphappy++;
+               break;
+
+       case NET_RX_CN_LOW:
+               port->stats.uplcong++;
+               break;
+
+       case NET_RX_CN_MOD:
+               port->stats.upmcong++;
+               break;
+
+       case NET_RX_CN_HIGH:
+               port->stats.uphcong++;
+               break;
+
+       case NET_RX_DROP:
+               port->stats.updropped++;
+               break;
+
+       default:
+               port->stats.updunno++;
+               break;
+       }
+
+       netdev->last_rx = jiffies;
+
+       rcv_desc->rcv_free++;
+       rcv_desc->rcv_pending--;
+
+       /*
+        * We just consumed one buffer so post a buffer.
+        */
+       adapter->stats.post_called++;
+       buffer->skb = NULL;
+       buffer->state = NETXEN_BUFFER_FREE;
+
+       port->stats.no_rcv++;
+       port->stats.rxbytes += length;
+}
+
+/* Process Receive status ring */
+u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max)
+{
+       struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);
+       struct status_desc_t *desc_head = recv_ctx->rcv_status_desc_head;
+       struct status_desc_t *desc;     /* used to read status desc here */
+       u32 producer = 0;       /* will be read from phantom */
+       u32 consumer = recv_ctx->status_rx_consumer;
+       int count = 0, ring;
+       struct netxen_rcv_desc_ctx *rcv_desc;
+
+       DPRINTK(INFO, "procesing receive\n");
+       /*
+        * we assume in this case that there is only one port and that is
+        * port #1...changes need to be done in firmware to indicate port
+        * number as part of the descriptor. This way we will be able to get
+        * the netdev which is associated with that device.
+        */
+       while (count < max) {
+               desc = &desc_head[consumer];
+               if (!(desc->owner & STATUS_OWNER_HOST)) {
+                       DPRINTK(ERR, "desc %p ownedby %x\n", desc, desc->owner);
+                       break;
+               }
+               netxen_process_rcv(adapter, ctx, desc);
+               consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
+               count++;
+       }
+       if (count) {
+               for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
+                       rcv_desc = &adapter->recv_ctx[ctx].rcv_desc[ring];
+                       netxen_post_rx_buffers(adapter, ctx, ring);
+               }
+       }
+
+       /* update the consumer index in phantom */
+       if (count) {
+               adapter->stats.process_rcv++;
+               recv_ctx->status_rx_consumer = consumer;
+               recv_ctx->status_rx_producer = producer;
+
+               /* Window = 1 */
+               read_lock(&adapter->adapter_lock);
+               writel(consumer,
+                      NETXEN_CRB_NORMALIZE(adapter,
+                                           recv_crb_registers[ctx].
+                                           crb_rcv_status_consumer));
+               read_unlock(&adapter->adapter_lock);
+       }
+
+       return count;
+}
+
+/* Process Command status ring */
+void netxen_process_cmd_ring(unsigned long data)
+{
+       u32 last_consumer;
+       u32 consumer;
+       struct netxen_adapter *adapter = (struct netxen_adapter *)data;
+       int count = 0;
+       struct netxen_cmd_buffer *buffer;
+       struct netxen_port *port;       /* port #1 */
+       struct netxen_port *nport;
+       struct pci_dev *pdev;
+       struct netxen_skb_frag *frag;
+       u32 i;
+       struct sk_buff *skb = NULL;
+       int p;
+
+       spin_lock(&adapter->tx_lock);
+       last_consumer = adapter->last_cmd_consumer;
+       DPRINTK(INFO, "procesing xmit complete\n");
+       /* we assume in this case that there is only one port and that is
+        * port #1...changes need to be done in firmware to indicate port
+        * number as part of the descriptor. This way we will be able to get
+        * the netdev which is associated with that device.
+        */
+       /* Window = 1 */
+       read_lock(&adapter->adapter_lock);
+       consumer =
+           readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMD_CONSUMER_OFFSET));
+       read_unlock(&adapter->adapter_lock);
+
+       if (last_consumer == consumer) {        /* Ring is empty    */
+               DPRINTK(INFO, "last_consumer %d == consumer %d\n",
+                       last_consumer, consumer);
+               spin_unlock(&adapter->tx_lock);
+               return;
+       }
+
+       adapter->proc_cmd_buf_counter++;
+       adapter->stats.process_xmit++;
+       /*
+        * Not needed - does not seem to be used anywhere.
+        * adapter->cmd_consumer = consumer;
+        */
+       spin_unlock(&adapter->tx_lock);
+
+       while ((last_consumer != consumer) && (count < MAX_STATUS_HANDLE)) {
+               buffer = &adapter->cmd_buf_arr[last_consumer];
+               port = adapter->port[buffer->port];
+               pdev = port->pdev;
+               frag = &buffer->frag_array[0];
+               skb = buffer->skb;
+               if (skb && (cmpxchg(&buffer->skb, skb, 0) == skb)) {
+                       pci_unmap_single(pdev, frag->dma, frag->length,
+                                        PCI_DMA_TODEVICE);
+                       for (i = 1; i < buffer->frag_count; i++) {
+                               DPRINTK(INFO, "getting fragment no %d\n", i);
+                               frag++; /* Get the next frag */
+                               pci_unmap_page(pdev, frag->dma, frag->length,
+                                              PCI_DMA_TODEVICE);
+                       }
+
+                       port->stats.skbfreed++;
+                       dev_kfree_skb_any(skb);
+                       skb = NULL;
+               } else if (adapter->proc_cmd_buf_counter == 1) {
+                       port->stats.txnullskb++;
+               }
+               if (unlikely(netif_queue_stopped(port->netdev)
+                            && netif_carrier_ok(port->netdev))
+                   && ((jiffies - port->netdev->trans_start) >
+                       port->netdev->watchdog_timeo)) {
+                       schedule_work(port->adapter->tx_timeout_task +
+                                     port->portnum);
+               }
+
+               last_consumer = get_next_index(last_consumer,
+                                              adapter->max_tx_desc_count);
+               count++;
+       }
+       adapter->stats.noxmitdone += count;
+
+       count = 0;
+       spin_lock(&adapter->tx_lock);
+       if ((--adapter->proc_cmd_buf_counter) == 0) {
+               adapter->last_cmd_consumer = last_consumer;
+               while ((adapter->last_cmd_consumer != consumer)
+                      && (count < MAX_STATUS_HANDLE)) {
+                       buffer =
+                           &adapter->cmd_buf_arr[adapter->last_cmd_consumer];
+                       count++;
+                       if (buffer->skb)
+                               break;
+                       else
+                               adapter->last_cmd_consumer =
+                                   get_next_index(adapter->last_cmd_consumer,
+                                                  adapter->max_tx_desc_count);
+               }
+       }
+       if (count) {
+               for (p = 0; p < adapter->ahw.max_ports; p++) {
+                       nport = adapter->port[p];
+                       if (netif_queue_stopped(nport->netdev)
+                           && (nport->state == NETXEN_PORT_UP)
+                           && (nport->flags & NETXEN_NETDEV_STATUS)) {
+                               netif_wake_queue(nport->netdev);
+                               nport->flags &= ~NETXEN_NETDEV_STATUS;
+                       }
+               }
+       }
+
+       spin_unlock(&adapter->tx_lock);
+       DPRINTK(INFO, "last consumer is %d in %s\n", last_consumer,
+               __FUNCTION__);
+}
+
+/**
+ * netxen_post_rx_buffers puts buffer in the Phantom memory
+ **/
+void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 
ringid)
+{
+       struct pci_dev *pdev = adapter->ahw.pdev;
+       struct sk_buff *skb;
+       struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);
+       struct netxen_rcv_desc_ctx *rcv_desc = NULL;
+       struct netxen_recv_crb *crbarea = &recv_crb_registers[ctx];
+       struct netxen_rcv_desc_crb *rcv_desc_crb = NULL;
+       u32 producer;
+       struct rcv_desc_t *pdesc;
+       struct netxen_rx_buffer *buffer;
+       int count = 0;
+       int index = 0;
+
+       adapter->stats.post_called++;
+       rcv_desc = &recv_ctx->rcv_desc[ringid];
+       rcv_desc_crb = &crbarea->rcv_desc_crb[ringid];
+
+       producer = rcv_desc->producer;
+       index = rcv_desc->begin_alloc;
+       buffer = &rcv_desc->rx_buf_arr[index];
+       /* We can start writing rx descriptors into the phantom memory. */
+       while (buffer->state == NETXEN_BUFFER_FREE) {
+               skb = dev_alloc_skb(rcv_desc->skb_size);
+               if (unlikely(!skb)) {
+                       /*
+                        * We need to schedule the posting of buffers to the 
pegs.
+                        */
+                       rcv_desc->begin_alloc = index;
+                       DPRINTK(ERR, "unm_post_rx_buffers: "
+                               " allocated only %d buffers\n", count);
+                       break;
+               }
+               count++;        /* now there should be no failure */
+               pdesc = &rcv_desc->desc_head[producer];
+               skb_reserve(skb, IP_ALIGNMENT_BYTES);
+               /* 
+                * This will be setup when we receive the
+                * buffer after it has been filled
+                * skb->dev = netdev;
+                */
+               buffer->skb = skb;
+               buffer->state = NETXEN_BUFFER_BUSY;
+               buffer->dma = pci_map_single(pdev, skb->data,
+                                            rcv_desc->dma_size,
+                                            PCI_DMA_FROMDEVICE);
+               /* make a rcv descriptor  */
+               pdesc->reference_handle = buffer->ref_handle;
+               pdesc->buffer_length = rcv_desc->dma_size;
+               pdesc->addr_buffer = buffer->dma;
+               DPRINTK(INFO, "done writing descripter\n");
+               producer =
+                   get_next_index(producer, rcv_desc->max_rx_desc_count);
+               index = get_next_index(index, rcv_desc->max_rx_desc_count);
+               buffer = &rcv_desc->rx_buf_arr[index];
+       }
+       rcv_desc->begin_alloc = index;
+
+       /* if we did allocate buffers, then write the count to Phantom */
+       if (count) {
+               rcv_desc->begin_alloc = index;
+               rcv_desc->rcv_pending += count;
+               adapter->stats.lastposted = count;
+               adapter->stats.posted += count;
+               rcv_desc->producer = producer;
+               if (rcv_desc->rcv_free >= 32) {
+                       rcv_desc->rcv_free = 0;
+                       /* Window = 1 */
+                       read_lock(&adapter->adapter_lock);
+                       writel((producer - 1) &
+                              (rcv_desc->max_rx_desc_count - 1),
+                              NETXEN_CRB_NORMALIZE(adapter,
+                                                   rcv_desc_crb->
+                                                   crb_rcv_producer_offset));
+                       read_unlock(&adapter->adapter_lock);
+
+               }
+       }
+}
+
+int netxen_nic_tx_has_work(struct netxen_adapter *adapter)
+{
+       if (find_diff_among(adapter->last_cmd_consumer,
+                           adapter->cmd_producer,
+                           adapter->max_tx_desc_count) > 0)
+               return 1;
+
+       return 0;
+}
+
+int
+netxen_nic_fill_statistics(struct netxen_adapter *adapter,
+                          struct netxen_port *port,
+                          struct netxen_statistics *netxen_stats)
+{
+       unsigned long flags;
+       void *addr;
+
+       if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
+               write_lock_irqsave(&adapter->adapter_lock, flags);
+               netxen_nic_pci_change_crbwindow(adapter, 0);
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_TX_BYTE_CNT,
+                                          &(netxen_stats->tx_bytes));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_TX_FRAME_CNT,
+                                          &(netxen_stats->tx_packets));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_RX_BYTE_CNT,
+                                          &(netxen_stats->rx_bytes));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_RX_FRAME_CNT,
+                                          &(netxen_stats->rx_packets));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_AGGR_ERROR_CNT,
+                                          &(netxen_stats->rx_errors));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_CRC_ERROR_CNT,
+                                          &(netxen_stats->rx_crc_errors));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_OVERSIZE_FRAME_ERR,
+                                          &(netxen_stats->
+                                            rx_long_length_error));
+               NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_XGE_UNDERSIZE_FRAME_ERR,
+                                          &(netxen_stats->
+                                            rx_short_length_error));
+
+               netxen_nic_pci_change_crbwindow(adapter, 1);
+               write_unlock_irqrestore(&adapter->adapter_lock, flags);
+       } else {
+               spin_lock_bh(&adapter->tx_lock);
+               netxen_stats->tx_bytes = port->stats.txbytes;
+               netxen_stats->tx_packets = port->stats.xmitedframes +
+                   port->stats.xmitfinished;
+               netxen_stats->rx_bytes = port->stats.rxbytes;
+               netxen_stats->rx_packets = port->stats.no_rcv;
+               netxen_stats->rx_errors = port->stats.rcvdbadskb;
+               netxen_stats->tx_errors = port->stats.nocmddescriptor;
+               netxen_stats->rx_short_length_error = port->stats.uplcong;
+               netxen_stats->rx_long_length_error = port->stats.uphcong;
+               netxen_stats->rx_crc_errors = 0;
+               netxen_stats->rx_mac_errors = 0;
+               spin_unlock_bh(&adapter->tx_lock);
+       }
+       return 0;
+}
+
+void netxen_nic_clear_stats(struct netxen_adapter *adapter)
+{
+       struct netxen_port *port;
+       int port_num;
+
+       memset(&adapter->stats, 0, sizeof(adapter->stats));
+       for (port_num = 0; port_num < adapter->ahw.max_ports; port_num++) {
+               port = adapter->port[port_num];
+               memset(&port->stats, 0, sizeof(port->stats));
+       }
+}
+
+int
+netxen_nic_clear_statistics(struct netxen_adapter *adapter,
+                           struct netxen_port *port)
+{
+       unsigned long flags;
+       void *addr;
+       int data = 0;
+
+       write_lock_irqsave(&adapter->adapter_lock, flags);
+       netxen_nic_pci_change_crbwindow(adapter, 0);
+
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_TX_BYTE_CNT, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_TX_FRAME_CNT, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_RX_BYTE_CNT, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_RX_FRAME_CNT, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_AGGR_ERROR_CNT, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_CRC_ERROR_CNT, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_OVERSIZE_FRAME_ERR, &data);
+       NETXEN_NIC_LOCKED_WRITE_REG(NETXEN_NIU_XGE_UNDERSIZE_FRAME_ERR, &data);
+
+       netxen_nic_pci_change_crbwindow(adapter, 1);
+       write_unlock_irqrestore(&adapter->adapter_lock, flags);
+       netxen_nic_clear_stats(adapter);
+       return 0;
+}
+
+int
+netxen_nic_do_ioctl(struct netxen_adapter *adapter, void *u_data,
+                   struct netxen_port *port)
+{
+       struct netxen_nic_ioctl_data data;
+       struct netxen_nic_ioctl_data *up_data;
+       int retval = 0;
+       struct netxen_statistics netxen_stats;
+
+       up_data = (void *)u_data;
+
+       DPRINTK(INFO, "doing ioctl for %p\n", adapter);
+       if (copy_from_user(&data, up_data, sizeof(data))) {
+               /* evil user tried to crash the kernel */
+               DPRINTK(ERR, "bad copy from userland: %d\n", (int)sizeof(data));
+               retval = -EFAULT;
+               goto error_out;
+       }
+
+       /* Shouldn't access beyond legal limits of  "char u[64];" member */
+       if (!data.ptr && (data.size > sizeof(data.u))) {
+               /* evil user tried to crash the kernel */
+               DPRINTK(ERR, "bad size: %d\n", data.size);
+               retval = -EFAULT;
+               goto error_out;
+       }
+
+       switch (data.cmd) {
+       case netxen_nic_cmd_pci_read:
+               if ((retval = netxen_nic_hw_read_wx(adapter, data.off,
+                                                   &(data.u), data.size)))
+                       goto error_out;
+               if (copy_to_user((void *)&(up_data->u), &(data.u), data.size)) {
+                       DPRINTK(ERR, "bad copy to userland: %d\n",
+                               (int)sizeof(data));
+                       retval = -EFAULT;
+                       goto error_out;
+               }
+               data.rv = 0;
+               break;
+
+       case netxen_nic_cmd_pci_write:
+               data.rv = netxen_nic_hw_write_wx(adapter, data.off, &(data.u),
+                                                data.size);
+               break;
+
+       case netxen_nic_cmd_pci_mem_read:
+               DPRINTK(INFO, "doing %s for %p\n",
+                       "netxen_nic_cmd_pci_mm_rd", adapter);
+               netxen_nic_pci_mem_read(adapter, data.off, &(data.u),
+                                       data.size);
+               if (copy_to_user((void *)&(up_data->u), &(data.u), data.size)) {
+                       DPRINTK(ERR, "bad copy to userland: %d\n",
+                               (int)sizeof(data));
+                       retval = -EFAULT;
+                       goto error_out;
+               }
+               data.rv = 0;
+               DPRINTK(INFO, "read %lx\n", (unsigned long)data.u);
+               break;
+
+       case netxen_nic_cmd_pci_mem_write:
+               netxen_nic_pci_mem_write(adapter, data.off, &(data.u),
+                                        data.size);
+               data.rv = 0;    /* write always succeeds */
+               break;
+
+       case netxen_nic_cmd_pci_config_read:
+               switch (data.size) {
+               case 1:
+                       data.rv = pci_read_config_byte(adapter->ahw.pdev,
+                                                      data.off,
+                                                      (char *)&(data.u));
+                       break;
+               case 2:
+                       data.rv = pci_read_config_word(adapter->ahw.pdev,
+                                                      data.off,
+                                                      (short *)&(data.u));
+                       break;
+               case 4:
+                       data.rv = pci_read_config_dword(adapter->ahw.pdev,
+                                                       data.off,
+                                                       (u32 *) & (data.u));
+                       break;
+               }
+               if (copy_to_user((void *)&(up_data->u), &(data.u), data.size)) {
+                       DPRINTK(ERR, "bad copy to userland: %d\n",
+                               (int)sizeof(data));
+                       retval = -EFAULT;
+                       goto error_out;
+               }
+               break;
+
+       case netxen_nic_cmd_pci_config_write:
+               switch (data.size) {
+               case 1:
+                       data.rv = pci_write_config_byte(adapter->ahw.pdev,
+                                                       data.off,
+                                                       *(char *)&(data.u));
+                       break;
+               case 2:
+                       data.rv = pci_write_config_word(adapter->ahw.pdev,
+                                                       data.off,
+                                                       *(short *)&(data.u));
+                       break;
+               case 4:
+                       data.rv = pci_write_config_dword(adapter->ahw.pdev,
+                                                        data.off,
+                                                        *(u32 *) & (data.u));
+                       break;
+               }
+               break;
+
+       case netxen_nic_cmd_get_stats:
+               data.rv =
+                   netxen_nic_fill_statistics(adapter, port, &netxen_stats);
+               if (copy_to_user
+                   ((void *)(up_data->ptr), (void *)&netxen_stats,
+                    sizeof(struct netxen_statistics))) {
+                       DPRINTK(ERR, "bad copy to userland: %d\n",
+                               (int)sizeof(netxen_stats));
+                       retval = -EFAULT;
+                       goto error_out;
+               }
+               up_data->rv = data.rv;
+               break;
+
+       case netxen_nic_cmd_clear_stats:
+               data.rv = netxen_nic_clear_statistics(adapter, port);
+               up_data->rv = data.rv;
+               break;
+
+       case netxen_nic_cmd_get_version:
+               if (copy_to_user
+                   ((void *)&(up_data->u), NETXEN_NIC_LINUX_VERSIONID,
+                    sizeof(NETXEN_NIC_LINUX_VERSIONID))) {
+                       DPRINTK(ERR, "bad copy to userland: %d\n",
+                               (int)sizeof(data));
+                       retval = -EFAULT;
+                       goto error_out;
+               }
+               break;
+
+       default:
+               DPRINTK(INFO, "bad command %d for %p\n", data.cmd, adapter);
+               retval = -EOPNOTSUPP;
+               goto error_out;
+       }
+       put_user(data.rv, &(up_data->rv));
+       DPRINTK(INFO, "done ioctl for %p well.\n", adapter);
+
+      error_out:
+       return retval;
+}

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to