hw-mgmt: thermal: Fix thermal data

Bug: #3567299, #3567934 Reviewed-by: Ciju Rajan K <[email protected]> Reviewed-by: Vadim Pasternak <[email protected]> Signed-off-by: Oleksandr Shamray <[email protected]>
Mellanox · Aug 9, 2023 · cab1635 · cab1635
1 parent 6461d6e
commit cab1635
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 56 deletions.
diff --git a/usr/etc/hw-management-thermal/tc_config_mqm8700.json b/usr/etc/hw-management-thermal/tc_config_mqm8700.json
@@ -42,7 +42,7 @@
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 50, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!70000", "val_max": "!125000",  "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_mqm9700.json b/usr/etc/hw-management-thermal/tc_config_mqm9700.json
@@ -42,7 +42,7 @@
 		"module\\d+":     {"pwm_min": 30, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 30, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"voltmon\\d+_temp":{"pwm_min": 30, "pwm_max" : 100, "val_min": "!85000", "val_max": "!125000", "poll_time": 60},
-		"sodimm\\d_temp" :{"pwm_min": 30, "pwm_max" : 100, "val_min": "!75000", "val_max": 85000, "poll_time": 30},
-		"sensor_amb":     {"pwm_min": 30, "pwm_max" : 60, "val_min": 35000, "val_max": 55000, "poll_time": 30}
+		"sodimm\\d_temp" :{"pwm_min": 30, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 30},
+		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 40, "val_min": 30000, "val_max": 50000, "poll_time": 30}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_msn2201.json b/usr/etc/hw-management-thermal/tc_config_msn2201.json
@@ -41,7 +41,7 @@
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!95000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 50, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!80000", "val_max": "!125000",  "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	},
 	"asic_config" : {"1":  {"bus" : 2, "addr" : "0048", "pwm_control": true, "fan_control": true}}

diff --git a/usr/etc/hw-management-thermal/tc_config_msn3420.json b/usr/etc/hw-management-thermal/tc_config_msn3420.json
@@ -3,28 +3,28 @@
 		"C2P": {
 			"untrusted": {"-127:25": 20, "26:40": 30, "41:120": 40},
 			"fan_err": {
-				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"tacho": {"-127:35": 20, "36:120": 30},
+				"present": {"-127:35": 20, "36:120": 30},
+				"direction": {"-127:35": 20, "36:120": 30}
 			},
 			"psu_err":  {
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"present": {"-127:35": 20, "36:120": 30},
+				"direction": {"-127:35": 20, "36:120": 30}
 			},
-			"sensor_read_error" :  {"-127:120": 100}
+			"sensor_read_error" : {"-127:35": 20, "36:120": 30}
 		},
 		"P2C": {
 			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
 			"fan_err": {
-				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"tacho": {"-127:35": 20, "36:120": 30},
+				"present": {"-127:35": 20, "36:120": 30},
+				"direction": {"-127:35": 20, "36:120": 30}
 			},
 			"psu_err":  {
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction":{"-127:25": 20, "26:40": 30, "41:120": 40}
+				"present": {"-127:35": 20, "36:120": 30},
+				"direction":{"-127:35": 20, "36:120": 30}
 			},
-			"sensor_read_error" :  {"-127:25": 20, "26:40": 30, "41:120": 40}
+			"sensor_read_error" :  {"-127:35": 20, "36:120": 30}
 		}
 	},
 	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:60": 60,  "61:70": 60, "71:80": 60, "81:90": 60, "91:100": 60},
@@ -42,7 +42,7 @@
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 50, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!70000", "val_max": "!125000",  "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3700.json b/usr/etc/hw-management-thermal/tc_config_msn3700.json
@@ -42,7 +42,7 @@
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 50, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!70000", "val_max": "!125000",  "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3700C.json b/usr/etc/hw-management-thermal/tc_config_msn3700C.json
@@ -3,28 +3,28 @@
 		"C2P": {
 			"untrusted": {"-127:25": 20, "26:40": 30, "41:120": 40},
 			"fan_err": {
-				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"tacho":  {"-127:40": 20, "41:120": 30},
+				"present": {"-127:40": 20, "41:120": 30},
+				"direction": {"-127:40": 20, "41:120": 30}
 			},
 			"psu_err":  {
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"present": {"-127:40": 20, "41:120": 30},
+				"direction": {"-127:40": 20, "41:120": 30}
 			},
-			"sensor_read_error" :  {"-127:25": 20, "26:40": 30, "41:120": 40}
+			"sensor_read_error" :  {"-127:40": 20, "41:120": 30}
 		},
 		"P2C": {
 			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
 			"fan_err": {
-				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"tacho": {"-127:40": 20, "41:120": 30},
+				"present": {"-127:40": 20, "41:120": 30},
+				"direction": {"-127:40": 20, "41:120": 30}
 			},
 			"psu_err":  {
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction":{"-127:25": 20, "26:40": 30, "41:120": 40}
+				"present": {"-127:40": 20, "41:120": 30},
+				"direction":{"-127:40": 20, "41:120": 30}
 			},
-			"sensor_read_error" :  {"-127:25": 20, "26:40": 30, "41:120": 40}
+			"sensor_read_error" :  {"-127:40": 20, "41:120": 30}
 		}
 	},
 	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:60": 60,  "61:70": 60, "71:80": 60, "81:90": 60, "91:100": 60},
@@ -42,7 +42,7 @@
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 50, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!70000", "val_max": "!125000",  "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3800.json b/usr/etc/hw-management-thermal/tc_config_msn3800.json
@@ -29,20 +29,20 @@
 	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:60": 60,  "61:70": 70, "71:80": 80, "81:90": 90, "91:100": 100},
 	"fan_trend" : {
 		"C2P": {
-			"0" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 10, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
-			"1" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 10, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
+			"0" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
+			"1" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
 		"P2C": {
-			"0" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 10, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
-			"1" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 10, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}
+			"0" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
+			"1" : {"rpm_min":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}
 		}
 	},
 	"dev_parameters" : {
 		"asic":           {"pwm_min": 20, "pwm_max" : 100, "val_min":"!70000", "val_max":"!105000", "poll_time": 3}, 
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 40, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!70000", "val_max": "!125000",  "poll_time": 60},
-		"sodimm\\d_temp" :{"pwm_min": 30, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
+		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60},
 		"gearbox\\d+":    {"pwm_min": 20, "pwm_max" : 100, "val_min":"!70000", "val_max":"!105000", "poll_time": 20}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_msn4410.json b/usr/etc/hw-management-thermal/tc_config_msn4410.json
@@ -3,28 +3,28 @@
 		"C2P": {
 			"untrusted": {"-127:25": 20, "26:40": 30, "41:120": 40},
 			"fan_err": {
-				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"tacho": {"-127:20": 30, "21:35": 40, "36:120": 50},
+				"present": {"-127:20": 30, "21:35": 40, "36:120": 50},
+				"direction": {"-127:20": 30, "21:35": 40, "36:120": 50}
 			},
 			"psu_err":  {
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"present": {"-127:20": 30, "21:35": 40, "36:120": 50},
+				"direction": {"-127:20": 30, "21:35": 40, "36:120": 50}
 			},
-			"sensor_read_error" :  {"-127:120": 100}
+			"sensor_read_error" : {"-127:20": 30, "21:35": 40, "36:120": 50}
 		},
 		"P2C": {
 			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
 			"fan_err": {
-				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40}
+				"tacho": {"-127:20": 30, "21:35": 40, "36:120": 50},
+				"present": {"-127:20": 30, "21:35": 40, "36:120": 50},
+				"direction": {"-127:20": 30, "21:35": 40, "36:120": 50}
 			},
 			"psu_err":  {
-				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
-				"direction":{"-127:25": 20, "26:40": 30, "41:120": 40}
+				"present": {"-127:20": 30, "21:35": 40, "36:120": 50},
+				"direction": {"-127:20": 30, "21:35": 40, "36:120": 50}
 			},
-			"sensor_read_error" :  {"-127:25": 20, "26:40": 30, "41:120": 40}
+			"sensor_read_error" :  {"-127:20": 30, "21:35": 40, "36:120": 50}
 		}
 	},
 	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:60": 60,  "61:70": 60, "71:80": 60, "81:90": 60, "91:100": 60},

diff --git a/usr/etc/hw-management-thermal/tc_config_msn4700.json b/usr/etc/hw-management-thermal/tc_config_msn4700.json
@@ -31,10 +31,10 @@
 	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:60": 60,  "61:70": 60, "71:80": 60, "81:90": 60, "91:100": 60},
 	"fan_trend" : {
 		"C2P": {
-			"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 221, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30},
+			"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 220, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30},
 			"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30}},
 		"P2C": {
-			"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 221, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30},
+			"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 220, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30},
 			"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30}
 		}
 	},
@@ -43,7 +43,7 @@
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 20, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 20, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
 		"sensor_amb":     {"pwm_min": 20, "pwm_max" : 50, "val_min": 30000, "val_max": 50000, "poll_time": 30},
-		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!70000", "val_max": "!125000",  "poll_time": 60},
+		"voltmon\\d+_temp": {"pwm_min": 20, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 20, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	}
 }
diff --git a/usr/etc/hw-management-thermal/tc_config_msn5600.json b/usr/etc/hw-management-thermal/tc_config_msn5600.json
@@ -28,7 +28,7 @@
 	"psu_fan_pwm_decode" : {"0:100": -1},
 	"fan_trend" : {
         "C2P": {
-			"0" : {"rpm_min":4143, "rpm_max":13500, "slope": 132, "pwm_min" : 30, "pwm_max_reduction" : 10},
+			"0" : {"rpm_min":4143, "rpm_max":13500, "slope": 133, "pwm_min" : 30, "pwm_max_reduction" : 10},
 			"1" : {"rpm_min":3891, "rpm_max":12603, "slope": 123, "pwm_min" : 30, "pwm_max_reduction" : 10}},
 		"P2C": {
 			"0" : {"rpm_min":0, "rpm_max":0, "slope": 150, "pwm_min" : 101, "pwm_max_reduction" : 10},
@@ -39,10 +39,8 @@
 		"asic":           {"pwm_min": 30, "pwm_max" : 100, "val_min":"!70000", "val_max":"!105000", "poll_time": 3}, 
 		"(cpu_pack|cpu_core\\d+)": {"pwm_min": 30, "pwm_max" : 100,  "val_min": "!70000", "val_max": "!100000", "poll_time": 3},
 		"module\\d+":     {"pwm_min": 30, "pwm_max" : 100, "val_min":60000, "val_max":80000, "poll_time": 20},
-		"sensor_amb":     {"pwm_min": 60, "pwm_max" : 60, "val_min": 30000, "val_max": 55000, "poll_time": 30},
+		"sensor_amb":     {"pwm_min": 30, "pwm_max" : 50, "val_min": 30000, "val_max": 55000, "poll_time": 30},
 		"voltmon\\d+_temp": {"pwm_min": 30, "pwm_max": 100, "val_min": "!85000", "val_max": "!125000",  "poll_time": 60},
 		"sodimm\\d_temp" :{"pwm_min": 30, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60}
 	}
 }
-
-