control:p10bmc:rainier-4u/1s4u - Updated config values from thermal

Received multiple updated fan control configuration values related to
the thermal team's exercising of fan control.

Change-Id: I9200d6cd2fb53af4b00bfff2fcf11ea356831205
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/ibm,rainier-4u/events.json
index b6add91..4b55b4f 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/events.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/events.json
@@ -24,7 +24,7 @@
          "name": "count_state_before_target",
          "count": 1,
          "state": false,
-         "target": 10000
+         "target": 10400
        }
      ]
    },
@@ -78,7 +78,7 @@
          "name": "count_state_before_target",
          "count": 1,
          "state": false,
-         "target": 10000
+         "target": 10400
        }
      ]
    },
@@ -180,7 +180,7 @@
                  "property": { "name": "Value" }
                }
              ],
-             "target": 10000
+             "target": 10400
            }
          ]
        }
@@ -217,7 +217,7 @@
         "name": "count_state_floor",
         "count": 1,
         "state": false,
-        "floor": 10000
+        "floor": 10400
       }
     ]
   },
@@ -340,7 +340,7 @@
         "name": "count_state_floor",
         "count": 1,
         "state": false,
-        "floor": 10000
+        "floor": 10400
       }
     ]
   },
@@ -890,7 +890,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 66.0,
+         "state": 63.0,
          "delta": 200
        },
        {
@@ -902,7 +902,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
+         "state": 65.0,
          "delta": 200
        },
        {
@@ -914,7 +914,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 72.0,
+         "state": 74.0,
          "delta": 200
        },
        {
@@ -926,7 +926,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 55.0,
+         "state": 66.0,
          "delta": 200
        },
        {
@@ -938,7 +938,7 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 55.0,
+         "state": 57.0,
          "delta": 200
        },
        {
@@ -1011,7 +1011,7 @@
            }
          ],
          "state_parameter_name": "proc_0_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1023,7 +1023,7 @@
            }
          ],
          "state_parameter_name": "proc_1_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1035,7 +1035,7 @@
            }
          ],
          "state_parameter_name": "proc_2_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1047,7 +1047,7 @@
            }
          ],
          "state_parameter_name": "proc_3_core_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1059,7 +1059,7 @@
            }
          ],
          "state_parameter_name": "proc_0_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1071,7 +1071,7 @@
            }
          ],
          "state_parameter_name": "proc_1_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1083,7 +1083,7 @@
            }
          ],
          "state_parameter_name": "proc_2_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1095,7 +1095,7 @@
            }
          ],
          "state_parameter_name": "proc_3_ioring_dvfs_decrease_temp",
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1106,8 +1106,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 63.0,
-         "delta": 40
+         "state": 60.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1118,8 +1118,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 49.0,
-         "delta": 40
+         "state": 62.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1130,8 +1130,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 69.0,
-         "delta": 40
+         "state": 71.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1142,8 +1142,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
-         "delta": 40
+         "state": 63.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1154,8 +1154,8 @@
              "property": { "name": "Value" }
            }
          ],
-         "state": 52.0,
-         "delta": 40
+         "state": 54.0,
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1167,7 +1167,7 @@
            }
          ],
          "state": 79.0,
-         "delta": 30
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1179,7 +1179,7 @@
            }
          ],
          "state": 55.0,
-         "delta": 40
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1191,7 +1191,7 @@
            }
          ],
          "state": 60.0,
-         "delta": 80
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1203,7 +1203,7 @@
            }
          ],
          "state": 65.0,
-         "delta": 80
+         "delta": 50
        },
        {
          "name": "set_net_decrease_target",
@@ -1215,7 +1215,7 @@
            }
          ],
          "state": 65.0,
-         "delta": 80
+         "delta": 50
        }
      ]
    },
@@ -1361,7 +1361,8 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 7000 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 2, "floor": 8000 },
+                  { "value": 3, "floor": 9000 }
                 ]
               }
             ]
@@ -1375,20 +1376,20 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 5500
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 5500
+                    "floor": 6000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 5900
+                    "floor": 6000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 5900
+                    "floor": 6000
                   }
                 ]
               },
@@ -1396,7 +1397,8 @@
                 "parameter": "pcie_floor_index",
                 "floors": [
                   { "value": 1, "floor": 8000 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 2, "floor": 9000 },
+                  { "value": 3, "floor": 9500 }
                 ]
               }
             ]
@@ -1410,63 +1412,65 @@
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 6900
+                    "floor": 7000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 6900
+                    "floor": 7000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 7900
+                    "floor": 7000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 7900
+                    "floor": 7000
                   }
                 ]
               },
               {
                 "parameter": "pcie_floor_index",
                 "floors": [
-                  { "value": 1, "floor": 8900 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 1, "floor": 9000 },
+                  { "value": 2, "floor": 9500 },
+                  { "value": 3, "floor": 10400 }
                 ]
               }
             ]
           },
           {
-            // Entry valid for ambient temp < 43
-            "key": 43,
+            // Entry valid for ambient temp < 42
+            "key": 42,
             "floors": [
               {
                 "group": "power mode",
                 "floors": [
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.Static",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.PowerSaving",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.MaximumPerformance",
-                    "floor": 8800
+                    "floor": 8000
                   },
                   {
                     // OEM == MaximumPerformance
                     "value": "xyz.openbmc_project.Control.Power.Mode.PowerMode.OEM",
-                    "floor": 8800
+                    "floor": 8000
                   }
                 ]
               },
               {
                 "parameter": "pcie_floor_index",
                 "floors": [
-                  { "value": 1, "floor": 8900 },
-                  { "value": 2, "floor": 9000 }
+                  { "value": 1, "floor": 9500 },
+                  { "value": 2, "floor": 10400 },
+                  { "value": 3, "floor": 10400 }
                 ]
               }
             ]