From eab6d2496d65e0cd2b70b1b29c54210f6c48748b Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 8 Jul 2021 10:16:27 +0800 Subject: [PATCH 1/2] thermal: Update thermal table - Add TempPath field to support force update for on-board ntc thermistors. - Update hysteresis for trigger sensors to prevent genlink storm Bug: 191971470 Test: check if thermhal polling can start in time by burn8 Change-Id: I855ccee34602268315d7cd16896cba19b954d115 --- thermal_info_config_oriole.json | 34 +++++++++++++++++++++++++++ thermal_info_config_oriole_WHI_A.json | 21 +++++++++++++++++ thermal_info_config_raven.json | 34 +++++++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 3e9022e..f5a2fd6 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -57,6 +57,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -72,6 +73,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -87,6 +89,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -102,6 +105,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -117,6 +121,16 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -134,6 +148,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -149,6 +164,16 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -723,6 +748,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index c0597b5..79f44b0 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -27,6 +27,16 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -44,6 +54,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -59,6 +70,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -412,6 +424,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 5d59943..bc94332 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -57,6 +57,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -72,6 +73,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -87,6 +89,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -102,6 +105,16 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -119,6 +132,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -134,6 +148,16 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -151,6 +175,7 @@ "NAN", "NAN" ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -723,6 +748,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true From 2e843cadf806056b7349013f5d89d191ede2ec2b Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Wed, 4 Aug 2021 11:16:43 +0800 Subject: [PATCH 2/2] thermal: Update thermal table Add hysteresis for bcl sensors to prevent genlink storm. Bug: 191971470 Test: check trip_point_0_hyst is correct Change-Id: I96cae3766544230d3926c2d306ec93dc355223ef --- thermal_info_config_oriole.json | 99 +++++++++++++++++++++++++ thermal_info_config_oriole_WHI_A.json | 103 +++++++++++++++++++++++++- thermal_info_config_raven.json | 99 +++++++++++++++++++++++++ 3 files changed, 299 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index f5a2fd6..b67f5e7 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -732,6 +732,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -773,6 +782,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -789,6 +807,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -805,6 +832,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -821,6 +857,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -837,6 +882,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -853,6 +907,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -869,6 +932,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -885,6 +957,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -901,6 +982,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -917,6 +1007,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index 79f44b0..fad145a 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -408,6 +408,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -449,6 +458,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -465,6 +483,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -477,12 +504,21 @@ "NAN", "NAN", "NAN", - 7, + 7000, "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", - "Multiplier":0.001, + "Multiplier":1, "Monitor":true }, { @@ -497,6 +533,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -513,6 +558,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -529,6 +583,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -545,6 +608,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -561,6 +633,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -577,6 +658,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -593,6 +683,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index bc94332..2325169 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -732,6 +732,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -773,6 +782,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -789,6 +807,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -805,6 +832,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -821,6 +857,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -837,6 +882,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -853,6 +907,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -869,6 +932,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -885,6 +957,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -901,6 +982,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true @@ -917,6 +1007,15 @@ "NAN", "NAN" ], + "HotHysteresis":[ + 0.0, + 0.0, + 0.0, + 0.0, + 100, + 0.0, + 0.0 + ], "VrThreshold":"NAN", "Multiplier":1, "Monitor":true