Skip to content

Commit

Permalink
hw-mgmt: thermal: Fix thermal data
Browse files Browse the repository at this point in the history 
Fix thermal data for mqm9700/msn3700/sn4410/msn4700

Reviewed-by: Ciju Rajan K <[email protected]>
Signed-off-by: Oleksandr Shamray <[email protected]>
  • Loading branch information
@sholeksandr
sholeksandr committed Aug 8, 2023
1 parent 5f8ea82 commit 81d094b
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
10 changes: 5 additions & 5 deletions usr/etc/hw-management-thermal/tc_config_mqm9700.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
"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":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":5650, "rpm_max":27500, "slope": 273.1, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
"0" : {"rpm_min":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30},
"1" : {"rpm_min":5650, "rpm_max":27500, "slope": 273.1, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30}},
"P2C": {
"0" : {"rpm_min":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":5650, "rpm_max":27500, "slope": 273.1, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}}
"0" : {"rpm_min":6150, "rpm_max":29700, "slope": 294.6, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30},
"1" : {"rpm_min":5650, "rpm_max":27500, "slope": 273.1, "pwm_min" : 20, "pwm_max_reduction" : 3, "rpm_tolerance" : 30}}
},
"dev_parameters" : {
"asic": {"pwm_min": 30, "pwm_max" : 100, "val_min":"!70000", "val_max":"!105000", "poll_time": 3},
"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" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 30},
"sodimm\\d_temp" :{"pwm_min": 30, "pwm_max" : 70, "val_min": "!70000", "val_max": 95000, "poll_time": 60},
"sensor_amb": {"pwm_min": 20, "pwm_max" : 40, "val_min": 30000, "val_max": 50000, "poll_time": 30}
}
}
4 changes: 2 additions & 2 deletions usr/etc/hw-management-thermal/tc_config_msn3700.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"fan_trend" : {
"C2P": {
"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 221, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 196, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
"P2C": {
"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 221, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 196, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}
}
},
"dev_parameters" : {
Expand Down
4 changes: 2 additions & 2 deletions usr/etc/hw-management-thermal/tc_config_msn3700C.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"fan_trend" : {
"C2P": {
"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 221, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 196, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}},
"P2C": {
"0" : {"rpm_min":5400, "rpm_max":23000, "slope": 221, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 196, "pwm_min" : 20, "pwm_max_reduction" : 10, "rpm_tolerance" : 30}
}
},
"dev_parameters" : {
Expand Down
10 changes: 5 additions & 5 deletions usr/etc/hw-management-thermal/tc_config_msn4410.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
"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" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 10, "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" : 10, "rpm_tolerance" : 30},
"1" : {"rpm_min":4800, "rpm_max":20500, "slope": 195, "pwm_min" : 20, "pwm_max_reduction" : 10, "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}
}
},
"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" : 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}
}
}
24 changes: 12 additions & 12 deletions usr/etc/hw-management-thermal/tc_config_msn4700.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
"C2P": {
"untrusted": {"-127:25": 30, "26:35": 40, "36:120": 50},
"fan_err": {
"tacho": {"-127:25": 30, "26:35": 40, "36:120": 50},
"present": {"-127:25": 30, "26:35": 40, "36:120": 50},
"direction": {"-127:25": 30, "26:35": 40, "36:120": 50}
"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": 30, "26:35": 40, "36:120": 50},
"direction": {"-127:25": 30, "26: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}
},
"sensor_read_error" : {"-127:25": 30, "26:35": 40, "36:120": 50}
"sensor_read_error" : {"-127:20": 30, "21:35": 40, "36:120": 50}
},
"P2C": {
"untrusted": {"-127:25": 30, "26:35": 40, "36:120": 50},
"fan_err": {
"tacho": {"-127:25": 30, "26:35": 40, "36:120": 50},
"present": {"-127:25": 30, "26:35": 40, "36:120": 50},
"direction": {"-127:25": 30, "26:35": 40, "36:120": 50}
"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": 30, "26:35": 40, "36:120": 50},
"direction": {"-127:25": 30, "26: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}
},
"sensor_read_error" : {"-127:25": 30, "26:35": 40, "36:120": 50}
"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},
Expand Down

0 comments on commit 81d094b

Please sign in to comment.