net: aquantia: add infrastructure to readout chip temperature

Ability to read the chip temperature from memory
via hwmon interface

Signed-off-by: Yana Esina <yana.esina@aquantia.com>
Signed-off-by: Nikita Danilov <nikita.danilov@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
index 81aab73dc22f0fd33d56c7d984094f28133782af..f1bc96c6f3b945391efdaf6888f9a071d618965b 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -259,6 +259,8 @@ struct aq_fw_ops {
 
        int (*update_stats)(struct aq_hw_s *self);
 
+       int (*get_phy_temp)(struct aq_hw_s *self, int *temp);
+
        u32 (*get_flow_control)(struct aq_hw_s *self, u32 *fcmode);
 
        int (*set_flow_control)(struct aq_hw_s *self);

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
index eb4b99d56081c776d2369a32609c9f0afcab1631..b521457434fcbbf27b06b5a529e6219bbd40f7ad 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
@@ -960,6 +960,7 @@ const struct aq_fw_ops aq_fw_1x_ops = {
        .set_state = hw_atl_utils_mpi_set_state,
        .update_link_status = hw_atl_utils_mpi_get_link_status,
        .update_stats = hw_atl_utils_update_stats,
+       .get_phy_temp = NULL,
        .set_power = aq_fw1x_set_power,
        .set_eee_rate = NULL,
        .get_eee_rate = NULL,

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
index fe6c5658e016dbcf0470250e04c8345460e988f5..fbc9d6ac841f38c4aa1a5b0a0cc41ed3c5d42a96 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c
@@ -38,6 +38,7 @@
 #define HW_ATL_FW2X_CTRL_WOL              BIT(CTRL_WOL)
 #define HW_ATL_FW2X_CTRL_LINK_DROP        BIT(CTRL_LINK_DROP)
 #define HW_ATL_FW2X_CTRL_PAUSE            BIT(CTRL_PAUSE)
+#define HW_ATL_FW2X_CTRL_TEMPERATURE      BIT(CTRL_TEMPERATURE)
 #define HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE BIT(CTRL_ASYMMETRIC_PAUSE)
 #define HW_ATL_FW2X_CTRL_FORCE_RECONNECT  BIT(CTRL_FORCE_RECONNECT)
 
@@ -310,6 +311,40 @@ static int aq_fw2x_update_stats(struct aq_hw_s *self)
        return hw_atl_utils_update_stats(self);
 }
 
+static int aq_fw2x_get_phy_temp(struct aq_hw_s *self, int *temp)
+{
+       u32 mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);
+       u32 temp_val = mpi_opts & HW_ATL_FW2X_CTRL_TEMPERATURE;
+       u32 phy_temp_offset;
+       u32 temp_res;
+       int err = 0;
+       u32 val;
+
+       phy_temp_offset = self->mbox_addr +
+                         offsetof(struct hw_atl_utils_mbox, info) +
+                         offsetof(struct hw_aq_info, phy_temperature);
+       /* Toggle statistics bit for FW to 0x36C.18 (CTRL_TEMPERATURE) */
+       mpi_opts = mpi_opts ^ HW_ATL_FW2X_CTRL_TEMPERATURE;
+       aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);
+       /* Wait FW to report back */
+       err = readx_poll_timeout_atomic(aq_fw2x_state2_get, self, val,
+                                       temp_val !=
+                                       (val & HW_ATL_FW2X_CTRL_TEMPERATURE),
+                                       1U, 10000U);
+       err = hw_atl_utils_fw_downld_dwords(self, phy_temp_offset,
+                                           &temp_res, 1);
+
+       if (err)
+               return err;
+
+       /* Convert PHY temperature from 1/256 degree Celsius
+        * to 1/1000 degree Celsius.
+        */
+       *temp = temp_res  * 1000 / 256;
+
+       return 0;
+}
+
 static int aq_fw2x_set_sleep_proxy(struct aq_hw_s *self, u8 *mac)
 {
        struct hw_atl_utils_fw_rpc *rpc = NULL;
@@ -509,6 +544,7 @@ const struct aq_fw_ops aq_fw_2x_ops = {
        .set_state = aq_fw2x_set_state,
        .update_link_status = aq_fw2x_update_link_status,
        .update_stats = aq_fw2x_update_stats,
+       .get_phy_temp = aq_fw2x_get_phy_temp,
        .set_power = aq_fw2x_set_power,
        .set_eee_rate = aq_fw2x_set_eee_rate,
        .get_eee_rate = aq_fw2x_get_eee_rate,