| Message ID | 20220906164720.330701-1-daniel.lezcano@linaro.org |
|---|---|
| Headers | show |
| Series | Rework the trip points creation | expand |
On 06/09/2022 18:46, Daniel Lezcano wrote: > The thermal framework gives the possibility to register the trip > points with the thermal zone. When that is done, no get_trip_* ops are > needed and they can be removed. > > Convert ops content logic into generic trip points and register them with the > thermal zone. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 06/09/2022 18:47, Daniel Lezcano wrote: > The thermal_zone_get_trip() does the same check as > of_thermal_is_trip_valid(). Replace the call to > of_thermal_is_trip_valid() by thermal_zone_get_trip(). > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > drivers/thermal/samsung/exynos_tmu.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > index 91e6860b5ec4..5e6bb74c67f0 100644 > --- a/drivers/thermal/samsung/exynos_tmu.c > +++ b/drivers/thermal/samsung/exynos_tmu.c > @@ -554,13 +554,15 @@ static void exynos4210_tmu_control(struct platform_device *pdev, bool on) > { > struct exynos_tmu_data *data = platform_get_drvdata(pdev); > struct thermal_zone_device *tz = data->tzd; > + struct thermal_trip trip; > unsigned int con, interrupt_en = 0, i; > > con = get_con_reg(data, readl(data->base + EXYNOS_TMU_REG_CONTROL)); > > if (on) { > for (i = 0; i < data->ntrip; i++) { > - if (!of_thermal_is_trip_valid(tz, i)) > + > + if (thermal_zone_get_trip(tz, i, &trip)) No need for empty line before. Ditto in other places. Best regards, Krzysztof
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: 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 <rajur@chelsio.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Peter Kaestle <peter@piie.net> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Mark Gross <markgross@kernel.org> Cc: Miquel Raynal <miquel.raynal@bootlin.com> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Amit Kucheria <amitk@kernel.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Nicolas Saenz Julienne <nsaenz@kernel.org> Cc: Broadcom Kernel Team <bcm-kernel-feedback-list@broadcom.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Ray Jui <rjui@broadcom.com> Cc: Scott Branden <sbranden@broadcom.com> Cc: Support Opensource <support.opensource@diasemi.com> Cc: Lukasz Luba <lukasz.luba@arm.com> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Thara Gopinath <thara.gopinath@linaro.org> Cc: Andy Gross <agross@kernel.org> Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: Keerthy <j-keerthy@ti.com> Cc: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Antoine Tenart <atenart@kernel.org> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Cc: Dmitry Osipenko <digetx@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-tegra@vger.kernel.org Cc: linux-omap@vger.kernel.org Daniel Lezcano (30): thermal/core: Add a generic thermal_zone_get_trip() function thermal/sysfs: Do not make get_trip_hyst optional thermal/core: Add a generic thermal_zone_set_trip() function thermal/core: Add a generic thermal_zone_get_crit_temp() 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 | 23 +-- 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 | 31 ++-- .../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 | 49 +----- drivers/thermal/samsung/exynos_tmu.c | 60 ++++--- 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 | 158 +++++++++++++++--- drivers/thermal/thermal_core.h | 22 --- drivers/thermal/thermal_helpers.c | 28 ++-- drivers/thermal/thermal_netlink.c | 21 +-- drivers/thermal/thermal_of.c | 116 ------------- drivers/thermal/thermal_sysfs.c | 127 +++++--------- drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 -- drivers/thermal/uniphier_thermal.c | 27 ++- include/linux/thermal.h | 10 ++ 32 files changed, 538 insertions(+), 810 deletions(-)