Commit 619f4edc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull thermal control updates from Rafael Wysocki:
 "These add Nova Lake processor support to the Intel thermal drivers and
  DPTF code, update thermal control documentation, simplify the ACPI
  DPTF code related to thermal control, add QCS8300 compatible to the
  tsens thermal DT bindings, add DT bindings for NXP i.MX91 thermal
  module and add support for it to the imx91 thermal driver, update a
  few other thermal drivers and fix a format string issue in a thermal
  utility:

   - Add Nova Lake processor thermal device to the int340x
     processor_thermal driver, add DLVR support for Nova Lake to it, add
     Nova Lake support to the ACPI DPTF code, document thermal
     throttling on Intel platforms, and update workload type hint
     interface documentation (Srinivas Pandruvada)

   - Remove int340x thermal scan handler from the ACPI DPTF code because
     it turned out to be unnecessary (Slawomir Rosek)

   - Clean up the Intel int340x thermal driver (Kaushlendra Kumar)

   - Document the RZ/V2H TSU DT bindings (Ovidiu Panait)

   - Document the Kaanapali Temperature Sensor (Manaf Meethalavalappu
     Pallikunhi)

   - Document R-Car Gen4 and RZ/G2 support in driver comment (Marek
     Vasut)

   - Convert to DEFINE_SIMPLE_DEV_PM_OPS() in R-Car [Gen3] (Geert
     Uytterhoeven)

   - Fix format string bug in thermal-engine (Malaya Kumar Rout)

   - Make ipq5018 tsens standalone compatible (George Moussalem)

   - Add the QCS8300 compatible for QCom Tsens (Gaurav Kohli)

   - Add support for the NXP i.MX91 thermal module, including the DT
     bindings (Pengfei Li)"

* tag 'thermal-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/drivers/imx91: Add support for i.MX91 thermal monitoring unit
  dt-bindings: thermal: fsl,imx91-tmu: add bindings for NXP i.MX91 thermal module
  dt-bindings: thermal: tsens: Add QCS8300 compatible
  dt-bindings: thermal: qcom-tsens: make ipq5018 tsens standalone compatible
  tools/thermal/thermal-engine: Fix format string bug in thermal-engine
  docs: driver-api/thermal/intel_dptf: Add new workload type hint
  thermal/drivers/rcar_gen3: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  thermal/drivers/rcar: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  Documentation: thermal: Document thermal throttling on Intel platforms
  ACPI: DPTF: Support Nova Lake
  thermal: intel: int340x: Add DLVR support for Nova Lake
  thermal: int340x: processor_thermal: Add Nova Lake processor thermal device
  thermal: intel: int340x: Replace sprintf() with sysfs_emit()
  thermal: intel: int340x: Use symbolic constant for UUID comparison
  thermal/drivers/rcar_gen3: Document R-Car Gen4 and RZ/G2 support in driver comment
  dt-bindings: thermal: qcom-tsens: document the Kaanapali Temperature Sensor
  dt-bindings: thermal: r9a09g047-tsu: Document RZ/V2H TSU
  ACPI: DPTF: Remove int340x thermal scan handler
  thermal: intel: Select INT340X_THERMAL from INTEL_SOC_DTS_THERMAL
parents d348c223 63d26c38

Documentation/admin-guide/thermal/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ Thermal Subsystem 
   :maxdepth: 1



   intel_powerclamp

   intel_thermal_throttle

Documentation/admin-guide/thermal/intel_thermal_throttle.rst

0 → 100644
+91 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0

.. include:: <isonum.txt>



=======================================

Intel thermal throttle events reporting

=======================================



:Author: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>



Introduction

------------



Intel processors have built in automatic and adaptive thermal monitoring

mechanisms that force the processor to reduce its power consumption in order

to operate within predetermined temperature limits.



Refer to section "THERMAL MONITORING AND PROTECTION" in the "Intel® 64 and

IA-32 Architectures Software Developer’s Manual Volume 3 (3A, 3B, 3C, & 3D):

System Programming Guide" for more details.



In general, there are two mechanisms to control the core temperature of the

processor. They are called "Thermal Monitor 1 (TM1) and Thermal Monitor 2 (TM2)".



The status of the temperature sensor that triggers the thermal monitor (TM1/TM2)

is indicated through the "thermal status flag" and "thermal status log flag" in

MSR_IA32_THERM_STATUS for core level and MSR_IA32_PACKAGE_THERM_STATUS for

package level.



Thermal Status flag, bit 0 — When set, indicates that the processor core

temperature is currently at the trip temperature of the thermal monitor and that

the processor power consumption is being reduced via either TM1 or TM2, depending

on which is enabled. When clear, the flag indicates that the core temperature is

below the thermal monitor trip temperature. This flag is read only.



Thermal Status Log flag, bit 1 — When set, indicates that the thermal sensor has

tripped since the last power-up or reset or since the last time that software

cleared this flag. This flag is a sticky bit; once set it remains set until

cleared by software or until a power-up or reset of the processor. The default

state is clear.



It is possible that when user reads MSR_IA32_THERM_STATUS or

MSR_IA32_PACKAGE_THERM_STATUS, TM1/TM2 is not active. In this case,

"Thermal Status flag" will read "0" and the "Thermal Status Log flag" will be set

to show any previous "TM1/TM2" activation. But since it needs to be cleared by

the software, it can't show the number of occurrences of "TM1/TM2" activations.



Hence, Linux provides counters of how many times the "Thermal Status flag" was

set. Also presents how long the "Thermal Status flag" was active in milliseconds.

Using these counters, users can check if the performance was limited because of

thermal events. It is recommended to read from sysfs instead of directly reading

MSRs as the "Thermal Status Log flag" is reset by the driver to implement rate

control.



Sysfs Interface

---------------



Thermal throttling events are presented for each CPU under

"/sys/devices/system/cpu/cpuX/thermal_throttle/", where "X" is the CPU number.



All these counters are read-only. They can't be reset to 0. So, they can potentially

overflow after reaching the maximum 64 bit unsigned integer.



``core_throttle_count``

	Shows the number of times "Thermal Status flag" changed from 0 to 1 for this

	CPU since OS boot and thermal vector is initialized. This is a 64 bit counter.



``package_throttle_count``

	Shows the number of times "Thermal Status flag" changed from 0 to 1 for the

	package containing this CPU since OS boot and thermal vector is initialized.

	Package status is broadcast to all CPUs; all CPUs in the package increment

	this count. This is a 64-bit counter.



``core_throttle_max_time_ms``

	Shows the maximum amount of time for which "Thermal Status flag" has been

	set to 1 for this CPU at the core level since OS boot and thermal vector

	is initialized.



``package_throttle_max_time_ms``

	Shows the maximum amount of time for which "Thermal Status flag" has been

	set to 1 for the package containing this CPU since OS boot and thermal

	vector is initialized.



``core_throttle_total_time_ms``

	Shows the cumulative time for which "Thermal Status flag" has been

	set to 1 for this CPU for core level since OS boot and thermal vector

	is initialized.



``package_throttle_total_time_ms``

	Shows the cumulative time for which "Thermal Status flag" has been set

	to 1 for the package containing this CPU since OS boot and thermal vector

	is initialized.

Documentation/devicetree/bindings/thermal/fsl,imx91-tmu.yaml

0 → 100644
+87 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/thermal/fsl,imx91-tmu.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: NXP i.MX91 Thermal



maintainers:

  - Pengfei Li <pengfei.li_1@nxp.com>



description:

  i.MX91 features a new temperature sensor. It includes programmable

  temperature threshold comparators for both normal and privileged

  accesses and allows a programmable measurement frequency for the

  Periodic One-Shot Measurement mode. Additionally, it provides

  status registers for indicating the end of measurement and threshold

  violation events.



properties:

  compatible:

    items:

      - const: fsl,imx91-tmu



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    items:

      - description: Comparator 1 irq

      - description: Comparator 2 irq

      - description: Data ready irq



  interrupt-names:

    items:

      - const: thr1

      - const: thr2

      - const: ready



  nvmem-cells:

    items:

      - description: Phandle to the trim control 1 provided by ocotp

      - description: Phandle to the trim control 2 provided by ocotp



  nvmem-cell-names:

    items:

      - const: trim1

      - const: trim2



  "#thermal-sensor-cells":

    const: 0



required:

  - compatible

  - reg

  - clocks

  - interrupts

  - interrupt-names



allOf:

  - $ref: thermal-sensor.yaml



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/imx93-clock.h>



    thermal-sensor@44482000 {

        compatible = "fsl,imx91-tmu";

        reg = <0x44482000 0x1000>;

        #thermal-sensor-cells = <0>;

        clocks = <&clk IMX93_CLK_TMC_GATE>;

        interrupt-parent = <&gic>;

        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

        interrupt-names = "thr1", "thr2", "ready";

        nvmem-cells = <&tmu_trim1>, <&tmu_trim2>;

        nvmem-cell-names = "trim1", "trim2";

    };



...

Documentation/devicetree/bindings/thermal/qcom-tsens.yaml

+8 −1
Original line number Diff line number Diff line
@@ -36,10 +36,15 @@ properties: 
              - qcom,msm8974-tsens

          - const: qcom,tsens-v0_1



      - description:

          v1 of TSENS without RPM which requires to be explicitly reset

          and enabled in the driver.

        enum:

          - qcom,ipq5018-tsens



      - description: v1 of TSENS

        items:

          - enum:

              - qcom,ipq5018-tsens

              - qcom,msm8937-tsens

              - qcom,msm8956-tsens

              - qcom,msm8976-tsens
@@ -50,11 +55,13 @@ properties: 
        items:

          - enum:

              - qcom,glymur-tsens

              - qcom,kaanapali-tsens

              - qcom,milos-tsens

              - qcom,msm8953-tsens

              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

              - qcom,qcm2290-tsens

	      - qcom,qcs8300-tsens

              - qcom,qcs615-tsens

              - qcom,sa8255p-tsens

              - qcom,sa8775p-tsens

Documentation/devicetree/bindings/thermal/renesas,r9a09g047-tsu.yaml

+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ description: 


properties:

  compatible:

    const: renesas,r9a09g047-tsu

    oneOf:

      - const: renesas,r9a09g047-tsu # RZ/G3E

      - items:

          - const: renesas,r9a09g057-tsu # RZ/V2H

          - const: renesas,r9a09g047-tsu # RZ/G3E



  reg:

    maxItems: 1