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

Commit 3ca8bc6d authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: add hwmon interface to export thermal data 



Some of our adapters have thermal data available, this patch exports
this data via hwmon sysfs interface.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e1ea9158

drivers/net/ethernet/intel/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,14 @@ config IXGBE 
	  To compile this driver as a module, choose M here. The module

	  will be called ixgbe.



config IXGBE_HWMON

	bool "Intel(R) 10GbE PCI Express adapters HWMON support"

	default y

	depends on IXGBE && HWMON && !(IXGBE=y && HWMON=m)

	---help---

	  Say Y if you want to expose the thermal sensor data on some of

	  our cards, via a hwmon sysfs interface.



config IXGBE_DCA

	bool "Direct Cache Access (DCA) Support"

	default y

drivers/net/ethernet/intel/ixgbe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ obj-$(CONFIG_IXGBE) += ixgbe.o 


ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \

              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \

              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o

              ixgbe_mbx.o ixgbe_x540.o ixgbe_sysfs.o ixgbe_lib.o



ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \

                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+26 −0
Original line number Diff line number Diff line
@@ -331,6 +331,26 @@ struct ixgbe_q_vector { 
	/* for dynamic allocation of rings associated with this q_vector */

	struct ixgbe_ring ring[0] ____cacheline_internodealigned_in_smp;

};

#ifdef CONFIG_IXGBE_HWMON



#define IXGBE_HWMON_TYPE_LOC		0

#define IXGBE_HWMON_TYPE_TEMP		1

#define IXGBE_HWMON_TYPE_CAUTION	2

#define IXGBE_HWMON_TYPE_MAX		3



struct hwmon_attr {

	struct device_attribute dev_attr;

	struct ixgbe_hw *hw;

	struct ixgbe_thermal_diode_data *sensor;

	char name[12];

};



struct hwmon_buff {

	struct device *device;

	struct hwmon_attr *hwmon_list;

	unsigned int n_hwmon;

};

#endif /* CONFIG_IXGBE_HWMON */



/*

 * microsecond values for various ITR rates shifted by 2 to fit itr register
@@ -535,6 +555,10 @@ struct ixgbe_adapter { 


	u32 timer_event_accumulator;

	u32 vferr_refcount;

	struct kobject *info_kobj;

#ifdef CONFIG_IXGBE_HWMON

	struct hwmon_buff ixgbe_hwmon_buff;

#endif /* CONFIG_IXGBE_HWMON */

};



struct ixgbe_fdir_filter {
@@ -635,6 +659,8 @@ extern int ixgbe_setup_tc(struct net_device *dev, u8 tc); 
#endif

extern void ixgbe_tx_ctxtdesc(struct ixgbe_ring *, u32, u32, u32, u32);

extern void ixgbe_do_reset(struct net_device *netdev);

extern void ixgbe_sysfs_exit(struct ixgbe_adapter *adapter);

extern int ixgbe_sysfs_init(struct ixgbe_adapter *adapter);

#ifdef IXGBE_FCOE

extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);

extern int ixgbe_fso(struct ixgbe_ring *tx_ring,

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+2 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,8 @@ static struct ixgbe_mac_operations mac_ops_82598 = { 
	.set_fw_drv_ver         = NULL,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,

	.get_thermal_sensor_data = NULL,

	.init_thermal_sensor_thresh = NULL,

};



static struct ixgbe_eeprom_operations eeprom_ops_82598 = {

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+2 −0
Original line number Diff line number Diff line
@@ -2119,6 +2119,8 @@ static struct ixgbe_mac_operations mac_ops_82599 = { 
	.set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,

	.acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,

	.release_swfw_sync      = &ixgbe_release_swfw_sync,

	.get_thermal_sensor_data = &ixgbe_get_thermal_sensor_data_generic,

	.init_thermal_sensor_thresh = &ixgbe_init_thermal_sensor_thresh_generic,



};