From d40decae68312d586860b3c62307e8ccfabc1a79 Mon Sep 17 00:00:00 2001 From: Gopala Krishna Nuthaki Date: Mon, 19 Apr 2021 23:14:13 +0530 Subject: [PATCH 1/2] ARM: dts: msm: Update Ibat threshold and BCL thermal config for YUPIK Update ibat level0 threshold to 5A based on latest recommendation. Remove GPU mitigation rules from BCL thermalzone config as GPU driver itself monitors BCL irq on CB and mitigates its frequency. Change-Id: I73f3fbab2e949cee957c09325f6fb4364bdead60 --- qcom/yupik-thermal-overlay-qrd.dtsi | 98 +++++++++++++++++------------ qcom/yupik-thermal-overlay.dtsi | 76 ++++++++++------------ 2 files changed, 90 insertions(+), 84 deletions(-) diff --git a/qcom/yupik-thermal-overlay-qrd.dtsi b/qcom/yupik-thermal-overlay-qrd.dtsi index 4d302f1cff41..1b35cdcf63e9 100644 --- a/qcom/yupik-thermal-overlay-qrd.dtsi +++ b/qcom/yupik-thermal-overlay-qrd.dtsi @@ -33,6 +33,14 @@ }; }; + pm8350b-ibat-lvl0 { + trips { + ibat-lvl0 { + temperature = <5000>; + }; + }; + }; + pm8350b-bcl-lvl0 { cooling-maps { vbat_cpu4 { @@ -45,50 +53,55 @@ cooling-device = <&cpu5_isolate 1 1>; }; - vbat_gpu0 { + vbat_cpu6 { trip = <&b_bcl_lvl0>; - cooling-device = <&msm_gpu 2 2>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + vbat_cpu7 { + trip = <&b_bcl_lvl0>; + cooling-device = <&cpu7_isolate 1 1>; }; vbat_cdsp0 { trip = <&b_bcl_lvl0>; cooling-device = <&cdsp_sw 2 2>; }; + + vbat_modem0 { + trip = <&b_bcl_lvl0>; + cooling-device = <&modem_pa 2 2>; + }; + + vbat_modem1 { + trip = <&b_bcl_lvl0>; + cooling-device = <&modem_tj 1 1>; + }; }; }; pm8350b-bcl-lvl1 { cooling-maps { - vbat_cpu6 { + vbat_gpu { trip = <&b_bcl_lvl1>; - cooling-device = <&cpu6_isolate 1 1>; - }; - - vbat_cpu7 { - trip = <&b_bcl_lvl1>; - cooling-device = <&cpu7_isolate 1 1>; - }; - - vbat_gpu1 { - trip = <&b_bcl_lvl1>; - cooling-device = <&msm_gpu 4 4>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; }; vbat_cdsp1 { trip = <&b_bcl_lvl1>; cooling-device = <&cdsp_sw 4 4>; }; + + vbat_modem2 { + trip = <&b_bcl_lvl1>; + cooling-device = <&modem_tj 3 3>; + }; }; }; pm8350b-bcl-lvl2 { cooling-maps { - vbat_gpu2 { - trip = <&b_bcl_lvl2>; - cooling-device = <&msm_gpu THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; - }; - vbat_cdsp2 { trip = <&b_bcl_lvl2>; cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT @@ -110,52 +123,57 @@ cooling-device = <&cpu5_isolate 1 1>; }; - vph_gpu0 { + vph_cpu6 { trip = <&c_bcl_lvl0>; - cooling-device = <&msm_gpu 2 2>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + vph_cpu7 { + trip = <&c_bcl_lvl0>; + cooling-device = <&cpu7_isolate 1 1>; }; vph_cdsp0 { trip = <&c_bcl_lvl0>; cooling-device = <&cdsp_sw 2 2>; }; + + vph_modem0 { + trip = <&c_bcl_lvl0>; + cooling-device = <&modem_pa 2 2>; + }; + + vph_modem1 { + trip = <&c_bcl_lvl0>; + cooling-device = <&modem_tj 1 1>; + }; }; }; pm8350c-bcl-lvl1 { disable-thermal-zone; cooling-maps { - vph_cpu6 { + vph_gpu { trip = <&c_bcl_lvl1>; - cooling-device = <&cpu6_isolate 1 1>; - }; - - vph_cpu7 { - trip = <&c_bcl_lvl1>; - cooling-device = <&cpu7_isolate 1 1>; - }; - - vph_gpu1 { - trip = <&c_bcl_lvl1>; - cooling-device = <&msm_gpu 4 4>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; }; vph_cdsp1 { trip = <&c_bcl_lvl1>; cooling-device = <&cdsp_sw 4 4>; }; + + vph_modem2 { + trip = <&c_bcl_lvl1>; + cooling-device = <&modem_tj 3 3>; + }; }; }; pm8350c-bcl-lvl2 { disable-thermal-zone; cooling-maps { - vph_gpu2 { - trip = <&c_bcl_lvl2>; - cooling-device = <&msm_gpu THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; - }; - vph_cdsp2 { trip = <&c_bcl_lvl2>; cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT diff --git a/qcom/yupik-thermal-overlay.dtsi b/qcom/yupik-thermal-overlay.dtsi index 6e1e1f9389e4..08629122a0e4 100644 --- a/qcom/yupik-thermal-overlay.dtsi +++ b/qcom/yupik-thermal-overlay.dtsi @@ -33,6 +33,14 @@ }; }; + pm7325b-ibat-lvl0 { + trips { + ibat-lvl0 { + temperature = <5000>; + }; + }; + }; + pm7325b-bcl-lvl0 { cooling-maps { vbat_cpu4 { @@ -45,9 +53,14 @@ cooling-device = <&cpu5_isolate 1 1>; }; - vbat_gpu0 { + vbat_cpu6 { trip = <&b_bcl_lvl0>; - cooling-device = <&msm_gpu 2 2>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + vbat_cpu7 { + trip = <&b_bcl_lvl0>; + cooling-device = <&cpu7_isolate 1 1>; }; vbat_cdsp0 { @@ -69,19 +82,10 @@ pm7325b-bcl-lvl1 { cooling-maps { - vbat_cpu6 { + vbat_gpu { trip = <&b_bcl_lvl1>; - cooling-device = <&cpu6_isolate 1 1>; - }; - - vbat_cpu7 { - trip = <&b_bcl_lvl1>; - cooling-device = <&cpu7_isolate 1 1>; - }; - - vbat_gpu1 { - trip = <&b_bcl_lvl1>; - cooling-device = <&msm_gpu 4 4>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; }; vbat_cdsp1 { @@ -89,7 +93,7 @@ cooling-device = <&cdsp_sw 4 4>; }; - vbat_modem0 { + vbat_modem2 { trip = <&b_bcl_lvl1>; cooling-device = <&modem_tj 3 3>; }; @@ -98,12 +102,6 @@ pm7325b-bcl-lvl2 { cooling-maps { - vbat_gpu2 { - trip = <&b_bcl_lvl2>; - cooling-device = <&msm_gpu THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; - }; - vbat_cdsp2 { trip = <&b_bcl_lvl2>; cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT @@ -125,9 +123,14 @@ cooling-device = <&cpu5_isolate 1 1>; }; - vph_gpu0 { + vph_cpu6 { trip = <&c_bcl_lvl0>; - cooling-device = <&msm_gpu 2 2>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + vph_cpu7 { + trip = <&c_bcl_lvl0>; + cooling-device = <&cpu7_isolate 1 1>; }; vph_cdsp0 { @@ -135,12 +138,12 @@ cooling-device = <&cdsp_sw 2 2>; }; - vbat_modem0 { + vph_modem0 { trip = <&c_bcl_lvl0>; cooling-device = <&modem_pa 2 2>; }; - vbat_modem1 { + vph_modem1 { trip = <&c_bcl_lvl0>; cooling-device = <&modem_tj 1 1>; }; @@ -150,19 +153,10 @@ pm8350c-bcl-lvl1 { disable-thermal-zone; cooling-maps { - vph_cpu6 { + vph_gpu { trip = <&c_bcl_lvl1>; - cooling-device = <&cpu6_isolate 1 1>; - }; - - vph_cpu7 { - trip = <&c_bcl_lvl1>; - cooling-device = <&cpu7_isolate 1 1>; - }; - - vph_gpu1 { - trip = <&c_bcl_lvl1>; - cooling-device = <&msm_gpu 4 4>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; }; vph_cdsp1 { @@ -170,7 +164,7 @@ cooling-device = <&cdsp_sw 4 4>; }; - vbat_modem0 { + vph_modem2 { trip = <&c_bcl_lvl1>; cooling-device = <&modem_tj 3 3>; }; @@ -180,12 +174,6 @@ pm8350c-bcl-lvl2 { disable-thermal-zone; cooling-maps { - vph_gpu2 { - trip = <&c_bcl_lvl2>; - cooling-device = <&msm_gpu THERMAL_MAX_LIMIT - THERMAL_MAX_LIMIT>; - }; - vph_cdsp2 { trip = <&c_bcl_lvl2>; cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT From c6c0e850e5411259bc3a29de972b39bc0a6ba2dd Mon Sep 17 00:00:00 2001 From: Gopala Krishna Nuthaki Date: Tue, 20 Apr 2021 17:51:42 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Remove SDPM and policy-engine support for YUPIK Remove SDPM and policy-engine support based on latest recommondation for YUPIK. Change-Id: I7bf2d81913d13f448fac22aebfb46097ba93e2ea --- qcom/yupik-thermal.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qcom/yupik-thermal.dtsi b/qcom/yupik-thermal.dtsi index 579811c898ca..9898b8d44e90 100644 --- a/qcom/yupik-thermal.dtsi +++ b/qcom/yupik-thermal.dtsi @@ -70,6 +70,7 @@ <&dispcc DISP_CC_MDSS_MDP_CLK_SRC>; cam_cc_ipe-supply = <&cam_cc_ipe_0_gdsc>; csr-id = <1 4>; + status = "disabled"; }; cx_sdpm@0x00634000 { @@ -80,6 +81,7 @@ <&dispcc DISP_CC_MDSS_MDP_CLK_SRC>; cam_cc_ipe-supply = <&cam_cc_ipe_0_gdsc>; csr-id = <0 2>; + status = "disabled"; }; mx_pe: mx_rdpm_pe@0x00637000 { @@ -87,6 +89,7 @@ #thermal-sensor-cells = <0>; reg = <0x00637000 0x1000>; interrupts = ; + status = "disabled"; }; cx_pe: cx_rdpm_pe@0x00635000 { @@ -94,6 +97,7 @@ #thermal-sensor-cells = <0>; reg = <0x00635000 0x1000>; interrupts = ; + status = "disabled"; }; }; @@ -1660,6 +1664,7 @@ polling-delay = <0>; thermal-sensors = <&mx_pe>; thermal-governor = "step_wise"; + status = "disabled"; trips { mx_pe_config1: mx-pe-config1 { temperature = <1>; @@ -1723,6 +1728,7 @@ polling-delay = <0>; thermal-sensors = <&cx_pe>; thermal-governor = "step_wise"; + status = "disabled"; trips { cx_pe_config1: cx-pe-config1 { temperature = <1>;