Fix incorrect Talos fan control settings

Fan control is now operational on Talos hardware

3 files changed, 21 insertions, 21 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 44fb52f22..33ff0bb8e 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
@@ -371,7 +371,7 @@ events:
       zone_conditions:
           - name: air_cooled_chassis
             zones:
-                - 0
+                - 1
       group: air_cooled_zone1_fans
       interface: xyz.openbmc_project.State.Decorator.OperationalStatus
       property:
@@ -390,7 +390,7 @@ events:
       zone_conditions:
           - name: air_cooled_chassis
             zones:
-                - 1
+                - 2
       group: air_cooled_zone2_fans
       interface: xyz.openbmc_project.State.Decorator.OperationalStatus
       property:
@@ -485,7 +485,7 @@ events:
       zone_conditions:
           - name: air_cooled_chassis
             zones:
-                - 0
+                - 2
       group: zone2_ambient
       interface: xyz.openbmc_project.Sensor.Value
       property:
@@ -505,14 +505,14 @@ events:
           - name: set_ceiling_from_average_sensor_value
             map:
                 value:
-                    - 248: 69
+                    - 25000: 69
                     - 27000: 100
                 type: std::map<int64_t, uint64_t>
     - name: set_water_cooled_speed_boundaries_based_on_ambient
       zone_conditions:
           - name: water_and_air_cooled_chassis
             zones:
-                - 0
+                - 2
       group: zone2_ambient
       interface: xyz.openbmc_project.Sensor.Value
       property:
@@ -532,7 +532,7 @@ events:
           - name: set_ceiling_from_average_sensor_value
             map:
                 value:
-                    - 248: 69
+                    - 25000: 69
                     - 27000: 100
                 type: std::map<int64_t, uint64_t>
     - name: speed_changes_based_on_regulator_temps
@@ -640,7 +640,7 @@ events:
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 73000
+                      property: 53000
                       factor:
                           value: 1000
                           type: int64_t
@@ -648,7 +648,7 @@ events:
                           value: 4
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 70000
+                      property: 50000
                       factor:
                           value: 1000
                           type: int64_t
@@ -672,7 +672,7 @@ events:
                     - name: propertiesChanged
                 actions:
                     - name: set_net_increase_speed
-                      property: 73000
+                      property: 53000
                       factor:
                           value: 1000
                           type: int64_t
@@ -680,7 +680,7 @@ events:
                           value: 4
                           type: uint64_t
                     - name: set_net_decrease_speed
-                      property: 70000
+                      property: 50000
                       factor:
                           value: 1000
                           type: int64_t
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 86458021a..38222e85a 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
@@ -13,7 +13,7 @@ zone_configuration:
       - air
       - all
       full_speed: 100
-      default_floor: 76
+      default_floor: 10
       increase_delay: 5
       decrease_interval: 1
     - zone: 1
@@ -21,7 +21,7 @@ zone_configuration:
       - air
       - all
       full_speed: 100
-      default_floor: 76
+      default_floor: 10
       increase_delay: 5
       decrease_interval: 1
     - zone: 2
@@ -29,7 +29,7 @@ zone_configuration:
       - air
       - all
       full_speed: 100
-      default_floor: 76
+      default_floor: 10
       increase_delay: 5
       decrease_interval: 1
 
@@ -43,7 +43,7 @@ zone_configuration:
       - water
       - all
       full_speed: 100
-      default_floor: 76
+      default_floor: 10
       increase_delay: 5
       decrease_interval: 1
     - zone: 2
@@ -51,6 +51,6 @@ zone_configuration:
       - water
       - all
       full_speed: 100
-      default_floor: 76
+      default_floor: 10
       increase_delay: 5
       decrease_interval: 1
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
index de86a5d4a..931118fb0 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
@@ -1,7 +1,7 @@
 fans:
   - inventory: /system/chassis/motherboard/fan0
     allowed_out_of_range_time: 30
-    deviation: 15
+    deviation: -500
     num_sensors_nonfunc_for_fan_nonfunc: 1
     sensors:
       - name: fan0
@@ -9,7 +9,7 @@ fans:
 
   - inventory: /system/chassis/motherboard/fan1
     allowed_out_of_range_time: 30
-    deviation: 15
+    deviation: -500
     num_sensors_nonfunc_for_fan_nonfunc: 1
     sensors:
       - name: fan1
@@ -17,7 +17,7 @@ fans:
 
   - inventory: /system/chassis/motherboard/fan2
     allowed_out_of_range_time: 30
-    deviation: 15
+    deviation: -500
     num_sensors_nonfunc_for_fan_nonfunc: 1
     sensors:
       - name: fan2
@@ -25,7 +25,7 @@ fans:
 
   - inventory: /system/chassis/motherboard/fan3
     allowed_out_of_range_time: 30
-    deviation: 15
+    deviation: -500
     num_sensors_nonfunc_for_fan_nonfunc: 1
     sensors:
       - name: fan3
@@ -33,7 +33,7 @@ fans:
 
   - inventory: /system/chassis/motherboard/fan4
     allowed_out_of_range_time: 30
-    deviation: 15
+    deviation: -500
     num_sensors_nonfunc_for_fan_nonfunc: 1
     sensors:
       - name: fan4
@@ -41,7 +41,7 @@ fans:
 
   - inventory: /system/chassis/motherboard/fan5
     allowed_out_of_range_time: 30
-    deviation: 15
+    deviation: -500
     num_sensors_nonfunc_for_fan_nonfunc: 1
     sensors:
       - name: fan5