leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwmon: (asus-ec-sensors) read sensors as signed ints

Browse Source 
Temperature sensor readings are signed, which is hinted by their blank
value (oxd8, 216 as unsigned and -40 as signed). T_Sensor, Crosshair
VIII Hero, and a freezer were used to confirm that.

Here we read fan sensors as signed too, because with their typical
values and 2-byte width, I can't tell a difference between signed and
unsigned, as I don't have a high speed chipset fan.

Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
Link: https://lore.kernel.org/r/20220204163045.576903-1-eugene.shalygin@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Eugene Shalygin 2022-02-04 17:30:45 +01:00 committed by Guenter Roeck
parent 88846ff742
commit 339f8a998f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/hwmon/asus-ec-sensors.c
View File

@ -221,7 +221,7 @@ static const struct dmi_system_id asus_ec_dmi_table[] __initconst = {
struct ec_sensor { struct ec_sensor {
unsigned int info_index; unsigned int info_index;
u32 cached_value; s32 cached_value;
}; };
struct ec_sensors_data { struct ec_sensors_data {
@ -408,15 +408,15 @@ static int asus_ec_block_read(const struct device *dev,
return status; return status;
} }
static inline u32 get_sensor_value(const struct ec_sensor_info *si, u8 *data) static inline s32 get_sensor_value(const struct ec_sensor_info *si, u8 *data)
{ {
switch (si->addr.components.size) { switch (si->addr.components.size) {
case 1: case 1:
return *data; return (s8)*data;
case 2: case 2:
return get_unaligned_be16(data); return (s16)get_unaligned_be16(data);
case 4: case 4:
return get_unaligned_be32(data); return (s32)get_unaligned_be32(data);
default: default:
return 0; return 0;
} }
@ -462,7 +462,7 @@ cleanup:
return status; return status;
} }
static int scale_sensor_value(u32 value, int data_type) static long scale_sensor_value(s32 value, int data_type)
{ {
switch (data_type) { switch (data_type) {
case hwmon_curr: case hwmon_curr:
@ -476,7 +476,7 @@ static int scale_sensor_value(u32 value, int data_type)
static int get_cached_value_or_update(const struct device *dev, static int get_cached_value_or_update(const struct device *dev,
int sensor_index, int sensor_index,
struct ec_sensors_data *state, u32 *value) struct ec_sensors_data *state, s32 *value)
{ {
if (time_after(jiffies, state->last_updated + HZ)) { if (time_after(jiffies, state->last_updated + HZ)) {
if (update_ec_sensors(dev, state)) { if (update_ec_sensors(dev, state)) {
@ -499,7 +499,7 @@ static int asus_ec_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val) u32 attr, int channel, long *val)
{ {
int ret; int ret;
u32 value = 0; s32 value = 0;
struct ec_sensors_data *state = dev_get_drvdata(dev); struct ec_sensors_data *state = dev_get_drvdata(dev);
int sidx = find_ec_sensor_index(state, type, channel); int sidx = find_ec_sensor_index(state, type, channel);