Commit 673483c7 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Add firmware info to ethtool get regs. 



By default we add firmware information to ethtool get regs.
Optionally firmware info can instead be sent to log.

Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2af6fd8b

drivers/net/qlge/qlge.h

+2 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,7 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data); 
int ql_unpause_mpi_risc(struct ql_adapter *qdev);

int ql_pause_mpi_risc(struct ql_adapter *qdev);

int ql_hard_reset_mpi_risc(struct ql_adapter *qdev);

int ql_soft_reset_mpi_risc(struct ql_adapter *qdev);

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,
@@ -2236,6 +2237,7 @@ int ql_mb_set_mgmnt_traffic_ctl(struct ql_adapter *qdev, u32 control); 
int ql_mb_get_port_cfg(struct ql_adapter *qdev);

int ql_mb_set_port_cfg(struct ql_adapter *qdev);

int ql_wait_fifo_empty(struct ql_adapter *qdev);

void ql_get_dump(struct ql_adapter *qdev, void *buff);

void ql_gen_reg_dump(struct ql_adapter *qdev,

			struct ql_reg_dump *mpi_coredump);

netdev_tx_t ql_lb_send(struct sk_buff *skb, struct net_device *ndev);

drivers/net/qlge/qlge_dbg.c

+20 −1
Original line number Diff line number Diff line
@@ -1317,10 +1317,29 @@ void ql_gen_reg_dump(struct ql_adapter *qdev, 
	status = ql_get_ets_regs(qdev, &mpi_coredump->ets[0]);

	if (status)

		return;

}



void ql_get_dump(struct ql_adapter *qdev, void *buff)

{

	/*

	 * If the dump has already been taken and is stored

	 * in our internal buffer and if force dump is set then

	 * just start the spool to dump it to the log file

	 * and also, take a snapshot of the general regs to

	 * to the user's buffer or else take complete dump

	 * to the user's buffer if force is not set.

	 */



	if (test_bit(QL_FRC_COREDUMP, &qdev->flags))

	if (!test_bit(QL_FRC_COREDUMP, &qdev->flags)) {

		if (!ql_core_dump(qdev, buff))

			ql_soft_reset_mpi_risc(qdev);

		else

			netif_err(qdev, drv, qdev->ndev, "coredump failed!\n");

	} else {

		ql_gen_reg_dump(qdev, buff);

		ql_get_core_dump(qdev);

	}

}



/* Coredump to messages log file using separate worker thread */

void ql_mpi_core_to_log(struct work_struct *work)

drivers/net/qlge/qlge_ethtool.c

+16 −3
Original line number Diff line number Diff line
@@ -375,7 +375,10 @@ static void ql_get_drvinfo(struct net_device *ndev, 
	strncpy(drvinfo->bus_info, pci_name(qdev->pdev), 32);

	drvinfo->n_stats = 0;

	drvinfo->testinfo_len = 0;

	drvinfo->regdump_len = 0;

	if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))

		drvinfo->regdump_len = sizeof(struct ql_mpi_coredump);

	else

		drvinfo->regdump_len = sizeof(struct ql_reg_dump);

	drvinfo->eedump_len = 0;

}
@@ -547,6 +550,11 @@ static void ql_self_test(struct net_device *ndev, 


static int ql_get_regs_len(struct net_device *ndev)

{

	struct ql_adapter *qdev = netdev_priv(ndev);



	if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))

		return sizeof(struct ql_mpi_coredump);

	else

		return sizeof(struct ql_reg_dump);

}
@@ -555,7 +563,12 @@ static void ql_get_regs(struct net_device *ndev, 
{

	struct ql_adapter *qdev = netdev_priv(ndev);



	ql_gen_reg_dump(qdev, p);

	ql_get_dump(qdev, p);

	qdev->core_is_dumped = 0;

	if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))

		regs->len = sizeof(struct ql_mpi_coredump);

	else

		regs->len = sizeof(struct ql_reg_dump);

}



static int ql_get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)

drivers/net/qlge/qlge_mpi.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data) 
	return status;

}



static int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)

int ql_soft_reset_mpi_risc(struct ql_adapter *qdev)

{

	int status;

	status = ql_write_mpi_reg(qdev, 0x00001010, 1);