ath5k: define ath_common ops
[safe/jmp/linux-2.6] / drivers / net / netxen / netxen_nic_hw.c
index f5db48b..3231400 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2003 - 2006 NetXen, Inc.
+ * Copyright (C) 2003 - 2009 NetXen, Inc.
+ * Copyright (C) 2009 - QLogic Corporation.
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * The full GNU General Public License is included in this distribution
  * in the file called LICENSE.
  *
- * Contact Information:
- *    info@netxen.com
- * NetXen,
- * 3965 Freedom Circle, Fourth floor,
- * Santa Clara, CA 95054
- *
- *
- * Source file for NIC routines to access the Phantom hardware
- *
  */
 
 #include "netxen_nic.h"
 #include "netxen_nic_hw.h"
-#include "netxen_nic_phan_reg.h"
-
 
 #include <net/ip.h>
 
 #define CRB_HI(off)    ((crb_hub_agt[CRB_BLK(off)] << 20) | ((off) & 0xf0000))
 #define CRB_INDIRECT_2M        (0x1e0000UL)
 
-#define CRB_WIN_LOCK_TIMEOUT 100000000
-static crb_128M_2M_block_map_t crb_128M_2M_map[64] = {
+#ifndef readq
+static inline u64 readq(void __iomem *addr)
+{
+       return readl(addr) | (((u64) readl(addr + 4)) << 32LL);
+}
+#endif
+
+#ifndef writeq
+static inline void writeq(u64 val, void __iomem *addr)
+{
+       writel(((u32) (val)), (addr));
+       writel(((u32) (val >> 32)), (addr + 4));
+}
+#endif
+
+#define ADDR_IN_RANGE(addr, low, high) \
+       (((addr) < (high)) && ((addr) >= (low)))
+
+#define PCI_OFFSET_FIRST_RANGE(adapter, off)    \
+       ((adapter)->ahw.pci_base0 + (off))
+#define PCI_OFFSET_SECOND_RANGE(adapter, off)   \
+       ((adapter)->ahw.pci_base1 + (off) - SECOND_PAGE_GROUP_START)
+#define PCI_OFFSET_THIRD_RANGE(adapter, off)    \
+       ((adapter)->ahw.pci_base2 + (off) - THIRD_PAGE_GROUP_START)
+
+static void __iomem *pci_base_offset(struct netxen_adapter *adapter,
+                                           unsigned long off)
+{
+       if (ADDR_IN_RANGE(off, FIRST_PAGE_GROUP_START, FIRST_PAGE_GROUP_END))
+               return PCI_OFFSET_FIRST_RANGE(adapter, off);
+
+       if (ADDR_IN_RANGE(off, SECOND_PAGE_GROUP_START, SECOND_PAGE_GROUP_END))
+               return PCI_OFFSET_SECOND_RANGE(adapter, off);
+
+       if (ADDR_IN_RANGE(off, THIRD_PAGE_GROUP_START, THIRD_PAGE_GROUP_END))
+               return PCI_OFFSET_THIRD_RANGE(adapter, off);
+
+       return NULL;
+}
+
+static crb_128M_2M_block_map_t
+crb_128M_2M_map[64] __cacheline_aligned_in_smp = {
     {{{0, 0,         0,         0} } },                /* 0: PCI */
     {{{1, 0x0100000, 0x0102000, 0x120000},     /* 1: PCIE */
          {1, 0x0110000, 0x0120000, 0x130000},
@@ -282,36 +312,63 @@ static unsigned crb_hub_agt[64] =
 
 /*  PCI Windowing for DDR regions.  */
 
-#define ADDR_IN_RANGE(addr, low, high) \
-       (((addr) <= (high)) && ((addr) >= (low)))
-
 #define NETXEN_WINDOW_ONE      0x2000000 /*CRB Window: bit 25 of CRB address */
 
-#define NETXEN_NIC_ZERO_PAUSE_ADDR     0ULL
-#define NETXEN_NIC_UNIT_PAUSE_ADDR     0x200ULL
-#define NETXEN_NIC_EPG_PAUSE_ADDR1     0x2200010000c28001ULL
-#define NETXEN_NIC_EPG_PAUSE_ADDR2     0x0100088866554433ULL
+#define NETXEN_PCIE_SEM_TIMEOUT        10000
+
+int
+netxen_pcie_sem_lock(struct netxen_adapter *adapter, int sem, u32 id_reg)
+{
+       int done = 0, timeout = 0;
+
+       while (!done) {
+               done = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_LOCK(sem)));
+               if (done == 1)
+                       break;
+               if (++timeout >= NETXEN_PCIE_SEM_TIMEOUT)
+                       return -1;
+               msleep(1);
+       }
+
+       if (id_reg)
+               NXWR32(adapter, id_reg, adapter->portnum);
 
-#define NETXEN_NIC_WINDOW_MARGIN 0x100000
+       return 0;
+}
 
-int netxen_nic_set_mac(struct net_device *netdev, void *p)
+void
+netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem)
 {
-       struct netxen_adapter *adapter = netdev_priv(netdev);
-       struct sockaddr *addr = p;
+       int val;
+       val = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));
+}
 
-       if (netif_running(netdev))
-               return -EBUSY;
+int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
+{
+       if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+               NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_1+(0x10000*port), 0x1447);
+               NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_0+(0x10000*port), 0x5);
+       }
 
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
+       return 0;
+}
 
-       memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+/* Disable an XG interface */
+int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
+{
+       __u32 mac_cfg;
+       u32 port = adapter->physical_port;
 
-       /* For P3, MAC addr is not set in NIU */
-       if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
-               if (adapter->macaddr_set)
-                       adapter->macaddr_set(adapter, addr->sa_data);
+       if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+               return 0;
+
+       if (port > NETXEN_NIU_MAX_XG_PORTS)
+               return -EINVAL;
 
+       mac_cfg = 0;
+       if (NXWR32(adapter,
+                       NETXEN_NIU_XGE_CONFIG_0 + (0x10000 * port), mac_cfg))
+               return -EIO;
        return 0;
 }
 
@@ -324,6 +381,56 @@ int netxen_nic_set_mac(struct net_device *netdev, void *p)
 #define MAC_LO(addr) \
        ((addr[5] << 16) | (addr[4] << 8) | (addr[3]))
 
+int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
+{
+       __u32 reg;
+       u32 port = adapter->physical_port;
+
+       if (port > NETXEN_NIU_MAX_XG_PORTS)
+               return -EINVAL;
+
+       reg = NXRD32(adapter, NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port));
+       if (mode == NETXEN_NIU_PROMISC_MODE)
+               reg = (reg | 0x2000UL);
+       else
+               reg = (reg & ~0x2000UL);
+
+       if (mode == NETXEN_NIU_ALLMULTI_MODE)
+               reg = (reg | 0x1000UL);
+       else
+               reg = (reg & ~0x1000UL);
+
+       NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_1 + (0x10000 * port), reg);
+
+       return 0;
+}
+
+int netxen_p2_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)
+{
+       u32 mac_hi, mac_lo;
+       u32 reg_hi, reg_lo;
+
+       u8 phy = adapter->physical_port;
+
+       if (phy >= NETXEN_NIU_MAX_XG_PORTS)
+               return -EINVAL;
+
+       mac_lo = ((u32)addr[0] << 16) | ((u32)addr[1] << 24);
+       mac_hi = addr[2] | ((u32)addr[3] << 8) |
+               ((u32)addr[4] << 16) | ((u32)addr[5] << 24);
+
+       reg_lo = NETXEN_NIU_XGE_STATION_ADDR_0_1 + (0x10000 * phy);
+       reg_hi = NETXEN_NIU_XGE_STATION_ADDR_0_HI + (0x10000 * phy);
+
+       /* write twice to flush */
+       if (NXWR32(adapter, reg_lo, mac_lo) || NXWR32(adapter, reg_hi, mac_hi))
+               return -EIO;
+       if (NXWR32(adapter, reg_lo, mac_lo) || NXWR32(adapter, reg_hi, mac_hi))
+               return -EIO;
+
+       return 0;
+}
+
 static int
 netxen_nic_enable_mcast_filter(struct netxen_adapter *adapter)
 {
@@ -334,22 +441,20 @@ netxen_nic_enable_mcast_filter(struct netxen_adapter *adapter)
        if (adapter->mc_enabled)
                return 0;
 
-       adapter->hw_read_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG, &val, 4);
+       val = NXRD32(adapter, NETXEN_MAC_ADDR_CNTL_REG);
        val |= (1UL << (28+port));
-       adapter->hw_write_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG, &val, 4);
+       NXWR32(adapter, NETXEN_MAC_ADDR_CNTL_REG, val);
 
        /* add broadcast addr to filter */
        val = 0xffffff;
-       netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
-       netxen_crb_writelit_adapter(adapter,
-                       NETXEN_UNICAST_ADDR(port, 0)+4, val);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0)+4, val);
 
        /* add station addr to filter */
        val = MAC_HI(addr);
-       netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 1), val);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1), val);
        val = MAC_LO(addr);
-       netxen_crb_writelit_adapter(adapter,
-                       NETXEN_UNICAST_ADDR(port, 1)+4, val);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1)+4, val);
 
        adapter->mc_enabled = 1;
        return 0;
@@ -365,18 +470,17 @@ netxen_nic_disable_mcast_filter(struct netxen_adapter *adapter)
        if (!adapter->mc_enabled)
                return 0;
 
-       adapter->hw_read_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG, &val, 4);
+       val = NXRD32(adapter, NETXEN_MAC_ADDR_CNTL_REG);
        val &= ~(1UL << (28+port));
-       adapter->hw_write_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG, &val, 4);
+       NXWR32(adapter, NETXEN_MAC_ADDR_CNTL_REG, val);
 
        val = MAC_HI(addr);
-       netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
        val = MAC_LO(addr);
-       netxen_crb_writelit_adapter(adapter,
-                       NETXEN_UNICAST_ADDR(port, 0)+4, val);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0)+4, val);
 
-       netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 1), 0);
-       netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 1)+4, 0);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1), 0);
+       NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1)+4, 0);
 
        adapter->mc_enabled = 0;
        return 0;
@@ -392,10 +496,8 @@ netxen_nic_set_mcast_addr(struct netxen_adapter *adapter,
        lo = MAC_LO(addr);
        hi = MAC_HI(addr);
 
-       netxen_crb_writelit_adapter(adapter,
-                       NETXEN_MCAST_ADDR(port, index), hi);
-       netxen_crb_writelit_adapter(adapter,
-                       NETXEN_MCAST_ADDR(port, index)+4, lo);
+       NXWR32(adapter, NETXEN_MCAST_ADDR(port, index), hi);
+       NXWR32(adapter, NETXEN_MCAST_ADDR(port, index)+4, lo);
 
        return 0;
 }
@@ -448,130 +550,118 @@ void netxen_p2_nic_set_multi(struct net_device *netdev)
                netxen_nic_set_mcast_addr(adapter, index, null_addr);
 }
 
-static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
-               u8 *addr, nx_mac_list_t **add_list, nx_mac_list_t **del_list)
-{
-       nx_mac_list_t *cur, *prev;
-
-       /* if in del_list, move it to adapter->mac_list */
-       for (cur = *del_list, prev = NULL; cur;) {
-               if (memcmp(addr, cur->mac_addr, ETH_ALEN) == 0) {
-                       if (prev == NULL)
-                               *del_list = cur->next;
-                       else
-                               prev->next = cur->next;
-                       cur->next = adapter->mac_list;
-                       adapter->mac_list = cur;
-                       return 0;
-               }
-               prev = cur;
-               cur = cur->next;
-       }
-
-       /* make sure to add each mac address only once */
-       for (cur = adapter->mac_list; cur; cur = cur->next) {
-               if (memcmp(addr, cur->mac_addr, ETH_ALEN) == 0)
-                       return 0;
-       }
-       /* not in del_list, create new entry and add to add_list */
-       cur = kmalloc(sizeof(*cur), in_atomic()? GFP_ATOMIC : GFP_KERNEL);
-       if (cur == NULL) {
-               printk(KERN_ERR "%s: cannot allocate memory. MAC filtering may"
-                               "not work properly from now.\n", __func__);
-               return -1;
-       }
-
-       memcpy(cur->mac_addr, addr, ETH_ALEN);
-       cur->next = *add_list;
-       *add_list = cur;
-       return 0;
-}
-
 static int
 netxen_send_cmd_descs(struct netxen_adapter *adapter,
-               struct cmd_desc_type0 *cmd_desc_arr, int nr_elements)
+               struct cmd_desc_type0 *cmd_desc_arr, int nr_desc)
 {
-       uint32_t i, producer;
+       u32 i, producer, consumer;
        struct netxen_cmd_buffer *pbuf;
        struct cmd_desc_type0 *cmd_desc;
-
-       if (nr_elements > MAX_PENDING_DESC_BLOCK_SIZE || nr_elements == 0) {
-               printk(KERN_WARNING "%s: Too many command descriptors in a "
-                             "request\n", __func__);
-               return -EINVAL;
-       }
+       struct nx_host_tx_ring *tx_ring;
 
        i = 0;
 
-       producer = adapter->cmd_producer;
+       if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
+               return -EIO;
+
+       tx_ring = adapter->tx_ring;
+       __netif_tx_lock_bh(tx_ring->txq);
+
+       producer = tx_ring->producer;
+       consumer = tx_ring->sw_consumer;
+
+       if (nr_desc >= netxen_tx_avail(tx_ring)) {
+               netif_tx_stop_queue(tx_ring->txq);
+               __netif_tx_unlock_bh(tx_ring->txq);
+               return -EBUSY;
+       }
+
        do {
                cmd_desc = &cmd_desc_arr[i];
 
-               pbuf = &adapter->cmd_buf_arr[producer];
-               pbuf->mss = 0;
-               pbuf->total_length = 0;
+               pbuf = &tx_ring->cmd_buf_arr[producer];
                pbuf->skb = NULL;
-               pbuf->cmd = 0;
                pbuf->frag_count = 0;
-               pbuf->port = 0;
 
-               /* adapter->ahw.cmd_desc_head[producer] = *cmd_desc; */
-               memcpy(&adapter->ahw.cmd_desc_head[producer],
+               memcpy(&tx_ring->desc_head[producer],
                        &cmd_desc_arr[i], sizeof(struct cmd_desc_type0));
 
-               producer = get_next_index(producer,
-                               adapter->max_tx_desc_count);
+               producer = get_next_index(producer, tx_ring->num_desc);
                i++;
 
-       } while (i != nr_elements);
+       } while (i != nr_desc);
 
-       adapter->cmd_producer = producer;
+       tx_ring->producer = producer;
 
-       /* write producer index to start the xmit */
+       netxen_nic_update_cmd_producer(adapter, tx_ring);
 
-       netxen_nic_update_cmd_producer(adapter, adapter->cmd_producer);
+       __netif_tx_unlock_bh(tx_ring->txq);
 
        return 0;
 }
 
-static int nx_p3_sre_macaddr_change(struct net_device *dev,
-               u8 *addr, unsigned op)
+static int
+nx_p3_sre_macaddr_change(struct netxen_adapter *adapter, u8 *addr, unsigned op)
 {
-       struct netxen_adapter *adapter = (struct netxen_adapter *)dev->priv;
        nx_nic_req_t req;
-       nx_mac_req_t mac_req;
-       int rv;
+       nx_mac_req_t *mac_req;
+       u64 word;
 
        memset(&req, 0, sizeof(nx_nic_req_t));
-       req.qhdr |= (NX_NIC_REQUEST << 23);
-       req.req_hdr |= NX_MAC_EVENT;
-       req.req_hdr |= ((u64)adapter->portnum << 16);
-       mac_req.op = op;
-       memcpy(&mac_req.mac_addr, addr, 6);
-       req.words[0] = cpu_to_le64(*(u64 *)&mac_req);
+       req.qhdr = cpu_to_le64(NX_NIC_REQUEST << 23);
 
-       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
-       if (rv != 0) {
-               printk(KERN_ERR "ERROR. Could not send mac update\n");
-               return rv;
+       word = NX_MAC_EVENT | ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+
+       mac_req = (nx_mac_req_t *)&req.words[0];
+       mac_req->op = op;
+       memcpy(mac_req->mac_addr, addr, 6);
+
+       return netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+}
+
+static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
+               u8 *addr, struct list_head *del_list)
+{
+       struct list_head *head;
+       nx_mac_list_t *cur;
+
+       /* look up if already exists */
+       list_for_each(head, del_list) {
+               cur = list_entry(head, nx_mac_list_t, list);
+
+               if (memcmp(addr, cur->mac_addr, ETH_ALEN) == 0) {
+                       list_move_tail(head, &adapter->mac_list);
+                       return 0;
+               }
        }
 
-       return 0;
+       cur = kzalloc(sizeof(nx_mac_list_t), GFP_ATOMIC);
+       if (cur == NULL) {
+               printk(KERN_ERR "%s: failed to add mac address filter\n",
+                               adapter->netdev->name);
+               return -ENOMEM;
+       }
+       memcpy(cur->mac_addr, addr, ETH_ALEN);
+       list_add_tail(&cur->list, &adapter->mac_list);
+       return nx_p3_sre_macaddr_change(adapter,
+                               cur->mac_addr, NETXEN_MAC_ADD);
 }
 
 void netxen_p3_nic_set_multi(struct net_device *netdev)
 {
        struct netxen_adapter *adapter = netdev_priv(netdev);
-       nx_mac_list_t *cur, *next, *del_list, *add_list = NULL;
        struct dev_mc_list *mc_ptr;
        u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
        u32 mode = VPORT_MISS_MODE_DROP;
+       LIST_HEAD(del_list);
+       struct list_head *head;
+       nx_mac_list_t *cur;
 
-       del_list = adapter->mac_list;
-       adapter->mac_list = NULL;
+       list_splice_tail_init(&adapter->mac_list, &del_list);
 
-       nx_p3_nic_add_mac(adapter, netdev->dev_addr, &add_list, &del_list);
-       nx_p3_nic_add_mac(adapter, bcast_addr, &add_list, &del_list);
+       nx_p3_nic_add_mac(adapter, netdev->dev_addr, &del_list);
+       nx_p3_nic_add_mac(adapter, bcast_addr, &del_list);
 
        if (netdev->flags & IFF_PROMISC) {
                mode = VPORT_MISS_MODE_ACCEPT_ALL;
@@ -587,43 +677,63 @@ void netxen_p3_nic_set_multi(struct net_device *netdev)
        if (netdev->mc_count > 0) {
                for (mc_ptr = netdev->mc_list; mc_ptr;
                     mc_ptr = mc_ptr->next) {
-                       nx_p3_nic_add_mac(adapter, mc_ptr->dmi_addr,
-                                         &add_list, &del_list);
+                       nx_p3_nic_add_mac(adapter, mc_ptr->dmi_addr, &del_list);
                }
        }
 
 send_fw_cmd:
        adapter->set_promisc(adapter, mode);
-       for (cur = del_list; cur;) {
-               nx_p3_sre_macaddr_change(netdev, cur->mac_addr, NETXEN_MAC_DEL);
-               next = cur->next;
+       head = &del_list;
+       while (!list_empty(head)) {
+               cur = list_entry(head->next, nx_mac_list_t, list);
+
+               nx_p3_sre_macaddr_change(adapter,
+                               cur->mac_addr, NETXEN_MAC_DEL);
+               list_del(&cur->list);
                kfree(cur);
-               cur = next;
-       }
-       for (cur = add_list; cur;) {
-               nx_p3_sre_macaddr_change(netdev, cur->mac_addr, NETXEN_MAC_ADD);
-               next = cur->next;
-               cur->next = adapter->mac_list;
-               adapter->mac_list = cur;
-               cur = next;
        }
 }
 
 int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
 {
        nx_nic_req_t req;
+       u64 word;
 
        memset(&req, 0, sizeof(nx_nic_req_t));
 
-       req.qhdr |= (NX_HOST_REQUEST << 23);
-       req.req_hdr |= NX_NIC_H2C_OPCODE_PROXY_SET_VPORT_MISS_MODE;
-       req.req_hdr |= ((u64)adapter->portnum << 16);
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_PROXY_SET_VPORT_MISS_MODE |
+                       ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+
        req.words[0] = cpu_to_le64(mode);
 
        return netxen_send_cmd_descs(adapter,
                                (struct cmd_desc_type0 *)&req, 1);
 }
 
+void netxen_p3_free_mac_list(struct netxen_adapter *adapter)
+{
+       nx_mac_list_t *cur;
+       struct list_head *head = &adapter->mac_list;
+
+       while (!list_empty(head)) {
+               cur = list_entry(head->next, nx_mac_list_t, list);
+               nx_p3_sre_macaddr_change(adapter,
+                               cur->mac_addr, NETXEN_MAC_DEL);
+               list_del(&cur->list);
+               kfree(cur);
+       }
+}
+
+int netxen_p3_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)
+{
+       /* assuming caller has already copied new addr to netdev */
+       netxen_p3_nic_set_multi(adapter->netdev);
+       return 0;
+}
+
 #define        NETXEN_CONFIG_INTR_COALESCE     3
 
 /*
@@ -632,13 +742,15 @@ int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
 int netxen_config_intr_coalesce(struct netxen_adapter *adapter)
 {
        nx_nic_req_t req;
+       u64 word;
        int rv;
 
        memset(&req, 0, sizeof(nx_nic_req_t));
 
-       req.qhdr |= (NX_NIC_REQUEST << 23);
-       req.req_hdr |= NETXEN_CONFIG_INTR_COALESCE;
-       req.req_hdr |= ((u64)adapter->portnum << 16);
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NETXEN_CONFIG_INTR_COALESCE | ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
 
        memcpy(&req.words[0], &adapter->coal, sizeof(adapter->coal));
 
@@ -651,6 +763,182 @@ int netxen_config_intr_coalesce(struct netxen_adapter *adapter)
        return rv;
 }
 
+int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
+{
+       nx_nic_req_t req;
+       u64 word;
+       int rv = 0;
+
+       if ((adapter->flags & NETXEN_NIC_LRO_ENABLED) == enable)
+               return 0;
+
+       memset(&req, 0, sizeof(nx_nic_req_t));
+
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_CONFIG_HW_LRO | ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+
+       req.words[0] = cpu_to_le64(enable);
+
+       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+       if (rv != 0) {
+               printk(KERN_ERR "ERROR. Could not send "
+                       "configure hw lro request\n");
+       }
+
+       adapter->flags ^= NETXEN_NIC_LRO_ENABLED;
+
+       return rv;
+}
+
+int netxen_config_bridged_mode(struct netxen_adapter *adapter, int enable)
+{
+       nx_nic_req_t req;
+       u64 word;
+       int rv = 0;
+
+       if (!!(adapter->flags & NETXEN_NIC_BRIDGE_ENABLED) == enable)
+               return rv;
+
+       memset(&req, 0, sizeof(nx_nic_req_t));
+
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_CONFIG_BRIDGING |
+               ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+
+       req.words[0] = cpu_to_le64(enable);
+
+       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+       if (rv != 0) {
+               printk(KERN_ERR "ERROR. Could not send "
+                               "configure bridge mode request\n");
+       }
+
+       adapter->flags ^= NETXEN_NIC_BRIDGE_ENABLED;
+
+       return rv;
+}
+
+
+#define RSS_HASHTYPE_IP_TCP    0x3
+
+int netxen_config_rss(struct netxen_adapter *adapter, int enable)
+{
+       nx_nic_req_t req;
+       u64 word;
+       int i, rv;
+
+       u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
+                       0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
+                       0x255b0ec26d5a56daULL };
+
+
+       memset(&req, 0, sizeof(nx_nic_req_t));
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_CONFIG_RSS | ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+
+       /*
+        * RSS request:
+        * bits 3-0: hash_method
+        *      5-4: hash_type_ipv4
+        *      7-6: hash_type_ipv6
+        *        8: enable
+        *        9: use indirection table
+        *    47-10: reserved
+        *    63-48: indirection table mask
+        */
+       word =  ((u64)(RSS_HASHTYPE_IP_TCP & 0x3) << 4) |
+               ((u64)(RSS_HASHTYPE_IP_TCP & 0x3) << 6) |
+               ((u64)(enable & 0x1) << 8) |
+               ((0x7ULL) << 48);
+       req.words[0] = cpu_to_le64(word);
+       for (i = 0; i < 5; i++)
+               req.words[i+1] = cpu_to_le64(key[i]);
+
+
+       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+       if (rv != 0) {
+               printk(KERN_ERR "%s: could not configure RSS\n",
+                               adapter->netdev->name);
+       }
+
+       return rv;
+}
+
+int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd)
+{
+       nx_nic_req_t req;
+       u64 word;
+       int rv;
+
+       memset(&req, 0, sizeof(nx_nic_req_t));
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_CONFIG_IPADDR | ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+
+       req.words[0] = cpu_to_le64(cmd);
+       req.words[1] = cpu_to_le64(ip);
+
+       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+       if (rv != 0) {
+               printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n",
+                               adapter->netdev->name,
+                               (cmd == NX_IP_UP) ? "Add" : "Remove", ip);
+       }
+       return rv;
+}
+
+int netxen_linkevent_request(struct netxen_adapter *adapter, int enable)
+{
+       nx_nic_req_t req;
+       u64 word;
+       int rv;
+
+       memset(&req, 0, sizeof(nx_nic_req_t));
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_GET_LINKEVENT | ((u64)adapter->portnum << 16);
+       req.req_hdr = cpu_to_le64(word);
+       req.words[0] = cpu_to_le64(enable | (enable << 8));
+
+       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+       if (rv != 0) {
+               printk(KERN_ERR "%s: could not configure link notification\n",
+                               adapter->netdev->name);
+       }
+
+       return rv;
+}
+
+int netxen_send_lro_cleanup(struct netxen_adapter *adapter)
+{
+       nx_nic_req_t req;
+       u64 word;
+       int rv;
+
+       memset(&req, 0, sizeof(nx_nic_req_t));
+       req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
+
+       word = NX_NIC_H2C_OPCODE_LRO_REQUEST |
+               ((u64)adapter->portnum << 16) |
+               ((u64)NX_NIC_LRO_REQUEST_CLEANUP << 56) ;
+
+       req.req_hdr = cpu_to_le64(word);
+
+       rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
+       if (rv != 0) {
+               printk(KERN_ERR "%s: could not cleanup lro flows\n",
+                               adapter->netdev->name);
+       }
+       return rv;
+}
+
 /*
  * netxen_nic_change_mtu - Change the Maximum Transfer Unit
  * @returns 0 on success, negative on failure
@@ -684,34 +972,11 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu)
        return rc;
 }
 
-int netxen_is_flash_supported(struct netxen_adapter *adapter)
-{
-       const int locs[] = { 0, 0x4, 0x100, 0x4000, 0x4128 };
-       int addr, val01, val02, i, j;
-
-       /* if the flash size less than 4Mb, make huge war cry and die */
-       for (j = 1; j < 4; j++) {
-               addr = j * NETXEN_NIC_WINDOW_MARGIN;
-               for (i = 0; i < ARRAY_SIZE(locs); i++) {
-                       if (netxen_rom_fast_read(adapter, locs[i], &val01) == 0
-                           && netxen_rom_fast_read(adapter, (addr + locs[i]),
-                                                   &val02) == 0) {
-                               if (val01 == val02)
-                                       return -1;
-                       } else
-                               return -1;
-               }
-       }
-
-       return 0;
-}
-
 static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
                                  int size, __le32 * buf)
 {
-       int i, addr;
+       int i, v, addr;
        __le32 *ptr32;
-       u32 v;
 
        addr = base;
        ptr32 = buf;
@@ -738,18 +1003,15 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
        __le32 *pmac = (__le32 *) mac;
        u32 offset;
 
-       offset = NETXEN_USER_START +
-               offsetof(struct netxen_new_user_info, mac_addr) +
-               adapter->portnum * sizeof(u64);
+       offset = NX_FW_MAC_ADDR_OFFSET + (adapter->portnum * sizeof(u64));
 
        if (netxen_get_flash_block(adapter, offset, sizeof(u64), pmac) == -1)
                return -1;
 
        if (*mac == cpu_to_le64(~0ULL)) {
 
-               offset = NETXEN_USER_START_OLD +
-                       offsetof(struct netxen_user_old_info, mac_addr) +
-                       adapter->portnum * sizeof(u64);
+               offset = NX_OLD_MAC_ADDR_OFFSET +
+                       (adapter->portnum * sizeof(u64));
 
                if (netxen_get_flash_block(adapter,
                                        offset, sizeof(u64), pmac) == -1)
@@ -769,54 +1031,21 @@ int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
        crbaddr = CRB_MAC_BLOCK_START +
                (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1));
 
-       adapter->hw_read_wx(adapter, crbaddr, &mac_lo, 4);
-       adapter->hw_read_wx(adapter, crbaddr+4, &mac_hi, 4);
-
-       mac_hi = cpu_to_le32(mac_hi);
-       mac_lo = cpu_to_le32(mac_lo);
+       mac_lo = NXRD32(adapter, crbaddr);
+       mac_hi = NXRD32(adapter, crbaddr+4);
 
        if (pci_func & 1)
-               *mac = ((mac_lo >> 16) | ((u64)mac_hi << 16));
+               *mac = le64_to_cpu((mac_lo >> 16) | ((u64)mac_hi << 16));
        else
-               *mac = ((mac_lo) | ((u64)mac_hi << 32));
-
-       return 0;
-}
-
-#define CRB_WIN_LOCK_TIMEOUT 100000000
-
-static int crb_win_lock(struct netxen_adapter *adapter)
-{
-       int done = 0, timeout = 0;
+               *mac = le64_to_cpu((u64)mac_lo | ((u64)mac_hi << 32));
 
-       while (!done) {
-               /* acquire semaphore3 from PCI HW block */
-               adapter->hw_read_wx(adapter,
-                               NETXEN_PCIE_REG(PCIE_SEM7_LOCK), &done, 4);
-               if (done == 1)
-                       break;
-               if (timeout >= CRB_WIN_LOCK_TIMEOUT)
-                       return -1;
-               timeout++;
-               udelay(1);
-       }
-       netxen_crb_writelit_adapter(adapter,
-                       NETXEN_CRB_WIN_LOCK_ID, adapter->portnum);
        return 0;
 }
 
-static void crb_win_unlock(struct netxen_adapter *adapter)
-{
-       int val;
-
-       adapter->hw_read_wx(adapter,
-                       NETXEN_PCIE_REG(PCIE_SEM7_UNLOCK), &val, 4);
-}
-
 /*
  * Changes the CRB window to the specified window.
  */
-void
+static void
 netxen_nic_pci_change_crbwindow_128M(struct netxen_adapter *adapter, u32 wndw)
 {
        void __iomem *offset;
@@ -867,17 +1096,15 @@ netxen_nic_pci_change_crbwindow_128M(struct netxen_adapter *adapter, u32 wndw)
  * In: 'off' is offset from base in 128M pci map
  */
 static int
-netxen_nic_pci_get_crb_addr_2M(struct netxen_adapter *adapter,
-               ulong *off, int len)
+netxen_nic_pci_get_crb_addr_2M(struct netxen_adapter *adapter, ulong *off)
 {
-       unsigned long end = *off + len;
        crb_128M_2M_sub_block_map_t *m;
 
 
        if (*off >= NETXEN_CRB_MAX)
                return -1;
 
-       if (*off >= NETXEN_PCI_CAMQM && (end <= NETXEN_PCI_CAMQM_2M_END)) {
+       if (*off >= NETXEN_PCI_CAMQM && (*off < NETXEN_PCI_CAMQM_2M_END)) {
                *off = (*off - NETXEN_PCI_CAMQM) + NETXEN_PCI_CAMQM_2M_BASE +
                        (ulong)adapter->ahw.pci_base0;
                return 0;
@@ -887,14 +1114,13 @@ netxen_nic_pci_get_crb_addr_2M(struct netxen_adapter *adapter,
                return -1;
 
        *off -= NETXEN_PCI_CRBSPACE;
-       end = *off + len;
 
        /*
         * Try direct map
         */
        m = &crb_128M_2M_map[CRB_BLK(*off)].sub_block[CRB_SUBBLK(*off)];
 
-       if (m->valid && (m->start_128M <= *off) && (m->end_128M >= end)) {
+       if (m->valid && (m->start_128M <= *off) && (m->end_128M > *off)) {
                *off = *off + m->start_2M - m->start_128M +
                        (ulong)adapter->ahw.pci_base0;
                return 0;
@@ -917,13 +1143,12 @@ netxen_nic_pci_set_crbwindow_2M(struct netxen_adapter *adapter, ulong *off)
        u32 win_read;
 
        adapter->crb_win = CRB_HI(*off);
-       writel(adapter->crb_win, (void *)(CRB_WINDOW_2M +
-               adapter->ahw.pci_base0));
+       writel(adapter->crb_win, (adapter->ahw.pci_base0 + CRB_WINDOW_2M));
        /*
         * Read back value to make sure write has gone through before trying
         * to use it.
         */
-       win_read = readl((void *)(CRB_WINDOW_2M + adapter->ahw.pci_base0));
+       win_read = readl(adapter->ahw.pci_base0 + CRB_WINDOW_2M);
        if (win_read != adapter->crb_win) {
                printk(KERN_ERR "%s: Written crbwin (0x%x) != "
                                "Read crbwin (0x%x), off=0x%lx\n",
@@ -933,197 +1158,71 @@ netxen_nic_pci_set_crbwindow_2M(struct netxen_adapter *adapter, ulong *off)
                (ulong)adapter->ahw.pci_base0;
 }
 
-int netxen_load_firmware(struct netxen_adapter *adapter)
-{
-       int i;
-       u32 data, size = 0;
-       u32 flashaddr = NETXEN_BOOTLD_START, memaddr = NETXEN_BOOTLD_START;
-
-       size = (NETXEN_IMAGE_START - NETXEN_BOOTLD_START)/4;
-
-       if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
-               adapter->pci_write_normalize(adapter,
-                               NETXEN_ROMUSB_GLB_CAS_RST, 1);
-
-       for (i = 0; i < size; i++) {
-               if (netxen_rom_fast_read(adapter, flashaddr, (int *)&data) != 0)
-                       return -EIO;
-
-               adapter->pci_mem_write(adapter, memaddr, &data, 4);
-               flashaddr += 4;
-               memaddr += 4;
-               cond_resched();
-       }
-       msleep(1);
-
-       if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
-               adapter->pci_write_normalize(adapter,
-                               NETXEN_ROMUSB_GLB_SW_RESET, 0x80001d);
-       else {
-               adapter->pci_write_normalize(adapter,
-                               NETXEN_ROMUSB_GLB_CHIP_CLK_CTRL, 0x3fff);
-               adapter->pci_write_normalize(adapter,
-                               NETXEN_ROMUSB_GLB_CAS_RST, 0);
-       }
-
-       return 0;
-}
-
-int
-netxen_nic_hw_write_wx_128M(struct netxen_adapter *adapter,
-               ulong off, void *data, int len)
+static int
+netxen_nic_hw_write_wx_128M(struct netxen_adapter *adapter, ulong off, u32 data)
 {
+       unsigned long flags;
        void __iomem *addr;
 
-       if (ADDR_IN_WINDOW1(off)) {
+       if (ADDR_IN_WINDOW1(off))
                addr = NETXEN_CRB_NORMALIZE(adapter, off);
-       } else {                /* Window 0 */
+       else
                addr = pci_base_offset(adapter, off);
-               netxen_nic_pci_change_crbwindow_128M(adapter, 0);
-       }
-
-       DPRINTK(INFO, "writing to base %lx offset %llx addr %p"
-               " data %llx len %d\n",
-               pci_base(adapter, off), off, addr,
-               *(unsigned long long *)data, len);
-       if (!addr) {
-               netxen_nic_pci_change_crbwindow_128M(adapter, 1);
-               return 1;
-       }
-
-       switch (len) {
-       case 1:
-               writeb(*(u8 *) data, addr);
-               break;
-       case 2:
-               writew(*(u16 *) data, addr);
-               break;
-       case 4:
-               writel(*(u32 *) data, addr);
-               break;
-       case 8:
-               writeq(*(u64 *) data, addr);
-               break;
-       default:
-               DPRINTK(INFO,
-                       "writing data %lx to offset %llx, num words=%d\n",
-                       *(unsigned long *)data, off, (len >> 3));
-
-               netxen_nic_hw_block_write64((u64 __iomem *) data, addr,
-                                           (len >> 3));
-               break;
-       }
-       if (!ADDR_IN_WINDOW1(off))
-               netxen_nic_pci_change_crbwindow_128M(adapter, 1);
-
-       return 0;
-}
 
-int
-netxen_nic_hw_read_wx_128M(struct netxen_adapter *adapter,
-               ulong off, void *data, int len)
-{
-       void __iomem *addr;
+       BUG_ON(!addr);
 
        if (ADDR_IN_WINDOW1(off)) {     /* Window 1 */
-               addr = NETXEN_CRB_NORMALIZE(adapter, off);
+               read_lock(&adapter->adapter_lock);
+               writel(data, addr);
+               read_unlock(&adapter->adapter_lock);
        } else {                /* Window 0 */
+               write_lock_irqsave(&adapter->adapter_lock, flags);
                addr = pci_base_offset(adapter, off);
                netxen_nic_pci_change_crbwindow_128M(adapter, 0);
-       }
-
-       DPRINTK(INFO, "reading from base %lx offset %llx addr %p\n",
-               pci_base(adapter, off), off, addr);
-       if (!addr) {
+               writel(data, addr);
                netxen_nic_pci_change_crbwindow_128M(adapter, 1);
-               return 1;
-       }
-       switch (len) {
-       case 1:
-               *(u8 *) data = readb(addr);
-               break;
-       case 2:
-               *(u16 *) data = readw(addr);
-               break;
-       case 4:
-               *(u32 *) data = readl(addr);
-               break;
-       case 8:
-               *(u64 *) data = readq(addr);
-               break;
-       default:
-               netxen_nic_hw_block_read64((u64 __iomem *) data, addr,
-                                          (len >> 3));
-               break;
+               write_unlock_irqrestore(&adapter->adapter_lock, flags);
        }
-       DPRINTK(INFO, "read %lx\n", *(unsigned long *)data);
-
-       if (!ADDR_IN_WINDOW1(off))
-               netxen_nic_pci_change_crbwindow_128M(adapter, 1);
 
        return 0;
 }
 
-int
-netxen_nic_hw_write_wx_2M(struct netxen_adapter *adapter,
-               ulong off, void *data, int len)
+static u32
+netxen_nic_hw_read_wx_128M(struct netxen_adapter *adapter, ulong off)
 {
-       unsigned long flags = 0;
-       int rv;
+       unsigned long flags;
+       void __iomem *addr;
+       u32 data;
 
-       rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off, len);
+       if (ADDR_IN_WINDOW1(off))
+               addr = NETXEN_CRB_NORMALIZE(adapter, off);
+       else
+               addr = pci_base_offset(adapter, off);
 
-       if (rv == -1) {
-               printk(KERN_ERR "%s: invalid offset: 0x%016lx\n",
-                               __func__, off);
-               dump_stack();
-               return -1;
-       }
+       BUG_ON(!addr);
 
-       if (rv == 1) {
+       if (ADDR_IN_WINDOW1(off)) {     /* Window 1 */
+               read_lock(&adapter->adapter_lock);
+               data = readl(addr);
+               read_unlock(&adapter->adapter_lock);
+       } else {                /* Window 0 */
                write_lock_irqsave(&adapter->adapter_lock, flags);
-               crb_win_lock(adapter);
-               netxen_nic_pci_set_crbwindow_2M(adapter, &off);
-       }
-
-       DPRINTK(1, INFO, "write data %lx to offset %llx, len=%d\n",
-                       *(unsigned long *)data, off, len);
-
-       switch (len) {
-       case 1:
-               writeb(*(uint8_t *)data, (void *)off);
-               break;
-       case 2:
-               writew(*(uint16_t *)data, (void *)off);
-               break;
-       case 4:
-               writel(*(uint32_t *)data, (void *)off);
-               break;
-       case 8:
-               writeq(*(uint64_t *)data, (void *)off);
-               break;
-       default:
-               DPRINTK(1, INFO,
-                       "writing data %lx to offset %llx, num words=%d\n",
-                       *(unsigned long *)data, off, (len>>3));
-               break;
-       }
-       if (rv == 1) {
-               crb_win_unlock(adapter);
+               netxen_nic_pci_change_crbwindow_128M(adapter, 0);
+               data = readl(addr);
+               netxen_nic_pci_change_crbwindow_128M(adapter, 1);
                write_unlock_irqrestore(&adapter->adapter_lock, flags);
        }
 
-       return 0;
+       return data;
 }
 
-int
-netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter,
-               ulong off, void *data, int len)
+static int
+netxen_nic_hw_write_wx_2M(struct netxen_adapter *adapter, ulong off, u32 data)
 {
-       unsigned long flags = 0;
+       unsigned long flags;
        int rv;
 
-       rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off, len);
+       rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off);
 
        if (rv == -1) {
                printk(KERN_ERR "%s: invalid offset: 0x%016lx\n",
@@ -1136,93 +1235,48 @@ netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter,
                write_lock_irqsave(&adapter->adapter_lock, flags);
                crb_win_lock(adapter);
                netxen_nic_pci_set_crbwindow_2M(adapter, &off);
-       }
-
-       DPRINTK(1, INFO, "read from offset %lx, len=%d\n", off, len);
-
-       switch (len) {
-       case 1:
-               *(uint8_t *)data = readb((void *)off);
-               break;
-       case 2:
-               *(uint16_t *)data = readw((void *)off);
-               break;
-       case 4:
-               *(uint32_t *)data = readl((void *)off);
-               break;
-       case 8:
-               *(uint64_t *)data = readq((void *)off);
-               break;
-       default:
-               break;
-       }
-
-       DPRINTK(1, INFO, "read %lx\n", *(unsigned long *)data);
-
-       if (rv == 1) {
+               writel(data, (void __iomem *)off);
                crb_win_unlock(adapter);
                write_unlock_irqrestore(&adapter->adapter_lock, flags);
-       }
-
-       return 0;
-}
-
-void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val)
-{
-       adapter->hw_write_wx(adapter, off, &val, 4);
-}
-
-int netxen_nic_reg_read(struct netxen_adapter *adapter, u64 off)
-{
-       int val;
-       adapter->hw_read_wx(adapter, off, &val, 4);
-       return val;
-}
+       } else
+               writel(data, (void __iomem *)off);
 
-/* Change the window to 0, write and change back to window 1. */
-void netxen_nic_write_w0(struct netxen_adapter *adapter, u32 index, u32 value)
-{
-       adapter->hw_write_wx(adapter, index, &value, 4);
-}
 
-/* Change the window to 0, read and change back to window 1. */
-void netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index, u32 *value)
-{
-       adapter->hw_read_wx(adapter, index, value, 4);
+       return 0;
 }
 
-void netxen_nic_write_w1(struct netxen_adapter *adapter, u32 index, u32 value)
+static u32
+netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter, ulong off)
 {
-       adapter->hw_write_wx(adapter, index, &value, 4);
-}
+       unsigned long flags;
+       int rv;
+       u32 data;
 
-void netxen_nic_read_w1(struct netxen_adapter *adapter, u32 index, u32 *value)
-{
-       adapter->hw_read_wx(adapter, index, value, 4);
-}
+       rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off);
 
-/*
- * check memory access boundary.
- * used by test agent. support ddr access only for now
- */
-static unsigned long
-netxen_nic_pci_mem_bound_check(struct netxen_adapter *adapter,
-               unsigned long long addr, int size)
-{
-       if (!ADDR_IN_RANGE(addr,
-                       NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX) ||
-               !ADDR_IN_RANGE(addr+size-1,
-                       NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX) ||
-               ((size != 1) && (size != 2) && (size != 4) && (size != 8))) {
-               return 0;
+       if (rv == -1) {
+               printk(KERN_ERR "%s: invalid offset: 0x%016lx\n",
+                               __func__, off);
+               dump_stack();
+               return -1;
        }
 
-       return 1;
+       if (rv == 1) {
+               write_lock_irqsave(&adapter->adapter_lock, flags);
+               crb_win_lock(adapter);
+               netxen_nic_pci_set_crbwindow_2M(adapter, &off);
+               data = readl((void __iomem *)off);
+               crb_win_unlock(adapter);
+               write_unlock_irqrestore(&adapter->adapter_lock, flags);
+       } else
+               data = readl((void __iomem *)off);
+
+       return data;
 }
 
 static int netxen_pci_set_window_warning_count;
 
-unsigned long
+static unsigned long
 netxen_nic_pci_set_window_128M(struct netxen_adapter *adapter,
                unsigned long long addr)
 {
@@ -1286,33 +1340,56 @@ netxen_nic_pci_set_window_128M(struct netxen_adapter *adapter,
        return addr;
 }
 
-/*
- * Note : only 32-bit writes!
- */
-int netxen_nic_pci_write_immediate_128M(struct netxen_adapter *adapter,
-               u64 off, u32 data)
+/* window 1 registers only */
+static void netxen_nic_io_write_128M(struct netxen_adapter *adapter,
+               void __iomem *addr, u32 data)
 {
-       writel(data, (void __iomem *)(PCI_OFFSET_SECOND_RANGE(adapter, off)));
-       return 0;
+       read_lock(&adapter->adapter_lock);
+       writel(data, addr);
+       read_unlock(&adapter->adapter_lock);
+}
+
+static u32 netxen_nic_io_read_128M(struct netxen_adapter *adapter,
+               void __iomem *addr)
+{
+       u32 val;
+
+       read_lock(&adapter->adapter_lock);
+       val = readl(addr);
+       read_unlock(&adapter->adapter_lock);
+
+       return val;
 }
 
-u32 netxen_nic_pci_read_immediate_128M(struct netxen_adapter *adapter, u64 off)
+static void netxen_nic_io_write_2M(struct netxen_adapter *adapter,
+               void __iomem *addr, u32 data)
 {
-       return readl((void __iomem *)(pci_base_offset(adapter, off)));
+       writel(data, addr);
 }
 
-void netxen_nic_pci_write_normalize_128M(struct netxen_adapter *adapter,
-               u64 off, u32 data)
+static u32 netxen_nic_io_read_2M(struct netxen_adapter *adapter,
+               void __iomem *addr)
 {
-       writel(data, NETXEN_CRB_NORMALIZE(adapter, off));
+       return readl(addr);
 }
 
-u32 netxen_nic_pci_read_normalize_128M(struct netxen_adapter *adapter, u64 off)
+void __iomem *
+netxen_get_ioaddr(struct netxen_adapter *adapter, u32 offset)
 {
-       return readl(NETXEN_CRB_NORMALIZE(adapter, off));
+       ulong off = offset;
+
+       if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+               if (offset < NETXEN_CRB_PCIX_HOST2 &&
+                               offset > NETXEN_CRB_PCIX_HOST)
+                       return PCI_OFFSET_SECOND_RANGE(adapter, offset);
+               return NETXEN_CRB_NORMALIZE(adapter, offset);
+       }
+
+       BUG_ON(netxen_nic_pci_get_crb_addr_2M(adapter, &off));
+       return (void __iomem *)off;
 }
 
-unsigned long
+static unsigned long
 netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
                unsigned long long addr)
 {
@@ -1323,12 +1400,8 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
                /* DDR network side */
                window = MN_WIN(addr);
                adapter->ahw.ddr_mn_window = window;
-               adapter->hw_write_wx(adapter,
-                               adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
-                               &window, 4);
-               adapter->hw_read_wx(adapter,
-                               adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
-                               &win_read, 4);
+               NXWR32(adapter, adapter->ahw.mn_win_crb, window);
+               win_read = NXRD32(adapter, adapter->ahw.mn_win_crb);
                if ((win_read << 17) != window) {
                        printk(KERN_INFO "Written MNwin (0x%x) != "
                                "Read MNwin (0x%x)\n", window, win_read);
@@ -1343,12 +1416,8 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
 
                window = OCM_WIN(addr);
                adapter->ahw.ddr_mn_window = window;
-               adapter->hw_write_wx(adapter,
-                               adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
-                               &window, 4);
-               adapter->hw_read_wx(adapter,
-                               adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
-                               &win_read, 4);
+               NXWR32(adapter, adapter->ahw.mn_win_crb, window);
+               win_read = NXRD32(adapter, adapter->ahw.mn_win_crb);
                if ((win_read >> 7) != window) {
                        printk(KERN_INFO "%s: Written OCMwin (0x%x) != "
                                        "Read OCMwin (0x%x)\n",
@@ -1361,12 +1430,8 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
                /* QDR network side */
                window = MS_WIN(addr);
                adapter->ahw.qdr_sn_window = window;
-               adapter->hw_write_wx(adapter,
-                               adapter->ahw.ms_win_crb | NETXEN_PCI_CRBSPACE,
-                               &window, 4);
-               adapter->hw_read_wx(adapter,
-                               adapter->ahw.ms_win_crb | NETXEN_PCI_CRBSPACE,
-                               &win_read, 4);
+               NXWR32(adapter, adapter->ahw.ms_win_crb, window);
+               win_read = NXRD32(adapter, adapter->ahw.ms_win_crb);
                if (win_read != window) {
                        printk(KERN_INFO "%s: Written MSwin (0x%x) != "
                                        "Read MSwin (0x%x)\n",
@@ -1389,206 +1454,40 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
        return addr;
 }
 
-static int netxen_nic_pci_is_same_window(struct netxen_adapter *adapter,
-                                     unsigned long long addr)
-{
-       int window;
-       unsigned long long qdr_max;
-
-       if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
-               qdr_max = NETXEN_ADDR_QDR_NET_MAX_P2;
-       else
-               qdr_max = NETXEN_ADDR_QDR_NET_MAX_P3;
-
-       if (ADDR_IN_RANGE(addr,
-                       NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX)) {
-               /* DDR network side */
-               BUG();  /* MN access can not come here */
-       } else if (ADDR_IN_RANGE(addr,
-                       NETXEN_ADDR_OCM0, NETXEN_ADDR_OCM0_MAX)) {
-               return 1;
-       } else if (ADDR_IN_RANGE(addr,
-                               NETXEN_ADDR_OCM1, NETXEN_ADDR_OCM1_MAX)) {
-               return 1;
-       } else if (ADDR_IN_RANGE(addr, NETXEN_ADDR_QDR_NET, qdr_max)) {
-               /* QDR network side */
-               window = ((addr - NETXEN_ADDR_QDR_NET) >> 22) & 0x3f;
-               if (adapter->ahw.qdr_sn_window == window)
-                       return 1;
-       }
-
-       return 0;
-}
-
-static int netxen_nic_pci_mem_read_direct(struct netxen_adapter *adapter,
-                       u64 off, void *data, int size)
-{
-       unsigned long flags;
-       void *addr;
-       int ret = 0;
-       u64 start;
-       uint8_t *mem_ptr = NULL;
-       unsigned long mem_base;
-       unsigned long mem_page;
-
-       write_lock_irqsave(&adapter->adapter_lock, flags);
-
-       /*
-        * If attempting to access unknown address or straddle hw windows,
-        * do not access.
-        */
-       start = adapter->pci_set_window(adapter, off);
-       if ((start == -1UL) ||
-               (netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {
-               write_unlock_irqrestore(&adapter->adapter_lock, flags);
-               printk(KERN_ERR "%s out of bound pci memory access. "
-                       "offset is 0x%llx\n", netxen_nic_driver_name,
-                       (unsigned long long)off);
-               return -1;
-       }
-
-       addr = (void *)(pci_base_offset(adapter, start));
-       if (!addr) {
-               write_unlock_irqrestore(&adapter->adapter_lock, flags);
-               mem_base = pci_resource_start(adapter->pdev, 0);
-               mem_page = start & PAGE_MASK;
-               /* Map two pages whenever user tries to access addresses in two
-               consecutive pages.
-               */
-               if (mem_page != ((start + size - 1) & PAGE_MASK))
-                       mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE * 2);
-               else
-                       mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE);
-               if (mem_ptr == 0UL) {
-                       *(uint8_t  *)data = 0;
-                       return -1;
-               }
-               addr = mem_ptr;
-               addr += start & (PAGE_SIZE - 1);
-               write_lock_irqsave(&adapter->adapter_lock, flags);
-       }
-
-       switch (size) {
-       case 1:
-               *(uint8_t  *)data = readb(addr);
-               break;
-       case 2:
-               *(uint16_t *)data = readw(addr);
-               break;
-       case 4:
-               *(uint32_t *)data = readl(addr);
-               break;
-       case 8:
-               *(uint64_t *)data = readq(addr);
-               break;
-       default:
-               ret = -1;
-               break;
-       }
-       write_unlock_irqrestore(&adapter->adapter_lock, flags);
-       DPRINTK(1, INFO, "read %llx\n", *(unsigned long long *)data);
-
-       if (mem_ptr)
-               iounmap(mem_ptr);
-       return ret;
-}
-
-static int
-netxen_nic_pci_mem_write_direct(struct netxen_adapter *adapter, u64 off,
-               void *data, int size)
-{
-       unsigned long flags;
-       void *addr;
-       int ret = 0;
-       u64 start;
-       uint8_t *mem_ptr = NULL;
-       unsigned long mem_base;
-       unsigned long mem_page;
-
-       write_lock_irqsave(&adapter->adapter_lock, flags);
-
-       /*
-        * If attempting to access unknown address or straddle hw windows,
-        * do not access.
-        */
-       start = adapter->pci_set_window(adapter, off);
-       if ((start == -1UL) ||
-               (netxen_nic_pci_is_same_window(adapter, off+size-1) == 0)) {
-               write_unlock_irqrestore(&adapter->adapter_lock, flags);
-               printk(KERN_ERR "%s out of bound pci memory access. "
-                       "offset is 0x%llx\n", netxen_nic_driver_name,
-                       (unsigned long long)off);
-               return -1;
-       }
-
-       addr = (void *)(pci_base_offset(adapter, start));
-       if (!addr) {
-               write_unlock_irqrestore(&adapter->adapter_lock, flags);
-               mem_base = pci_resource_start(adapter->pdev, 0);
-               mem_page = start & PAGE_MASK;
-               /* Map two pages whenever user tries to access addresses in two
-                * consecutive pages.
-                */
-               if (mem_page != ((start + size - 1) & PAGE_MASK))
-                       mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE*2);
-               else
-                       mem_ptr = ioremap(mem_base + mem_page, PAGE_SIZE);
-               if (mem_ptr == 0UL)
-                       return -1;
-               addr = mem_ptr;
-               addr += start & (PAGE_SIZE - 1);
-               write_lock_irqsave(&adapter->adapter_lock, flags);
-       }
-
-       switch (size) {
-       case 1:
-               writeb(*(uint8_t *)data, addr);
-               break;
-       case 2:
-               writew(*(uint16_t *)data, addr);
-               break;
-       case 4:
-               writel(*(uint32_t *)data, addr);
-               break;
-       case 8:
-               writeq(*(uint64_t *)data, addr);
-               break;
-       default:
-               ret = -1;
-               break;
-       }
-       write_unlock_irqrestore(&adapter->adapter_lock, flags);
-       DPRINTK(1, INFO, "writing data %llx to offset %llx\n",
-                       *(unsigned long long *)data, start);
-       if (mem_ptr)
-               iounmap(mem_ptr);
-       return ret;
-}
-
 #define MAX_CTL_CHECK   1000
 
-int
+static int
 netxen_nic_pci_mem_write_128M(struct netxen_adapter *adapter,
                u64 off, void *data, int size)
 {
-       unsigned long   flags, mem_crb;
+       unsigned long   flags;
        int          i, j, ret = 0, loop, sz[2], off0;
        uint32_t      temp;
        uint64_t      off8, tmpw, word[2] = {0, 0};
+       void __iomem *mem_crb;
 
-       /*
-        * If not MN, go check for MS or invalid.
-        */
-       if (netxen_nic_pci_mem_bound_check(adapter, off, size) == 0)
-               return netxen_nic_pci_mem_write_direct(adapter,
-                               off, data, size);
+       if (size != 8)
+               return -EIO;
+
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_QDR_NET,
+                               NETXEN_ADDR_QDR_NET_MAX_P2)) {
+               mem_crb = pci_base_offset(adapter, NETXEN_CRB_QDR_NET);
+               goto correct;
+       }
+
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX)) {
+               mem_crb = pci_base_offset(adapter, NETXEN_CRB_DDR_NET);
+               goto correct;
+       }
+
+       return -EIO;
 
+correct:
        off8 = off & 0xfffffff8;
        off0 = off & 0x7;
        sz[0] = (size < (8 - off0)) ? size : (8 - off0);
        sz[1] = size - sz[0];
        loop = ((off0 + size - 1) >> 3) + 1;
-       mem_crb = (unsigned long)pci_base_offset(adapter, NETXEN_CRB_DDR_NET);
 
        if ((size != 8) || (off0 != 0))  {
                for (i = 0; i < loop; i++) {
@@ -1626,28 +1525,29 @@ netxen_nic_pci_mem_write_128M(struct netxen_adapter *adapter,
 
        for (i = 0; i < loop; i++) {
                writel((uint32_t)(off8 + (i << 3)),
-                       (void *)(mem_crb+MIU_TEST_AGT_ADDR_LO));
+                       (mem_crb+MIU_TEST_AGT_ADDR_LO));
                writel(0,
-                       (void *)(mem_crb+MIU_TEST_AGT_ADDR_HI));
+                       (mem_crb+MIU_TEST_AGT_ADDR_HI));
                writel(word[i] & 0xffffffff,
-                       (void *)(mem_crb+MIU_TEST_AGT_WRDATA_LO));
+                       (mem_crb+MIU_TEST_AGT_WRDATA_LO));
                writel((word[i] >> 32) & 0xffffffff,
-                       (void *)(mem_crb+MIU_TEST_AGT_WRDATA_HI));
+                       (mem_crb+MIU_TEST_AGT_WRDATA_HI));
                writel(MIU_TA_CTL_ENABLE|MIU_TA_CTL_WRITE,
-                       (void *)(mem_crb+MIU_TEST_AGT_CTRL));
+                       (mem_crb+MIU_TEST_AGT_CTRL));
                writel(MIU_TA_CTL_START|MIU_TA_CTL_ENABLE|MIU_TA_CTL_WRITE,
-                       (void *)(mem_crb+MIU_TEST_AGT_CTRL));
+                       (mem_crb+MIU_TEST_AGT_CTRL));
 
                for (j = 0; j < MAX_CTL_CHECK; j++) {
                        temp = readl(
-                            (void *)(mem_crb+MIU_TEST_AGT_CTRL));
+                            (mem_crb+MIU_TEST_AGT_CTRL));
                        if ((temp & MIU_TA_CTL_BUSY) == 0)
                                break;
                }
 
                if (j >= MAX_CTL_CHECK) {
-                       printk("%s: %s Fail to write through agent\n",
-                                       __func__, netxen_nic_driver_name);
+                       if (printk_ratelimit())
+                               dev_err(&adapter->pdev->dev,
+                                       "failed to write through agent\n");
                        ret = -1;
                        break;
                }
@@ -1658,53 +1558,64 @@ netxen_nic_pci_mem_write_128M(struct netxen_adapter *adapter,
        return ret;
 }
 
-int
+static int
 netxen_nic_pci_mem_read_128M(struct netxen_adapter *adapter,
                u64 off, void *data, int size)
 {
-       unsigned long   flags, mem_crb;
+       unsigned long   flags;
        int          i, j = 0, k, start, end, loop, sz[2], off0[2];
        uint32_t      temp;
        uint64_t      off8, val, word[2] = {0, 0};
+       void __iomem *mem_crb;
 
+       if (size != 8)
+               return -EIO;
 
-       /*
-        * If not MN, go check for MS or invalid.
-        */
-       if (netxen_nic_pci_mem_bound_check(adapter, off, size) == 0)
-               return netxen_nic_pci_mem_read_direct(adapter, off, data, size);
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_QDR_NET,
+                               NETXEN_ADDR_QDR_NET_MAX_P2)) {
+               mem_crb = pci_base_offset(adapter, NETXEN_CRB_QDR_NET);
+               goto correct;
+       }
+
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX)) {
+               mem_crb = pci_base_offset(adapter, NETXEN_CRB_DDR_NET);
+               goto correct;
+       }
 
+       return -EIO;
+
+correct:
        off8 = off & 0xfffffff8;
        off0[0] = off & 0x7;
        off0[1] = 0;
        sz[0] = (size < (8 - off0[0])) ? size : (8 - off0[0]);
        sz[1] = size - sz[0];
        loop = ((off0[0] + size - 1) >> 3) + 1;
-       mem_crb = (unsigned long)pci_base_offset(adapter, NETXEN_CRB_DDR_NET);
 
        write_lock_irqsave(&adapter->adapter_lock, flags);
        netxen_nic_pci_change_crbwindow_128M(adapter, 0);
 
        for (i = 0; i < loop; i++) {
                writel((uint32_t)(off8 + (i << 3)),
-                       (void *)(mem_crb+MIU_TEST_AGT_ADDR_LO));
+                       (mem_crb+MIU_TEST_AGT_ADDR_LO));
                writel(0,
-                       (void *)(mem_crb+MIU_TEST_AGT_ADDR_HI));
+                       (mem_crb+MIU_TEST_AGT_ADDR_HI));
                writel(MIU_TA_CTL_ENABLE,
-                       (void *)(mem_crb+MIU_TEST_AGT_CTRL));
+                       (mem_crb+MIU_TEST_AGT_CTRL));
                writel(MIU_TA_CTL_START|MIU_TA_CTL_ENABLE,
-                       (void *)(mem_crb+MIU_TEST_AGT_CTRL));
+                       (mem_crb+MIU_TEST_AGT_CTRL));
 
                for (j = 0; j < MAX_CTL_CHECK; j++) {
                        temp = readl(
-                             (void *)(mem_crb+MIU_TEST_AGT_CTRL));
+                             (mem_crb+MIU_TEST_AGT_CTRL));
                        if ((temp & MIU_TA_CTL_BUSY) == 0)
                                break;
                }
 
                if (j >= MAX_CTL_CHECK) {
-                       printk(KERN_ERR "%s: %s Fail to read through agent\n",
-                                       __func__, netxen_nic_driver_name);
+                       if (printk_ratelimit())
+                               dev_err(&adapter->pdev->dev,
+                                       "failed to read through agent\n");
                        break;
                }
 
@@ -1712,7 +1623,7 @@ netxen_nic_pci_mem_read_128M(struct netxen_adapter *adapter,
                end   = (off0[i] + sz[i] - 1) >> 2;
                for (k = start; k <= end; k++) {
                        word[i] |= ((uint64_t) readl(
-                                   (void *)(mem_crb +
+                                   (mem_crb +
                                    MIU_TEST_AGT_RDDATA(k))) << (32*k));
                }
        }
@@ -1744,30 +1655,35 @@ netxen_nic_pci_mem_read_128M(struct netxen_adapter *adapter,
                *(uint64_t *)data = val;
                break;
        }
-       DPRINTK(1, INFO, "read %llx\n", *(unsigned long long *)data);
        return 0;
 }
 
-int
+static int
 netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
                u64 off, void *data, int size)
 {
        int i, j, ret = 0, loop, sz[2], off0;
        uint32_t temp;
-       uint64_t off8, mem_crb, tmpw, word[2] = {0, 0};
+       uint64_t off8, tmpw, word[2] = {0, 0};
+       void __iomem *mem_crb;
 
-       /*
-        * If not MN, go check for MS or invalid.
-        */
-       if (off >= NETXEN_ADDR_QDR_NET && off <= NETXEN_ADDR_QDR_NET_MAX_P3)
-               mem_crb = NETXEN_CRB_QDR_NET;
-       else {
-               mem_crb = NETXEN_CRB_DDR_NET;
-               if (netxen_nic_pci_mem_bound_check(adapter, off, size) == 0)
-                       return netxen_nic_pci_mem_write_direct(adapter,
-                                       off, data, size);
+       if (size != 8)
+               return -EIO;
+
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_QDR_NET,
+                               NETXEN_ADDR_QDR_NET_MAX_P3)) {
+               mem_crb = netxen_get_ioaddr(adapter, NETXEN_CRB_QDR_NET);
+               goto correct;
+       }
+
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX)) {
+               mem_crb = netxen_get_ioaddr(adapter, NETXEN_CRB_DDR_NET);
+               goto correct;
        }
 
+       return -EIO;
+
+correct:
        off8 = off & 0xfffffff8;
        off0 = off & 0x7;
        sz[0] = (size < (8 - off0)) ? size : (8 - off0);
@@ -1776,8 +1692,8 @@ netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
 
        if ((size != 8) || (off0 != 0)) {
                for (i = 0; i < loop; i++) {
-                       if (adapter->pci_mem_read(adapter, off8 + (i << 3),
-                                               &word[i], 8))
+                       if (adapter->pci_mem_read(adapter,
+                                       off8 + (i << 3), &word[i], 8))
                                return -1;
                }
        }
@@ -1813,35 +1729,26 @@ netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
         */
 
        for (i = 0; i < loop; i++) {
-               temp = off8 + (i << 3);
-               adapter->hw_write_wx(adapter,
-                               mem_crb+MIU_TEST_AGT_ADDR_LO, &temp, 4);
-               temp = 0;
-               adapter->hw_write_wx(adapter,
-                               mem_crb+MIU_TEST_AGT_ADDR_HI, &temp, 4);
-               temp = word[i] & 0xffffffff;
-               adapter->hw_write_wx(adapter,
-                               mem_crb+MIU_TEST_AGT_WRDATA_LO, &temp, 4);
-               temp = (word[i] >> 32) & 0xffffffff;
-               adapter->hw_write_wx(adapter,
-                               mem_crb+MIU_TEST_AGT_WRDATA_HI, &temp, 4);
-               temp = MIU_TA_CTL_ENABLE | MIU_TA_CTL_WRITE;
-               adapter->hw_write_wx(adapter,
-                               mem_crb+MIU_TEST_AGT_CTRL, &temp, 4);
-               temp = MIU_TA_CTL_START | MIU_TA_CTL_ENABLE | MIU_TA_CTL_WRITE;
-               adapter->hw_write_wx(adapter,
-                               mem_crb+MIU_TEST_AGT_CTRL, &temp, 4);
+               writel(off8 + (i << 3), mem_crb+MIU_TEST_AGT_ADDR_LO);
+               writel(0, mem_crb+MIU_TEST_AGT_ADDR_HI);
+               writel(word[i] & 0xffffffff, mem_crb+MIU_TEST_AGT_WRDATA_LO);
+               writel((word[i] >> 32) & 0xffffffff,
+                               mem_crb+MIU_TEST_AGT_WRDATA_HI);
+               writel((MIU_TA_CTL_ENABLE | MIU_TA_CTL_WRITE),
+                               mem_crb+MIU_TEST_AGT_CTRL);
+               writel(MIU_TA_CTL_START | MIU_TA_CTL_ENABLE | MIU_TA_CTL_WRITE,
+                               mem_crb+MIU_TEST_AGT_CTRL);
 
                for (j = 0; j < MAX_CTL_CHECK; j++) {
-                       adapter->hw_read_wx(adapter,
-                                       mem_crb + MIU_TEST_AGT_CTRL, &temp, 4);
+                       temp = readl(mem_crb + MIU_TEST_AGT_CTRL);
                        if ((temp & MIU_TA_CTL_BUSY) == 0)
                                break;
                }
 
                if (j >= MAX_CTL_CHECK) {
-                       printk(KERN_ERR "%s: Fail to write through agent\n",
-                                       netxen_nic_driver_name);
+                       if (printk_ratelimit())
+                               dev_err(&adapter->pdev->dev,
+                                       "failed to write through agent\n");
                        ret = -1;
                        break;
                }
@@ -1854,27 +1761,32 @@ netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
        return ret;
 }
 
-int
+static int
 netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
                u64 off, void *data, int size)
 {
        int i, j = 0, k, start, end, loop, sz[2], off0[2];
        uint32_t      temp;
-       uint64_t      off8, val, mem_crb, word[2] = {0, 0};
+       uint64_t      off8, val, word[2] = {0, 0};
+       void __iomem *mem_crb;
 
-       /*
-        * If not MN, go check for MS or invalid.
-        */
+       if (size != 8)
+               return -EIO;
+
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_QDR_NET,
+                               NETXEN_ADDR_QDR_NET_MAX_P3)) {
+               mem_crb = netxen_get_ioaddr(adapter, NETXEN_CRB_QDR_NET);
+               goto correct;
+       }
 
-       if (off >= NETXEN_ADDR_QDR_NET && off <= NETXEN_ADDR_QDR_NET_MAX_P3)
-               mem_crb = NETXEN_CRB_QDR_NET;
-       else {
-               mem_crb = NETXEN_CRB_DDR_NET;
-               if (netxen_nic_pci_mem_bound_check(adapter, off, size) == 0)
-                       return netxen_nic_pci_mem_read_direct(adapter,
-                                       off, data, size);
+       if (ADDR_IN_RANGE(off, NETXEN_ADDR_DDR_NET, NETXEN_ADDR_DDR_NET_MAX)) {
+               mem_crb = netxen_get_ioaddr(adapter, NETXEN_CRB_DDR_NET);
+               goto correct;
        }
 
+       return -EIO;
+
+correct:
        off8 = off & 0xfffffff8;
        off0[0] = off & 0x7;
        off0[1] = 0;
@@ -1889,37 +1801,29 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
         */
 
        for (i = 0; i < loop; i++) {
-               temp = off8 + (i << 3);
-               adapter->hw_write_wx(adapter,
-                               mem_crb + MIU_TEST_AGT_ADDR_LO, &temp, 4);
-               temp = 0;
-               adapter->hw_write_wx(adapter,
-                               mem_crb + MIU_TEST_AGT_ADDR_HI, &temp, 4);
-               temp = MIU_TA_CTL_ENABLE;
-               adapter->hw_write_wx(adapter,
-                               mem_crb + MIU_TEST_AGT_CTRL, &temp, 4);
-               temp = MIU_TA_CTL_START | MIU_TA_CTL_ENABLE;
-               adapter->hw_write_wx(adapter,
-                               mem_crb + MIU_TEST_AGT_CTRL, &temp, 4);
+               writel(off8 + (i << 3), mem_crb + MIU_TEST_AGT_ADDR_LO);
+               writel(0, mem_crb + MIU_TEST_AGT_ADDR_HI);
+               writel(MIU_TA_CTL_ENABLE, mem_crb + MIU_TEST_AGT_CTRL);
+               writel(MIU_TA_CTL_START | MIU_TA_CTL_ENABLE,
+                               mem_crb + MIU_TEST_AGT_CTRL);
 
                for (j = 0; j < MAX_CTL_CHECK; j++) {
-                       adapter->hw_read_wx(adapter,
-                                       mem_crb + MIU_TEST_AGT_CTRL, &temp, 4);
+                       temp = readl(mem_crb + MIU_TEST_AGT_CTRL);
                        if ((temp & MIU_TA_CTL_BUSY) == 0)
                                break;
                }
 
                if (j >= MAX_CTL_CHECK) {
-                       printk(KERN_ERR "%s: Fail to read through agent\n",
-                                       netxen_nic_driver_name);
+                       if (printk_ratelimit())
+                               dev_err(&adapter->pdev->dev,
+                                       "failed to read through agent\n");
                        break;
                }
 
                start = off0[i] >> 2;
                end   = (off0[i] + sz[i] - 1) >> 2;
                for (k = start; k <= end; k++) {
-                       adapter->hw_read_wx(adapter,
-                               mem_crb + MIU_TEST_AGT_RDDATA(k), &temp, 4);
+                       temp = readl(mem_crb + MIU_TEST_AGT_RDDATA(k));
                        word[i] |= ((uint64_t)temp << (32 * k));
                }
        }
@@ -1953,91 +1857,84 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
                *(uint64_t *)data = val;
                break;
        }
-       DPRINTK(1, INFO, "read %llx\n", *(unsigned long long *)data);
        return 0;
 }
 
-/*
- * Note : only 32-bit writes!
- */
-int netxen_nic_pci_write_immediate_2M(struct netxen_adapter *adapter,
-               u64 off, u32 data)
+void
+netxen_setup_hwops(struct netxen_adapter *adapter)
 {
-       adapter->hw_write_wx(adapter, off, &data, 4);
+       adapter->init_port = netxen_niu_xg_init_port;
+       adapter->stop_port = netxen_niu_disable_xg_port;
 
-       return 0;
-}
+       if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+               adapter->crb_read = netxen_nic_hw_read_wx_128M,
+               adapter->crb_write = netxen_nic_hw_write_wx_128M,
+               adapter->pci_set_window = netxen_nic_pci_set_window_128M,
+               adapter->pci_mem_read = netxen_nic_pci_mem_read_128M,
+               adapter->pci_mem_write = netxen_nic_pci_mem_write_128M,
+               adapter->io_read = netxen_nic_io_read_128M,
+               adapter->io_write = netxen_nic_io_write_128M,
+
+               adapter->macaddr_set = netxen_p2_nic_set_mac_addr;
+               adapter->set_multi = netxen_p2_nic_set_multi;
+               adapter->set_mtu = netxen_nic_set_mtu_xgb;
+               adapter->set_promisc = netxen_p2_nic_set_promisc;
 
-u32 netxen_nic_pci_read_immediate_2M(struct netxen_adapter *adapter, u64 off)
-{
-       u32 temp;
-       adapter->hw_read_wx(adapter, off, &temp, 4);
-       return temp;
+       } else {
+               adapter->crb_read = netxen_nic_hw_read_wx_2M,
+               adapter->crb_write = netxen_nic_hw_write_wx_2M,
+               adapter->pci_set_window = netxen_nic_pci_set_window_2M,
+               adapter->pci_mem_read = netxen_nic_pci_mem_read_2M,
+               adapter->pci_mem_write = netxen_nic_pci_mem_write_2M,
+               adapter->io_read = netxen_nic_io_read_2M,
+               adapter->io_write = netxen_nic_io_write_2M,
+
+               adapter->set_mtu = nx_fw_cmd_set_mtu;
+               adapter->set_promisc = netxen_p3_nic_set_promisc;
+               adapter->macaddr_set = netxen_p3_nic_set_mac_addr;
+               adapter->set_multi = netxen_p3_nic_set_multi;
+
+               adapter->phy_read = nx_fw_cmd_query_phy;
+               adapter->phy_write = nx_fw_cmd_set_phy;
+       }
 }
 
-void netxen_nic_pci_write_normalize_2M(struct netxen_adapter *adapter,
-               u64 off, u32 data)
+int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 {
-       adapter->hw_write_wx(adapter, off, &data, 4);
-}
+       int offset, board_type, magic, header_version;
+       struct pci_dev *pdev = adapter->pdev;
 
-u32 netxen_nic_pci_read_normalize_2M(struct netxen_adapter *adapter, u64 off)
-{
-       u32 temp;
-       adapter->hw_read_wx(adapter, off, &temp, 4);
-       return temp;
-}
+       offset = NX_FW_MAGIC_OFFSET;
+       if (netxen_rom_fast_read(adapter, offset, &magic))
+               return -EIO;
 
-#if 0
-int
-netxen_nic_erase_pxe(struct netxen_adapter *adapter)
-{
-       if (netxen_rom_fast_write(adapter, NETXEN_PXE_START, 0) == -1) {
-               printk(KERN_ERR "%s: erase pxe failed\n",
-                       netxen_nic_driver_name);
-               return -1;
-       }
-       return 0;
-}
-#endif  /*  0  */
+       offset = NX_HDR_VERSION_OFFSET;
+       if (netxen_rom_fast_read(adapter, offset, &header_version))
+               return -EIO;
 
-int netxen_nic_get_board_info(struct netxen_adapter *adapter)
-{
-       int rv = 0;
-       int addr = NETXEN_BRDCFG_START;
-       struct netxen_board_info *boardinfo;
-       int index;
-       u32 *ptr32;
-
-       boardinfo = &adapter->ahw.boardcfg;
-       ptr32 = (u32 *) boardinfo;
-
-       for (index = 0; index < sizeof(struct netxen_board_info) / sizeof(u32);
-            index++) {
-               if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) {
-                       return -EIO;
-               }
-               ptr32++;
-               addr += sizeof(u32);
-       }
-       if (boardinfo->magic != NETXEN_BDINFO_MAGIC) {
-               printk("%s: ERROR reading %s board config."
-                      " Read %x, expected %x\n", netxen_nic_driver_name,
-                      netxen_nic_driver_name,
-                      boardinfo->magic, NETXEN_BDINFO_MAGIC);
-               rv = -1;
+       if (magic != NETXEN_BDINFO_MAGIC ||
+                       header_version != NETXEN_BDINFO_VERSION) {
+               dev_err(&pdev->dev,
+                       "invalid board config, magic=%08x, version=%08x\n",
+                       magic, header_version);
+               return -EIO;
        }
-       if (boardinfo->header_version != NETXEN_BDINFO_VERSION) {
-               printk("%s: Unknown board config version."
-                      " Read %x, expected %x\n", netxen_nic_driver_name,
-                      boardinfo->header_version, NETXEN_BDINFO_VERSION);
-               rv = -1;
+
+       offset = NX_BRDTYPE_OFFSET;
+       if (netxen_rom_fast_read(adapter, offset, &board_type))
+               return -EIO;
+
+       adapter->ahw.board_type = board_type;
+
+       if (board_type == NETXEN_BRDTYPE_P3_4_GB_MM) {
+               u32 gpio = NXRD32(adapter, NETXEN_ROMUSB_GLB_PAD_GPIO_I);
+               if ((gpio & 0x8000) == 0)
+                       board_type = NETXEN_BRDTYPE_P3_10G_TP;
        }
 
-       DPRINTK(INFO, "Discovered board type:0x%x  ", boardinfo->board_type);
-       switch ((netxen_brdtype_t) boardinfo->board_type) {
+       switch (board_type) {
        case NETXEN_BRDTYPE_P2_SB35_4G:
-               adapter->ahw.board_type = NETXEN_NIC_GBE;
+               adapter->ahw.port_type = NETXEN_NIC_GBE;
                break;
        case NETXEN_BRDTYPE_P2_SB31_10G:
        case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ:
@@ -2053,8 +1950,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
        case NETXEN_BRDTYPE_P3_10G_SFP_QT:
        case NETXEN_BRDTYPE_P3_10G_XFP:
        case NETXEN_BRDTYPE_P3_10000_BASE_T:
-
-               adapter->ahw.board_type = NETXEN_NIC_XGBE;
+               adapter->ahw.port_type = NETXEN_NIC_XGBE;
                break;
        case NETXEN_BRDTYPE_P1_BD:
        case NETXEN_BRDTYPE_P1_SB:
@@ -2063,17 +1959,19 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
        case NETXEN_BRDTYPE_P3_REF_QG:
        case NETXEN_BRDTYPE_P3_4_GB:
        case NETXEN_BRDTYPE_P3_4_GB_MM:
-
-               adapter->ahw.board_type = NETXEN_NIC_GBE;
+               adapter->ahw.port_type = NETXEN_NIC_GBE;
+               break;
+       case NETXEN_BRDTYPE_P3_10G_TP:
+               adapter->ahw.port_type = (adapter->portnum < 2) ?
+                       NETXEN_NIC_XGBE : NETXEN_NIC_GBE;
                break;
        default:
-               printk("%s: Unknown(%x)\n", netxen_nic_driver_name,
-                      boardinfo->board_type);
-               rv = -ENODEV;
+               dev_err(&pdev->dev, "unknown board type %x\n", board_type);
+               adapter->ahw.port_type = NETXEN_NIC_XGBE;
                break;
        }
 
-       return rv;
+       return 0;
 }
 
 /* NIU access sections */
@@ -2081,8 +1979,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)
 {
        new_mtu += MTU_FUDGE_FACTOR;
-       netxen_nic_write_w0(adapter,
-               NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->physical_port),
+       NXWR32(adapter, NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->physical_port),
                new_mtu);
        return 0;
 }
@@ -2091,33 +1988,27 @@ int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
 {
        new_mtu += MTU_FUDGE_FACTOR;
        if (adapter->physical_port == 0)
-               netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE,
-                               new_mtu);
+               NXWR32(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);
        else
-               netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE,
-                               new_mtu);
+               NXWR32(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE, new_mtu);
        return 0;
 }
 
-void
-netxen_crb_writelit_adapter(struct netxen_adapter *adapter,
-               unsigned long off, int data)
-{
-       adapter->hw_write_wx(adapter, off, &data, 4);
-}
-
 void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
 {
        __u32 status;
        __u32 autoneg;
-       __u32 mode;
        __u32 port_mode;
 
-       netxen_nic_read_w0(adapter, NETXEN_NIU_MODE, &mode);
-       if (netxen_get_niu_enable_ge(mode)) {   /* Gb 10/100/1000 Mbps mode */
+       if (!netif_carrier_ok(adapter->netdev)) {
+               adapter->link_speed   = 0;
+               adapter->link_duplex  = -1;
+               adapter->link_autoneg = AUTONEG_ENABLE;
+               return;
+       }
 
-               adapter->hw_read_wx(adapter,
-                               NETXEN_PORT_MODE_ADDR, &port_mode, 4);
+       if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
+               port_mode = NXRD32(adapter, NETXEN_PORT_MODE_ADDR);
                if (port_mode == NETXEN_PORT_MODE_802_3_AP) {
                        adapter->link_speed   = SPEED_1000;
                        adapter->link_duplex  = DUPLEX_FULL;
@@ -2141,7 +2032,7 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
                                        adapter->link_speed = SPEED_1000;
                                        break;
                                default:
-                                       adapter->link_speed = -1;
+                                       adapter->link_speed = 0;
                                        break;
                                }
                                switch (netxen_get_phy_duplex(status)) {
@@ -2164,63 +2055,26 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
                                goto link_down;
                } else {
                      link_down:
-                       adapter->link_speed = -1;
+                       adapter->link_speed = 0;
                        adapter->link_duplex = -1;
                }
        }
 }
 
-void netxen_nic_flash_print(struct netxen_adapter *adapter)
+int
+netxen_nic_wol_supported(struct netxen_adapter *adapter)
 {
-       u32 fw_major = 0;
-       u32 fw_minor = 0;
-       u32 fw_build = 0;
-       char brd_name[NETXEN_MAX_SHORT_NAME];
-       char serial_num[32];
-       int i, addr;
-       __le32 *ptr32;
-
-       struct netxen_board_info *board_info = &(adapter->ahw.boardcfg);
-
-       adapter->driver_mismatch = 0;
+       u32 wol_cfg;
 
-       ptr32 = (u32 *)&serial_num;
-       addr = NETXEN_USER_START +
-              offsetof(struct netxen_new_user_info, serial_num);
-       for (i = 0; i < 8; i++) {
-               if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) {
-                       printk("%s: ERROR reading %s board userarea.\n",
-                              netxen_nic_driver_name,
-                              netxen_nic_driver_name);
-                       adapter->driver_mismatch = 1;
-                       return;
-               }
-               ptr32++;
-               addr += sizeof(u32);
-       }
-
-       adapter->hw_read_wx(adapter, NETXEN_FW_VERSION_MAJOR, &fw_major, 4);
-       adapter->hw_read_wx(adapter, NETXEN_FW_VERSION_MINOR, &fw_minor, 4);
-       adapter->hw_read_wx(adapter, NETXEN_FW_VERSION_SUB, &fw_build, 4);
-
-       adapter->fw_major = fw_major;
-
-       if (adapter->portnum == 0) {
-               get_brd_name_by_type(board_info->board_type, brd_name);
+       if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+               return 0;
 
-               printk("NetXen %s Board S/N %s  Chip id 0x%x\n",
-                               brd_name, serial_num, board_info->chip_id);
-               printk("NetXen Firmware version %d.%d.%d\n", fw_major,
-                               fw_minor, fw_build);
+       wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG_NV);
+       if (wol_cfg & (1UL << adapter->portnum)) {
+               wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG);
+               if (wol_cfg & (1 << adapter->portnum))
+                       return 1;
        }
 
-       if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) <
-                       NETXEN_VERSION_CODE(3, 4, 216)) {
-               adapter->driver_mismatch = 1;
-               printk(KERN_ERR "%s: firmware version %d.%d.%d unsupported\n",
-                               netxen_nic_driver_name,
-                               fw_major, fw_minor, fw_build);
-               return;
-       }
+       return 0;
 }
-