]> Pileus Git - ~andy/linux/blobdiff - drivers/net/qlge/qlge_mpi.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[~andy/linux] / drivers / net / qlge / qlge_mpi.c
index e2b2286102d498795de75319c7f76920bb8f84fb..f84e8570c7cb79d4c161e90ccee1d420b55d256c 100644 (file)
@@ -1,5 +1,54 @@
 #include "qlge.h"
 
+int ql_unpause_mpi_risc(struct ql_adapter *qdev)
+{
+       u32 tmp;
+
+       /* Un-pause the RISC */
+       tmp = ql_read32(qdev, CSR);
+       if (!(tmp & CSR_RP))
+               return -EIO;
+
+       ql_write32(qdev, CSR, CSR_CMD_CLR_PAUSE);
+       return 0;
+}
+
+int ql_pause_mpi_risc(struct ql_adapter *qdev)
+{
+       u32 tmp;
+       int count = UDELAY_COUNT;
+
+       /* Pause the RISC */
+       ql_write32(qdev, CSR, CSR_CMD_SET_PAUSE);
+       do {
+               tmp = ql_read32(qdev, CSR);
+               if (tmp & CSR_RP)
+                       break;
+               mdelay(UDELAY_DELAY);
+               count--;
+       } while (count);
+       return (count == 0) ? -ETIMEDOUT : 0;
+}
+
+int ql_hard_reset_mpi_risc(struct ql_adapter *qdev)
+{
+       u32 tmp;
+       int count = UDELAY_COUNT;
+
+       /* Reset the RISC */
+       ql_write32(qdev, CSR, CSR_CMD_SET_RST);
+       do {
+               tmp = ql_read32(qdev, CSR);
+               if (tmp & CSR_RR) {
+                       ql_write32(qdev, CSR, CSR_CMD_CLR_RST);
+                       break;
+               }
+               mdelay(UDELAY_DELAY);
+               count--;
+       } while (count);
+       return (count == 0) ? -ETIMEDOUT : 0;
+}
+
 int ql_read_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 *data)
 {
        int status;
@@ -45,6 +94,35 @@ int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)
        return status;
 }
 
+/* Determine if we are in charge of the firwmare. If
+ * we are the lower of the 2 NIC pcie functions, or if
+ * we are the higher function and the lower function
+ * is not enabled.
+ */
+int ql_own_firmware(struct ql_adapter *qdev)
+{
+       u32 temp;
+
+       /* If we are the lower of the 2 NIC functions
+        * on the chip the we are responsible for
+        * core dump and firmware reset after an error.
+        */
+       if (qdev->func < qdev->alt_func)
+               return 1;
+
+       /* If we are the higher of the 2 NIC functions
+        * on the chip and the lower function is not
+        * enabled, then we are responsible for
+        * core dump and firmware reset after an error.
+        */
+       temp =  ql_read32(qdev, STS);
+       if (!(temp & (1 << (8 + qdev->alt_func))))
+               return 1;
+
+       return 0;
+
+}
+
 static int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp)
 {
        int i, status;
@@ -57,7 +135,7 @@ static int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp)
                    ql_read_mpi_reg(qdev, qdev->mailbox_out + i,
                                     &mbcp->mbox_out[i]);
                if (status) {
-                       QPRINTK(qdev, DRV, ERR, "Failed mailbox read.\n");
+                       netif_err(qdev, drv, qdev->ndev, "Failed mailbox read.\n");
                        break;
                }
        }
@@ -130,7 +208,7 @@ static int ql_idc_req_aen(struct ql_adapter *qdev)
        int status;
        struct mbox_params *mbcp = &qdev->idc_mbc;
 
-       QPRINTK(qdev, DRV, ERR, "Enter!\n");
+       netif_err(qdev, drv, qdev->ndev, "Enter!\n");
        /* Get the status data and start up a thread to
         * handle the request.
         */
@@ -138,8 +216,8 @@ static int ql_idc_req_aen(struct ql_adapter *qdev)
        mbcp->out_count = 4;
        status = ql_get_mb_sts(qdev, mbcp);
        if (status) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Could not read MPI, resetting ASIC!\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Could not read MPI, resetting ASIC!\n");
                ql_queue_asic_error(qdev);
        } else  {
                /* Begin polled mode early so
@@ -162,8 +240,8 @@ static int ql_idc_cmplt_aen(struct ql_adapter *qdev)
        mbcp->out_count = 4;
        status = ql_get_mb_sts(qdev, mbcp);
        if (status) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Could not read MPI, resetting RISC!\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Could not read MPI, resetting RISC!\n");
                ql_queue_fw_error(qdev);
        } else
                /* Wake up the sleeping mpi_idc_work thread that is
@@ -181,13 +259,13 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)
 
        status = ql_get_mb_sts(qdev, mbcp);
        if (status) {
-               QPRINTK(qdev, DRV, ERR,
-                       "%s: Could not get mailbox status.\n", __func__);
+               netif_err(qdev, drv, qdev->ndev,
+                         "%s: Could not get mailbox status.\n", __func__);
                return;
        }
 
        qdev->link_status = mbcp->mbox_out[1];
-       QPRINTK(qdev, DRV, ERR, "Link Up.\n");
+       netif_err(qdev, drv, qdev->ndev, "Link Up.\n");
 
        /* If we're coming back from an IDC event
         * then set up the CAM and frame routing.
@@ -195,8 +273,8 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)
        if (test_bit(QL_CAM_RT_SET, &qdev->flags)) {
                status = ql_cam_route_initialize(qdev);
                if (status) {
-                       QPRINTK(qdev, IFUP, ERR,
-                       "Failed to init CAM/Routing tables.\n");
+                       netif_err(qdev, ifup, qdev->ndev,
+                                 "Failed to init CAM/Routing tables.\n");
                        return;
                } else
                        clear_bit(QL_CAM_RT_SET, &qdev->flags);
@@ -207,7 +285,7 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)
         * to our liking.
         */
        if (!test_bit(QL_PORT_CFG, &qdev->flags)) {
-               QPRINTK(qdev, DRV, ERR, "Queue Port Config Worker!\n");
+               netif_err(qdev, drv, qdev->ndev, "Queue Port Config Worker!\n");
                set_bit(QL_PORT_CFG, &qdev->flags);
                /* Begin polled mode early so
                 * we don't get another interrupt
@@ -229,7 +307,7 @@ static void ql_link_down(struct ql_adapter *qdev, struct mbox_params *mbcp)
 
        status = ql_get_mb_sts(qdev, mbcp);
        if (status)
-               QPRINTK(qdev, DRV, ERR, "Link down AEN broken!\n");
+               netif_err(qdev, drv, qdev->ndev, "Link down AEN broken!\n");
 
        ql_link_off(qdev);
 }
@@ -242,9 +320,9 @@ static int ql_sfp_in(struct ql_adapter *qdev, struct mbox_params *mbcp)
 
        status = ql_get_mb_sts(qdev, mbcp);
        if (status)
-               QPRINTK(qdev, DRV, ERR, "SFP in AEN broken!\n");
+               netif_err(qdev, drv, qdev->ndev, "SFP in AEN broken!\n");
        else
-               QPRINTK(qdev, DRV, ERR, "SFP insertion detected.\n");
+               netif_err(qdev, drv, qdev->ndev, "SFP insertion detected.\n");
 
        return status;
 }
@@ -257,9 +335,9 @@ static int ql_sfp_out(struct ql_adapter *qdev, struct mbox_params *mbcp)
 
        status = ql_get_mb_sts(qdev, mbcp);
        if (status)
-               QPRINTK(qdev, DRV, ERR, "SFP out AEN broken!\n");
+               netif_err(qdev, drv, qdev->ndev, "SFP out AEN broken!\n");
        else
-               QPRINTK(qdev, DRV, ERR, "SFP removal detected.\n");
+               netif_err(qdev, drv, qdev->ndev, "SFP removal detected.\n");
 
        return status;
 }
@@ -272,13 +350,13 @@ static int ql_aen_lost(struct ql_adapter *qdev, struct mbox_params *mbcp)
 
        status = ql_get_mb_sts(qdev, mbcp);
        if (status)
-               QPRINTK(qdev, DRV, ERR, "Lost AEN broken!\n");
+               netif_err(qdev, drv, qdev->ndev, "Lost AEN broken!\n");
        else {
                int i;
-               QPRINTK(qdev, DRV, ERR, "Lost AEN detected.\n");
+               netif_err(qdev, drv, qdev->ndev, "Lost AEN detected.\n");
                for (i = 0; i < mbcp->out_count; i++)
-                       QPRINTK(qdev, DRV, ERR, "mbox_out[%d] = 0x%.08x.\n",
-                                       i, mbcp->mbox_out[i]);
+                       netif_err(qdev, drv, qdev->ndev, "mbox_out[%d] = 0x%.08x.\n",
+                                 i, mbcp->mbox_out[i]);
 
        }
 
@@ -293,15 +371,15 @@ static void ql_init_fw_done(struct ql_adapter *qdev, struct mbox_params *mbcp)
 
        status = ql_get_mb_sts(qdev, mbcp);
        if (status) {
-               QPRINTK(qdev, DRV, ERR, "Firmware did not initialize!\n");
+               netif_err(qdev, drv, qdev->ndev, "Firmware did not initialize!\n");
        } else {
-               QPRINTK(qdev, DRV, ERR, "Firmware Revision  = 0x%.08x.\n",
-                       mbcp->mbox_out[1]);
+               netif_err(qdev, drv, qdev->ndev, "Firmware Revision  = 0x%.08x.\n",
+                         mbcp->mbox_out[1]);
                qdev->fw_rev_id = mbcp->mbox_out[1];
                status = ql_cam_route_initialize(qdev);
                if (status)
-                       QPRINTK(qdev, IFUP, ERR,
-                               "Failed to init CAM/Routing tables.\n");
+                       netif_err(qdev, ifup, qdev->ndev,
+                                 "Failed to init CAM/Routing tables.\n");
        }
 }
 
@@ -320,8 +398,8 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)
        mbcp->out_count = 1;
        status = ql_get_mb_sts(qdev, mbcp);
        if (status) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Could not read MPI, resetting ASIC!\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Could not read MPI, resetting ASIC!\n");
                ql_queue_asic_error(qdev);
                goto end;
        }
@@ -410,15 +488,14 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)
                        mbcp->mbox_out[0] = MB_CMD_STS_ERR;
                        return status;
                }
-               QPRINTK(qdev, DRV, ERR,
-                       "Firmware initialization failed.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Firmware initialization failed.\n");
                status = -EIO;
                ql_queue_fw_error(qdev);
                break;
 
        case AEN_SYS_ERR:
-               QPRINTK(qdev, DRV, ERR,
-                       "System Error.\n");
+               netif_err(qdev, drv, qdev->ndev, "System Error.\n");
                ql_queue_fw_error(qdev);
                status = -EIO;
                break;
@@ -431,8 +508,8 @@ static int ql_mpi_handler(struct ql_adapter *qdev, struct mbox_params *mbcp)
                /* Need to support AEN 8110 */
                break;
        default:
-               QPRINTK(qdev, DRV, ERR,
-                       "Unsupported AE %.08x.\n", mbcp->mbox_out[0]);
+               netif_err(qdev, drv, qdev->ndev,
+                         "Unsupported AE %.08x.\n", mbcp->mbox_out[0]);
                /* Clear the MPI firmware status. */
        }
 end:
@@ -505,8 +582,8 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)
                        goto done;
        } while (time_before(jiffies, count));
 
-       QPRINTK(qdev, DRV, ERR,
-               "Timed out waiting for mailbox complete.\n");
+       netif_err(qdev, drv, qdev->ndev,
+                 "Timed out waiting for mailbox complete.\n");
        status = -ETIMEDOUT;
        goto end;
 
@@ -529,7 +606,6 @@ end:
        return status;
 }
 
-
 /* Get MPI firmware version. This will be used for
  * driver banner and for ethtool info.
  * Returns zero on success.
@@ -552,8 +628,8 @@ int ql_mb_about_fw(struct ql_adapter *qdev)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed about firmware command\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed about firmware command\n");
                status = -EIO;
        }
 
@@ -584,8 +660,8 @@ int ql_mb_get_fw_state(struct ql_adapter *qdev)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed Get Firmware State.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed Get Firmware State.\n");
                status = -EIO;
        }
 
@@ -594,8 +670,8 @@ int ql_mb_get_fw_state(struct ql_adapter *qdev)
         * happen.
         */
        if (mbcp->mbox_out[1] & 1) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Firmware waiting for initialization.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Firmware waiting for initialization.\n");
                status = -EIO;
        }
 
@@ -627,8 +703,7 @@ int ql_mb_idc_ack(struct ql_adapter *qdev)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed IDC ACK send.\n");
+               netif_err(qdev, drv, qdev->ndev, "Failed IDC ACK send.\n");
                status = -EIO;
        }
        return status;
@@ -659,16 +734,72 @@ int ql_mb_set_port_cfg(struct ql_adapter *qdev)
                return status;
 
        if (mbcp->mbox_out[0] == MB_CMD_STS_INTRMDT) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Port Config sent, wait for IDC.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Port Config sent, wait for IDC.\n");
        } else  if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed Set Port Configuration.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed Set Port Configuration.\n");
+               status = -EIO;
+       }
+       return status;
+}
+
+int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr,
+       u32 size)
+{
+       int status = 0;
+       struct mbox_params mbc;
+       struct mbox_params *mbcp = &mbc;
+
+       memset(mbcp, 0, sizeof(struct mbox_params));
+
+       mbcp->in_count = 9;
+       mbcp->out_count = 1;
+
+       mbcp->mbox_in[0] = MB_CMD_DUMP_RISC_RAM;
+       mbcp->mbox_in[1] = LSW(addr);
+       mbcp->mbox_in[2] = MSW(req_dma);
+       mbcp->mbox_in[3] = LSW(req_dma);
+       mbcp->mbox_in[4] = MSW(size);
+       mbcp->mbox_in[5] = LSW(size);
+       mbcp->mbox_in[6] = MSW(MSD(req_dma));
+       mbcp->mbox_in[7] = LSW(MSD(req_dma));
+       mbcp->mbox_in[8] = MSW(addr);
+
+
+       status = ql_mailbox_command(qdev, mbcp);
+       if (status)
+               return status;
+
+       if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
+               netif_err(qdev, drv, qdev->ndev, "Failed to dump risc RAM.\n");
                status = -EIO;
        }
        return status;
 }
 
+/* Issue a mailbox command to dump RISC RAM. */
+int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf,
+               u32 ram_addr, int word_count)
+{
+       int status;
+       char *my_buf;
+       dma_addr_t buf_dma;
+
+       my_buf = pci_alloc_consistent(qdev->pdev, word_count * sizeof(u32),
+                                       &buf_dma);
+       if (!my_buf)
+               return -EIO;
+
+       status = ql_mb_dump_ram(qdev, buf_dma, ram_addr, word_count);
+       if (!status)
+               memcpy(buf, my_buf, word_count * sizeof(u32));
+
+       pci_free_consistent(qdev->pdev, word_count * sizeof(u32), my_buf,
+                               buf_dma);
+       return status;
+}
+
 /* Get link settings and maximum frame size settings
  * for the current port.
  * Most likely will block.
@@ -691,12 +822,12 @@ int ql_mb_get_port_cfg(struct ql_adapter *qdev)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed Get Port Configuration.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed Get Port Configuration.\n");
                status = -EIO;
        } else  {
-               QPRINTK(qdev, DRV, DEBUG,
-                       "Passed Get Port Configuration.\n");
+               netif_printk(qdev, drv, KERN_DEBUG, qdev->ndev,
+                            "Passed Get Port Configuration.\n");
                qdev->link_config = mbcp->mbox_out[1];
                qdev->max_frame_size = mbcp->mbox_out[2];
        }
@@ -723,8 +854,7 @@ int ql_mb_wol_mode(struct ql_adapter *qdev, u32 wol)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed to set WOL mode.\n");
+               netif_err(qdev, drv, qdev->ndev, "Failed to set WOL mode.\n");
                status = -EIO;
        }
        return status;
@@ -766,8 +896,7 @@ int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 enable_wol)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed to set WOL mode.\n");
+               netif_err(qdev, drv, qdev->ndev, "Failed to set WOL mode.\n");
                status = -EIO;
        }
        return status;
@@ -793,8 +922,7 @@ static int ql_idc_wait(struct ql_adapter *qdev)
                        wait_for_completion_timeout(&qdev->ide_completion,
                                                        wait_time);
                if (!wait_time) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "IDC Timeout.\n");
+                       netif_err(qdev, drv, qdev->ndev, "IDC Timeout.\n");
                        break;
                }
                /* Now examine the response from the IDC process.
@@ -802,18 +930,17 @@ static int ql_idc_wait(struct ql_adapter *qdev)
                 * more wait time.
                 */
                if (mbcp->mbox_out[0] == AEN_IDC_EXT) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "IDC Time Extension from function.\n");
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "IDC Time Extension from function.\n");
                        wait_time += (mbcp->mbox_out[1] >> 8) & 0x0000000f;
                } else if (mbcp->mbox_out[0] == AEN_IDC_CMPLT) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "IDC Success.\n");
+                       netif_err(qdev, drv, qdev->ndev, "IDC Success.\n");
                        status = 0;
                        break;
                } else {
-                       QPRINTK(qdev, DRV, ERR,
-                               "IDC: Invalid State 0x%.04x.\n",
-                               mbcp->mbox_out[0]);
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "IDC: Invalid State 0x%.04x.\n",
+                                 mbcp->mbox_out[0]);
                        status = -EIO;
                        break;
                }
@@ -842,8 +969,8 @@ int ql_mb_set_led_cfg(struct ql_adapter *qdev, u32 led_config)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed to set LED Configuration.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed to set LED Configuration.\n");
                status = -EIO;
        }
 
@@ -868,8 +995,8 @@ int ql_mb_get_led_cfg(struct ql_adapter *qdev)
                return status;
 
        if (mbcp->mbox_out[0] != MB_CMD_STS_GOOD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed to get LED Configuration.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed to get LED Configuration.\n");
                status = -EIO;
        } else
                qdev->led_config = mbcp->mbox_out[1];
@@ -899,16 +1026,16 @@ int ql_mb_set_mgmnt_traffic_ctl(struct ql_adapter *qdev, u32 control)
                return status;
 
        if (mbcp->mbox_out[0] == MB_CMD_STS_INVLD_CMD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Command not supported by firmware.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Command not supported by firmware.\n");
                status = -EINVAL;
        } else if (mbcp->mbox_out[0] == MB_CMD_STS_ERR) {
                /* This indicates that the firmware is
                 * already in the state we are trying to
                 * change it to.
                 */
-               QPRINTK(qdev, DRV, ERR,
-                       "Command parameters make no change.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Command parameters make no change.\n");
        }
        return status;
 }
@@ -938,12 +1065,12 @@ static int ql_mb_get_mgmnt_traffic_ctl(struct ql_adapter *qdev, u32 *control)
        }
 
        if (mbcp->mbox_out[0] == MB_CMD_STS_INVLD_CMD) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Command not supported by firmware.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Command not supported by firmware.\n");
                status = -EINVAL;
        } else if (mbcp->mbox_out[0] == MB_CMD_STS_ERR) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Failed to get MPI traffic control.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Failed to get MPI traffic control.\n");
                status = -EIO;
        }
        return status;
@@ -999,8 +1126,8 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
        status = ql_mb_get_port_cfg(qdev);
        rtnl_unlock();
        if (status) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Bug: Failed to get port config data.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Bug: Failed to get port config data.\n");
                goto err;
        }
 
@@ -1013,8 +1140,8 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
        qdev->max_frame_size = CFG_DEFAULT_MAX_FRAME_SIZE;
        status = ql_set_port_cfg(qdev);
        if (status) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Bug: Failed to set port config data.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Bug: Failed to set port config data.\n");
                goto err;
        }
 end:
@@ -1046,8 +1173,8 @@ void ql_mpi_idc_work(struct work_struct *work)
 
        switch (aen) {
        default:
-               QPRINTK(qdev, DRV, ERR,
-                       "Bug: Unhandled IDC action.\n");
+               netif_err(qdev, drv, qdev->ndev,
+                         "Bug: Unhandled IDC action.\n");
                break;
        case MB_CMD_PORT_RESET:
        case MB_CMD_STOP_FW:
@@ -1062,11 +1189,11 @@ void ql_mpi_idc_work(struct work_struct *work)
                if (timeout) {
                        status = ql_mb_idc_ack(qdev);
                        if (status)
-                               QPRINTK(qdev, DRV, ERR,
-                                       "Bug: No pending IDC!\n");
+                               netif_err(qdev, drv, qdev->ndev,
+                                         "Bug: No pending IDC!\n");
                } else {
-                       QPRINTK(qdev, DRV, DEBUG,
-                                   "IDC ACK not required\n");
+                       netif_printk(qdev, drv, KERN_DEBUG, qdev->ndev,
+                                    "IDC ACK not required\n");
                        status = 0; /* success */
                }
                break;
@@ -1095,11 +1222,11 @@ void ql_mpi_idc_work(struct work_struct *work)
                if (timeout) {
                        status = ql_mb_idc_ack(qdev);
                        if (status)
-                               QPRINTK(qdev, DRV, ERR,
-                                   "Bug: No pending IDC!\n");
+                               netif_err(qdev, drv, qdev->ndev,
+                                         "Bug: No pending IDC!\n");
                } else {
-                       QPRINTK(qdev, DRV, DEBUG,
-                           "IDC ACK not required\n");
+                       netif_printk(qdev, drv, KERN_DEBUG, qdev->ndev,
+                                    "IDC ACK not required\n");
                        status = 0; /* success */
                }
                break;
@@ -1143,5 +1270,19 @@ void ql_mpi_reset_work(struct work_struct *work)
        cancel_delayed_work_sync(&qdev->mpi_work);
        cancel_delayed_work_sync(&qdev->mpi_port_cfg_work);
        cancel_delayed_work_sync(&qdev->mpi_idc_work);
+       /* If we're not the dominant NIC function,
+        * then there is nothing to do.
+        */
+       if (!ql_own_firmware(qdev)) {
+               netif_err(qdev, drv, qdev->ndev, "Don't own firmware!\n");
+               return;
+       }
+
+       if (!ql_core_dump(qdev, qdev->mpi_coredump)) {
+               netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
+               qdev->core_is_dumped = 1;
+               queue_delayed_work(qdev->workqueue,
+                       &qdev->mpi_core_to_log, 5 * HZ);
+       }
        ql_soft_reset_mpi_risc(qdev);
 }