# git rev-parse -q --verify 1b72607d7321e66829e11148712b3a2ba1dc83e7^{commit} 1b72607d7321e66829e11148712b3a2ba1dc83e7 already have revision, skipping fetch # git checkout -q -f -B kisskb 1b72607d7321e66829e11148712b3a2ba1dc83e7 # git clean -qxdf # < git log -1 # commit 1b72607d7321e66829e11148712b3a2ba1dc83e7 # Merge: 88af9b164c7a 6828e402d06f # Author: Linus Torvalds # Date: Tue Feb 21 12:32:05 2023 -0800 # # Merge tag 'thermal-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm # # Pull thermal control updates from Rafael Wysocki: # "The majority of changes here are related to the general switch-over to # using arrays of generic trip point structures registered along with a # thermal zone instead of trip point callbacks (this has been done # mostly by Daniel Lezcano with some help from yours truly on the Intel # drivers front). # # Apart from that and the related reorganization of code, there are some # enhancements of the existing driver and a new Mediatek Low Voltage # Thermal Sensor (LVTS) driver. The Intel powerclamp undergoes a major # rework so it will use the generic idle_inject facility for CPU idle # time injection going forward and it will take additional module # parameters for specifying the subset of CPUs to be affected by it # (work done by Srinivas Pandruvada). # # Also included are assorted fixes and a whole bunch of cleanups. # # Specifics: # # - Rework a large bunch of drivers to use the generic thermal trip # structure and use the opportunity to do more cleanups by removing # unused functions from the OF code (Daniel Lezcano) # # - Remove core header inclusion from drivers (Daniel Lezcano) # # - Fix some locking issues related to the generic thermal trip rework # (Johan Hovold) # # - Fix a crash when requesting the critical temperature on tegra, # which is related to the generic trip point work (Jon Hunter) # # - Clean up thermal device unregistration code (Viresh Kumar) # # - Fix and clean up thermal control core initialization error code # paths (Daniel Lezcano) # # - Relocate the trip points handling code into a separate file (Daniel # Lezcano) # # - Make the thermal core fail registration of thermal zones and # cooling devices if the thermal class has not been registered # (Rafael Wysocki) # # - Add trip point initialization helper functions for ACPI-defined # trip points and modify two thermal drivers to use them (Rafael # Wysocki, Daniel Lezcano) # # - Make the core thermal control code use sysfs_emit_at() instead of # scnprintf() where applicable (ye xingchen) # # - Consolidate code accessing the Intel TCC (Thermal Control # Circuitry) MSRs by introducing library functions for that and # making the TCC-related code in thermal drivers use them (Zhang Rui) # # - Enhance the x86_pkg_temp_thermal driver to support dynamic tjmax # changes (Zhang Rui) # # - Address an "unsigned expression compared with zero" warning in the # intel_soc_dts_iosf thermal driver (Yang Li) # # - Update comments regarding two functions in the Intel Menlow thermal # driver (Deming Wang) # # - Use sysfs_emit_at() instead of scnprintf() in the int340x thermal # driver (ye xingchen) # # - Make the intel_pch thermal driver support the Wellsburg PCH (Tim # Zimmermann) # # - Modify the intel_pch and processor_thermal_device_pci thermal # drivers use generic trip point tables instead of thermal zone trip # point callbacks (Daniel Lezcano) # # - Add production mode attribute sysfs attribute to the int340x # thermal driver (Srinivas Pandruvada) # # - Rework dynamic trip point updates handling and locking in the # int340x thermal driver (Rafael Wysocki) # # - Make the int340x thermal driver use a generic trip points table # instead of thermal zone trip point callbacks (Rafael Wysocki, # Daniel Lezcano) # # - Clean up and improve the int340x thermal driver (Rafael Wysocki) # # - Simplify and clean up the intel_pch thermal driver (Rafael Wysocki) # # - Fix the Intel powerclamp thermal driver and make it use the common # idle injection framework (Srinivas Pandruvada) # # - Add two module parameters, cpumask and max_idle, to the Intel # powerclamp thermal driver to allow it to affect only a specific # subset of CPUs instead of all of them (Srinivas Pandruvada) # # - Make the Intel quark_dts thermal driver Use generic trip point # objects instead of its own trip point representation (Daniel # Lezcano) # # - Add toctree entry for thermal documents and fix two issues in the # Intel powerclamp driver documentation (Bagas Sanjaya) # # - Use strscpy() to instead of strncpy() in the thermal core (Xu # Panda) # # - Fix thermal_sampling_exit() (Vincent Guittot) # # - Add Mediatek Low Voltage Thermal Sensor (LVTS) driver (Balsam # Chihi) # # - Add r8a779g0 RCar support to the rcar_gen3 thermal driver (Geert # Uytterhoeven) # # - Fix useless call to set_trips() when resuming in the rcar_gen3 # thermal control driver and add interrupt support detection at init # time to it (Niklas Söderlund) # # - Fix memory corruption in the hi3660 thermal driver (Yongqin Liu) # # - Fix include path for libnl3 in pkg-config file for libthermal # (Vibhav Pant) # # - Remove syscfg-based driver for st as the platform is not supported # any more (Alain Volmat)" # # * tag 'thermal-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (135 commits) # thermal/drivers/st: Remove syscfg based driver # thermal: Remove core header inclusion from drivers # tools/lib/thermal: Fix include path for libnl3 in pkg-config file. # thermal/drivers/hisi: Drop second sensor hi3660 # thermal/drivers/rcar_gen3_thermal: Fix device initialization # thermal/drivers/rcar_gen3_thermal: Create device local ops struct # thermal/drivers/rcar_gen3_thermal: Do not call set_trips() when resuming # thermal/drivers/rcar_gen3: Add support for R-Car V4H # dt-bindings: thermal: rcar-gen3-thermal: Add r8a779g0 support # thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver # dt-bindings: thermal: mediatek: Add LVTS thermal controllers # thermal/drivers/mediatek: Relocate driver to mediatek folder # tools/lib/thermal: Fix thermal_sampling_exit() # Documentation: powerclamp: Fix numbered lists formatting # Documentation: powerclamp: Escape wildcard in cpumask description # Documentation: admin-guide: Add toctree entry for thermal docs # thermal: intel: powerclamp: Add two module parameters # Documentation: admin-guide: Move intel_powerclamp documentation # thermal: core: Use sysfs_emit_at() instead of scnprintf() # thermal: intel: powerclamp: Fix duration module parameter # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 1b72607d7321e66829e11148712b3a2ba1dc83e7 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12624:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12629:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12631:warning: override: reassigning to symbol UML_NET_SLIP .config:12634:warning: override: reassigning to symbol UML_NET_MCAST .config:12636:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:252: arch/um/os-Linux/util.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:504: arch/um/os-Linux] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/fs/btrfs/send.c: In function 'get_cur_inode_state': /kisskb/src/fs/btrfs/send.c:1909:13: error: 'right_gen' may be used uninitialized in this function [-Werror=maybe-uninitialized] } else if (right_gen == gen) { ^ /kisskb/src/fs/btrfs/send.c: At top level: cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:252: fs/btrfs/send.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:504: fs/btrfs] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:504: fs] Error 2 In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:94:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2161:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:504: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:2021: .] Error 2 make: *** [Makefile:242: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:11:51.715029