Raise CPU core temp setpoints

Implement less aggressive fan curve
Multiply all base fan speeds by 10 due to recent phosphor-hwmon change

2 files changed, 71 insertions, 71 deletions

diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
index 90bde1dc0..8e35aba95 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
@@ -288,7 +288,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: missing_before_high_speed_air_zone1
       zone_conditions:
@@ -307,7 +307,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: missing_before_high_speed_air_zone2
       zone_conditions:
@@ -326,7 +326,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_air_zone0
       zone_conditions:
@@ -345,7 +345,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_air_zone1
       zone_conditions:
@@ -364,7 +364,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_air_zone2
       zone_conditions:
@@ -383,7 +383,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: missing_before_high_speed_water_and_air_zone0
       zone_conditions:
@@ -402,7 +402,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: missing_before_high_speed_water_and_air_zone2
       zone_conditions:
@@ -421,7 +421,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_water_and_air_zone0
       zone_conditions:
@@ -440,7 +440,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: fails_before_high_speed_water_and_air_zone2
       zone_conditions:
@@ -459,7 +459,7 @@ events:
             count: 1
             property: false
             speed:
-                value: 100
+                value: 1000
                 type: uint64_t
     - name: set_air_cooled_speed_boundaries_based_on_ambient
       zone_conditions:
@@ -477,19 +477,19 @@ events:
           - name: set_floor_from_average_sensor_value
             map:
                 value:
-                    - 22000: 15
-                    - 27000: 20
-                    - 32000: 25
-                    - 37000: 30
-                    - 40000: 35
-                    - 42000: 40
-                    - 45000: 45
+                    - 22000: 150
+                    - 27000: 200
+                    - 32000: 250
+                    - 37000: 300
+                    - 40000: 350
+                    - 42000: 400
+                    - 45000: 450
                 type: std::map<int64_t, uint64_t>
           - name: set_ceiling_from_average_sensor_value
             map:
                 value:
-                    - 25000: 75
-                    - 27000: 100
+                    - 25000: 750
+                    - 27000: 1000
                 type: std::map<int64_t, uint64_t>
     - name: set_water_cooled_speed_boundaries_based_on_ambient
       zone_conditions:
@@ -507,19 +507,19 @@ events:
           - name: set_floor_from_average_sensor_value
             map:
                 value:
-                    - 22000: 25
-                    - 27000: 30
-                    - 32000: 35
-                    - 37000: 40
-                    - 42000: 45
-                    - 47000: 50
-                    - 50000: 55
+                    - 22000: 250
+                    - 27000: 300
+                    - 32000: 350
+                    - 37000: 400
+                    - 42000: 450
+                    - 47000: 500
+                    - 50000: 550
                 type: std::map<int64_t, uint64_t>
           - name: set_ceiling_from_average_sensor_value
             map:
                 value:
-                    - 25000: 85
-                    - 27000: 100
+                    - 25000: 850
+                    - 27000: 1000
                 type: std::map<int64_t, uint64_t>
     - name: speed_changes_based_on_regulator_temps
       zone_conditions:
@@ -541,18 +541,18 @@ events:
           - name: set_net_increase_speed
             property: 85000
             factor:
-                value: 1000
+                value: 10000
                 type: int64_t
             delta:
-                value: 4
+                value: 40
                 type: uint64_t
           - name: set_net_decrease_speed
             property: 82000
             factor:
-                value: 1000
+                value: 10000
                 type: int64_t
             delta:
-                value: 1
+                value: 5
                 type: uint64_t
       timer:
           interval: 5
@@ -576,18 +576,18 @@ events:
           - name: set_net_increase_speed
             property: 55000
             factor:
-                value: 1000
+                value: 10000
                 type: int64_t
             delta:
-                value: 4
+                value: 40
                 type: uint64_t
           - name: set_net_decrease_speed
             property: 52000
             factor:
-                value: 1000
+                value: 10000
                 type: int64_t
             delta:
-                value: 1
+                value: 5
                 type: uint64_t
       timer:
           interval: 5
@@ -620,20 +620,20 @@ events:
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 53000
+                      property: 67000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 4
+                          value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 50000
+                      property: 63000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 1
+                          value: 5
                           type: uint64_t
                 timer:
                     interval: 5
@@ -657,18 +657,18 @@ events:
                     - name: set_net_increase_speed
                       property: 64000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 4
+                          value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
                       property: 61000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 1
+                          value: 5
                           type: uint64_t
                 timer:
                     interval: 5
@@ -701,20 +701,20 @@ events:
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 53000
+                      property: 67000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 4
+                          value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 50000
+                      property: 63000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 1
+                          value: 5
                           type: uint64_t
                 timer:
                     interval: 5
@@ -738,18 +738,18 @@ events:
                     - name: set_net_increase_speed
                       property: 64000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 4
+                          value: 40
                           type: uint64_t
                     - name: set_net_decrease_speed
                       property: 61000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 1
+                          value: 5
                           type: uint64_t
                 timer:
                     interval: 5
@@ -787,18 +787,18 @@ events:
                     - name: set_net_increase_speed
                       property: 45000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 1
+                          value: 10
                           type: uint64_t
                     - name: set_net_decrease_speed
                       property: 35000
                       factor:
-                          value: 1000
+                          value: 10000
                           type: int64_t
                       delta:
-                          value: 1
+                          value: 10
                           type: uint64_t
                 timer:
                     interval: 5
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
index 38222e85a..e065aaa5e 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
@@ -1,5 +1,5 @@
 manager_configuration:
-  power_on_delay: 20
+  power_on_delay: 5
 
 zone_configuration:
 
@@ -12,24 +12,24 @@ zone_configuration:
       cooling_profiles:
       - air
       - all
-      full_speed: 100
-      default_floor: 10
+      full_speed: 1000
+      default_floor: 100
       increase_delay: 5
       decrease_interval: 1
     - zone: 1
       cooling_profiles:
       - air
       - all
-      full_speed: 100
-      default_floor: 10
+      full_speed: 1000
+      default_floor: 100
       increase_delay: 5
       decrease_interval: 1
     - zone: 2
       cooling_profiles:
       - air
       - all
-      full_speed: 100
-      default_floor: 10
+      full_speed: 1000
+      default_floor: 100
       increase_delay: 5
       decrease_interval: 1
 
@@ -42,15 +42,15 @@ zone_configuration:
       cooling_profiles:
       - water
       - all
-      full_speed: 100
-      default_floor: 10
+      full_speed: 1000
+      default_floor: 100
       increase_delay: 5
       decrease_interval: 1
     - zone: 2
       cooling_profiles:
       - water
       - all
-      full_speed: 100
-      default_floor: 10
+      full_speed: 1000
+      default_floor: 100
       increase_delay: 5
       decrease_interval: 1