* [GIT PULL] thermal for v5.7-rc1
@ 2020-04-07 11:26 Daniel Lezcano
2020-04-08 3:14 ` Linus Torvalds
2020-04-08 3:20 ` pr-tracker-bot
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Lezcano @ 2020-04-07 11:26 UTC (permalink / raw)
To: Linus Torvalds
Cc: Zhang Rui, Linux Kernel Mailing List, Linux PM mailing list,
Amit Kucheria
The following changes since commit
f8788d86ab28f61f7b46eb6be375f8a726783636:
Linux 5.6-rc3 (2020-02-23 16:17:42 -0800)
are available in the Git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
tags/thermal-v5.7-rc1
for you to fetch changes up to 11700fcb90b40a38fbfba55b2bedfc9909be8ec8:
Documentation: cpu-idle-cooling: Fix diagram for 33% duty cycle
(2020-04-07 10:45:15 +0200)
----------------------------------------------------------------
- Convert tsens configuration DT binding to yaml (Rajeshwari)
- Add interrupt support on the rcar sensor (Niklas Söderlund)
- Add a new Spreadtrum thermal driver (Baolin Wang)
- Add thermal binding for the fsl scu board, a new API to retrieve the
sensor id bound to the thermal zone and i.MX system controller
sensor (Anson Huang))
- Remove warning log when a deferred probe is requested on Exynos
(Marek Szyprowski)
- Add the thermal monitoring unit support for imx8mm with its DT
bindings (Anson Huang)
- Rephrase the Kconfig text for clarity (Linus Walleij)
- Use the gpio descriptor for the ti-soc-thermal (Linus Walleij)
- Align msg structure to 4 bytes for i.MX SC, fix the Kconfig
dependency, add the __may_be unused annotation for PM functions and
the COMPILE_TEST option for imx8mm (Anson Huang)
- Fix a dependency on regmap in Kconfig for qoriq (Yuantian Tang)
- Add DT binding and support for the rcar gen3 r8a77961 and improve
the error path on the rcar init function (Niklas Söderlund)
- Cleanup and improvements for the tsens Qcom sensor (Amit Kucheria)
- Improve code by removing lock and caching values in the rcar thermal
sensor (Niklas Söderlund)
- Cleanup in the qoriq drivers and add a call to
imx_thermal_unregister_legacy_cooling in the removal function (Anson
Huang)
- Remove redundant 'maxItems' in tsens and sprd DT bindings (Rob Herring)
- Change the thermal DT bindings by making the cooling-maps optional
(Yuantian Tang)
- Add Tiger Lake support (Sumeet Pawnikar)
- Use scnprintf() for avoiding potential buffer overflow (Takashi Iwai)
- Make pkg_temp_lock a raw_spinlock_t(Clark Williams)
- Fix incorrect data types by changing them to signed on i.MX SC
(Anson Huang)
- Replace zero-length array with flexible-array member (Gustavo A. R.
Silva)
- Add support for i.MX8MP in the driver and in the DT bindings (Anson
Huang)
- Fix return value of the cpufreq_set_cur_state() function (Willy Wolff)
- Remove abusing and scary WARN_ON in the cpufreq cooling device
(Daniel Lezcano)
- Fix build warning of incorrect argument type reported by sparse on
imx8mm (Anson Huang)
- Fix stub for the devfreq cooling device (Martin Blumenstingl)
- Fix cpu idle cooling documentation (Sergey Vidishev)
----------------------------------------------------------------
Amit Kucheria (8):
drivers: thermal: tsens: De-constify struct tsens_features
drivers: thermal: tsens: Pass around struct tsens_sensor as a
constant
drivers: thermal: tsens: use simpler variables
drivers: thermal: tsens: Release device in success path
drivers: thermal: tsens: Add critical interrupt support
drivers: thermal: tsens: Add watchdog support
drivers: thermal: tsens: kernel-doc fixup
drivers: thermal: tsens: Remove unnecessary irq flag
Anson Huang (18):
dt-bindings: fsl: scu: add thermal binding
thermal: of-thermal: add API for getting sensor ID from DT
thermal: imx_sc: add i.MX system controller thermal support
dt-bindings: thermal: imx8mm-thermal: Add binding doc for i.MX8MM
thermal: imx8mm: Add support for i.MX8MM thermal monitoring unit
thermal: imx_sc_thermal: Align imx sc thermal msg structs to 4
thermal: imx_thermal: Use __maybe_unused instead of CONFIG_PM_SLEEP
thermal: Fix build warning of !defined(CONFIG_THERMAL_OF)
thermal: Remove COMPILE_TEST for IMX_SC_THERMAL
thermal: Add COMPILE_TEST support for i.MX8MM
thermal: imx: Remove unused includes
thermal: qoriq: Use devm_add_action_or_reset() to handle all
cleanups
thermal: qoriq: Sort includes alphabetically
thermal: imx: Calling imx_thermal_unregister_legacy_cooling() in
.remove
thermal: imx_sc_thermal: Fix incorrect data type
dt-bindings: thermal: imx8mm-thermal: Add support for i.MX8MP
thermal: imx8mm: Add i.MX8MP support
thermal: imx8mm: Fix build warning of incorrect argument type
Baolin Wang (1):
dt-bindings: thermal: sprd: Add the Spreadtrum thermal documentation
Clark Williams (1):
thermal/x86_pkg_temp: Make pkg_temp_lock a raw_spinlock_t
Daniel Lezcano (1):
thermal/drivers/cpufreq_cooling: Remove abusing WARN_ON
Freeman Liu (1):
thermal: sprd: Add Spreadtrum thermal driver support
Geert Uytterhoeven (2):
dt-bindings: thermal: rcar-gen3-thermal: Add r8a77961 support
thermal: rcar_gen3_thermal: Add r8a77961 support
Gustavo A. R. Silva (1):
thermal: qcom: tsens.h: Replace zero-length array with
flexible-array member
Linus Walleij (2):
thermal: Rephrase the Kconfig text for thermal
thermal: ti-soc-thermal: Use GPIO descriptors
Marek Szyprowski (1):
thermal: exynos: Silence warning during deferred probe
Martin Blumenstingl (1):
thermal: devfreq_cooling: inline all stubs for
CONFIG_DEVFREQ_THERMAL=n
Niklas Söderlund (6):
thermal: rcar_gen3_thermal: Remove unneeded curly brackets
thermal: rcar_gen3_thermal: Generate interrupt when temperature
changes
thermal: rcar_thermal: Handle probe error gracefully
thermal: rcar_thermal: Always update thermal zone on interrupt
thermal: rcar_thermal: Do not store ctemp in rcar_thermal_priv
thermal: rcar_thermal: Remove lock in
rcar_thermal_get_current_temp()
Rajeshwari (1):
dt-bindings: thermal: tsens: Add configuration in yaml
Rob Herring (2):
dt-bindings: thermal: sprd: Remove redundant 'maxItems'
dt-bindings: thermal: qcom-tsens: Remove redundant 'maxItems'
Sergey Vidishev (1):
Documentation: cpu-idle-cooling: Fix diagram for 33% duty cycle
Sumeet Pawnikar (1):
thermal: int340x: processor_thermal: Add Tiger Lake support
Takashi Iwai (1):
thermal: int340x_thermal: Use scnprintf() for avoiding potential
buffer overflow
Willy Wolff (1):
thermal/drivers/cpufreq_cooling: Fix return of cpufreq_set_cur_state
Yuantian Tang (2):
thermal: qoriq: Fix a compiling issue
dt-bindings: thermal: make cooling-maps property optional
.../devicetree/bindings/arm/freescale/fsl,scu.txt | 16 +
.../devicetree/bindings/thermal/imx8mm-thermal.txt | 15 +
.../devicetree/bindings/thermal/qcom-tsens.yaml | 2 +-
.../bindings/thermal/rcar-gen3-thermal.txt | 1 +
.../devicetree/bindings/thermal/sprd-thermal.yaml | 107 ++++
.../devicetree/bindings/thermal/thermal.txt | 2 +-
.../driver-api/thermal/cpu-idle-cooling.rst | 4 +-
drivers/thermal/Kconfig | 42 +-
drivers/thermal/Makefile | 3 +
drivers/thermal/cpufreq_cooling.c | 10 +-
drivers/thermal/imx8mm_thermal.c | 236 +++++++++
drivers/thermal/imx_sc_thermal.c | 148 ++++++
drivers/thermal/imx_thermal.c | 16 +-
.../intel/int340x_thermal/int3400_thermal.c | 2 +-
.../int340x_thermal/processor_thermal_device.c | 5 +
drivers/thermal/intel/x86_pkg_temp_thermal.c | 24 +-
drivers/thermal/of-thermal.c | 62 ++-
drivers/thermal/qcom/tsens-8960.c | 4 +-
drivers/thermal/qcom/tsens-common.c | 194 +++++++-
drivers/thermal/qcom/tsens-v0_1.c | 6 +-
drivers/thermal/qcom/tsens-v1.c | 6 +-
drivers/thermal/qcom/tsens-v2.c | 24 +-
drivers/thermal/qcom/tsens.c | 65 ++-
drivers/thermal/qcom/tsens.h | 105 +++-
drivers/thermal/qoriq_thermal.c | 40 +-
drivers/thermal/rcar_gen3_thermal.c | 31 +-
drivers/thermal/rcar_thermal.c | 53 +-
drivers/thermal/samsung/exynos_tmu.c | 4 +-
drivers/thermal/sprd_thermal.c | 552
+++++++++++++++++++++
drivers/thermal/st/stm_thermal.c | 3 +-
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 44 +-
drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 +-
include/linux/devfreq_cooling.h | 2 +-
include/linux/thermal.h | 10 +
tools/thermal/tmon/tmon.c | 26 +-
35 files changed, 1613 insertions(+), 255 deletions(-)
create mode 100644
Documentation/devicetree/bindings/thermal/imx8mm-thermal.txt
create mode 100644
Documentation/devicetree/bindings/thermal/sprd-thermal.yaml
create mode 100644 drivers/thermal/imx8mm_thermal.c
create mode 100644 drivers/thermal/imx_sc_thermal.c
create mode 100644 drivers/thermal/sprd_thermal.c
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] thermal for v5.7-rc1
2020-04-07 11:26 [GIT PULL] thermal for v5.7-rc1 Daniel Lezcano
@ 2020-04-08 3:14 ` Linus Torvalds
2020-04-08 10:53 ` Daniel Lezcano
2020-04-08 3:20 ` pr-tracker-bot
1 sibling, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2020-04-08 3:14 UTC (permalink / raw)
To: Daniel Lezcano, Ingo Molnar, Thara Gopinath, Willy Wolff,
Viresh Kumar, Peter Zijlstra (Intel)
Cc: Zhang Rui, Linux Kernel Mailing List, Linux PM mailing list,
Amit Kucheria
On Tue, Apr 7, 2020 at 4:26 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
> tags/thermal-v5.7-rc1
Ho humm.
This caused a conflict between commit
f12e4f66ab6a ("thermal/cpu-cooling: Update thermal pressure in case
of a maximum frequency capping")
that came in through the scheduler updates from Ingo Molnar, and commit
ff44f672d741 ("thermal/drivers/cpufreq_cooling: Fix return of
cpufreq_set_cur_state")
from the thermal tree.
The conflict wasn't complicated, but the reason I mention it is that I
resolved it in a way that neither of those commits had done.
In particular, the thermal tree did
ret = freq_qos_update_request(..)
return ret < 0 ? ret : 0;
where that whole "return negative or zero" logic is new (it used to
return positive values, the fix was to return zero instead).
The scheduler tree did
ret = freq_qos_update_request(..)
if (ret > 0) {.. do thermal pressure thing ..}
return ret;
which obviously still returns that positive value.
My resolution to the conflict was to not take that return with a
conditional operation, but instead just add a
ret = 0;
to inside that thermal pressure if-statement, and avoid returning a
non-zero positive value that way.
I just wanted both sides to be aware of my non-traditional merge
resolution, and take a look.
Linus
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] thermal for v5.7-rc1
2020-04-07 11:26 [GIT PULL] thermal for v5.7-rc1 Daniel Lezcano
2020-04-08 3:14 ` Linus Torvalds
@ 2020-04-08 3:20 ` pr-tracker-bot
1 sibling, 0 replies; 4+ messages in thread
From: pr-tracker-bot @ 2020-04-08 3:20 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Linus Torvalds, Zhang Rui, Linux Kernel Mailing List,
Linux PM mailing list, Amit Kucheria
The pull request you sent on Tue, 7 Apr 2020 13:26:48 +0200:
> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git tags/thermal-v5.7-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/34183ddd13dbfa859c4b68d16a30aad2cce72b11
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] thermal for v5.7-rc1
2020-04-08 3:14 ` Linus Torvalds
@ 2020-04-08 10:53 ` Daniel Lezcano
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Lezcano @ 2020-04-08 10:53 UTC (permalink / raw)
To: Linus Torvalds, Ingo Molnar, Thara Gopinath, Willy Wolff,
Viresh Kumar, Peter Zijlstra (Intel)
Cc: Zhang Rui, Linux Kernel Mailing List, Linux PM mailing list,
Amit Kucheria
Hi Linus,
On 08/04/2020 05:14, Linus Torvalds wrote:
> On Tue, Apr 7, 2020 at 4:26 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
>> tags/thermal-v5.7-rc1
>
> Ho humm.
>
> This caused a conflict between commit
>
> f12e4f66ab6a ("thermal/cpu-cooling: Update thermal pressure in case
> of a maximum frequency capping")
>
> that came in through the scheduler updates from Ingo Molnar, and commit
>
> ff44f672d741 ("thermal/drivers/cpufreq_cooling: Fix return of
> cpufreq_set_cur_state")
>
> from the thermal tree.
>
> The conflict wasn't complicated, but the reason I mention it is that I
> resolved it in a way that neither of those commits had done.
>
> In particular, the thermal tree did
>
> ret = freq_qos_update_request(..)
> return ret < 0 ? ret : 0;
>
> where that whole "return negative or zero" logic is new (it used to
> return positive values, the fix was to return zero instead).
>
> The scheduler tree did
>
> ret = freq_qos_update_request(..)
> if (ret > 0) {.. do thermal pressure thing ..}
> return ret;
>
> which obviously still returns that positive value.
>
> My resolution to the conflict was to not take that return with a
> conditional operation, but instead just add a
>
> ret = 0;
>
> to inside that thermal pressure if-statement, and avoid returning a
> non-zero positive value that way.
>
> I just wanted both sides to be aware of my non-traditional merge
> resolution, and take a look.
The resolution looks correct to me.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-08 10:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-07 11:26 [GIT PULL] thermal for v5.7-rc1 Daniel Lezcano
2020-04-08 3:14 ` Linus Torvalds
2020-04-08 10:53 ` Daniel Lezcano
2020-04-08 3:20 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).