Merge "defconfig: kona: Enable CPU isolation cooling device" (3cfa8983) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm64/boot/dts/qcom/kona-thermal.dtsi

+499 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,51 @@

		#include <dt-bindings/thermal/thermal.h>

		&cpufreq_hw {
		qcom,cpu-isolation {
		compatible = "qcom,cpu-isolate";
		cpu0_isolate: cpu0-isolate {
		qcom,cpu = <&CPU0>;
		#cooling-cells = <2>;
		};

		cpu1_isolate: cpu1-isolate {
		qcom,cpu = <&CPU1>;
		#cooling-cells = <2>;
		};

		cpu2_isolate: cpu2-isolate {
		qcom,cpu = <&CPU2>;
		#cooling-cells = <2>;
		};

		cpu3_isolate: cpu3-isolate {
		qcom,cpu = <&CPU3>;
		#cooling-cells = <2>;
		};

		cpu4_isolate: cpu4-isolate {
		qcom,cpu = <&CPU4>;
		#cooling-cells = <2>;
		};

		cpu5_isolate: cpu5-isolate {
		qcom,cpu = <&CPU5>;
		#cooling-cells = <2>;
		};

		cpu6_isolate: cpu6-isolate {
		qcom,cpu = <&CPU6>;
		#cooling-cells = <2>;
		};

		cpu7_isolate: cpu7-isolate {
		qcom,cpu = <&CPU7>;
		#cooling-cells = <2>;
		};
		};
		};

		&thermal_zones {
		aoss0-usr {
		polling-delay-passive = <0>;
		@@ -17,6 +62,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -31,6 +81,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -45,6 +100,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -59,6 +119,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -73,6 +138,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -87,6 +157,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -101,6 +176,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -115,6 +195,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -129,6 +214,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -143,6 +233,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -157,6 +252,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -171,6 +271,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -185,6 +290,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -199,6 +309,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -213,6 +328,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -227,6 +347,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -241,6 +366,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -255,6 +385,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -269,6 +404,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -283,6 +423,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -297,6 +442,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -311,6 +461,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -325,6 +480,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -339,6 +499,11 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		@@ -353,6 +518,340 @@
		hysteresis = <1000>;
		type = "passive";
		};
		active-config1 {
		temperature = <115000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		gpuss-max-step {
		polling-delay-passive = <10>;
		polling-delay = <100>;
		thermal-governor = "step_wise";
		trips {
		gpu_trip0: gpu-trip0 {
		temperature = <95000>;
		hysteresis = <0>;
		type = "passive";
		};
		};

		cooling-maps {
		gpu_cdev {
		trip = <&gpu_trip0>;
		cooling-device = <&msm_gpu THERMAL_NO_LIMIT
		THERMAL_NO_LIMIT>;
		};
		};
		};

		apc-0-max-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		trips {
		silver-trip {
		temperature = <120000>;
		hysteresis = <0>;
		type = "passive";
		};
		};
		};

		apc-1-max-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		trips {
		gold-trip {
		temperature = <120000>;
		hysteresis = <0>;
		type = "passive";
		};
		};
		};

		pop-mem-step {
		polling-delay-passive = <10>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 3>;
		thermal-governor = "step_wise";
		trips {
		pop_trip: pop-trip {
		temperature = <95000>;
		hysteresis = <0>;
		type = "passive";
		};
		};

		cooling-maps {
		pop_cdev4 {
		trip = <&pop_trip>;
		cooling-device =
		<&CPU4 THERMAL_NO_LIMIT
		THERMAL_NO_LIMIT>;
		};

		pop_cdev7 {
		trip = <&pop_trip>;
		cooling-device =
		<&CPU7 THERMAL_NO_LIMIT
		THERMAL_NO_LIMIT>;
		};
		};
		};

		cpu-0-0-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens0 1>;
		trips {
		cpu00_config: cpu00-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu00_cdev {
		trip = <&cpu00_config>;
		cooling-device = <&cpu0_isolate 1 1>;
		};
		};
		};

		cpu-0-1-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens0 2>;
		trips {
		cpu01_config: cpu01-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu01_cdev {
		trip = <&cpu01_config>;
		cooling-device = <&cpu1_isolate 1 1>;
		};
		};
		};

		cpu-0-2-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&tsens0 3>;
		trips {
		cpu02_config: cpu02-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu02_cdev {
		trip = <&cpu02_config>;
		cooling-device = <&cpu2_isolate 1 1>;
		};
		};
		};

		cpu-0-3-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 4>;
		thermal-governor = "step_wise";
		trips {
		cpu03_config: cpu03-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu03_cdev {
		trip = <&cpu03_config>;
		cooling-device = <&cpu3_isolate 1 1>;
		};
		};
		};

		cpu-1-0-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 7>;
		thermal-governor = "step_wise";
		trips {
		cpu10_config: cpu10-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu10_cdev {
		trip = <&cpu10_config>;
		cooling-device = <&cpu4_isolate 1 1>;
		};
		};
		};

		cpu-1-1-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 8>;
		thermal-governor = "step_wise";
		trips {
		cpu11_config: cpu11-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu11_cdev {
		trip = <&cpu11_config>;
		cooling-device = <&cpu5_isolate 1 1>;
		};
		};
		};

		cpu-1-2-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 9>;
		thermal-governor = "step_wise";
		trips {
		cpu12_config: cpu12-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu12_cdev {
		trip = <&cpu12_config>;
		cooling-device = <&cpu6_isolate 1 1>;
		};
		};
		};

		cpu-1-3-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 10>;
		thermal-governor = "step_wise";
		trips {
		cpu13_config: cpu13-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu13_cdev {
		trip = <&cpu13_config>;
		cooling-device = <&cpu7_isolate 1 1>;
		};
		};
		};

		cpu-1-4-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 11>;
		thermal-governor = "step_wise";
		trips {
		cpu14_config: cpu14-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu14_cdev {
		trip = <&cpu14_config>;
		cooling-device = <&cpu4_isolate 1 1>;
		};
		};
		};

		cpu-1-5-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 12>;
		thermal-governor = "step_wise";
		trips {
		cpu15_config: cpu15-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu15_cdev {
		trip = <&cpu15_config>;
		cooling-device = <&cpu5_isolate 1 1>;
		};
		};
		};

		cpu-1-6-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 13>;
		thermal-governor = "step_wise";
		trips {
		cpu16_config: cpu16-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu16_cdev {
		trip = <&cpu16_config>;
		cooling-device = <&cpu6_isolate 1 1>;
		};
		};
		};

		cpu-1-7-step {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 14>;
		thermal-governor = "step_wise";
		trips {
		cpu17_config: cpu17-config {
		temperature = <110000>;
		hysteresis = <10000>;
		type = "passive";
		};
		};

		cooling-maps {
		cpu17_cdev {
		trip = <&cpu17_config>;
		cooling-device = <&cpu7_isolate 1 1>;
		};
		};
		};
		};

arch/arm64/boot/dts/qcom/kona.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		qcom,freq-domain = <&cpufreq_hw 0 4>;
		capacity-dmips-mhz = <1024>;
		dynamic-power-coefficient = <100>;
		#cooling-cells = <2>;
		L2_0: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x20000>;
		@@ -196,6 +197,7 @@
		qcom,freq-domain = <&cpufreq_hw 1 4>;
		capacity-dmips-mhz = <1894>;
		dynamic-power-coefficient = <514>;
		#cooling-cells = <2>;
		L2_4: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x40000>;
		@@ -322,6 +324,7 @@
		qcom,freq-domain = <&cpufreq_hw 2 4>;
		capacity-dmips-mhz = <1894>;
		dynamic-power-coefficient = <598>;
		#cooling-cells = <2>;
		L2_7: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x80000>;

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -346,6 +346,7 @@ CONFIG_QTI_QMI_SENSOR=y
		CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_QTI_QMI_COOLING_DEVICE=y
		CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -355,6 +355,7 @@ CONFIG_QTI_QMI_SENSOR=y
		CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_QTI_QMI_COOLING_DEVICE=y
		CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y