From bfd08cbbaabe65c9d0e4a53c0418bd1eabe40727 Mon Sep 17 00:00:00 2001 From: Gopala Krishna Nuthaki Date: Mon, 19 Apr 2021 23:14:13 +0530 Subject: [PATCH] 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