hw-mgmt: thermal-control: Fix overlapping range keys in configs

sholeksandr · sholeksandr · commit 4d01052ffcd6 · 2026-02-11T10:05:23.000+02:00
Fix overlapping range keys in thermal config JSONs
- psu_fan_pwm_decode:
	"11:21" -&gt; "11:20" (20 files, overlap with "21:30")
- dmin P2C untrusted:
	"36:120": 60 -&gt; "41:120": 60 (6 files, overlap with "36:40")

Signed-off-by: Oleksandr Shamray &lt;oleksandrs@nvidia.com&gt;
diff --git a/usr/etc/hw-management-thermal/tc_config_default.json b/usr/etc/hw-management-thermal/tc_config_default.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" :  {"-127:120": 100}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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":0, "rpm_max":0, "slope": 150, "pwm_min" : 101, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_mqm8700.json b/usr/etc/hw-management-thermal/tc_config_mqm8700.json
@@ -15,7 +15,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		},
 		"P2C": {
-			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
+			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "41:120": 60},
 			"fan_err": {
 				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
 				"direction": {"-127:25": 20, "26:40": 30, "41:120": 40},
@@ -28,7 +28,7 @@
 			"sensor_read_error" :  {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_mqm9700.json b/usr/etc/hw-management-thermal/tc_config_mqm9700.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 3},
diff --git a/usr/etc/hw-management-thermal/tc_config_mqm9701.json b/usr/etc/hw-management-thermal/tc_config_mqm9701.json
@@ -29,7 +29,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 3},
diff --git a/usr/etc/hw-management-thermal/tc_config_msb7xxx.json b/usr/etc/hw-management-thermal/tc_config_msb7xxx.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" :  {"-127:25": 30, "26:30": 40, "31:35": 50, "36:120": 60}
 		}
 	},
-	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
 	"fan_trend" : {
         "C2P": {
 			"0" : {"rpm_min":6300, "rpm_max":21000, "slope": 207.1, "pwm_min" : 30, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn2201.json b/usr/etc/hw-management-thermal/tc_config_msn2201.json
@@ -28,7 +28,7 @@
 			"sensor_read_error":{"-127:20": 20, "21:30": 30, "31:40": 40, "41: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": 70, "71:80": 80, "81:90": 90, "91:100": 100},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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":1983, "rpm_max":22000, "slope": 227, "pwm_min" : 10, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn2410.json b/usr/etc/hw-management-thermal/tc_config_msn2410.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" :  {"-127:25": 30, "26:30": 40, "31:35": 50, "36:120": 60}
 		}
 	},
-	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
 	"fan_trend" : {
         "C2P": {
 			"0" : {"rpm_min":6300, "rpm_max":21000, "slope": 207.1, "pwm_min" : 30, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn2700.json b/usr/etc/hw-management-thermal/tc_config_msn2700.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" :  {"-127:25": 30, "26:30": 40, "31:35": 50, "36:120": 60}
 		}
 	},
-	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
 	"fan_trend" : {
         "C2P": {
 			"0" : {"rpm_min":6300, "rpm_max":21000, "slope": 207.1, "pwm_min" : 30, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn27002.json b/usr/etc/hw-management-thermal/tc_config_msn27002.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" :  {"-127:25": 30, "26:30": 40, "31:35": 50, "36:120": 60}
 		}
 	},
-	"psu_fan_pwm_decode" : {"0:10": 10, "11:21": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 20, "21:30": 30, "31:40": 40, "41:50": 50, "51:100": 60},
 	"fan_trend" : {
         "C2P": {
 			"0" : {"rpm_min":6300, "rpm_max":21000, "slope": 207.1, "pwm_min" : 30, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3420.json b/usr/etc/hw-management-thermal/tc_config_msn3420.json
@@ -15,7 +15,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		},
 		"P2C": {
-			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
+			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "41:120": 60},
 			"fan_err": {
 				"tacho": {"-127:35": 20, "36:120": 30},
 				"present": {"-127:35": 20, "36:120": 30},
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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" : 25, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3700.json b/usr/etc/hw-management-thermal/tc_config_msn3700.json
@@ -15,7 +15,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		},
 		"P2C": {
-			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
+			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "41:120": 60},
 			"fan_err": {
 				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
 				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3700C.json b/usr/etc/hw-management-thermal/tc_config_msn3700C.json
@@ -15,7 +15,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		},
 		"P2C": {
-			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
+			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "41:120": 60},
 			"fan_err": {
 				"tacho": {"-127:40": 20, "41:120": 30},
 				"present": {"-127:40": 20, "41:120": 30},
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3750.json b/usr/etc/hw-management-thermal/tc_config_msn3750.json
@@ -15,7 +15,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		},
 		"P2C": {
-			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
+			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "41:120": 60},
 			"fan_err": {
 				"tacho": {"-127:25": 20, "26:40": 30, "41:120": 40},
 				"present": {"-127:25": 20, "26:40": 30, "41:120": 40},
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn3800.json b/usr/etc/hw-management-thermal/tc_config_msn3800.json
@@ -27,7 +27,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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" : 20, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn4410.json b/usr/etc/hw-management-thermal/tc_config_msn4410.json
@@ -15,7 +15,7 @@
 			"sensor_read_error" : {"-127:120": 80}
 		},
 		"P2C": {
-			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "36:120": 60},
+			"untrusted":  {"-127:15": 20, "16:30": 30, "31:35": 40, "36:40": 50, "41:120": 60},
 			"fan_err": {
 				"tacho": {"-127:20": 30, "21:35": 40, "36:120": 50},
 				"present": {"-127:20": 30, "21:35": 40, "36:120": 50},
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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": 220, "pwm_min" : 20, "pwm_max_reduction" : 3},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn4600.json b/usr/etc/hw-management-thermal/tc_config_msn4600.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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":3500, "rpm_max":17700, "slope": 178, "pwm_min" : 20, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn4600C.json b/usr/etc/hw-management-thermal/tc_config_msn4600C.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 60}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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":3100, "rpm_max":11000, "slope": 99, "pwm_min" : 20, "pwm_max_reduction" : 10},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn4700.json b/usr/etc/hw-management-thermal/tc_config_msn4700.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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": 220, "pwm_min" : 20, "pwm_max_reduction" : 3},
diff --git a/usr/etc/hw-management-thermal/tc_config_msn4700_mps.json b/usr/etc/hw-management-thermal/tc_config_msn4700_mps.json
@@ -28,7 +28,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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": 220, "pwm_min" : 20, "pwm_max_reduction" : 3},
diff --git a/usr/etc/hw-management-thermal/tc_config_sn4280.json b/usr/etc/hw-management-thermal/tc_config_sn4280.json
@@ -26,7 +26,7 @@
 			"sensor_read_error" : {"-127:120": 70}
 		}
 	},
-	"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},
+	"psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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": 98.8, "pwm_min" : 20, "pwm_max_reduction" : 10},

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"sensor_read_error" : {"-127:120": 100}`
`29`	`29`	`}`
`30`	`30`	`},`
`31`		`- "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},`
	`31`	`+ "psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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},`
`32`	`32`	`"fan_trend" : {`
`33`	`33`	`"C2P": {`
`34`	`34`	`"0" : {"rpm_min":0, "rpm_max":0, "slope": 150, "pwm_min" : 101, "pwm_max_reduction" : 10},`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`"sensor_read_error" : {"-127:120": 60}`
`30`	`30`	`}`
`31`	`31`	`},`
`32`		`- "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},`
	`32`	`+ "psu_fan_pwm_decode" : {"0:10": 10, "11:20": 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},`
`33`	`33`	`"fan_trend" : {`
`34`	`34`	`"C2P": {`
`35`	`35`	`"0" : {"rpm_min":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 3},`