6 files changed, 239 insertions, 92 deletions

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 970cedeb5f37..a9c1fcca5e75 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -60,7 +60,18 @@
 #define _NETXEN_NIC_LINUX_SUBVERSION 30
 #define NETXEN_NIC_LINUX_VERSIONID  "4.0.30"
 
-#define NETXEN_VERSION_CODE(a, b, c)    (((a) << 16) + ((b) << 8) + (c))
+#define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
+#define _major(v)       (((v) >> 24) & 0xff)
+#define _minor(v)       (((v) >> 16) & 0xff)
+#define _build(v)       ((v) & 0xffff)
+
+/* version in image has weird encoding:
+ *  7:0  - major
+ * 15:8  - minor
+ * 31:16 - build (little endian)
+ */
+#define NETXEN_DECODE_VERSION(v) \
+        NETXEN_VERSION_CODE(((v) & 0xff), (((v) >> 8) & 0xff), ((v) >> 16))
 
 #define NETXEN_NUM_FLASH_SECTORS (64)
 #define NETXEN_FLASH_SECTOR_SIZE (64 * 1024)
@@ -199,6 +210,7 @@
 #define NETXEN_CTX_SIGNATURE    0xdee0
 #define NETXEN_CTX_SIGNATURE_V2 0x0002dee0
 #define NETXEN_CTX_RESET        0xbad0
+#define NETXEN_CTX_D3_RESET     0xacc0
 #define NETXEN_RCV_PRODUCER(ringid)     (ringid)
 
 #define PHAN_PEG_RCV_INITIALIZED        0xff01
@@ -614,6 +626,7 @@ struct netxen_new_user_info {
 #define NX_P2_MN_ROMIMAGE       0
 #define NX_P3_CT_ROMIMAGE       1
 #define NX_P3_MN_ROMIMAGE       2
+#define NX_FLASH_ROMIMAGE       3
 
 #define NETXEN_USER_START_OLD NETXEN_PXE_START  /* for backward compatibility */
 
@@ -761,6 +774,8 @@ struct nx_host_tx_ring {
         u32 crb_cmd_consumer;
         u32 num_desc;
 
+        struct netdev_queue *txq;
+
         struct netxen_cmd_buffer *cmd_buf_arr;
         struct cmd_desc_type0 *desc_head;
         dma_addr_t phys_addr;
@@ -1239,11 +1254,11 @@ struct netxen_adapter {
         u8 mc_enabled;
         u8 max_mc_count;
         u8 rss_supported;
-        u8 resv2;
+        u8 link_changed;
         u32 resv3;
 
         u8 has_link_events;
-        u8 resv1;
+        u8 fw_type;
         u16 tx_context_id;
         u16 mtu;
         u16 is_up;
@@ -1387,6 +1402,7 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter);
 int netxen_initialize_adapter_offload(struct netxen_adapter *adapter);
 int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
 int netxen_load_firmware(struct netxen_adapter *adapter);
+int netxen_need_fw_reset(struct netxen_adapter *adapter);
 void netxen_request_firmware(struct netxen_adapter *adapter);
 void netxen_release_firmware(struct netxen_adapter *adapter);
 int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose);
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index 4754f5cffad0..9f8ae4719e2f 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -684,10 +684,8 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
                         goto err_out_free;
         } else {
                 err = netxen_init_old_ctx(adapter);
-                if (err) {
-                        netxen_free_hw_resources(adapter);
-                        return err;
-                }
+                if (err)
+                        goto err_out_free;
         }
 
         return 0;
@@ -708,15 +706,18 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter)
         int port = adapter->portnum;
 
         if (adapter->fw_major >= 4) {
-                nx_fw_cmd_destroy_tx_ctx(adapter);
                 nx_fw_cmd_destroy_rx_ctx(adapter);
+                nx_fw_cmd_destroy_tx_ctx(adapter);
         } else {
                 netxen_api_lock(adapter);
                 NXWR32(adapter, CRB_CTX_SIGNATURE_REG(port),
-                                NETXEN_CTX_RESET | port);
+                                NETXEN_CTX_D3_RESET | port);
                 netxen_api_unlock(adapter);
         }
 
+        /* Allow dma queues to drain after context reset */
+        msleep(20);
+
         recv_ctx = &adapter->recv_ctx;
 
         if (recv_ctx->hwctx != NULL) {
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 3cc047844af3..824103675648 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -853,6 +853,7 @@ enum {
 #define NX_PEG_TUNE_CAPABILITY          (NETXEN_CAM_RAM(0x02c))
 
 #define NETXEN_CAM_RAM_DMA_WATCHDOG_CTRL                (0x14)
+#define NETXEN_PEG_ALIVE_COUNTER        (NETXEN_CAM_RAM(0xb0))
 
 #define ISR_MSI_INT_TRIGGER(FUNC) (NETXEN_PCIX_PS_REG(PCIX_MSI_F(FUNC)))
 #define ISR_LEGACY_INT_TRIGGERED(VAL)   (((VAL) & 0x300) == 0x200)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index ce3b89d2cbb6..b9123d445c96 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -461,13 +461,14 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,
         i = 0;
 
         tx_ring = adapter->tx_ring;
-        netif_tx_lock_bh(adapter->netdev);
+        __netif_tx_lock_bh(tx_ring->txq);
 
         producer = tx_ring->producer;
         consumer = tx_ring->sw_consumer;
 
-        if (nr_desc >= find_diff_among(producer, consumer, tx_ring->num_desc)) {
-                netif_tx_unlock_bh(adapter->netdev);
+        if (nr_desc >= netxen_tx_avail(tx_ring)) {
+                netif_tx_stop_queue(tx_ring->txq);
+                __netif_tx_unlock_bh(tx_ring->txq);
                 return -EBUSY;
         }
 
@@ -490,7 +491,7 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,
 
         netxen_nic_update_cmd_producer(adapter, tx_ring);
 
-        netif_tx_unlock_bh(adapter->netdev);
+        __netif_tx_unlock_bh(tx_ring->txq);
 
         return 0;
 }
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 055bb61d6e77..5d3343ef3d86 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -214,6 +214,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
         adapter->tx_ring = tx_ring;
 
         tx_ring->num_desc = adapter->num_txd;
+        tx_ring->txq = netdev_get_tx_queue(netdev, 0);
 
         cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(tx_ring));
         if (cmd_buf_arr == NULL) {
@@ -684,11 +685,84 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose)
 }
 
 int
+netxen_need_fw_reset(struct netxen_adapter *adapter)
+{
+        u32 count, old_count;
+        u32 val, version, major, minor, build;
+        int i, timeout;
+        u8 fw_type;
+
+        /* NX2031 firmware doesn't support heartbit */
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return 1;
+
+        /* last attempt had failed */
+        if (NXRD32(adapter, CRB_CMDPEG_STATE) == PHAN_INITIALIZE_FAILED)
+                return 1;
+
+        old_count = count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
+
+        for (i = 0; i < 10; i++) {
+
+                timeout = msleep_interruptible(200);
+                if (timeout) {
+                        NXWR32(adapter, CRB_CMDPEG_STATE,
+                                        PHAN_INITIALIZE_FAILED);
+                        return -EINTR;
+                }
+
+                count = NXRD32(adapter, NETXEN_PEG_ALIVE_COUNTER);
+                if (count != old_count)
+                        break;
+        }
+
+        /* firmware is dead */
+        if (count == old_count)
+                return 1;
+
+        /* check if we have got newer or different file firmware */
+        if (adapter->fw) {
+
+                const struct firmware *fw = adapter->fw;
+
+                val = cpu_to_le32(*(u32 *)&fw->data[NX_FW_VERSION_OFFSET]);
+                version = NETXEN_DECODE_VERSION(val);
+
+                major = NXRD32(adapter, NETXEN_FW_VERSION_MAJOR);
+                minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);
+                build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);
+
+                if (version > NETXEN_VERSION_CODE(major, minor, build))
+                        return 1;
+
+                if (version == NETXEN_VERSION_CODE(major, minor, build)) {
+
+                        val = NXRD32(adapter, NETXEN_MIU_MN_CONTROL);
+                        fw_type = (val & 0x4) ?
+                                NX_P3_CT_ROMIMAGE : NX_P3_MN_ROMIMAGE;
+
+                        if (adapter->fw_type != fw_type)
+                                return 1;
+                }
+        }
+
+        return 0;
+}
+
+static char *fw_name[] = {
+        "nxromimg.bin", "nx3fwct.bin", "nx3fwmn.bin", "flash",
+};
+
+int
 netxen_load_firmware(struct netxen_adapter *adapter)
 {
         u64 *ptr64;
         u32 i, flashaddr, size;
         const struct firmware *fw = adapter->fw;
+        struct pci_dev *pdev = adapter->pdev;
+
+        dev_info(&pdev->dev, "loading firmware from %s\n",
+                        fw_name[adapter->fw_type]);
 
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 NXWR32(adapter, NETXEN_ROMUSB_GLB_CAS_RST, 1);
@@ -756,7 +830,7 @@ static int
 netxen_validate_firmware(struct netxen_adapter *adapter, const char *fwname)
 {
         __le32 val;
-        u32 major, minor, build, ver, min_ver, bios;
+        u32 ver, min_ver, bios;
         struct pci_dev *pdev = adapter->pdev;
         const struct firmware *fw = adapter->fw;
 
@@ -768,21 +842,18 @@ netxen_validate_firmware(struct netxen_adapter *adapter, const char *fwname)
                 return -EINVAL;
 
         val = cpu_to_le32(*(u32 *)&fw->data[NX_FW_VERSION_OFFSET]);
-        major = (__force u32)val & 0xff;
-        minor = ((__force u32)val >> 8) & 0xff;
-        build = (__force u32)val >> 16;
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
                 min_ver = NETXEN_VERSION_CODE(4, 0, 216);
         else
                 min_ver = NETXEN_VERSION_CODE(3, 4, 216);
 
-        ver = NETXEN_VERSION_CODE(major, minor, build);
+        ver = NETXEN_DECODE_VERSION(val);
 
-        if ((major > _NETXEN_NIC_LINUX_MAJOR) || (ver < min_ver)) {
+        if ((_major(ver) > _NETXEN_NIC_LINUX_MAJOR) || (ver < min_ver)) {
                 dev_err(&pdev->dev,
                                 "%s: firmware version %d.%d.%d unsupported\n",
-                                fwname, major, minor, build);
+                                fwname, _major(ver), _minor(ver), _build(ver));
                 return -EINVAL;
         }
 
@@ -798,22 +869,21 @@ netxen_validate_firmware(struct netxen_adapter *adapter, const char *fwname)
         if (netxen_rom_fast_read(adapter,
                         NX_FW_VERSION_OFFSET, (int *)&val))
                 return -EIO;
-        major = (__force u32)val & 0xff;
-        minor = ((__force u32)val >> 8) & 0xff;
-        build = (__force u32)val >> 16;
-        if (NETXEN_VERSION_CODE(major, minor, build) > ver)
+        val = NETXEN_DECODE_VERSION(val);
+        if (val > ver) {
+                dev_info(&pdev->dev, "%s: firmware is older than flash\n",
+                                fwname);
                 return -EINVAL;
+        }
 
         NXWR32(adapter, NETXEN_CAM_RAM(0x1fc), NETXEN_BDINFO_MAGIC);
         return 0;
 }
 
-static char *fw_name[] = { "nxromimg.bin", "nx3fwct.bin", "nx3fwmn.bin" };
-
 void netxen_request_firmware(struct netxen_adapter *adapter)
 {
         u32 capability, flashed_ver;
-        int fw_type;
+        u8 fw_type;
         struct pci_dev *pdev = adapter->pdev;
         int rc = 0;
 
@@ -830,6 +900,8 @@ request_mn:
 
         netxen_rom_fast_read(adapter,
                         NX_FW_VERSION_OFFSET, (int *)&flashed_ver);
+        flashed_ver = NETXEN_DECODE_VERSION(flashed_ver);
+
         if (flashed_ver >= NETXEN_VERSION_CODE(4, 0, 220)) {
                 capability = NXRD32(adapter, NX_PEG_TUNE_CAPABILITY);
                 if (capability & NX_PEG_TUNE_MN_PRESENT) {
@@ -838,6 +910,10 @@ request_mn:
                 }
         }
 
+        fw_type = NX_FLASH_ROMIMAGE;
+        adapter->fw = NULL;
+        goto done;
+
 request_fw:
         rc = request_firmware(&adapter->fw, fw_name[fw_type], &pdev->dev);
         if (rc != 0) {
@@ -846,6 +922,7 @@ request_fw:
                         goto request_mn;
                 }
 
+                fw_type = NX_FLASH_ROMIMAGE;
                 adapter->fw = NULL;
                 goto done;
         }
@@ -859,16 +936,13 @@ request_fw:
                         goto request_mn;
                 }
 
+                fw_type = NX_FLASH_ROMIMAGE;
                 adapter->fw = NULL;
                 goto done;
         }
 
 done:
-        if (adapter->fw)
-                dev_info(&pdev->dev, "loading firmware from file %s\n",
-                                fw_name[fw_type]);
-        else
-                dev_info(&pdev->dev, "loading firmware from flash\n");
+        adapter->fw_type = fw_type;
 }
 
 
@@ -1327,10 +1401,10 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
                 smp_mb();
 
                 if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
-                        netif_tx_lock(netdev);
+                        __netif_tx_lock(tx_ring->txq, smp_processor_id());
                         if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH)
                                 netif_wake_queue(netdev);
-                        netif_tx_unlock(netdev);
+                        __netif_tx_unlock(tx_ring->txq);
                 }
         }
         /*
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 2919a2d12bf4..28f270f5ac78 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -94,10 +94,6 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(pci, netxen_pci_tbl);
 
-static struct workqueue_struct *netxen_workq;
-#define SCHEDULE_WORK(tp)       queue_work(netxen_workq, tp)
-#define FLUSH_SCHEDULED_WORK()  flush_workqueue(netxen_workq)
-
 static void netxen_watchdog(unsigned long);
 
 static uint32_t crb_cmd_producer[4] = {
@@ -171,6 +167,8 @@ netxen_free_sds_rings(struct netxen_recv_context *recv_ctx)
 {
         if (recv_ctx->sds_rings != NULL)
                 kfree(recv_ctx->sds_rings);
+
+        recv_ctx->sds_rings = NULL;
 }
 
 static int
@@ -193,6 +191,21 @@ netxen_napi_add(struct netxen_adapter *adapter, struct net_device *netdev)
 }
 
 static void
+netxen_napi_del(struct netxen_adapter *adapter)
+{
+        int ring;
+        struct nx_host_sds_ring *sds_ring;
+        struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
+
+        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+                sds_ring = &recv_ctx->sds_rings[ring];
+                netif_napi_del(&sds_ring->napi);
+        }
+
+        netxen_free_sds_rings(&adapter->recv_ctx);
+}
+
+static void
 netxen_napi_enable(struct netxen_adapter *adapter)
 {
         int ring;
@@ -215,13 +228,13 @@ netxen_napi_disable(struct netxen_adapter *adapter)
 
         for (ring = 0; ring < adapter->max_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
-                napi_disable(&sds_ring->napi);
                 netxen_nic_disable_int(sds_ring);
-                synchronize_irq(sds_ring->irq);
+                napi_synchronize(&sds_ring->napi);
+                napi_disable(&sds_ring->napi);
         }
 }
 
-static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id)
+static int nx_set_dma_mask(struct netxen_adapter *adapter)
 {
         struct pci_dev *pdev = adapter->pdev;
         uint64_t mask, cmask;
@@ -229,19 +242,17 @@ static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id)
         adapter->pci_using_dac = 0;
 
         mask = DMA_BIT_MASK(32);
-        /*
-         * Consistent DMA mask is set to 32 bit because it cannot be set to
-         * 35 bits. For P3 also leave it at 32 bits for now. Only the rings
-         * come off this pool.
-         */
         cmask = DMA_BIT_MASK(32);
 
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
 #ifndef CONFIG_IA64
-        if (revision_id >= NX_P3_B0)
-                mask = DMA_BIT_MASK(39);
-        else if (revision_id == NX_P2_C1)
                 mask = DMA_BIT_MASK(35);
 #endif
+        } else {
+                mask = DMA_BIT_MASK(39);
+                cmask = mask;
+        }
+
         if (pci_set_dma_mask(pdev, mask) == 0 &&
                 pci_set_consistent_dma_mask(pdev, cmask) == 0) {
                 adapter->pci_using_dac = 1;
@@ -256,13 +267,13 @@ static int
 nx_update_dma_mask(struct netxen_adapter *adapter)
 {
         int change, shift, err;
-        uint64_t mask, old_mask;
+        uint64_t mask, old_mask, old_cmask;
         struct pci_dev *pdev = adapter->pdev;
 
         change = 0;
 
         shift = NXRD32(adapter, CRB_DMA_SHIFT);
-        if (shift >= 32)
+        if (shift > 32)
                 return 0;
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id) && (shift > 9))
@@ -272,14 +283,29 @@ nx_update_dma_mask(struct netxen_adapter *adapter)
 
         if (change) {
                 old_mask = pdev->dma_mask;
-                mask = (1ULL<<(32+shift)) - 1;
+                old_cmask = pdev->dev.coherent_dma_mask;
+
+                mask = DMA_BIT_MASK(32+shift);
 
                 err = pci_set_dma_mask(pdev, mask);
                 if (err)
-                        return pci_set_dma_mask(pdev, old_mask);
+                        goto err_out;
+
+                if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+
+                        err = pci_set_consistent_dma_mask(pdev, mask);
+                        if (err)
+                                goto err_out;
+                }
+                dev_info(&pdev->dev, "using %d-bit dma mask\n", 32+shift);
         }
 
         return 0;
+
+err_out:
+        pci_set_dma_mask(pdev, old_mask);
+        pci_set_consistent_dma_mask(pdev, old_cmask);
+        return err;
 }
 
 static void netxen_check_options(struct netxen_adapter *adapter)
@@ -718,6 +744,10 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
         if (request_fw)
                 netxen_request_firmware(adapter);
 
+        err = netxen_need_fw_reset(adapter);
+        if (err <= 0)
+                return err;
+
         if (first_boot != 0x55555555) {
                 NXWR32(adapter, CRB_CMDPEG_STATE, 0);
                 netxen_pinit_from_rom(adapter, 0);
@@ -829,11 +859,11 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
 
         adapter->ahw.linkup = 0;
 
-        netxen_napi_enable(adapter);
-
         if (adapter->max_sds_rings > 1)
                 netxen_config_rss(adapter, 1);
 
+        netxen_napi_enable(adapter);
+
         if (adapter->capabilities & NX_FW_CAPABILITY_LINK_NOTIFICATION)
                 netxen_linkevent_request(adapter, 1);
         else
@@ -847,8 +877,9 @@ netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
 static void
 netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
 {
+        spin_lock(&adapter->tx_clean_lock);
         netif_carrier_off(netdev);
-        netif_stop_queue(netdev);
+        netif_tx_disable(netdev);
 
         if (adapter->stop_port)
                 adapter->stop_port(adapter);
@@ -859,8 +890,8 @@ netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
         netxen_napi_disable(adapter);
 
         netxen_release_tx_buffers(adapter);
+        spin_unlock(&adapter->tx_clean_lock);
 
-        FLUSH_SCHEDULED_WORK();
         del_timer_sync(&adapter->watchdog_timer);
 }
 
@@ -875,10 +906,12 @@ netxen_nic_attach(struct netxen_adapter *adapter)
         struct nx_host_tx_ring *tx_ring;
 
         err = netxen_init_firmware(adapter);
-        if (err != 0) {
-                printk(KERN_ERR "Failed to init firmware\n");
-                return -EIO;
-        }
+        if (err)
+                return err;
+
+        err = netxen_napi_add(adapter, netdev);
+        if (err)
+                return err;
 
         if (adapter->fw_major < 4)
                 adapter->max_rds_rings = 3;
@@ -939,9 +972,10 @@ err_out_free_sw:
 static void
 netxen_nic_detach(struct netxen_adapter *adapter)
 {
-        netxen_release_rx_buffers(adapter);
         netxen_free_hw_resources(adapter);
+        netxen_release_rx_buffers(adapter);
         netxen_nic_free_irq(adapter);
+        netxen_napi_del(adapter);
         netxen_free_sw_resources(adapter);
 
         adapter->is_up = 0;
@@ -1000,7 +1034,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         revision_id = pdev->revision;
         adapter->ahw.revision_id = revision_id;
 
-        err = nx_set_dma_mask(adapter, revision_id);
+        err = nx_set_dma_mask(adapter);
         if (err)
                 goto err_out_free_netdev;
 
@@ -1086,9 +1120,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netdev->irq = adapter->msix_entries[0].vector;
 
-        if (netxen_napi_add(adapter, netdev))
-                goto err_out_disable_msi;
-
         init_timer(&adapter->watchdog_timer);
         adapter->watchdog_timer.function = &netxen_watchdog;
         adapter->watchdog_timer.data = (unsigned long)adapter;
@@ -1158,6 +1189,9 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         unregister_netdev(netdev);
 
+        cancel_work_sync(&adapter->watchdog_task);
+        cancel_work_sync(&adapter->tx_timeout_task);
+
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
                 netxen_nic_detach(adapter);
         }
@@ -1166,7 +1200,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
                 netxen_free_adapter_offload(adapter);
 
         netxen_teardown_intr(adapter);
-        netxen_free_sds_rings(&adapter->recv_ctx);
 
         netxen_cleanup_pci_map(adapter);
 
@@ -1192,6 +1225,9 @@ netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)
         if (netif_running(netdev))
                 netxen_nic_down(adapter, netdev);
 
+        cancel_work_sync(&adapter->watchdog_task);
+        cancel_work_sync(&adapter->tx_timeout_task);
+
         if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
                 netxen_nic_detach(adapter);
 
@@ -1529,10 +1565,7 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter)
                 printk(KERN_ALERT
                        "%s: Device temperature %d degrees C exceeds"
                        " maximum allowed. Hardware has been shut down.\n",
-                       netxen_nic_driver_name, temp_val);
-
-                netif_carrier_off(netdev);
-                netif_stop_queue(netdev);
+                       netdev->name, temp_val);
                 rv = 1;
         } else if (temp_state == NX_TEMP_WARN) {
                 if (adapter->temp == NX_TEMP_NORMAL) {
@@ -1540,13 +1573,13 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter)
                                "%s: Device temperature %d degrees C "
                                "exceeds operating range."
                                " Immediate action needed.\n",
-                               netxen_nic_driver_name, temp_val);
+                               netdev->name, temp_val);
                 }
         } else {
                 if (adapter->temp == NX_TEMP_WARN) {
                         printk(KERN_INFO
                                "%s: Device temperature is now %d degrees C"
-                               " in normal range.\n", netxen_nic_driver_name,
+                               " in normal range.\n", netdev->name,
                                temp_val);
                 }
         }
@@ -1566,10 +1599,7 @@ void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup)
                         netif_carrier_off(netdev);
                         netif_stop_queue(netdev);
                 }
-
-                if (!adapter->has_link_events)
-                        netxen_nic_set_link_parameters(adapter);
-
+                adapter->link_changed = !adapter->has_link_events;
         } else if (!adapter->ahw.linkup && linkup) {
                 printk(KERN_INFO "%s: %s NIC Link is up\n",
                        netxen_nic_driver_name, netdev->name);
@@ -1578,9 +1608,7 @@ void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup)
                         netif_carrier_on(netdev);
                         netif_wake_queue(netdev);
                 }
-
-                if (!adapter->has_link_events)
-                        netxen_nic_set_link_parameters(adapter);
+                adapter->link_changed = !adapter->has_link_events;
         }
 }
 
@@ -1607,11 +1635,36 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)
         netxen_advert_link_change(adapter, linkup);
 }
 
+static void netxen_nic_thermal_shutdown(struct netxen_adapter *adapter)
+{
+        struct net_device *netdev = adapter->netdev;
+
+        netif_device_detach(netdev);
+        netxen_nic_down(adapter, netdev);
+        netxen_nic_detach(adapter);
+}
+
 static void netxen_watchdog(unsigned long v)
 {
         struct netxen_adapter *adapter = (struct netxen_adapter *)v;
 
-        SCHEDULE_WORK(&adapter->watchdog_task);
+        if (netxen_nic_check_temp(adapter))
+                goto do_sched;
+
+        if (!adapter->has_link_events) {
+                netxen_nic_handle_phy_intr(adapter);
+
+                if (adapter->link_changed)
+                        goto do_sched;
+        }
+
+        if (netif_running(adapter->netdev))
+                mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
+
+        return;
+
+do_sched:
+        schedule_work(&adapter->watchdog_task);
 }
 
 void netxen_watchdog_task(struct work_struct *work)
@@ -1619,11 +1672,13 @@ void netxen_watchdog_task(struct work_struct *work)
         struct netxen_adapter *adapter =
                 container_of(work, struct netxen_adapter, watchdog_task);
 
-        if ((adapter->portnum  == 0) && netxen_nic_check_temp(adapter))
+        if (adapter->temp == NX_TEMP_PANIC) {
+                netxen_nic_thermal_shutdown(adapter);
                 return;
+        }
 
-        if (!adapter->has_link_events)
-                netxen_nic_handle_phy_intr(adapter);
+        if (adapter->link_changed)
+                netxen_nic_set_link_parameters(adapter);
 
         if (netif_running(adapter->netdev))
                 mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
@@ -1631,9 +1686,8 @@ void netxen_watchdog_task(struct work_struct *work)
 
 static void netxen_tx_timeout(struct net_device *netdev)
 {
-        struct netxen_adapter *adapter = (struct netxen_adapter *)
-                                                netdev_priv(netdev);
-        SCHEDULE_WORK(&adapter->tx_timeout_task);
+        struct netxen_adapter *adapter = netdev_priv(netdev);
+        schedule_work(&adapter->tx_timeout_task);
 }
 
 static void netxen_tx_timeout_task(struct work_struct *work)
@@ -1641,6 +1695,9 @@ static void netxen_tx_timeout_task(struct work_struct *work)
         struct netxen_adapter *adapter =
                 container_of(work, struct netxen_adapter, tx_timeout_task);
 
+        if (!netif_running(adapter->netdev))
+                return;
+
         printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
                netxen_nic_driver_name, adapter->netdev->name);
 
@@ -1753,7 +1810,8 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
 
         if ((work_done < budget) && tx_complete) {
                 napi_complete(&sds_ring->napi);
-                netxen_nic_enable_int(sds_ring);
+                if (netif_running(adapter->netdev))
+                        netxen_nic_enable_int(sds_ring);
         }
 
         return work_done;
@@ -1786,9 +1844,6 @@ static int __init netxen_init_module(void)
 {
         printk(KERN_INFO "%s\n", netxen_nic_driver_string);
 
-        if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL)
-                return -ENOMEM;
-
         return pci_register_driver(&netxen_driver);
 }
 
@@ -1797,7 +1852,6 @@ module_init(netxen_init_module);
 static void __exit netxen_exit_module(void)
 {
         pci_unregister_driver(&netxen_driver);
-        destroy_workqueue(netxen_workq);
 }
 
 module_exit(netxen_exit_module);