Pull thermal control updates from Rafael Wysocki: "These start a rework of the handling of trip points in the thermal core, improve the cpufreq/devfreq cooling device handling, update some thermal control drivers and the tmon utility and clean up code. Specifics: - Consolidate the thermal core code by beginning to move the thermal trip structure from the thermal OF code as a generic structure to be used by the different sensors when registering a thermal zone (Daniel Lezcano). - Make per cpufreq / devfreq cooling device ops instead of using a global variable, fix comments and rework the trace information (Lukasz Luba). - Add the include/dt-bindings/thermal.h under the area covered by the thermal maintainer in the MAINTAINERS file (Lukas Bulwahn). - Improve the error output by giving the sensor identification when a thermal zone failed to initialize, the DT bindings by changing the positive logic and adding the r8a779f0 support on the rcar3 (Wolfram Sang). - Convert the QCom tsens DT binding to the dtsformat format (Krzysztof Kozlowski). - Remove the pointless get_trend() function in the QCom, Ux500 and tegra thermal drivers, along with the unused DROP_FULL and RAISE_FULL trends definitions. Simplify the code by using clamp() macros (Daniel Lezcano). - Fix ref_table memory leak at probe time on the k3_j72xx bandgap (Bryan Brattlof). - Fix array underflow in prep_lookup_table (Dan Carpenter). - Add static annotation to the k3_j72xx_bandgap_j7* data structure (Jin Xiaoyun). - Fix typos in comments detected on sun8i by Coccinelle (Julia Lawall). - Fix typos in comments on rzg2l (Biju Das). - Remove as unnecessary call to dev_err() as the error is already printed by the failing function on u8500 (Yang Li). - Register the thermal zones as hwmon sensors for the Qcom thermal sensors (Dmitry Baryshkov). - Fix 'tmon' tool compilation issue by adding phtread.h include (Markus Mayer). - Fix typo in the comments for the 'tmon' tool (Slark Xiao). - Make the thermal core use ida_alloc()/free() directly instead of ida_simple_get()/ida_simple_remove() that have been deprecated (keliu). - Drop ACPI_FADT_LOW_POWER_S0 check from the Intel PCH thermal control driver (Rafael Wysocki)" * tag 'thermal-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (39 commits) thermal/of: Initialize trip points separately thermal/of: Use thermal trips stored in the thermal zone thermal/core: Add thermal_trip in thermal_zone thermal/core: Rename 'trips' to 'num_trips' thermal/core: Move thermal_set_delay_jiffies to static thermal/core: Remove unneeded EXPORT_SYMBOLS thermal/of: Move thermal_trip structure to thermal.h thermal/of: Remove the device node pointer for thermal_trip thermal/of: Replace device node match with device node search thermal/core: Remove duplicate information when an error occurs thermal/core: Avoid calling ->get_trip_temp() unnecessarily thermal/tools/tmon: Fix typo 'the the' in comment thermal/tools/tmon: Include pthread and time headers in tmon.h thermal/ti-soc-thermal: Fix comment typo thermal/drivers/qcom/spmi-adc-tm5: Register thermal zones as hwmon sensors thermal/drivers/qcom/temp-alarm: Register thermal zones as hwmon sensors thermal/drivers/u8500: Remove unnecessary print function dev_err() thermal/drivers/rzg2l: Fix comments thermal/drivers/sun8i: Fix typo in comment thermal/drivers/k3_j72xx_bandgap: Make k3_j72xx_bandgap_j721e_data and k3_j72xx_bandgap_j7200_data static ...
Showing the changes to include/trace (1 of 33 files). Show all
Unified · Split
| @@ -92,34 +92,22 @@ TRACE_EVENT(thermal_zone_trip, · 91 unmodified lines | |||
| 92 | ); | 92 | ); |
| 93 | 93 | ||
| 94 | #ifdef CONFIG_CPU_THERMAL | 94 | #ifdef CONFIG_CPU_THERMAL |
| 95 | TRACE_EVENT(thermal_power_cpu_get_power, | 95 | TRACE_EVENT(thermal_power_cpu_get_power_simple, |
| 96 | TP_PROTO(const struct cpumask *cpus, unsigned long freq, u32 *load, | 96 | TP_PROTO(int cpu, u32 power), |
| 97 | size_t load_len, u32 dynamic_power), | ||
| 98 | 97 | ||
| 99 | TP_ARGS(cpus, freq, load, load_len, dynamic_power), | 98 | TP_ARGS(cpu, power), |
| 100 | 99 | ||
| 101 | TP_STRUCT__entry( | 100 | TP_STRUCT__entry( |
| 102 | __bitmask(cpumask, num_possible_cpus()) | 101 | __field(int, cpu) |
| 103 | __field(unsigned long, freq ) | 102 | __field(u32, power) |
| 104 | __dynamic_array(u32, load, load_len) | ||
| 105 | __field(size_t, load_len ) | ||
| 106 | __field(u32, dynamic_power ) | ||
| 107 | ), | 103 | ), |
| 108 | 104 | ||
| 109 | TP_fast_assign( | 105 | TP_fast_assign( |
| 110 | __assign_bitmask(cpumask, cpumask_bits(cpus), | 106 | __entry->cpu = cpu; |
| 111 | num_possible_cpus()); | 107 | __entry->power = power; |
| 112 | __entry->freq = freq; | ||
| 113 | memcpy(__get_dynamic_array(load), load, | ||
| 114 | load_len * sizeof(*load)); | ||
| 115 | __entry->load_len = load_len; | ||
| 116 | __entry->dynamic_power = dynamic_power; | ||
| 117 | ), | 108 | ), |
| 118 | 109 | ||
| 119 | TP_printk("cpus=%s freq=%lu load={%s} dynamic_power=%d", | 110 | TP_printk("cpu=%d power=%u", __entry->cpu, __entry->power) |
| 120 | __get_bitmask(cpumask), __entry->freq, | ||
| 121 | __print_array(__get_dynamic_array(load), __entry->load_len, 4), | ||
| 122 | __entry->dynamic_power) | ||
| 123 | ); | 111 | ); |
| 124 | 112 | ||
| 125 | TRACE_EVENT(thermal_power_cpu_limit, | 113 | TRACE_EVENT(thermal_power_cpu_limit, |