Skip to content

Rework the trip points creation

Daniel Lezcano linux-arm-kernel linux-arm-msm linux-omap linux-pm linux-renesas-soc linux-samsung-soc linux-tegra lkml netdev platform-driver-x86 9 versions – Applied

Status from this message: The following commit has been merged into the thermal/next branch of thermal:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest29 patches 13 repliesApplied
  2. v729 patches 14 repliesSuperseded
  3. v629 patches 0 repliesSuperseded
Earlier versions · 6
VersionPostedPatchesRepliesStatus
v5 posting 2/20 of 30 patches1 replySuperseded
v5 posting 1/230 patches12 repliesSuperseded
v430 patches13 repliesSuperseded
v330 patches9 repliesSuperseded
v226 patches7 repliesSuperseded
v126 patches8 repliesSuperseded

Changes in v8 from the cover letter

- Pretty oneline change and parenthesis removal (Rafael)
- Collected tags

Patches in v8 Applied

#Subject and filesSizeRepliesApplied
1/29thermal/core: Add a generic thermal_zone_get_trip() functiondrivers/thermal/thermal_core.c drivers/thermal/thermal_core.h drivers/thermal/thermal_helpers.c +3 more+149 -893 replies
2/29thermal/sysfs: Always expose hysteresis attributesdrivers/thermal/thermal_sysfs.c+9 -160 replies
3/29thermal/core: Add a generic thermal_zone_set_trip() functiondrivers/thermal/thermal_core.c drivers/thermal/thermal_sysfs.c include/linux/thermal.h+66 -351 reply
4/29thermal/core/governors: Use thermal_zone_get_trip() instead of ops functionsdrivers/thermal/gov_bang_bang.c drivers/thermal/gov_fair_share.c drivers/thermal/gov_power_allocator.c +1 more+62 -680 replies
5/29thermal/of: Use generic thermal_zone_get_trip() functiondrivers/thermal/thermal_of.c+0 -360 replies
6/29thermal/of: Remove unused functionsdrivers/thermal/thermal_core.h drivers/thermal/thermal_of.c+0 -240 replies
7/29thermal/drivers/exynos: Use generic thermal_zone_get_trip() functiondrivers/thermal/samsung/exynos_tmu.c+16 -250 replies
8/29thermal/drivers/exynos: of_thermal_get_ntrips()drivers/thermal/samsung/exynos_tmu.c+4 -30 replies
9/29thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip()drivers/thermal/samsung/exynos_tmu.c+6 -30 replies
10/29thermal/drivers/tegra: Use generic thermal_zone_get_trip() functiondrivers/thermal/tegra/soctherm.c drivers/thermal/tegra/tegra30-tsensor.c+22 -280 replies
11/29thermal/drivers/uniphier: Use generic thermal_zone_get_trip() functiondrivers/thermal/uniphier_thermal.c+12 -150 replies
12/29thermal/drivers/hisi: Use generic thermal_zone_get_trip() functiondrivers/thermal/hisi_thermal.c+6 -50 replies
13/29thermal/drivers/qcom: Use generic thermal_zone_get_trip() functiondrivers/thermal/qcom/qcom-spmi-temp-alarm.c+17 -220 replies
14/29thermal/drivers/armada: Use generic thermal_zone_get_trip() functiondrivers/thermal/armada_thermal.c+20 -190 replies
15/29thermal/drivers/rcar_gen3: Use the generic function to get the number of tripsdrivers/thermal/rcar_gen3_thermal.c+1 -10 replies
16/29thermal/of: Remove of_thermal_get_ntrips()drivers/thermal/thermal_core.h drivers/thermal/thermal_of.c+0 -210 replies
17/29thermal/of: Remove of_thermal_is_trip_valid()drivers/thermal/thermal_core.h drivers/thermal/thermal_of.c+0 -290 replies
18/29thermal/of: Remove of_thermal_set_trip_hyst()drivers/thermal/thermal_of.c+0 -130 replies
19/29thermal/of: Remove of_thermal_get_crit_temp()drivers/thermal/thermal_of.c+0 -157 replies
20/29thermal/drivers/st: Use generic trip pointsdrivers/thermal/st/st_thermal.c+7 -400 replies
21/29thermal/drivers/imx: Use generic thermal_zone_get_trip() functiondrivers/thermal/imx_thermal.c+27 -450 replies
22/29thermal/drivers/rcar: Use generic thermal_zone_get_trip() functiondrivers/thermal/rcar_thermal.c+6 -470 replies
23/29thermal/drivers/broadcom: Use generic thermal_zone_get_trip() functiondrivers/thermal/broadcom/bcm2835_thermal.c+5 -30 replies
24/29thermal/drivers/da9062: Use generic thermal_zone_get_trip() functiondrivers/thermal/da9062-thermal.c+8 -440 replies
25/29thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid()drivers/thermal/ti-soc-thermal/ti-thermal.h+0 -150 replies
26/29thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() functiondrivers/platform/x86/acerhdf.c+26 -470 replies
27/29thermal/drivers/cxgb4: Use generic thermal_zone_get_trip() functiondrivers/net/ethernet/chelsio/cxgb4/cxgb4.h drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c+8 -350 replies
28/29thermal/intel/int340x: Replace parameter to simplifydrivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h drivers/thermal/intel/int340x_thermal/processor_thermal_device.c+20 -270 replies
29/29thermal/drivers/intel: Use generic thermal_zone_get_trip() functiondrivers/thermal/intel/x86_pkg_temp_thermal.c+67 -530 replies

Reviews trailers per patch

18 of 29 patches have a Reviewed-by or Acked-by.

PatchRafael J. WysockiZhang RuiKrzysztof KozlowskiLukasz LubaKunihiko HayashiAmit KucheriaDmitry BaryshkovNiklas SöderlundFlorian FainelliAdam WardHans de GoedePeter KästleJakub KicinskiSrinivas PandruvadaMarek Szyprowski
1/29A-b R-b
2/29A-b
3/29A-b
4/29A-b R-b R-b
5/29
6/29
7/29A-b
8/29R-b
9/29A-b
10/29
11/29R-b
12/29
13/29A-b R-b
14/29
15/29R-b
16/29
17/29
18/29
19/29R-b T-b
20/29
21/29
22/29R-b
23/29A-b
24/29R-b
25/29
26/29A-b A-b
27/29A-b
28/29R-b
29/29R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 15 reviewers.

Read the v8 thread

Cover letter [PATCH v8 00/29] Rework the trip points creation

This work is the pre-requisite of handling correctly when the trip point are crossed. For that we need to rework how the trip points are declared and assigned to a thermal zone.

Even if it appears to be a common sense to have the trip points being ordered, this no guarantee neither documentation telling that is the case.

One solution could have been to create an ordered array of trips built when registering the thermal zone by calling the different get_trip* ops. However those ops receive a thermal zone pointer which is not known as it is in the process of creating it.

This cyclic dependency shows we have to rework how we manage the trip points.

Actually, all the trip points definition can be common to the backend sensor drivers and we can factor out the thermal trip structure in all of them.

Then, as we register the thermal trips array, they will be available in the thermal zone structure and a core function can return the trip given its id.

The get_trip_* ops won't be needed anymore and could be removed. The resulting code will be another step forward to a self encapsulated generic thermal framework.

Most of the drivers can be converted more or less easily. This series does a first round with most of the drivers. Some remain and will be converted but with a smaller set of changes as the conversion is a bit more complex.

Changelog:
v8:
- Pretty oneline change and parenthesis removal (Rafael)
- Collected tags
v7:
- Added missing return 0 in the x86_pkg_temp driver
v6:
- Improved the code for the get_crit_temp() function as suggested by Rafael
- Removed inner parenthesis in the set_trip_temp() function and invert the conditions. Check the type of the trip point is unchanged
- Folded patch 4 with 1
- Add per thermal zone info message in the bang-bang governor
- Folded the fix for an uninitialized variable in int340x_thermal_zone_add()
v5:
- Fixed a deadlock when calling thermal_zone_get_trip() while handling the thermal zone lock
- Remove an extra line in the sysfs change
- Collected tags
v4:
- Remove extra lines on exynos changes as reported by Krzysztof Kozlowski
- Collected tags
v3:
- Reorg the series to be git-bisect safe
- Added the set_trip generic function
- Added the get_crit_temp generic function
- Removed more dead code in the thermal-of
- Fixed the exynos changelog
- Fixed the error check for the exynos drivers
- Collected tags
v2:
- Added missing EXPORT_SYMBOL_GPL() for thermal_zone_get_trip()
- Removed tab whitespace in the acerhdf driver
- Collected tags

Cc Raju Rangoju <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Peter Kaestle <[email protected]>
Cc Hans de Goede <[email protected]>
Cc Mark Gross <[email protected]>
Cc Miquel Raynal <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Amit Kucheria <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>
Cc Broadcom Kernel Team <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Ray Jui <[email protected]>
Cc Scott Branden <[email protected]>
Cc Support Opensource <[email protected]>
Cc Lukasz Luba <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc NXP Linux Team <[email protected]>
Cc Thara Gopinath <[email protected]>
Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc "Niklas Söderlund" <[email protected]>
Cc Bartlomiej Zolnierkiewicz <[email protected]>
Cc Krzysztof Kozlowski <[email protected]>
Cc Alim Akhtar <[email protected]>
Cc Thierry Reding <[email protected]>
Cc Jonathan Hunter <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc Keerthy <[email protected]>
Cc Kunihiko Hayashi <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Antoine Tenart <[email protected]>
Cc Srinivas Pandruvada <[email protected]>
Cc Dmitry Osipenko <[email protected]>

Daniel Lezcano (29):
thermal/core: Add a generic thermal_zone_get_trip() function thermal/sysfs: Always expose hysteresis attributes thermal/core: Add a generic thermal_zone_set_trip() function thermal/core/governors: Use thermal_zone_get_trip() instead of ops
functions
thermal/of: Use generic thermal_zone_get_trip() function thermal/of: Remove unused functions thermal/drivers/exynos: Use generic thermal_zone_get_trip() function thermal/drivers/exynos: of_thermal_get_ntrips() thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by
thermal_zone_get_trip()
thermal/drivers/tegra: Use generic thermal_zone_get_trip() function thermal/drivers/uniphier: Use generic thermal_zone_get_trip() function thermal/drivers/hisi: Use generic thermal_zone_get_trip() function thermal/drivers/qcom: Use generic thermal_zone_get_trip() function thermal/drivers/armada: Use generic thermal_zone_get_trip() function thermal/drivers/rcar_gen3: Use the generic function to get the number
of trips
thermal/of: Remove of_thermal_get_ntrips()
thermal/of: Remove of_thermal_is_trip_valid()
thermal/of: Remove of_thermal_set_trip_hyst()
thermal/of: Remove of_thermal_get_crit_temp() thermal/drivers/st: Use generic trip points thermal/drivers/imx: Use generic thermal_zone_get_trip() function thermal/drivers/rcar: Use generic thermal_zone_get_trip() function thermal/drivers/broadcom: Use generic thermal_zone_get_trip() function thermal/drivers/da9062: Use generic thermal_zone_get_trip() function thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() /
ti_thermal_trip_is_valid()
thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function thermal/drivers/cxgb4: Use generic thermal_zone_get_trip() function thermal/intel/int340x: Replace parameter to simplify thermal/drivers/intel: Use generic thermal_zone_get_trip() function

 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h    |   2 -
 .../ethernet/chelsio/cxgb4/cxgb4_thermal.c    |  41 +----
 drivers/platform/x86/acerhdf.c                |  73 +++-----
 drivers/thermal/armada_thermal.c              |  39 ++---
 drivers/thermal/broadcom/bcm2835_thermal.c    |   8 +-
 drivers/thermal/da9062-thermal.c              |  52 +-----
 drivers/thermal/gov_bang_bang.c               |  39 +++--
 drivers/thermal/gov_fair_share.c              |  18 +-
 drivers/thermal/gov_power_allocator.c         |  51 +++---
 drivers/thermal/gov_step_wise.c               |  22 ++-
 drivers/thermal/hisi_thermal.c                |  11 +-
 drivers/thermal/imx_thermal.c                 |  72 +++-----
 .../int340x_thermal/int340x_thermal_zone.c    |  33 ++--
 .../int340x_thermal/int340x_thermal_zone.h    |   4 +-
 .../processor_thermal_device.c                |  10 +-
 drivers/thermal/intel/x86_pkg_temp_thermal.c  | 120 +++++++------
 drivers/thermal/qcom/qcom-spmi-temp-alarm.c   |  39 ++---
 drivers/thermal/rcar_gen3_thermal.c           |   2 +-
 drivers/thermal/rcar_thermal.c                |  53 +-----
 drivers/thermal/samsung/exynos_tmu.c          |  57 +++----
 drivers/thermal/st/st_thermal.c               |  47 +----
 drivers/thermal/tegra/soctherm.c              |  33 ++--
 drivers/thermal/tegra/tegra30-tsensor.c       |  17 +-
 drivers/thermal/thermal_core.c                | 160 +++++++++++++++---
 drivers/thermal/thermal_core.h                |  24 +--
 drivers/thermal/thermal_helpers.c             |  28 +--
 drivers/thermal/thermal_netlink.c             |  21 +--
 drivers/thermal/thermal_of.c                  | 116 -------------
 drivers/thermal/thermal_sysfs.c               | 133 +++++----------
 drivers/thermal/ti-soc-thermal/ti-thermal.h   |  15 --
 drivers/thermal/uniphier_thermal.c            |  27 ++-
 include/linux/thermal.h                       |  10 ++
 32 files changed, 559 insertions(+), 818 deletions(-)
Signature · 1 line
2.34.1