hwmon: sbtsi_temp: AMD CPU extended temperature range support
PATCH 1/1 hwmon: sbtsi_temp: AMD CPU extended temperature range support
From: Chuande Chen <[email protected]>
Many AMD CPUs can support this feature now.
We would get a wrong CPU DIE temp if don't consider this. In low-temperature environments, the CPU die temperature can drop below zero.
So many platform would like to make extended temperature range as their default configuration.
Default temperature range (0C to 255.875C) degree celsius. Extended temperature range (-49C to +206.875C) degree celsius. Ref Doc: AMD V3000 PPR (Doc ID #56558).
--- drivers/hwmon/sbtsi_temp.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/hwmon/sbtsi_temp.c +25 -7
@@ -30,6 +30,14 @@#define SBTSI_REG_TEMP_LOW_DEC 0x14/* RW */ #define SBTSI_CONFIG_READ_ORDER_SHIFT 5 +/* +* Bit for temperature measurement range. +* Value=0: Use default temperature range (0C to 255.875C) for reporting temperature. +* Value=1: Use extended temperature range (-49C to +206.875C) for reporting temperature. +*/ +#define SBTSI_CONFIG_EXT_RAGE_SHIFT 2 + +#define SBTSI_TEMP_EXT_RAGE_ADJ 49000#define SBTSI_TEMP_MIN 0#define SBTSI_TEMP_MAX 255875
@@ -74,7 +82,12 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, {struct sbtsi_data *data =dev_get_drvdata (dev);s32 temp_int, temp_dec; -int err; +int err, cfg; + + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +if (err <0 ) +return err; + cfg = err;switch (attr) {case hwmon_temp_input:
@@ -85,12 +98,8 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type,* so integer part should be read first. If bit == 1, read * order should be reversed. */ - err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); -if (err <0 ) -return err; -mutex_lock (&data->lock); -if (err &BIT (SBTSI_CONFIG_READ_ORDER_SHIFT )) { +if (cfg &BIT (SBTSI_CONFIG_READ_ORDER_SHIFT )) { temp_dec =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_DEC ); temp_int =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_INT ); }else {
@@ -122,6 +131,8 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type,return temp_dec; *val =sbtsi_reg_to_mc (temp_int, temp_dec); +if (cfg &BIT (SBTSI_CONFIG_EXT_RAGE_SHIFT )) + *val -=SBTSI_TEMP_EXT_RAGE_ADJ ;return 0 ; }
@@ -130,9 +141,14 @@ static int sbtsi_write(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long val) { struct sbtsi_data *data = dev_get_drvdata(dev); -int reg_int, reg_dec, err; +int reg_int, reg_dec, err, cfg;u8 temp_int, temp_dec; + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +if (err <0 ) +return err; + cfg = err; +switch (attr) {case hwmon_temp_max: reg_int =SBTSI_REG_TEMP_HIGH_INT ;
@@ -146,6 +162,8 @@ static int sbtsi_write(struct device *dev, enum hwmon_sensor_types type,return -EINVAL ; } +if (cfg &BIT (SBTSI_CONFIG_EXT_RAGE_SHIFT )) + val +=SBTSI_TEMP_EXT_RAGE_ADJ ; val =clamp_val (val,SBTSI_TEMP_MIN ,SBTSI_TEMP_MAX );sbtsi_mc_to_reg (val, &temp_int, &temp_dec);
Signature · 1 line
2.39.5 (Apple Git-154)
Guenter Roeck
maintainerQuoted 23 lines · Chuande Chen
From: Chuande Chen <[email protected]>
Many AMD CPUs can support this feature now.
We would get a wrong CPU DIE temp if don't consider this. In low-temperature environments, the CPU die temperature can drop below zero.
So many platform would like to make extended temperature range as their default configuration.
Default temperature range (0C to 255.875C) degree celsius. Extended temperature range (-49C to +206.875C) degree celsius. Ref Doc: AMD V3000 PPR (Doc ID #56558).Signed-off-by Chuande Chen <[email protected]>--- drivers/hwmon/sbtsi_temp.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)drivers/hwmon/sbtsi_temp.c +0
-0@@ -30,6 +30,14 @@#define SBTSI_REG_TEMP_LOW_DEC 0x14/* RW */
drivers/hwmon/sbtsi_temp.c line 40
Quoted 10 lines
drivers/hwmon/sbtsi_temp.c +8
-0#define SBTSI_CONFIG_READ_ORDER_SHIFT 5 +/* +* Bit for temperature measurement range. +* Value=0: Use default temperature range (0C to 255.875C) for reporting temperature. +* Value=1: Use extended temperature range (-49C to +206.875C) for reporting temperature. +*/ +#define SBTSI_CONFIG_EXT_RAGE_SHIFT 2 + +#define SBTSI_TEMP_EXT_RAGE_ADJ 49000
Lower bits first, please. Also, I am quite sure that this should be "RANGE", not "RAGE".
Quoted 5 lines
drivers/hwmon/sbtsi_temp.c +0
-0#define SBTSI_TEMP_MIN 0#define SBTSI_TEMP_MAX 255875@@ -74,7 +82,12 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, {
drivers/hwmon/sbtsi_temp.c static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, · line 91
Quoted 10 lines
drivers/hwmon/sbtsi_temp.c +6
-1struct sbtsi_data *data =dev_get_drvdata (dev);s32 temp_int, temp_dec; -int err; +int err, cfg; + + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +if (err <0 ) +return err; + cfg = err;
Since the configuration byte is now needed in two functions, and since it is not expected to change dynamically, please store the configuration in struct sbtsi_data in the probe function and read it from there.
Thanks,
Guenter
v2 cover hwmon: sbtsi_temp: AMD CPU extended temperature range support
In reply to Chuande ChenFrom: Chuande Chen <[email protected]>
V1 -> V2: addressed review comments, also save READ_ORDER bit into sbtsi_data
Chuande Chen (1):
hwmon: sbtsi_temp: AMD CPU extended temperature range support
drivers/hwmon/sbtsi_temp.c | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-)
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH v2 1/1 hwmon: sbtsi_temp: AMD CPU extended temperature range support
From: Chuande Chen <[email protected]>
Many AMD CPUs can support this feature now.
We would get a wrong CPU DIE temp if don't consider this. In low-temperature environments, the CPU die temperature can drop below zero.
So many platform would like to make extended temperature range as their default configuration.
Default temperature range (0C to 255.875C) degree celsius. Extended temperature range (-49C to +206.875C) degree celsius. Ref Doc: AMD V3000 PPR (Doc ID #56558).
---
V1 -> V2: addressed review comments, also save READ_ORDER bit into sbtsi_data
--- drivers/hwmon/sbtsi_temp.c | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-)
drivers/hwmon/sbtsi_temp.c +33 -13
@@ -5,6 +5,7 @@* * Copyright (c) 2020, Google Inc. * Copyright (c) 2020, Kun Yi <[email protected]> +* Copyright (c) 2025, Chuande Chen <[email protected]> */ #include <linux/err.h>
@@ -14,6 +15,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/bitfield.h> /* * SB-TSI registers only support SMBus byte data access. "_INT" registers are
@@ -29,8 +31,23 @@#define SBTSI_REG_TEMP_HIGH_DEC 0x13/* RW */ #define SBTSI_REG_TEMP_LOW_DEC 0x14/* RW */ +/* +* Bit for reporting value with temperature measurement range. +* bit == 0: Use default temperature range (0C to 255.875C). +* bit == 1: Use extended temperature range (-49C to +206.875C). +*/ +#define SBTSI_CONFIG_EXT_RANGE_SHIFT 2 +/* +* ReadOrder bit specifies the reading order of integer and +* decimal part of CPU temp for atomic reads. If bit == 0, +* reading integer part triggers latching of the decimal part, +* so integer part should be read first. If bit == 1, read +* order should be reversed. +*/ #define SBTSI_CONFIG_READ_ORDER_SHIFT 5 +#define SBTSI_TEMP_EXT_RANGE_ADJ 49000 +#define SBTSI_TEMP_MIN 0#define SBTSI_TEMP_MAX 255875
@@ -38,6 +55,8 @@struct sbtsi_data {struct i2c_client *client;struct mutex lock; +bool ext_range_mode; +bool read_order; };/*
@@ -74,23 +93,11 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, {struct sbtsi_data *data =dev_get_drvdata (dev);s32 temp_int, temp_dec; -int err;switch (attr) {case hwmon_temp_input: -/* -* ReadOrder bit specifies the reading order of integer and -* decimal part of CPU temp for atomic reads. If bit == 0, -* reading integer part triggers latching of the decimal part, -* so integer part should be read first. If bit == 1, read -* order should be reversed. -*/ - err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); -if (err <0 ) -return err; -mutex_lock (&data->lock); -if (err &BIT (SBTSI_CONFIG_READ_ORDER_SHIFT )) { +if (data->read_order) { temp_dec =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_DEC ); temp_int =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_INT ); }else {
@@ -122,6 +129,8 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type,return temp_dec; *val =sbtsi_reg_to_mc (temp_int, temp_dec); +if (data->ext_range_mode) + *val -=SBTSI_TEMP_EXT_RANGE_ADJ ;return 0 ; }
@@ -146,6 +155,8 @@ static int sbtsi_write(struct device *dev, enum hwmon_sensor_types type,return -EINVAL ; } +if (data->ext_range_mode) + val +=SBTSI_TEMP_EXT_RANGE_ADJ ; val =clamp_val (val,SBTSI_TEMP_MIN ,SBTSI_TEMP_MAX );sbtsi_mc_to_reg (val, &temp_int, &temp_dec);
@@ -203,6 +214,7 @@ static int sbtsi_probe(struct i2c_client *client)struct device *dev = &client->dev;struct device *hwmon_dev;struct sbtsi_data *data; +int err; data =devm_kzalloc (dev,sizeof (struct sbtsi_data ),GFP_KERNEL );if (!data)
@@ -214,6 +226,14 @@ static int sbtsi_probe(struct i2c_client *client) hwmon_dev =devm_hwmon_device_register_with_info (dev, client->name, data, &sbtsi_chip_info,NULL ); +mutex_lock (&data->lock); + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +mutex_unlock (&data->lock); +if (err <0 ) +return err; + data->ext_range_mode =FIELD_GET (BIT (SBTSI_CONFIG_EXT_RANGE_SHIFT ), err); + data->read_order =FIELD_GET (BIT (SBTSI_CONFIG_READ_ORDER_SHIFT ), err); +return PTR_ERR_OR_ZERO (hwmon_dev); }
Signature · 1 line
2.39.5 (Apple Git-154)
Guenter Roeck
maintainerQuoted 2 lines · Chuande Chen
From: Chuande Chen <[email protected]>
Any reason for not sending this from your Cisco e-mail address ?
Quoted 2 lines
Many AMD CPUs can support this feature now.
We would get a wrong CPU DIE temp if don't consider this.
temperature.
Quoted 6 lines
In low-temperature environments, the CPU die temperature can drop below zero.
So many platform would like to make extended temperature range as their default configuration.
Default temperature range (0C to 255.875C) degree celsius. Extended temperature range (-49C to +206.875C) degree celsius.
Celsius. But then "C" and "degree celsius" is redundant and "degree celsius" can be dropped.
Quoted 2 lines
Ref Doc: AMD V3000 PPR (Doc ID #56558).
The document is not available to the public. You will need to find someone from AMD to provide an Acked-by: or Reviewed-by: tag to show me that the V3000 hardware really uses this bit.
The column limit for patch descriptions is 75 characters. Please use it.
Quoted 12 lines
Signed-off-by Chuande Chen <[email protected]>---
V1 -> V2: addressed review comments, also saveREAD_ORDERbit intosbtsi_data--- drivers/hwmon/sbtsi_temp.c | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-)drivers/hwmon/sbtsi_temp.c +0
-0
drivers/hwmon/sbtsi_temp.c line 8
Quoted 4 lines
drivers/hwmon/sbtsi_temp.c +1
-0@@ -5,6 +5,7 @@* * Copyright (c) 2020, Google Inc. * Copyright (c) 2020, Kun Yi <[email protected]> +* Copyright (c) 2025, Chuande Chen <[email protected]>
For adding a few lines of code ? If everyone would do that, the Linux kernel code would consist of 50% or more copyright lines. If you insist on this, I'll have to try and find official guidelines about if and when it is appropriate to add copyrights.
Plus this made me suspicious: How do I know that you are really a Cisco employee and not someone who tries to sneak in some code that isn't even supported by real hardware ?
Quoted 18 lines
drivers/hwmon/sbtsi_temp.c +4
-0*/ #include <linux/err.h> @@ -14,6 +15,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/bitfield.h> /* * SB-TSI registers only support SMBus byte data access. "_INT" registers are @@ -29,8 +31,23 @@#define SBTSI_REG_TEMP_HIGH_DEC 0x13/* RW */ #define SBTSI_REG_TEMP_LOW_DEC 0x14/* RW */ +/* +* Bit for reporting value with temperature measurement range. +* bit == 0: Use default temperature range (0C to 255.875C).
drivers/hwmon/sbtsi_temp.c line 46
Quoted 10 lines
drivers/hwmon/sbtsi_temp.c +10
-0+* bit == 1: Use extended temperature range (-49C to +206.875C). +*/ +#define SBTSI_CONFIG_EXT_RANGE_SHIFT 2 +/* +* ReadOrder bit specifies the reading order of integer and +* decimal part of CPU temp for atomic reads. If bit == 0, +* reading integer part triggers latching of the decimal part, +* so integer part should be read first. If bit == 1, read +* order should be reversed. +*/
Too many line splits. Extend lines to 80 characters. Yes, I see this is copied from below, but that doesn't mean it can not be adjusted.
Quoted 68 lines
drivers/hwmon/sbtsi_temp.c +10
-13#define SBTSI_CONFIG_READ_ORDER_SHIFT 5 +#define SBTSI_TEMP_EXT_RANGE_ADJ 49000 +#define SBTSI_TEMP_MIN 0#define SBTSI_TEMP_MAX 255875@@ -38,6 +55,8 @@struct sbtsi_data {struct i2c_client *client;struct mutex lock; +bool ext_range_mode; +bool read_order; };/* @@ -74,23 +93,11 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, {struct sbtsi_data *data =dev_get_drvdata (dev);s32 temp_int, temp_dec; -int err;switch (attr) {case hwmon_temp_input: -/* -* ReadOrder bit specifies the reading order of integer and -* decimal part of CPU temp for atomic reads. If bit == 0, -* reading integer part triggers latching of the decimal part, -* so integer part should be read first. If bit == 1, read -* order should be reversed. -*/ - err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); -if (err <0 ) -return err; -mutex_lock (&data->lock); -if (err &BIT (SBTSI_CONFIG_READ_ORDER_SHIFT )) { +if (data->read_order) { temp_dec =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_DEC ); temp_int =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_INT ); }else {@@ -122,6 +129,8 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type,return temp_dec; *val =sbtsi_reg_to_mc (temp_int, temp_dec); +if (data->ext_range_mode) + *val -=SBTSI_TEMP_EXT_RANGE_ADJ ;return 0 ; }@@ -146,6 +155,8 @@ static int sbtsi_write(struct device *dev, enum hwmon_sensor_types type,return -EINVAL ; } +if (data->ext_range_mode) + val +=SBTSI_TEMP_EXT_RANGE_ADJ ; val =clamp_val (val,SBTSI_TEMP_MIN ,SBTSI_TEMP_MAX );sbtsi_mc_to_reg (val, &temp_int, &temp_dec);@@ -203,6 +214,7 @@ static int sbtsi_probe(struct i2c_client *client)struct device *dev = &client->dev;struct device *hwmon_dev;struct sbtsi_data *data; +int err; data =devm_kzalloc (dev,sizeof (struct sbtsi_data ),GFP_KERNEL );if (!data)
drivers/hwmon/sbtsi_temp.c static int sbtsi_probe(struct i2c_client *client) · line 231
Quoted 6 lines
drivers/hwmon/sbtsi_temp.c +3
-0@@ -214,6 +226,14 @@ static int sbtsi_probe(struct i2c_client *client) hwmon_dev =devm_hwmon_device_register_with_info (dev, client->name, data, &sbtsi_chip_info,NULL ); +mutex_lock (&data->lock); + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +mutex_unlock (&data->lock);
Unnecessary lock. First, this is in the probe function, where a lock is not needed in the first place. Second, it is a single I2C operation, which does not need a lock either case.
On top of that, this needs to be called before the call to devm_hwmon_device_register_with_info() because otherwise the first read can happen before the bits are set.
Guenter
Quoted 8 lines
drivers/hwmon/sbtsi_temp.c +5
-0+if (err <0 ) +return err; + data->ext_range_mode =FIELD_GET (BIT (SBTSI_CONFIG_EXT_RANGE_SHIFT ), err); + data->read_order =FIELD_GET (BIT (SBTSI_CONFIG_READ_ORDER_SHIFT ), err); +return PTR_ERR_OR_ZERO (hwmon_dev); }
Guenter Roeck
maintainerQuoted 10 lines · Chuande Chen
From: Chuande Chen <[email protected]>
V1 -> V2: addressed review comments, also save
READ_ORDERbit intosbtsi_dataChuande Chen (1):
hwmon:sbtsi_temp: AMD CPU extended temperature range supportdrivers/hwmon/sbtsi_temp.c | 46 +++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 13 deletions(-)
Introductory patches are not needed for individual patches and only add noise. Please just send the patch with change log after "---".
Guenter
PATCH v3 1/1 hwmon: sbtsi_temp: AMD CPU extended temperature range support
In reply to Chuande ChenFrom: Chuande Chen <[email protected]>
Many AMD CPUs can support this feature now. We would get a wrong CPU DIE temperature if don't consider this. In low-temperature environments, the CPU die temperature can drop below zero. So many platforms would like to make extended temperature range as their default configuration. Default temperature range (0C to 255.875C).
Extended temperature range (-49C to +206.875C).
Ref Doc: AMD V3000 PPR (Doc ID #56558).
---
V2 -> V3: Addressed review comments. Remove my name from Copyright.
In sbtsi_probe(), removed unnecessary lock, save config before call devm_hwmon_device_register_with_info().
V1 -> V2: addressed review comments, also save READ_ORDER bit into sbtsi_data
--- drivers/hwmon/sbtsi_temp.c | 46 +++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 15 deletions(-)
drivers/hwmon/sbtsi_temp.c +31 -15
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/bitfield.h> /* * SB-TSI registers only support SMBus byte data access. "_INT" registers are
@@ -29,8 +30,22 @@#define SBTSI_REG_TEMP_HIGH_DEC 0x13/* RW */ #define SBTSI_REG_TEMP_LOW_DEC 0x14/* RW */ +/* +* Bit for reporting value with temperature measurement range. +* bit == 0: Use default temperature range (0C to 255.875C). +* bit == 1: Use extended temperature range (-49C to +206.875C). +*/ +#define SBTSI_CONFIG_EXT_RANGE_SHIFT 2 +/* +* ReadOrder bit specifies the reading order of integer and decimal part of +* CPU temperature for atomic reads. If bit == 0, reading integer part triggers +* latching of the decimal part, so integer part should be read first. +* If bit == 1, read order should be reversed. +*/ #define SBTSI_CONFIG_READ_ORDER_SHIFT 5 +#define SBTSI_TEMP_EXT_RANGE_ADJ 49000 +#define SBTSI_TEMP_MIN 0#define SBTSI_TEMP_MAX 255875
@@ -38,6 +53,8 @@struct sbtsi_data {struct i2c_client *client;struct mutex lock; +bool ext_range_mode; +bool read_order; };/*
@@ -74,23 +91,11 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, {struct sbtsi_data *data =dev_get_drvdata (dev);s32 temp_int, temp_dec; -int err;switch (attr) {case hwmon_temp_input: -/* -* ReadOrder bit specifies the reading order of integer and -* decimal part of CPU temp for atomic reads. If bit == 0, -* reading integer part triggers latching of the decimal part, -* so integer part should be read first. If bit == 1, read -* order should be reversed. -*/ - err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); -if (err <0 ) -return err; -mutex_lock (&data->lock); -if (err &BIT (SBTSI_CONFIG_READ_ORDER_SHIFT )) { +if (data->read_order) { temp_dec =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_DEC ); temp_int =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_INT ); }else {
@@ -122,6 +127,8 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type,return temp_dec; *val =sbtsi_reg_to_mc (temp_int, temp_dec); +if (data->ext_range_mode) + *val -=SBTSI_TEMP_EXT_RANGE_ADJ ;return 0 ; }
@@ -146,6 +153,8 @@ static int sbtsi_write(struct device *dev, enum hwmon_sensor_types type,return -EINVAL ; } +if (data->ext_range_mode) + val +=SBTSI_TEMP_EXT_RANGE_ADJ ; val =clamp_val (val,SBTSI_TEMP_MIN ,SBTSI_TEMP_MAX );sbtsi_mc_to_reg (val, &temp_int, &temp_dec);
@@ -203,6 +212,7 @@ static int sbtsi_probe(struct i2c_client *client)struct device *dev = &client->dev;struct device *hwmon_dev;struct sbtsi_data *data; +int err; data =devm_kzalloc (dev,sizeof (struct sbtsi_data ),GFP_KERNEL );if (!data)
@@ -211,8 +221,14 @@ static int sbtsi_probe(struct i2c_client *client) data->client = client;mutex_init (&data->lock); - hwmon_dev =devm_hwmon_device_register_with_info (dev, client->name, data, &sbtsi_chip_info, -NULL ); + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +if (err <0 ) +return err; + data->ext_range_mode =FIELD_GET (BIT (SBTSI_CONFIG_EXT_RANGE_SHIFT ), err); + data->read_order =FIELD_GET (BIT (SBTSI_CONFIG_READ_ORDER_SHIFT ), err); + + hwmon_dev =devm_hwmon_device_register_with_info (dev, client->name, data, + &sbtsi_chip_info,NULL );return PTR_ERR_OR_ZERO (hwmon_dev); }
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH v3 1/1 hwmon: sbtsi_temp: AMD CPU extended temperature range support
In reply to Chuande ChenFrom: Chuande Chen <[email protected]>
Many AMD CPUs can support this feature now. We would get a wrong CPU DIE temperature if don't consider this. In low-temperature environments, the CPU die temperature can drop below zero. So many platforms would like to make extended temperature range as their default configuration. Default temperature range (0C to 255.875C).
Extended temperature range (-49C to +206.875C).
Ref Doc: AMD V3000 PPR (Doc ID #56558).
---
V2 -> V3: Addressed review comments. Remove my name from Copyright.
In sbtsi_probe(), removed unnecessary lock, save config before call devm_hwmon_device_register_with_info().
V1 -> V2: addressed review comments, also save READ_ORDER bit into sbtsi_data
--- drivers/hwmon/sbtsi_temp.c | 46 +++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 15 deletions(-)
drivers/hwmon/sbtsi_temp.c +31 -15
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/bitfield.h> /* * SB-TSI registers only support SMBus byte data access. "_INT" registers are
@@ -29,8 +30,22 @@#define SBTSI_REG_TEMP_HIGH_DEC 0x13/* RW */ #define SBTSI_REG_TEMP_LOW_DEC 0x14/* RW */ +/* +* Bit for reporting value with temperature measurement range. +* bit == 0: Use default temperature range (0C to 255.875C). +* bit == 1: Use extended temperature range (-49C to +206.875C). +*/ +#define SBTSI_CONFIG_EXT_RANGE_SHIFT 2 +/* +* ReadOrder bit specifies the reading order of integer and decimal part of +* CPU temperature for atomic reads. If bit == 0, reading integer part triggers +* latching of the decimal part, so integer part should be read first. +* If bit == 1, read order should be reversed. +*/ #define SBTSI_CONFIG_READ_ORDER_SHIFT 5 +#define SBTSI_TEMP_EXT_RANGE_ADJ 49000 +#define SBTSI_TEMP_MIN 0#define SBTSI_TEMP_MAX 255875
@@ -38,6 +53,8 @@struct sbtsi_data {struct i2c_client *client;struct mutex lock; +bool ext_range_mode; +bool read_order; };/*
@@ -74,23 +91,11 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type, {struct sbtsi_data *data =dev_get_drvdata (dev);s32 temp_int, temp_dec; -int err;switch (attr) {case hwmon_temp_input: -/* -* ReadOrder bit specifies the reading order of integer and -* decimal part of CPU temp for atomic reads. If bit == 0, -* reading integer part triggers latching of the decimal part, -* so integer part should be read first. If bit == 1, read -* order should be reversed. -*/ - err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); -if (err <0 ) -return err; -mutex_lock (&data->lock); -if (err &BIT (SBTSI_CONFIG_READ_ORDER_SHIFT )) { +if (data->read_order) { temp_dec =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_DEC ); temp_int =i2c_smbus_read_byte_data (data->client,SBTSI_REG_TEMP_INT ); }else {
@@ -122,6 +127,8 @@ static int sbtsi_read(struct device *dev, enum hwmon_sensor_types type,return temp_dec; *val =sbtsi_reg_to_mc (temp_int, temp_dec); +if (data->ext_range_mode) + *val -=SBTSI_TEMP_EXT_RANGE_ADJ ;return 0 ; }
@@ -146,6 +153,8 @@ static int sbtsi_write(struct device *dev, enum hwmon_sensor_types type,return -EINVAL ; } +if (data->ext_range_mode) + val +=SBTSI_TEMP_EXT_RANGE_ADJ ; val =clamp_val (val,SBTSI_TEMP_MIN ,SBTSI_TEMP_MAX );sbtsi_mc_to_reg (val, &temp_int, &temp_dec);
@@ -203,6 +212,7 @@ static int sbtsi_probe(struct i2c_client *client)struct device *dev = &client->dev;struct device *hwmon_dev;struct sbtsi_data *data; +int err; data =devm_kzalloc (dev,sizeof (struct sbtsi_data ),GFP_KERNEL );if (!data)
@@ -211,8 +221,14 @@ static int sbtsi_probe(struct i2c_client *client) data->client = client;mutex_init (&data->lock); - hwmon_dev =devm_hwmon_device_register_with_info (dev, client->name, data, &sbtsi_chip_info, -NULL ); + err =i2c_smbus_read_byte_data (data->client,SBTSI_REG_CONFIG ); +if (err <0 ) +return err; + data->ext_range_mode =FIELD_GET (BIT (SBTSI_CONFIG_EXT_RANGE_SHIFT ), err); + data->read_order =FIELD_GET (BIT (SBTSI_CONFIG_READ_ORDER_SHIFT ), err); + + hwmon_dev =devm_hwmon_device_register_with_info (dev, client->name, data, + &sbtsi_chip_info,NULL );return PTR_ERR_OR_ZERO (hwmon_dev); }
Signature · 1 line
2.39.5 (Apple Git-154)
Quoted 11 lines · Chuande Chen
From: Chuande Chen <[email protected]>
Many AMD CPUs can support this feature now. We would get a wrong CPU DIE temperature if don't consider this. In low-temperature environments, the CPU die temperature can drop below zero. So many platforms would like to make extended temperature range as their default configuration. Default temperature range (0C to 255.875C).
Extended temperature range (-49C to +206.875C).
Ref Doc: AMD V3000 PPR (Doc ID #56558).Signed-off-by Chuande Chen <[email protected]>
Applied.
Thanks,
Guenter