Commit b109bc72 authored Dec 15, 2020 by Linus Torvalds

linux

Pull thermal updates from Daniel Lezcano:

 - Add upper and lower limits clamps for the cooling device state in the
   power allocator governor (Michael Kao)

 - Add upper and lower limits support for the power allocator governor
   (Lukasz Luba)

 - Optimize conditions testing for the trip points (Bernard Zhao)

 - Replace spin_lock_irqsave by spin_lock in hard IRQ on the rcar driver
   (Tian Tao)

 - Add MT8516 dt-bindings and device reset optional support (Fabien
   Parent)

 - Add a quiescent period to cool down the PCH when entering S0iX
   (Sumeet Pawnikar)

 - Use bitmap API instead of re-inventing the wheel on sun8i (Yangtao
   Li)

 - Remove useless NULL check in the hwmon driver (Bernard Zhao)

 - Update the current state in the cpufreq cooling device only if the
   frequency change is effective (Zhuguangqing)

 - Improve the schema validation for the rcar DT bindings (Geert
   Uytterhoeven)

 - Fix the user time unit in the documentation (Viresh Kumar)

 - Add PCI ids for Lewisburg PCH (Andres Freund)

 - Add hwmon support on amlogic (Martin Blumenstingl)

 - Fix build failure for PCH entering on in S0iX (Randy Dunlap)

 - Improve the k_* coefficient for the power allocator governor (Lukasz
   Luba)

 - Fix missing const on a sysfs attribute (Rikard Falkeborn)

 - Remove broken interrupt support on rcar to be replaced by a new one
   (Niklas Söderlund)

 - Improve the error code handling at init time on imx8mm (Fabio
   Estevam)

 - Compute interval validity once instead at each temperature reading
   iteration on acerhdf (Daniel Lezcano)

 - Add r8a779a0 support (Niklas Söderlund)

 - Add PCI ids for AlderLake PCH and mmio refactoring (Srinivas
   Pandruvada)

 - Add RFIM and mailbox support on int340x (Srinivas Pandruvada)

 - Use macro for temperature calculation on PCH (Sumeet Pawnikar)

 - Simplify return conditions at probe time on Broadcom (Zheng Yongjun)

 - Fix workload name on PCH (Srinivas Pandruvada)

 - Migrate the devfreq cooling device code to the energy model API
   (Lukasz Luba)

 - Emit a warning if the thermal_zone_device_update is called without
   the .get_temp() ops (Daniel Lezcano)

 - Add critical and hot ops for the thermal zone (Daniel Lezcano)

 - Remove notification usage when critical is reached on rcar (Daniel
   Lezcano)

 - Fix devfreq build when ENERGY_MODEL is not set (Lukasz Luba)

* tag 'thermal-v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (45 commits)
  thermal/drivers/devfreq_cooling: Fix the build when !ENERGY_MODEL
  thermal/drivers/rcar: Remove notification usage
  thermal/core: Add critical and hot ops
  thermal/core: Emit a warning if the thermal zone is updated without ops
  drm/panfrost: Register devfreq cooling and attempt to add Energy Model
  thermal: devfreq_cooling: remove old power model and use EM
  thermal: devfreq_cooling: add new registration functions with Energy Model
  thermal: devfreq_cooling: use a copy of device status
  thermal: devfreq_cooling: change tracing function and arguments
  thermal: int340x: processor_thermal: Correct workload type name
  thermal: broadcom: simplify the return expression of bcm2711_thermal_probe()
  thermal: intel: pch: use macro for temperature calculation
  thermal: int340x: processor_thermal: Add mailbox driver
  thermal: int340x: processor_thermal: Add RFIM driver
  thermal: int340x: processor_thermal: Add AlderLake PCI device id
  thermal: int340x: processor_thermal: Refactor MMIO interface
  thermal: rcar_gen3_thermal: Add r8a779a0 support
  dt-bindings: thermal: rcar-gen3-thermal: Add r8a779a0 support
  platform/x86/drivers/acerhdf: Check the interval value when it is set
  platform/x86/drivers/acerhdf: Use module_param_cb to set/get polling interval
  ...

parents ee249d30 4401117b

Documentation/devicetree/bindings/thermal/mediatek-thermal.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,18 +14,19 @@ Required properties:
		- "mediatek,mt2712-thermal" : For MT2712 family of SoCs
		- "mediatek,mt7622-thermal" : For MT7622 SoC
		- "mediatek,mt8183-thermal" : For MT8183 family of SoCs
		- "mediatek,mt8516-thermal", "mediatek,mt2701-thermal : For MT8516 family of SoCs
		- reg: Address range of the thermal controller
		- interrupts: IRQ for the thermal controller
		- clocks, clock-names: Clocks needed for the thermal controller. required
		clocks are:
		"therm": Main clock needed for register access
		"auxadc": The AUXADC clock
		- resets: Reference to the reset controller controlling the thermal controller.
		- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses
		- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller.
		- #thermal-sensor-cells : Should be 0. See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for a description.

		Optional properties:
		- resets: Reference to the reset controller controlling the thermal controller.
		- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If
		unspecified default values shall be used.
		- nvmem-cell-names: Should be "calibration-data"

Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml

+15 −2

Original line number	Diff line number	Diff line
		@@ -26,13 +26,16 @@ properties:
		- renesas,r8a77961-thermal # R-Car M3-W+
		- renesas,r8a77965-thermal # R-Car M3-N
		- renesas,r8a77980-thermal # R-Car V3H
		- renesas,r8a779a0-thermal # R-Car V3U

		reg:
		minItems: 2
		maxItems: 3
		maxItems: 4
		items:
		- description: TSC1 registers
		- description: TSC2 registers
		- description: TSC3 registers
		- description: TSC4 registers

		interrupts:
		items:
		@@ -55,12 +58,22 @@ properties:
		required:
		- compatible
		- reg
		- interrupts
		- clocks
		- power-domains
		- resets
		- "#thermal-sensor-cells"

		if:
		not:
		properties:
		compatible:
		contains:
		enum:
		- renesas,r8a779a0-thermal
		then:
		required:
		- interrupts

		additionalProperties: false

		examples:

Documentation/devicetree/bindings/thermal/rcar-thermal.yaml

+29 −19

Original line number	Diff line number	Diff line
		@@ -62,7 +62,13 @@ properties:
		"#thermal-sensor-cells":
		const: 0

		if:
		required:
		- compatible
		- reg

		allOf:
		- if:
		not:
		properties:
		compatible:
		contains:
		@@ -71,16 +77,20 @@ if:
		- renesas,thermal-r8a7779 # R-Car H1
		then:
		required:
		- compatible
		- reg
		else:
		- resets
		- '#thermal-sensor-cells'

		- if:
		not:
		properties:
		compatible:
		contains:
		const: renesas,thermal-r8a7779 # R-Car H1
		then:
		required:
		- compatible
		- reg
		- interrupts
		- clocks
		- power-domains
		- resets

		additionalProperties: false

Documentation/driver-api/thermal/sysfs-api.rst

+1 −2

Original line number	Diff line number	Diff line
		@@ -654,8 +654,7 @@ stats/time_in_state_ms:
		The amount of time spent by the cooling device in various cooling
		states. The output will have "<state> <time>" pair in each line, which
		will mean this cooling device spent <time> msec of time at <state>.
		Output will have one line for each of the supported states. usertime
		units here is 10mS (similar to other time exported in /proc).
		Output will have one line for each of the supported states.
		RO, Required

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
		}
		pfdevfreq->devfreq = devfreq;

		cooling = of_devfreq_cooling_register(dev->of_node, devfreq);
		cooling = devfreq_cooling_em_register(devfreq, NULL);
		if (IS_ERR(cooling))
		DRM_DEV_INFO(dev, "Failed to register cooling device\n");
		else

Admin message