* [GIT PULL] Thermal management updates for v4.1-rc2
@ 2015-04-27 11:58 Zhang Rui
2015-04-27 21:04 ` Linus Torvalds
0 siblings, 1 reply; 5+ messages in thread
From: Zhang Rui @ 2015-04-27 11:58 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux PM list
Hi, Linus,
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git next
to receive the Thermal Management updates for v4.1-rc2
with top-most commit
75229df63655fefc8e970c4017ba4db0174ab000:
Merge branches 'thermal-fix', 'thermal-intel' and 'thermal-soc'
of .git into next
on top of commit f22e6e847115abc3a0e2ad7bb18d243d42275af1:
Linux 4.0-rc7
Specifics:
- Enhance Thermal Framework with several new capabilities:
. use power estimates
. compute weights with relative integers instead of percentages
. allow governors to have private data in thermal zones
. export thermal zone parameters through sysfs
Thanks to the ARM thermal team (Javi M., Punit A., and KP).
- Introduce a new thermal governor: power allocator. First in kernel
closed loop PI(D) controller for thermal control. Thanks to ARM thermal
team.
- OF thermal now allows thermal zones to have sustainable power HW
specification. Thanks to Punit.
- Introduce thermal driver for Intel Quark SoC x1000platform. Thanks to
Ong, Boon Leong.
- Introduce QPNP PMIC temperature alarm driver. Thanks to Ivan T. I.;
- Enhance Exynos thermal driver to handle Exynos5433 TMU. Thanks to
Chanwoo C.
- TI thermal driver now has a better implementation for EOCZ bit. Thanks
to Pavel M.
- Add id for Broadwell server in intel_powerclamp driver. Thanks to
Jacob Pan.
- A couple of other small fixes and cleanups from Joe Perches, Brian
Norris, and Matthias Krause.
----------------------------------------------------------------
Brian Norris (1):
thermal: user_space: add trip point number to uevent data
Chanwoo Choi (1):
thermal: exynos: Add the support for Exynos5433 TMU
Ivan T. Ivanov (1):
thermal: Add QPNP PMIC temperature alarm driver
Jacob Pan (1):
thermal/intel_powerclamp: add id for broadwell server
Javi Merino (13):
thermal: fair_share: use the weight from the thermal instance
thermal: fair_share: fix typo
thermal: export weight to sysfs
thermal: fair_share: generalize the weight concept
thermal: let governors have private data for each thermal zone
thermal: extend the cooling device API to include power
information
thermal: cpu_cooling: implement the power cooling device API
thermal: introduce the Power Allocator governor
thermal: add trace events to the power allocator governor
thermal: x86_pkg_temp: drop const for thermal_zone_parameters
thermal: remove stale THERMAL_POWER_ACTOR select
thermal: cpu_cooling: Check memory allocation of power_table
thermal: export thermal_zone_parameters to sysfs
Joe Perches (1):
thermal: Use bool function return values of true/false not 1/0
Kapileshwar Singh (3):
thermal: of: fix cooling device weights in device tree
thermal: cpu_cooling: Remove cpu_dev update on policy CPU update
thermal: cpu_cooling: Fix power calculation when CPUs are offline
Mathias Krause (1):
thermal/intel_powerclamp: add __init / __exit annotations
Ong, Boon Leong (1):
thermal: intel Quark SoC X1000 DTS thermal driver
Pavel Machek (3):
cleanup ti-soc-thermal
ti-soc-thermal: implement eocz bit to make driver useful on omap3
ti-soc-thermal: request temperature periodically if hw can't do
that itself
Punit Agrawal (3):
of: thermal: Introduce sustainable power for a thermal zone
thermal: core: Add Kconfig option to enable writable trips
thermal: Default OF created trip points to writable
Srinivas Pandruvada (3):
Thermal: Intel SoC: DTS thermal IOSF core
Thermal: Intel SoC: DTS thermal use common APIs
Thermal/int340x/processor_thermal: Enable auxiliary DTS for
Braswell
Zhang Rui (2):
Merge branch 'linus' of
git://git.kernel.org/.../evalenti/linux-soc-thermal into thermal-soc
Merge branches 'thermal-fix', 'thermal-intel' and 'thermal-soc'
of .git into next
.../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++
.../devicetree/bindings/thermal/thermal.txt | 9 +
Documentation/thermal/cpu-cooling-api.txt | 156 +++++-
Documentation/thermal/power_allocator.txt | 247 +++++++++
Documentation/thermal/sysfs-api.txt | 83 ++-
drivers/acpi/thermal.c | 9 +-
drivers/platform/x86/acerhdf.c | 3 +-
drivers/thermal/Kconfig | 60 ++-
drivers/thermal/Makefile | 4 +
drivers/thermal/cpu_cooling.c | 585
++++++++++++++++++++-
drivers/thermal/db8500_thermal.c | 2 +-
drivers/thermal/fair_share.c | 41 +-
drivers/thermal/imx_thermal.c | 3 +-
.../int340x_thermal/processor_thermal_device.c | 55 +-
drivers/thermal/intel_powerclamp.c | 9 +-
drivers/thermal/intel_quark_dts_thermal.c | 473
+++++++++++++++++
drivers/thermal/intel_soc_dts_iosf.c | 483
+++++++++++++++++
drivers/thermal/intel_soc_dts_iosf.h | 62 +++
drivers/thermal/intel_soc_dts_thermal.c | 430
+--------------
drivers/thermal/of-thermal.c | 15 +-
drivers/thermal/power_allocator.c | 538
+++++++++++++++++++
drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++
drivers/thermal/samsung/exynos_tmu.c | 187 ++++++-
drivers/thermal/samsung/exynos_tmu.h | 1 +
drivers/thermal/thermal_core.c | 310 ++++++++++-
drivers/thermal/thermal_core.h | 13 +-
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 104 ++--
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +-
drivers/thermal/user_space.c | 13 +-
drivers/thermal/x86_pkg_temp_thermal.c | 2 +-
include/linux/cpu_cooling.h | 39 ++
include/linux/thermal.h | 86 ++-
include/trace/events/thermal.h | 58 ++
include/trace/events/thermal_power_allocator.h | 87 +++
34 files changed, 3986 insertions(+), 552 deletions(-)
create mode 100644
Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
create mode 100644 Documentation/thermal/power_allocator.txt
create mode 100644 drivers/thermal/intel_quark_dts_thermal.c
create mode 100644 drivers/thermal/intel_soc_dts_iosf.c
create mode 100644 drivers/thermal/intel_soc_dts_iosf.h
create mode 100644 drivers/thermal/power_allocator.c
create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c
create mode 100644 include/trace/events/thermal_power_allocator.h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] Thermal management updates for v4.1-rc2
2015-04-27 11:58 [GIT PULL] Thermal management updates for v4.1-rc2 Zhang Rui
@ 2015-04-27 21:04 ` Linus Torvalds
2015-04-28 2:40 ` Zhang, Rui
0 siblings, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2015-04-27 21:04 UTC (permalink / raw)
To: Zhang Rui; +Cc: Linux PM list
On Mon, Apr 27, 2015 at 4:58 AM, Zhang Rui <rui.zhang@intel.com> wrote:
>
> to receive the Thermal Management updates for v4.1-rc2
> with top-most commit
This came outside the merge window (why?), so I'm ignoring it.
If you have bug-fixes, send those. The rest can wait until 4.2.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [GIT PULL] Thermal management updates for v4.1-rc2
2015-04-27 21:04 ` Linus Torvalds
@ 2015-04-28 2:40 ` Zhang, Rui
2015-04-29 1:58 ` Eduardo Valentin
0 siblings, 1 reply; 5+ messages in thread
From: Zhang, Rui @ 2015-04-28 2:40 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux PM list
Hi, Linus,
Sorry that I missed the merged window as my email was broken while I was travelling in Portland last week. And I need to get it fixed after I came back this Sunday.
Thus I was hoping that this can still get merged as it is early -rc2.
Sorry for bringing the trouble to you and the patch contributors, I will send another git pull request.
Thanks,
rui
> -----Original Message-----
> From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> owner@vger.kernel.org] On Behalf Of Linus Torvalds
> Sent: Tuesday, April 28, 2015 5:05 AM
> To: Zhang, Rui
> Cc: Linux PM list
> Subject: Re: [GIT PULL] Thermal management updates for v4.1-rc2
> Importance: High
>
> On Mon, Apr 27, 2015 at 4:58 AM, Zhang Rui <rui.zhang@intel.com> wrote:
> >
> > to receive the Thermal Management updates for v4.1-rc2 with top-most
> > commit
>
> This came outside the merge window (why?), so I'm ignoring it.
>
> If you have bug-fixes, send those. The rest can wait until 4.2.
>
> Linus
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in the
> body of a message to majordomo@vger.kernel.org More majordomo info at
> http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] Thermal management updates for v4.1-rc2
2015-04-28 2:40 ` Zhang, Rui
@ 2015-04-29 1:58 ` Eduardo Valentin
2015-05-01 1:36 ` Zhang Rui
0 siblings, 1 reply; 5+ messages in thread
From: Eduardo Valentin @ 2015-04-29 1:58 UTC (permalink / raw)
To: Zhang, Rui; +Cc: Linus Torvalds, Linux PM list
[-- Attachment #1: Type: text/plain, Size: 2289 bytes --]
Linus, Rui,
On Tue, Apr 28, 2015 at 02:40:02AM +0000, Zhang, Rui wrote:
> Hi, Linus,
>
> Sorry that I missed the merged window as my email was broken while I was travelling in Portland last week. And I need to get it fixed after I came back this Sunday.
> Thus I was hoping that this can still get merged as it is early -rc2.
> Sorry for bringing the trouble to you and the patch contributors, I will send another git pull request.
>
> Thanks,
> rui
>
> > -----Original Message-----
> > From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> > owner@vger.kernel.org] On Behalf Of Linus Torvalds
> > Sent: Tuesday, April 28, 2015 5:05 AM
> > To: Zhang, Rui
> > Cc: Linux PM list
> > Subject: Re: [GIT PULL] Thermal management updates for v4.1-rc2
> > Importance: High
> >
> > On Mon, Apr 27, 2015 at 4:58 AM, Zhang Rui <rui.zhang@intel.com> wrote:
> > >
> > > to receive the Thermal Management updates for v4.1-rc2 with top-most
> > > commit
> >
> > This came outside the merge window (why?), so I'm ignoring it.
> >
> > If you have bug-fixes, send those. The rest can wait until 4.2.
> >
Linus,
We have content that has been waiting for 4.1 merge window for some
time. It was sent into linux-next several weeks ago [1]. My 4.1 pull
to Rui was a couple of weeks ago [2].
It is disappointing for the developers who has been waiting for final
merge of their code that in the end it didn't make it due to corporate
email issues.
I know it is your call to pull it or not for 4.1. I just want to explain
that the thermal-soc content is not a last minute change.
Rui,
Whenever you have such issues, let me know and we can do something to
avoid content missing the merge window. I can of course, send pulls with
accepted content, just the way I have been sending.
BR,
Eduardo Valentin
[1] - https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=899e56ad58f544e115070a7b4bd7b2dafc646936
[2] - http://marc.info/?l=linux-pm&m=142907689627135&w=2
> > Linus
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-pm" in the
> > body of a message to majordomo@vger.kernel.org More majordomo info at
> > http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] Thermal management updates for v4.1-rc2
2015-04-29 1:58 ` Eduardo Valentin
@ 2015-05-01 1:36 ` Zhang Rui
0 siblings, 0 replies; 5+ messages in thread
From: Zhang Rui @ 2015-05-01 1:36 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: Linus Torvalds, Linux PM list
Hi, Eduardo,
On Tue, 2015-04-28 at 18:58 -0700, Eduardo Valentin wrote:
> Linus, Rui,
>
> On Tue, Apr 28, 2015 at 02:40:02AM +0000, Zhang, Rui wrote:
> > Hi, Linus,
> >
> > Sorry that I missed the merged window as my email was broken while I was travelling in Portland last week. And I need to get it fixed after I came back this Sunday.
> > Thus I was hoping that this can still get merged as it is early -rc2.
> > Sorry for bringing the trouble to you and the patch contributors, I will send another git pull request.
> >
> > Thanks,
> > rui
> >
> > > -----Original Message-----
> > > From: linux-pm-owner@vger.kernel.org [mailto:linux-pm-
> > > owner@vger.kernel.org] On Behalf Of Linus Torvalds
> > > Sent: Tuesday, April 28, 2015 5:05 AM
> > > To: Zhang, Rui
> > > Cc: Linux PM list
> > > Subject: Re: [GIT PULL] Thermal management updates for v4.1-rc2
> > > Importance: High
> > >
> > > On Mon, Apr 27, 2015 at 4:58 AM, Zhang Rui <rui.zhang@intel.com> wrote:
> > > >
> > > > to receive the Thermal Management updates for v4.1-rc2 with top-most
> > > > commit
> > >
> > > This came outside the merge window (why?), so I'm ignoring it.
> > >
> > > If you have bug-fixes, send those. The rest can wait until 4.2.
> > >
>
> Linus,
>
> We have content that has been waiting for 4.1 merge window for some
> time. It was sent into linux-next several weeks ago [1]. My 4.1 pull
> to Rui was a couple of weeks ago [2].
>
> It is disappointing for the developers who has been waiting for final
> merge of their code that in the end it didn't make it due to corporate
> email issues.
>
> I know it is your call to pull it or not for 4.1. I just want to explain
> that the thermal-soc content is not a last minute change.
Again, I'm sorry that I missed this merge window.
It's disappointing but I think we should move forward.
can you please send me two git pull requests, one for 4.1-rc and another
for 4.2?
> Rui,
>
> Whenever you have such issues, let me know and we can do something to
> avoid content missing the merge window. I can of course, send pulls with
> accepted content, just the way I have been sending.
>
Sure will do next time. It is my mistake that I thought I was able to
catch the merge window.
thanks,
rui
>
> BR,
>
> Eduardo Valentin
>
> [1] - https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=899e56ad58f544e115070a7b4bd7b2dafc646936
> [2] - http://marc.info/?l=linux-pm&m=142907689627135&w=2
>
>
> > > Linus
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-pm" in the
> > > body of a message to majordomo@vger.kernel.org More majordomo info at
> > > http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-01 1:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-27 11:58 [GIT PULL] Thermal management updates for v4.1-rc2 Zhang Rui
2015-04-27 21:04 ` Linus Torvalds
2015-04-28 2:40 ` Zhang, Rui
2015-04-29 1:58 ` Eduardo Valentin
2015-05-01 1:36 ` Zhang Rui
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).