netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC] qlcnic: Enhance ethtool to display board temperature.
@ 2013-07-19  3:57 Himanshu Madhani
  2013-07-19 15:06 ` Rick Jones
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Himanshu Madhani @ 2013-07-19  3:57 UTC (permalink / raw)
  To: netdev; +Cc: davem, Dept_NX_Linux_NIC_Driver, Himanshu Madhani

From: Himanshu Madhani <himanshu.madhani@qlogic.com>

We need to provide a mechanism for a user space application to query
adapter temperature. This RFC patch is to request input on which of the
following approach would be appropriate way to export this information.

Here are the two approaches that I am exploring. Please review and
provide your recommendation.

1. Enhance ethtool to add capability for driver to advertise its
   board temperature as part of "ethtool -i <ethX>"

    For example, following would be output for an interface which
    has board temperature field populated via ethtool

    "#ethtool -i p10p1"
    driver: qlcnic
    version: 5.2.44
    bus-info: 0000:08:00.0
    supports-statistics: yes
    supports-test: yes
    supports-eeprom-access: yes
    supports-register-dump: yes
    supports-priv-flags: no
    board-temperature: 34

    There will be update required for ethtool.c in the repository
    git://git.kernel.org/pub/scm/network/ethtool/ethtool.git
    maintained by Ben Hutchings.

    if we decide to go with ethtool modification approach, I will send
    patch to update ethtool repository. Attached patch at the end of this
    email is for driver implementation for this approach.

2. Add a sysfs hook "brd_temp" which will be used by the application
   to query board temperature specific to the particular interface

   for example, driver with "brd_temp" sysfs hook will show temperature

   "#cat /sys/class/net/p10p1/device/brd_temp"
   34

Thank you for the comments.

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 7 +++++++
 include/uapi/linux/ethtool.h                        | 1 +
 2 files changed, 8 insertions(+)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 700a463..5335a71 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -235,6 +235,7 @@ qlcnic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 {
 	struct qlcnic_adapter *adapter = netdev_priv(dev);
 	u32 fw_major, fw_minor, fw_build;
+	u32 temp_val = 0;
 	fw_major = QLC_SHARED_REG_RD32(adapter, QLCNIC_FW_VERSION_MAJOR);
 	fw_minor = QLC_SHARED_REG_RD32(adapter, QLCNIC_FW_VERSION_MINOR);
 	fw_build = QLC_SHARED_REG_RD32(adapter, QLCNIC_FW_VERSION_SUB);
@@ -246,6 +247,12 @@ qlcnic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 	strlcpy(drvinfo->driver, qlcnic_driver_name, sizeof(drvinfo->driver));
 	strlcpy(drvinfo->version, QLCNIC_LINUX_VERSIONID,
 		sizeof(drvinfo->version));
+	if (qlcnic_82xx_check(adapter))
+		temp_val = QLC_SHARED_REG_RD32(adapter, QLCNIC_ASIC_TEMP);
+	else if (qlcnic_83xx_check(adapter))
+		temp_val = QLCRDX(adapter->ahw, QLC_83XX_ASIC_TEMP);
+
+	drvinfo->board_temp = qlcnic_get_temp_val(temp_val);
 }
 
 static int
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 38dbafa..2012015 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -101,6 +101,7 @@ struct ethtool_drvinfo {
 	__u32	testinfo_len;
 	__u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
 	__u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
+	__u32	board_temp;     /* board temperature */
 };
 
 #define SOPASS_MAX	6
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-07-23 21:32 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-19  3:57 [RFC] qlcnic: Enhance ethtool to display board temperature Himanshu Madhani
2013-07-19 15:06 ` Rick Jones
2013-07-19 17:59   ` Himanshu Madhani
2013-07-19 16:11 ` Stephen Hemminger
2013-07-19 18:00   ` Himanshu Madhani
2013-07-21 15:54 ` Ben Hutchings
2013-07-23 21:31   ` Himanshu Madhani

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).