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

4 files changed, 94 insertions, 64 deletions

diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
index 74bcfc425..632c76b52 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json
@@ -2,8 +2,8 @@
    "fans": [
       {
          "inventory": "/system/chassis/motherboard/fan0",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -12,18 +12,20 @@
          "sensors": [
             {
                "name": "fan0_0",
+               "threshold": 30,
                "has_target": true
             },
             {
                "name": "fan0_1",
+               "threshold": 30,
                "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan1",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -32,18 +34,20 @@
          "sensors": [
             {
                "name": "fan1_0",
+               "threshold": 30,
                "has_target": true
             },
             {
                "name": "fan1_1",
+               "threshold": 30,
                "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan2",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -52,18 +56,20 @@
          "sensors": [
             {
                "name": "fan2_0",
+               "threshold": 30,
                "has_target": true
             },
             {
                "name": "fan2_1",
+               "threshold": 30,
                "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan3",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -72,10 +78,12 @@
          "sensors": [
             {
                "name": "fan3_0",
+               "threshold": 30,
                "has_target": true
             },
             {
                "name": "fan3_1",
+               "threshold": 30,
                "has_target": false
             }
          ]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
index 737cb3f3b..eb519d9b4 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json
@@ -2,8 +2,8 @@
    "fans": [
       {
          "inventory": "/system/chassis/motherboard/fan0",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -12,14 +12,15 @@
          "sensors": [
             {
                "name": "fan0_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan1",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -28,14 +29,15 @@
          "sensors": [
             {
                "name": "fan1_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan2",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -44,14 +46,15 @@
          "sensors": [
             {
                "name": "fan2_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan4",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -60,6 +63,7 @@
          "sensors": [
             {
                "name": "fan4_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
index 145e37f38..b4143adba 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json
@@ -2,8 +2,8 @@
    "fans": [
       {
          "inventory": "/system/chassis/motherboard/fan0",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -12,20 +12,22 @@
          "sensors": [
             {
                "name": "fan0_0",
-               "has_target": true
+               "threshold": 30,
+               "has_target": true,
+               "factor": 0.627,
+               "offset": 750
             },
             {
                "name": "fan0_1",
-               "has_target": false,
-               "factor": 1.45,
-               "offset": -909
+               "threshold": 30,
+               "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan1",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -34,20 +36,22 @@
          "sensors": [
             {
                "name": "fan1_0",
-               "has_target": true
+               "threshold": 30,
+               "has_target": true,
+               "factor": 0.627,
+               "offset": 750
             },
             {
                "name": "fan1_1",
-               "has_target": false,
-               "factor": 1.45,
-               "offset": -909
+               "threshold": 30,
+               "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan2",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -56,20 +60,22 @@
          "sensors": [
             {
                "name": "fan2_0",
-               "has_target": true
+               "threshold": 30,
+               "has_target": true,
+               "factor": 0.627,
+               "offset": 750
             },
             {
                "name": "fan2_1",
-               "has_target": false,
-               "factor": 1.45,
-               "offset": -909
+               "threshold": 30,
+               "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan3",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -78,20 +84,22 @@
          "sensors": [
             {
                "name": "fan3_0",
-               "has_target": true
+               "threshold": 30,
+               "has_target": true,
+               "factor": 0.627,
+               "offset": 750
             },
             {
                "name": "fan3_1",
-               "has_target": false,
-               "factor": 1.45,
-               "offset": -909
+               "threshold": 30,
+               "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan4",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -100,20 +108,22 @@
          "sensors": [
             {
                "name": "fan4_0",
-               "has_target": true
+               "threshold": 30,
+               "has_target": true,
+               "factor": 0.627,
+               "offset": 750
             },
             {
                "name": "fan4_1",
-               "has_target": false,
-               "factor": 1.45,
-               "offset": -909
+               "threshold": 30,
+               "has_target": false
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan5",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -122,13 +132,15 @@
          "sensors": [
             {
                "name": "fan5_0",
-               "has_target": true
+               "threshold": 30,
+               "has_target": true,
+               "factor": 0.627,
+               "offset": 750
             },
             {
                "name": "fan5_1",
-               "has_target": false,
-               "factor": 1.45,
-               "offset": -909
+               "threshold": 30,
+               "has_target": false
             }
          ]
       }
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
index 71a489944..1bfb5378b 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json
@@ -2,8 +2,8 @@
    "fans": [
       {
          "inventory": "/system/chassis/motherboard/fan0",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -12,14 +12,15 @@
          "sensors": [
             {
                "name": "fan0_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan1",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -28,14 +29,15 @@
          "sensors": [
             {
                "name": "fan1_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan2",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -44,14 +46,15 @@
          "sensors": [
             {
                "name": "fan2_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan3",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -60,14 +63,15 @@
          "sensors": [
             {
                "name": "fan3_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan4",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -76,14 +80,15 @@
          "sensors": [
             {
                "name": "fan4_0",
+               "threshold": 30,
                "has_target": true
             }
          ]
       },
       {
          "inventory": "/system/chassis/motherboard/fan5",
-         "functional_delay": 5,
-         "allowed_out_of_range_time": 30,
+         "method": "count",
+         "count_interval": 1,
          "deviation": 15,
          "num_sensors_nonfunc_for_fan_nonfunc": 1,
          "monitor_start_delay": 30,
@@ -92,6 +97,7 @@
          "sensors": [
             {
                "name": "fan5_0",
+               "threshold": 30,
                "has_target": true
             }
          ]