Skip to content

Commit

Permalink
qlge: Don't use firmware when forcing firmware dump.
Browse files Browse the repository at this point in the history
In some cases the firmware may be dead.  Instead we dump the firmware
parameters and then restart it.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ron Mercer authored and David S. Miller committed Jul 6, 2010
1 parent f2c0500 commit fc312ec
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 24 deletions.
1 change: 0 additions & 1 deletion drivers/net/qlge/qlge.h
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,6 @@ int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf,
u32 ram_addr, int word_count);
int ql_core_dump(struct ql_adapter *qdev,
struct ql_mpi_coredump *mpi_coredump);
int ql_mb_sys_err(struct ql_adapter *qdev);
int ql_mb_about_fw(struct ql_adapter *qdev);
int ql_wol(struct ql_adapter *qdev);
int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 enable_wol);
Expand Down
7 changes: 1 addition & 6 deletions drivers/net/qlge/qlge_dbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1237,12 +1237,7 @@ static void ql_get_core_dump(struct ql_adapter *qdev)
"Force Coredump can only be done from interface that is up.\n");
return;
}

if (ql_mb_sys_err(qdev)) {
netif_err(qdev, ifup, qdev->ndev,
"Fail force coredump with ql_mb_sys_err().\n");
return;
}
ql_queue_fw_error(qdev);
}

void ql_gen_reg_dump(struct ql_adapter *qdev,
Expand Down
17 changes: 0 additions & 17 deletions drivers/net/qlge/qlge_mpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,23 +606,6 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp)
return status;
}

int ql_mb_sys_err(struct ql_adapter *qdev)
{
struct mbox_params mbc;
struct mbox_params *mbcp = &mbc;
int status;

memset(mbcp, 0, sizeof(struct mbox_params));

mbcp->in_count = 1;
mbcp->out_count = 0;

mbcp->mbox_in[0] = MB_CMD_MAKE_SYS_ERR;

status = ql_mailbox_command(qdev, mbcp);
return status;
}

/* Get MPI firmware version. This will be used for
* driver banner and for ethtool info.
* Returns zero on success.
Expand Down

0 comments on commit fc312ec

Please sign in to comment.