wspoon: Correct removal of air cooled events
Mistakenly removed air cooled events from being created when
specifically enabling water cooled only. Adding these back in as fan
control will continue to be limited on air cooled systems with the floor
held at 7200 RPMs.
Change-Id: Ia910b51564fd902e0b0e8c067d5649a689fd100a
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
index 23722b4..52fcfdd 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
@@ -327,6 +327,9 @@
- name: set_request_speed_base_with_max
- name: speed_changes_based_on_regulator_temps
zone_conditions:
+ - name: air_cooled_chassis
+ zones:
+ - 0
- name: water_and_air_cooled_chassis
zones:
- 0
@@ -356,6 +359,9 @@
interval: 5
- name: speed_changes_based_on_pcie_temps
zone_conditions:
+ - name: air_cooled_chassis
+ zones:
+ - 0
- name: water_and_air_cooled_chassis
zones:
- 0
@@ -400,8 +406,40 @@
type: bool
value: true
events:
+ - name: speed_changes_based_on_core_temps
+ zone_conditions:
+ - name: air_cooled_chassis
+ zones:
+ - 0
+ group: zone0_cores
+ interface: xyz.openbmc_project.Sensor.Value
+ property:
+ name: Value
+ type: int64_t
+ actions:
+ - name: set_net_increase_speed
+ property: 73000
+ factor:
+ value: 1000
+ type: int64_t
+ delta:
+ value: 400
+ type: uint64_t
+ - name: set_net_decrease_speed
+ property: 70000
+ factor:
+ value: 1000
+ type: int64_t
+ delta:
+ value: 40
+ type: uint64_t
+ timer:
+ interval: 5
- name: speed_changes_based_on_dimm_temps
zone_conditions:
+ - name: air_cooled_chassis
+ zones:
+ - 0
- name: water_and_air_cooled_chassis
zones:
- 0
@@ -429,3 +467,61 @@
type: uint64_t
timer:
interval: 5
+ - name: speed_changes_based_on_gpu_core_temps
+ zone_conditions:
+ - name: air_cooled_chassis
+ zones:
+ - 0
+ group: zone0_gpu_cores
+ interface: xyz.openbmc_project.Sensor.Value
+ property:
+ name: Value
+ type: int64_t
+ actions:
+ - name: set_net_increase_speed
+ property: 78000
+ factor:
+ value: 1000
+ type: int64_t
+ delta:
+ value: 600
+ type: uint64_t
+ - name: set_net_decrease_speed
+ property: 75000
+ factor:
+ value: 1000
+ type: int64_t
+ delta:
+ value: 40
+ type: uint64_t
+ timer:
+ interval: 5
+ - name: speed_changes_based_on_gpu_memory_temps
+ zone_conditions:
+ - name: air_cooled_chassis
+ zones:
+ - 0
+ group: zone0_gpu_memory
+ interface: xyz.openbmc_project.Sensor.Value
+ property:
+ name: Value
+ type: int64_t
+ actions:
+ - name: set_net_increase_speed
+ property: 80000
+ factor:
+ value: 1000
+ type: int64_t
+ delta:
+ value: 600
+ type: uint64_t
+ - name: set_net_decrease_speed
+ property: 77000
+ factor:
+ value: 1000
+ type: int64_t
+ delta:
+ value: 40
+ type: uint64_t
+ timer:
+ interval: 5