Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b71175 authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: Show newly flashed FW ver in ethtool 



This fix provides a newly flashed FW version (appended, in braces)
along with the currently running FW version via ethtool. The newly
flashed version runs only after a system reset.

Signed-off-by: default avatarSuresh Reddy <Suresh.Reddy@emulex.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e7d3f68

drivers/net/ethernet/emulex/benet/be_cmds.c

+18 −13
Original line number Diff line number Diff line
@@ -1444,32 +1444,37 @@ err: 
	spin_unlock_bh(&adapter->mcc_lock);

}



/* Uses Mbox */

int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver)

/* Uses synchronous mcc */

int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver,

			char *fw_on_flash)

{

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_get_fw_version *req;

	int status;



	if (mutex_lock_interruptible(&adapter->mbox_lock))

		return -1;

	spin_lock_bh(&adapter->mcc_lock);



	wrb = wrb_from_mbox(adapter);

	req = embedded_payload(wrb);

	wrb = wrb_from_mccq(adapter);

	if (!wrb) {

		status = -EBUSY;

		goto err;

	}



	req = embedded_payload(wrb);

	be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,

				OPCODE_COMMON_GET_FW_VERSION);



	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,

				OPCODE_COMMON_GET_FW_VERSION, sizeof(*req));



	status = be_mbox_notify_wait(adapter);

	status = be_mcc_notify_wait(adapter);

	if (!status) {

		struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb);

		strncpy(fw_ver, resp->firmware_version_string, FW_VER_LEN);

		strcpy(fw_ver, resp->firmware_version_string);

		if (fw_on_flash)

			strcpy(fw_on_flash, resp->fw_on_flash_version_string);

	}



	mutex_unlock(&adapter->mbox_lock);

err:

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}

drivers/net/ethernet/emulex/benet/be_cmds.h

+2 −1
Original line number Diff line number Diff line
@@ -1444,7 +1444,8 @@ extern int be_cmd_get_stats(struct be_adapter *adapter, 
			struct be_dma_mem *nonemb_cmd);

extern int lancer_cmd_get_pport_stats(struct be_adapter *adapter,

			struct be_dma_mem *nonemb_cmd);

extern int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver);

extern int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver,

		char *fw_on_flash);



extern int be_cmd_modify_eqd(struct be_adapter *adapter, u32 eq_id, u32 eqd);

extern int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id,

drivers/net/ethernet/emulex/benet/be_ethtool.c

+12 −2
Original line number Diff line number Diff line
@@ -118,14 +118,24 @@ static const char et_self_tests[][ETH_GSTRING_LEN] = { 
#define BE_ONE_PORT_EXT_LOOPBACK 0x2

#define BE_NO_LOOPBACK 0xff



static void

be_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)

static void be_get_drvinfo(struct net_device *netdev,

				struct ethtool_drvinfo *drvinfo)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	char fw_on_flash[FW_VER_LEN];



	memset(fw_on_flash, 0 , sizeof(fw_on_flash));

	be_cmd_get_fw_ver(adapter, adapter->fw_ver, fw_on_flash);



	strcpy(drvinfo->driver, DRV_NAME);

	strcpy(drvinfo->version, DRV_VER);

	strncpy(drvinfo->fw_version, adapter->fw_ver, FW_VER_LEN);

	if (memcmp(adapter->fw_ver, fw_on_flash, FW_VER_LEN) != 0) {

		strcat(drvinfo->fw_version, " [");

		strcat(drvinfo->fw_version, fw_on_flash);

		strcat(drvinfo->fw_version, "]");

	}



	strcpy(drvinfo->bus_info, pci_name(adapter->pdev));

	drvinfo->testinfo_len = 0;

	drvinfo->regdump_len = 0;

drivers/net/ethernet/emulex/benet/be_main.c

+1 −4
Original line number Diff line number Diff line
@@ -2528,6 +2528,7 @@ static int be_setup(struct be_adapter *adapter) 


	adapter->link_speed = -1;



	be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);

	return 0;



rx_qs_destroy:
@@ -3147,10 +3148,6 @@ static int be_get_config(struct be_adapter *adapter) 
	int status;

	u8 mac[ETH_ALEN];



	status = be_cmd_get_fw_ver(adapter, adapter->fw_ver);

	if (status)

		return status;



	status = be_cmd_query_fw_cfg(adapter, &adapter->port_num,

			&adapter->function_mode, &adapter->function_caps);

	if (status)