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

Commit 7aeb2156 authored by Padmanabh Ratnakar's avatar Padmanabh Ratnakar Committed by David S. Miller
Browse files

be2net : Fix die temperature stat for Lancer 



Query die temperature stat for Lancer to report it correctly
in ethtool.

Signed-off-by: default avatarPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c871c5f2

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

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ struct be_adapter { 
	u32 max_pmac_cnt;	/* Max secondary UC MACs programmable */

	u32 uc_macs;		/* Count of secondary UC MAC programmed */

	u32 msg_enable;

	int be_get_temp_freq;

};



#define be_physfn(adapter)		(!adapter->virtfn)

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

+1 −7
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ 
#include "be.h"

#include "be_cmds.h"



/* Must be a power of 2 or else MODULO will BUG_ON */

static int be_get_temp_freq = 64;



static inline void *embedded_payload(struct be_mcc_wrb *wrb)

{

	return wrb->payload.embedded_payload;
@@ -115,7 +112,7 @@ static int be_mcc_compl_process(struct be_adapter *adapter, 
		}

	} else {

		if (opcode == OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES)

			be_get_temp_freq = 0;

			adapter->be_get_temp_freq = 0;



		if (compl_status == MCC_STATUS_NOT_SUPPORTED ||

			compl_status == MCC_STATUS_ILLEGAL_REQUEST)
@@ -1206,9 +1203,6 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd) 
	struct be_cmd_req_hdr *hdr;

	int status = 0;



	if (MODULO(adapter->work_counter, be_get_temp_freq) == 0)

		be_cmd_get_die_temperature(adapter);



	spin_lock_bh(&adapter->mcc_lock);



	wrb = wrb_from_mccq(adapter);

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

+6 −0
Original line number Diff line number Diff line
@@ -3567,6 +3567,9 @@ static int be_get_initial_config(struct be_adapter *adapter) 
	if (be_is_wol_supported(adapter))

		adapter->wol = true;



	/* Must be a power of 2 or else MODULO will BUG_ON */

	adapter->be_get_temp_freq = 64;



	level = be_get_fw_log_level(adapter);

	adapter->msg_enable = level <= FW_LOG_LEVEL_DEFAULT ? NETIF_MSG_HW : 0;
@@ -3747,6 +3750,9 @@ static void be_worker(struct work_struct *work) 
			be_cmd_get_stats(adapter, &adapter->stats_cmd);

	}



	if (MODULO(adapter->work_counter, adapter->be_get_temp_freq) == 0)

		be_cmd_get_die_temperature(adapter);



	for_all_rx_queues(adapter, rxo, i) {

		if (rxo->rx_post_starved) {

			rxo->rx_post_starved = false;