Merge tag '0.43' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update

3 files changed, 117 insertions, 43 deletions

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 936b71631..74bcfc425 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",
@@ -84,24 +96,30 @@
             },
             {
                "name": "fan3_1"
-            },
-            {
-               "name": "fan0_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan1_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan2_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan3_0",
-               "in_trust": false
             }
          ]
       }
-   ]
+   ],
+   "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 95acaa35c..145e37f38 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",
@@ -136,32 +154,30 @@
             },
             {
                "name": "fan5_1"
-            },
-            {
-               "name": "fan0_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan1_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan2_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan3_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan4_0",
-               "in_trust": false
-            },
-            {
-               "name": "fan5_0",
-               "in_trust": false
             }
          ]
       }
-   ]
+   ],
+   "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 ce69e2002..71a489944 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
+            }
+       ]
+   }
 }