hwmon: (tps23861) fix byte order in current and voltage registers
Subsystems (2)
PATCH 1/1 hwmon: (tps23861) fix byte order in current and voltage registers
Trying to use this driver on a big-endian machine results in garbage values for voltage and current. The tps23861 registers are little- endian, and regmap_read_bulk() does not do byte order conversion. Thus on BE machines, the most significant bytes got modified, and were trimmed by the VOLTAGE_CURRENT_MASK.
To resolve this use uint16_t values, and convert them to host byte order using le16_to_cpu(). This results in correct readings on MIPS.
--- drivers/hwmon/tps23861.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/hwmon/tps23861.c +9 -5
@@ -140,7 +140,8 @@ static int tps23861_read_temp(struct tps23861_data *data, long *val)static int tps23861_read_voltage (struct tps23861_data *data,int channel,long *val) { -unsigned int regval; +uint16_t regval; +long raw_val;int err;if (channel <TPS23861_NUM_PORTS ) {
@@ -155,7 +156,8 @@ static int tps23861_read_voltage(struct tps23861_data *data, int channel,if (err <0 )return err; - *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , regval) *VOLTAGE_LSB ) /1000 ; + raw_val =le16_to_cpu (regval); + *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , raw_val) *VOLTAGE_LSB ) /1000 ;return 0 ; }
@@ -163,8 +165,9 @@ static int tps23861_read_voltage(struct tps23861_data *data, int channel,static int tps23861_read_current (struct tps23861_data *data,int channel,long *val) { -unsigned int current_lsb; -unsigned int regval; +long raw_val, current_lsb; +uint16_t regval; +int err;if (data->shunt_resistor ==SHUNT_RESISTOR_DEFAULT )
@@ -178,7 +181,8 @@ static int tps23861_read_current(struct tps23861_data *data, int channel,if (err <0 )return err; - *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , regval) * current_lsb) /1000000 ; + raw_val =le16_to_cpu (regval); + *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , raw_val) * current_lsb) /1000000 ;return 0 ; }
Signature · 1 line
2.34.3
Quoted 10 lines · Alexandru Gagniuc
Trying to use this driver on a big-endian machine results in garbage values for voltage and current. The tps23861 registers are little- endian, and
regmap_read_bulk()does not do byte order conversion. Thus on BE machines, the most significant bytes got modified, and were trimmed by theVOLTAGE_CURRENT_MASK.To resolve this use
uint16_tvalues, and convert them to host byte order usingle16_to_cpu(). This results in correct readings on MIPS.Signed-off-by Alexandru Gagniuc <[email protected]>
Applied.
Thanks,
Guenter
Quoted 50 lines
--- drivers/hwmon/tps23861.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)drivers/hwmon/tps23861.c +9
-5@@ -140,7 +140,8 @@ static int tps23861_read_temp(struct tps23861_data *data, long *val)static int tps23861_read_voltage (struct tps23861_data *data,int channel,long *val) { -unsigned int regval; +uint16_t regval; +long raw_val;int err;if (channel <TPS23861_NUM_PORTS ) {@@ -155,7 +156,8 @@ static int tps23861_read_voltage(struct tps23861_data *data, int channel,if (err <0 )return err; - *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , regval) *VOLTAGE_LSB ) /1000 ; + raw_val =le16_to_cpu (regval); + *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , raw_val) *VOLTAGE_LSB ) /1000 ;return 0 ; }@@ -163,8 +165,9 @@ static int tps23861_read_voltage(struct tps23861_data *data, int channel,static int tps23861_read_current (struct tps23861_data *data,int channel,long *val) { -unsigned int current_lsb; -unsigned int regval; +long raw_val, current_lsb; +uint16_t regval; +int err;if (data->shunt_resistor ==SHUNT_RESISTOR_DEFAULT )@@ -178,7 +181,8 @@ static int tps23861_read_current(struct tps23861_data *data, int channel,if (err <0 )return err; - *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , regval) * current_lsb) /1000000 ; + raw_val =le16_to_cpu (regval); + *val = (FIELD_GET (VOLTAGE_CURRENT_MASK , raw_val) * current_lsb) /1000000 ;return 0 ; }