summaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-06-25 07:06:29 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-25 21:03:32 -0700
commitbd97a63f7d9892b4536f331d263c2695cc52d08c (patch)
treee017c3e9f1f580131c01b51943c9ddc9f39dfe67 /drivers/net/sfc
parent477e54eba4fd092704e50e65ade79463bd17fa85 (diff)
downloadop-kernel-dev-bd97a63f7d9892b4536f331d263c2695cc52d08c.zip
op-kernel-dev-bd97a63f7d9892b4536f331d263c2695cc52d08c.tar.gz
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>
Diffstat (limited to 'drivers/net/sfc')
-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 92b35e3..3d950c2 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)
if (alarms1 || alarms2) {
netif_err(efx, hw, efx->net_dev,
"LM87 detected a hardware failure (status %02x:%02x)"
- "%s%s\n",
+ "%s%s%s\n",
alarms1, alarms2,
- (alarms1 & LM87_ALARM_TEMP_INT) ? " INTERNAL" : "",
- (alarms1 & LM87_ALARM_TEMP_EXT1) ? " EXTERNAL" : "");
+ (alarms1 & LM87_ALARM_TEMP_INT) ?
+ "; board is overheating" : "",
+ (alarms1 & LM87_ALARM_TEMP_EXT1) ?
+ "; controller is overheating" : "",
+ (alarms1 & ~(LM87_ALARM_TEMP_INT | LM87_ALARM_TEMP_EXT1)
+ || alarms2) ?
+ "; electrical fault" : "");
return -ERANGE;
}
OpenPOWER on IntegriCloud