public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian DC <radian.dc@gmail.com>
To: Jean Delvare <jdelvare@suse.com>,
	Guenter Roeck <linux@roeck-us.net>,
	linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Adrian DC <radian.dc@gmail.com>
Subject: [PATCH 2/3] hwmon/adt7470: resolve faulty 'temp*_alarm' values read output
Date: Sun,  5 Jan 2025 20:55:15 +0100	[thread overview]
Message-ID: <20250105195521.3263193-3-radian.dc@gmail.com> (raw)
In-Reply-To: <20250105195521.3263193-1-radian.dc@gmail.com>

Tested with the following script:
---

{
  # Access hwmon
  cd /sys/class/hwmon/hwmon1/

  # Check alarms
  alarms() {
    echo -n ' [READ]'
    echo -n " fan[1234]_alarm = $(cat ./fan[1234]_alarm | tr '\n' ' ')"
    echo -n " temp{[123456789],10}_alarm = $(cat ./temp{[123456789],10}_alarm | tr '\n' ' ')"
    echo ''
  }

  # Configure hardware
  echo '0' >./alarm_mask
  echo '10' >./num_temp_sensors

  # Test fans
  for fan in $(seq 1 4); do
    echo " [TEST] fan${fan}_min : Min FAN speed ${fan} under limit"
    echo '65535' >"./fan${fan}_min"
    sleep 4
    alarms
    echo '0' >"./fan${fan}_min"
    sleep 5
  done

  # Test temperatures
  for temp in $(seq 1 10); do
    echo " [TEST] temp${temp}_max : Max temperature ${temp} over limit"
    echo '-126000' >"./temp${temp}_max"
    sleep 5
    alarms
    echo '127000' >"./temp${temp}_max"
    sleep 5
  done

  # Test clean
  echo ' [TEST] Final state'
  alarms
}
---

Faulty values:
  [TEST] temp1_max : Max temperature 1 over limit
  [READ] fan[1234]_alarm = 0 0 0 0  temp{[123456789],10}_alarm = 0 1 0 1 0 1 0 1 0 1
  [TEST] temp2_max : Max temperature 2 over limit
  [READ] fan[1234]_alarm = 0 0 0 0  temp{[123456789],10}_alarm = 0 0 0 0 0 0 0 0 0 0
---

Fixed values:
 [TEST] fan1_min : Min FAN speed 1 under limit
 [READ] fan[1234]_alarm = 1 0 0 0  temp{[123456789],10}_alarm = 0 0 0 0 0 0 0 0 0 0
 [TEST] fan2_min : Min FAN speed 2 under limit
 [READ] fan[1234]_alarm = 0 1 0 0  temp{[123456789],10}_alarm = 0 0 0 0 0 0 0 0 0 0
 [TEST] fan3_min : Min FAN speed 3 under limit
 [READ] fan[1234]_alarm = 0 0 1 0  temp{[123456789],10}_alarm = 0 0 0 0 0 0 0 0 0 0
 [TEST] fan4_min : Min FAN speed 4 under limit
 [READ] fan[1234]_alarm = 0 0 0 1  temp{[123456789],10}_alarm = 0 0 0 0 0 0 0 0 0 0
 [TEST] temp1_max : Max temperature 1 over limit
 [READ] fan[1234]_alarm = 0 0 0 0  temp{[123456789],10}_alarm = 1 0 0 0 0 0 0 0 0 0
 [TEST] temp2_max : Max temperature 2 over limit
 [READ] fan[1234]_alarm = 0 0 0 0  temp{[123456789],10}_alarm = 0 1 0 0 0 0 0 0 0 0
 [TEST] temp3_max : Max temperature 3 over limit
 [READ] fan[1234]_alarm = 0 0 0 0  temp{[123456789],10}_alarm = 0 0 1 0 0 0 0 0 0 0
 ...
---

Signed-off-by: Adrian DC <radian.dc@gmail.com>
---
 drivers/hwmon/adt7470.c | 52 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index 712bc41b4a0d..afb881385dbb 100644
--- a/drivers/hwmon/adt7470.c
+++ b/drivers/hwmon/adt7470.c
@@ -551,7 +551,40 @@ static int adt7470_temp_read(struct device *dev, u32 attr, int channel, long *va
 		*val = 1000 * data->temp_max[channel];
 		break;
 	case hwmon_temp_alarm:
-		*val = !!(data->alarm & channel);
+		switch (channel) {
+		case 0:
+			*val = !!(data->alarm & ADT7470_R1T_ALARM);
+			break;
+		case 1:
+			*val = !!(data->alarm & ADT7470_R2T_ALARM);
+			break;
+		case 2:
+			*val = !!(data->alarm & ADT7470_R3T_ALARM);
+			break;
+		case 3:
+			*val = !!(data->alarm & ADT7470_R4T_ALARM);
+			break;
+		case 4:
+			*val = !!(data->alarm & ADT7470_R5T_ALARM);
+			break;
+		case 5:
+			*val = !!(data->alarm & ADT7470_R6T_ALARM);
+			break;
+		case 6:
+			*val = !!(data->alarm & ADT7470_R7T_ALARM);
+			break;
+		case 7:
+			*val = !!(data->alarm & (ADT7470_R8T_ALARM << 8));
+			break;
+		case 8:
+			*val = !!(data->alarm & (ADT7470_R9T_ALARM << 8));
+			break;
+		case 9:
+			*val = !!(data->alarm & (ADT7470_R10T_ALARM << 8));
+			break;
+		default:
+			return -EOPNOTSUPP;
+		}
 		break;
 	default:
 		return -EOPNOTSUPP;
@@ -648,7 +681,22 @@ static int adt7470_fan_read(struct device *dev, u32 attr, int channel, long *val
 			*val = 0;
 		break;
 	case hwmon_fan_alarm:
-		*val = !!(data->alarm & (1 << (12 + channel)));
+		switch (channel) {
+		case 0:
+			*val = !!(data->alarm & (ADT7470_FAN1_ALARM << 8));
+			break;
+		case 1:
+			*val = !!(data->alarm & (ADT7470_FAN2_ALARM << 8));
+			break;
+		case 2:
+			*val = !!(data->alarm & (ADT7470_FAN3_ALARM << 8));
+			break;
+		case 3:
+			*val = !!(data->alarm & (ADT7470_FAN4_ALARM << 8));
+			break;
+		default:
+			return -EOPNOTSUPP;
+		}
 		break;
 	default:
 		return -EOPNOTSUPP;
-- 
2.43.0


  parent reply	other threads:[~2025-01-05 19:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-05 19:55 [PATCH 0/3] hwmon/adt7470: fix 'fan*_{min,max}', 'temp*_alarm' and add 'temp_fan_norm_alarm' Adrian DC
2025-01-05 19:55 ` [PATCH 1/3] hwmon/adt7470: allow 'fan*_{min,max}' to be reset to '0' Adrian DC
2025-01-06 19:02   ` Guenter Roeck
2025-01-05 19:55 ` Adrian DC [this message]
2025-01-06 18:59   ` [PATCH 2/3] hwmon/adt7470: resolve faulty 'temp*_alarm' values read output Guenter Roeck
2025-01-05 19:55 ` [PATCH 3/3] hwmon/adt7470: create 'temp_fan_norm_alarm' attribute for 'NORM' alarm Adrian DC
2025-01-06 19:10   ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250105195521.3263193-3-radian.dc@gmail.com \
    --to=radian.dc@gmail.com \
    --cc=jdelvare@suse.com \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox