github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 00:22:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Thermal control fixes for 6.4-rc1

Browse Source 
- Fix NULL pointer access in the Intel powerclamp thermal driver that
    occurs on attempts to set the cooling device state to 0 in the
    default configuration (Srinivas Pandruvada).
 
  - Drop the stale MAINTAINERS entry for the Intel Menlow thermal driver
    that has been removed recently (Lukas Bulwahn).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmRVQEMSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRx2lgP/2dF1jIwbyv8BMdJzwYIOX8USPhu7Dgy
 XcoB3CSF/E2voA97lQRP4bcafTY7eQkF2bEz6tZjyo3nKP+pNQr3vmTIp//wMVrK
 d4Sptz0HVvn5maXRsjnnC8K5fJbL0Ms3bY/KXT5jiJ/7mAqNIviXGHX0vH+zNbSm
 +ukI9+YpaAvfgo/y/Q5l9xpQJapYZhGUY3Dws8xeUPzbWmxyLhnQa4dnHZMrUyQO
 C6GqRo2g9kmpSYOj6M31VVqkgCct4qk0SvcyT4/HCsIHtkgwnEQdWblJ0DMbdvMo
 izQ/WM2PRT+6OhQ9ghnWEiTEJtI/5+ZhRYZSG9PJrgAqeuKT+UFUzYsSCdkUQSmC
 I9MOOerhLMMAM4JqlAVYx/itZpkaWuyTCvWRw5sEeAj97kmFtMmZx7vLK9GJ7CK3
 VYtsAUqHuDI8D5RXuTN8KARgu4Q0LP/ZGQ0Gtu6BTNwg1EUF23DHCUBzA+xb3DNY
 vPZrb+Tk7Asx/7fkiKQHxLlmVOnUhxeo2qMdQmPL/EsCgxlEwYp98XNtltA8bsQz
 u+QY812+z4KOJfKHmQRvRMhFoltkT8TtcPDjbsr3rUDFiztp7HUU7d3wD+VBFDdm
 qfwNQ8TGVfRlRrjxEXigYDZilORFNwfkS1qO9tIcM7KymVqHga2Ex82dz+2irh9/
 y7OfMv4iAKvG
 =reUK
 -----END PGP SIGNATURE-----

Merge tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull thermal control fixes from Rafael Wysocki:
 "These fix a NULL pointer dereference in the Intel powerclamp driver
  introduced during the 6.3 cycle and update MAINTAINERS to match recent
  code changes.

  Specifics:

   - Fix NULL pointer access in the Intel powerclamp thermal driver that
     occurs on attempts to set the cooling device state to 0 in the
     default configuration (Srinivas Pandruvada)

   - Drop the stale MAINTAINERS entry for the Intel Menlow thermal
     driver that has been removed recently (Lukas Bulwahn)"

* tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  MAINTAINERS: remove section INTEL MENLOW THERMAL DRIVER
  thermal: intel: powerclamp: Fix NULL pointer access issue
This commit is contained in:
Linus Torvalds 2023-05-05 12:05:00 -07:00
commit 817e1af1b3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MAINTAINERS
View File

@ -10556,12 +10556,6 @@ F: drivers/hwmon/intel-m10-bmc-hwmon.c
F: drivers/mfd/intel-m10-bmc*
F: include/linux/mfd/intel-m10-bmc.h
INTEL MENLOW THERMAL DRIVER
M: Sujith Thomas <sujith.thomas@intel.com>
L: linux-pm@vger.kernel.org
S: Supported
F: drivers/thermal/intel/intel_menlow.c
INTEL P-Unit IPC DRIVER
M: Zha Qipeng <qipeng.zha@intel.com>
L: platform-driver-x86@vger.kernel.org

4
drivers/thermal/intel/intel_powerclamp.c
View File

@ -703,6 +703,10 @@ static int powerclamp_set_cur_state(struct thermal_cooling_device *cdev,
new_target_ratio = clamp(new_target_ratio, 0UL,
(unsigned long) (max_idle - 1));
if (powerclamp_data.target_ratio == new_target_ratio)
goto exit_set;
if (!powerclamp_data.target_ratio && new_target_ratio > 0) {
pr_info("Start idle injection to reduce power\n");
powerclamp_data.target_ratio = new_target_ratio;