aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-06-25 03:06:29 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-26 00:03:32 -0400
commitbd97a63f7d9892b4536f331d263c2695cc52d08c (patch)
treee017c3e9f1f580131c01b51943c9ddc9f39dfe67
parent477e54eba4fd092704e50e65ade79463bd17fa85 (diff)
sfc: Log clearer error messages for hardware monitor
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/sfc/falcon_boards.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index 92b35e3d1100..3d950c2cf205 100644
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@ -108,10 +108,15 @@ static int efx_check_lm87(struct efx_nic *efx, unsigned mask)
108 if (alarms1 || alarms2) { 108 if (alarms1 || alarms2) {
109 netif_err(efx, hw, efx->net_dev, 109 netif_err(efx, hw, efx->net_dev,
110 "LM87 detected a hardware failure (status %02x:%02x)" 110 "LM87 detected a hardware failure (status %02x:%02x)"
111 "%s%s\n", 111 "%s%s%s\n",
112 alarms1, alarms2, 112 alarms1, alarms2,
113 (alarms1 & LM87_ALARM_TEMP_INT) ? " INTERNAL" : "", 113 (alarms1 & LM87_ALARM_TEMP_INT) ?
114 (alarms1 & LM87_ALARM_TEMP_EXT1) ? " EXTERNAL" : ""); 114 "; board is overheating" : "",
115 (alarms1 & LM87_ALARM_TEMP_EXT1) ?
116 "; controller is overheating" : "",
117 (alarms1 & ~(LM87_ALARM_TEMP_INT | LM87_ALARM_TEMP_EXT1)
118 || alarms2) ?
119 "; electrical fault" : "");
115 return -ERANGE; 120 return -ERANGE;
116 } 121 }
117 122