-----Original Message----- From: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com Sent: Tuesday, June 29, 2021 5:58 AM To: daniel.lezcano@linaro.org; Zhang, Rui rui.zhang@intel.com; amitk@kernel.org Cc: linux-pm@vger.kernel.org; linux-kernel@vger.kernel.org; Srinivas Pandruvada srinivas.pandruvada@linux.intel.com; stable@vger.kernel.org Subject: [UPDATE][PATCH] thermal: int340x: processor_thermal: Fix tcc setting Importance: High

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

Fixes: fdf4f2fb8e899 ("drivers: thermal: processor_thermal_device: Export sysfs interface for TCC offset" Signed-off-by: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com Cc: stable@vger.kernel.org

Acked-by: Zhang Rui rui.zhang@intel.com

---

Update Added Fixes tag and cc to stable

.../processor_thermal_device.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c index de4fc640deb0..0f0038af2ad4 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c @@ -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);

-- 2.27.0

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//fe6a6de66... Author: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com AuthorDate: Mon, 28 Jun 2021 14:58:03 -07:00 Committer: Daniel Lezcano daniel.lezcano@linaro.org 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

Fixes: fdf4f2fb8e899 ("drivers: thermal: processor_thermal_device: Export sysfs interface for TCC offset") Signed-off-by: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com Cc: stable@vger.kernel.org Acked-by: Zhang Rui rui.zhang@intel.com Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org Link: https://lore.kernel.org/r/20210628215803.75038-1-srinivas.pandruvada@linux.i... --- drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c index de4fc64..0f0038a 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c @@ -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);