From f3e7ceeb25c4e1809fd54eb7b6ef97ce4ceba3c6 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Tue, 19 Jan 2021 14:09:34 -0600 Subject: meta-ibm: Use fan-monitor for fan errors Instead of using phosphor-dbus-monitor to create errors and handle power offs for fan errors, use phosphor-fan-monitor instead, now that it has the functionality. To do this, add the new rules to the fan monitor config files, and remove the phosphor-dbus-monitor fan rules files. Signed-off-by: Matt Spinler Change-Id: Ia03186132f04087be76d2fd43412c37698407f60 --- .../rainier/everest/config.json | 36 ++++++++++++++++++- .../rainier/rainier-2u/config.json | 42 +++++++++++++++++++++- .../rainier/rainier-4u/config.json | 42 +++++++++++++++++++++- 3 files changed, 117 insertions(+), 3 deletions(-) (limited to 'meta-ibm/recipes-phosphor/fans') diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json index 936b71631b..93d1bdc212 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json @@ -6,6 +6,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan0_0", @@ -23,6 +26,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan1_0", @@ -40,6 +46,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan2_0", @@ -57,6 +66,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan3_0", @@ -103,5 +115,27 @@ } ] } - ] + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 3, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } } diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json index 95acaa35c4..b15003a50a 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json @@ -6,6 +6,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan0_0", @@ -25,6 +28,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan1_0", @@ -44,6 +50,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan2_0", @@ -63,6 +72,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan3_0", @@ -82,6 +94,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan4_0", @@ -101,6 +116,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan5_0", @@ -163,5 +181,27 @@ } ] } - ] + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 3, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } } diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json index ce69e20021..71a4899442 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json @@ -6,6 +6,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan0_0", @@ -19,6 +22,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan1_0", @@ -32,6 +38,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan2_0", @@ -45,6 +54,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan3_0", @@ -58,6 +70,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan4_0", @@ -71,6 +86,9 @@ "allowed_out_of_range_time": 30, "deviation": 15, "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, "sensors": [ { "name": "fan5_0", @@ -78,5 +96,27 @@ } ] } - ] + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 2, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } } -- cgit v1.2.3