thermal: int340x: processor_thermal: Fix tcc setting
Subsystems (2)
PATCH 1/1 thermal: int340x: processor_thermal: Fix tcc setting
The following fixes are done for tcc sysfs interface:
- TCC is 6 bits only from bit 29-24
- TCC of 0 is valid
- When BIT(31) is set, this register is read only
- Check for invalid tcc value
- Error for negative values
Export sysfs interface for TCC offset"
---
Update
Added Fixes tag and cc to stable
.../processor_thermal_device.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +12 -8
@@ -78,24 +78,27 @@ static ssize_t tcc_offset_degree_celsius_show(struct device *dev,if (err)return err; - val = (val >>24 ) &0xff ; + val = (val >>24 ) &0x3f ;return sprintf (buf,"%d\n" , (int )val); } -static int tcc_offset_update (int tcc) +static int tcc_offset_update (unsigned int tcc) {u64 val;int err; -if (!tcc) +if (tcc >63 )return -EINVAL ; err =rdmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , &val);if (err)return err; - val &= ~GENMASK_ULL (31 ,24 ); - val |= (tcc &0xff ) <<24 ; +if (val &BIT (31 )) +return -EPERM ; + + val &= ~GENMASK_ULL (29 ,24 ); + val |= (tcc &0x3f ) <<24 ; err =wrmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , val);if (err)
@@ -104,14 +107,15 @@ static int tcc_offset_update(int tcc)return 0 ; } -static int tcc_offset_save; +static unsigned int tcc_offset_save;static ssize_t tcc_offset_degree_celsius_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { +unsigned int tcc;u64 val; -int tcc, err; +int err; err =rdmsrl_safe (MSR_PLATFORM_INFO , &val);if (err)
@@ -120,7 +124,7 @@ static ssize_t tcc_offset_degree_celsius_store(struct device *dev,if (!(val &BIT (30 )))return -EACCES ; -if (kstrtoint (buf,0 , &tcc)) +if (kstrtouint (buf,0 , &tcc))return -EINVAL ; err =tcc_offset_update (tcc);
Signature · 1 line
2.27.0
Quoted 19 lines
-----Original Message-----
From: Srinivas Pandruvada <[email protected]>
Sent: Tuesday, June 29, 2021 5:58 AM
To: [email protected]; Zhang, Rui <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; Srinivas Pandruvada <[email protected]>; [email protected]
Subject: [UPDATE][PATCH] thermal: int340x:processor_thermal: Fix tcc setting
Importance: HighThe following fixes are done for tcc sysfs interface:
- TCC is 6 bits only from bit 29-24
- TCC of 0 is valid
- When BIT(31) is set, this register is read only
- Check for invalid tcc value
- Error for negative values
Quoted 4 lines
Fixes fdf4f2fb8e899 ("drivers: thermal: processor_thermal_device:Export sysfs interface for TCC offset"
Signed-off-by Srinivas Pandruvada <[email protected]>
Quoted 75 lines
---
Update
Added Fixes tag and cc to stable.../processor_thermal_device.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +12
-8@@ -78,24 +78,27 @@ static ssize_t tcc_offset_degree_celsius_show(structdevice *dev, if (err) return err; - val = (val >>24 ) &0xff ; + val = (val >>24 ) &0x3f ;return sprintf (buf,"%d\n" , (int )val); } -static int tcc_offset_update (int tcc) +static int tcc_offset_update (unsigned int tcc) {u64 val;int err; -if (!tcc) +if (tcc >63 )return -EINVAL ; err =rdmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , &val);if (err)return err; - val &= ~GENMASK_ULL (31 ,24 ); - val |= (tcc &0xff ) <<24 ; +if (val &BIT (31 )) +return -EPERM ; + + val &= ~GENMASK_ULL (29 ,24 ); + val |= (tcc &0x3f ) <<24 ; err =wrmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , val);if (err)@@ -104,14 +107,15 @@ static int tcc_offset_update(int tcc)return 0 ; } -static int tcc_offset_save; +static unsigned int tcc_offset_save;static ssize_t tcc_offset_degree_celsius_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { +unsigned int tcc;u64 val; -int tcc, err; +int err; err =rdmsrl_safe (MSR_PLATFORM_INFO , &val);if (err)@@ -120,7 +124,7 @@ static ssize_t tcc_offset_degree_celsius_store(struct device *dev, if (!(val & BIT(30))) return -EACCES; -if (kstrtoint (buf,0 , &tcc)) +if (kstrtouint (buf,0 , &tcc))return -EINVAL ;err =
tcc_offset_update(tcc);
--
2.27.0
[thermal: thermal/next] thermal/drivers/int340x/processor_thermal: Fix tcc setting
In reply to Srinivas PandruvadaThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 1264017b3ab6d903760673a8515180af6e7a7f28 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//1264017b3ab6d903760673a8515180af6e7a7f28 Author: Srinivas Pandruvada <[email protected]> AuthorDate: Mon, 28 Jun 2021 14:58:03 -07:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Tue, 29 Jun 2021 08:15:53 +02:00
thermal/drivers/int340x/processor_thermal: Fix tcc setting
The following fixes are done for tcc sysfs interface:
- TCC is 6 bits only from bit 29-24
- TCC of 0 is valid
- When BIT(31) is set, this register is read only
- Check for invalid tcc value
- Error for negative values
--- drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +12 -8
@@ -78,24 +78,27 @@ static ssize_t tcc_offset_degree_celsius_show(struct device *dev,if (err)return err; - val = (val >>24 ) &0xff ; + val = (val >>24 ) &0x3f ;return sprintf (buf,"%d\n" , (int )val); } -static int tcc_offset_update (int tcc) +static int tcc_offset_update (unsigned int tcc) {u64 val;int err; -if (!tcc) +if (tcc >63 )return -EINVAL ; err =rdmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , &val);if (err)return err; - val &= ~GENMASK_ULL (31 ,24 ); - val |= (tcc &0xff ) <<24 ; +if (val &BIT (31 )) +return -EPERM ; + + val &= ~GENMASK_ULL (29 ,24 ); + val |= (tcc &0x3f ) <<24 ; err =wrmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , val);if (err)
@@ -104,14 +107,15 @@ static int tcc_offset_update(int tcc)return 0 ; } -static int tcc_offset_save; +static unsigned int tcc_offset_save;static ssize_t tcc_offset_degree_celsius_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { +unsigned int tcc;u64 val; -int tcc, err; +int err; err =rdmsrl_safe (MSR_PLATFORM_INFO , &val);if (err)
@@ -120,7 +124,7 @@ static ssize_t tcc_offset_degree_celsius_store(struct device *dev,if (!(val &BIT (30 )))return -EACCES ; -if (kstrtoint (buf,0 , &tcc)) +if (kstrtouint (buf,0 , &tcc))return -EINVAL ; err =tcc_offset_update (tcc);
[thermal: thermal/next] thermal/drivers/int340x/processor_thermal: Fix tcc setting
In reply to Srinivas PandruvadaThe following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: fe6a6de6692e7f7159c1ff42b07ecd737df712b4 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//fe6a6de6692e7f7159c1ff42b07ecd737df712b4 Author: Srinivas Pandruvada <[email protected]> AuthorDate: Mon, 28 Jun 2021 14:58:03 -07:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Sun, 04 Jul 2021 18:28:04 +02:00
thermal/drivers/int340x/processor_thermal: Fix tcc setting
The following fixes are done for tcc sysfs interface:
- TCC is 6 bits only from bit 29-24
- TCC of 0 is valid
- When BIT(31) is set, this register is read only
- Check for invalid tcc value
- Error for negative values
--- drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +12 -8
@@ -78,24 +78,27 @@ static ssize_t tcc_offset_degree_celsius_show(struct device *dev,if (err)return err; - val = (val >>24 ) &0xff ; + val = (val >>24 ) &0x3f ;return sprintf (buf,"%d\n" , (int )val); } -static int tcc_offset_update (int tcc) +static int tcc_offset_update (unsigned int tcc) {u64 val;int err; -if (!tcc) +if (tcc >63 )return -EINVAL ; err =rdmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , &val);if (err)return err; - val &= ~GENMASK_ULL (31 ,24 ); - val |= (tcc &0xff ) <<24 ; +if (val &BIT (31 )) +return -EPERM ; + + val &= ~GENMASK_ULL (29 ,24 ); + val |= (tcc &0x3f ) <<24 ; err =wrmsrl_safe (MSR_IA32_TEMPERATURE_TARGET , val);if (err)
@@ -104,14 +107,15 @@ static int tcc_offset_update(int tcc)return 0 ; } -static int tcc_offset_save; +static unsigned int tcc_offset_save;static ssize_t tcc_offset_degree_celsius_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { +unsigned int tcc;u64 val; -int tcc, err; +int err; err =rdmsrl_safe (MSR_PLATFORM_INFO , &val);if (err)
@@ -120,7 +124,7 @@ static ssize_t tcc_offset_degree_celsius_store(struct device *dev,if (!(val &BIT (30 )))return -EACCES ; -if (kstrtoint (buf,0 , &tcc)) +if (kstrtouint (buf,0 , &tcc))return -EINVAL ; err =tcc_offset_update (tcc);