Support degraded mode fan speeds on water cooled
Include fans to full speed on water cooled witherspoon when a single fan
is non-functional or not present.
Change-Id: Id8780b888e3cfa623a4ea28d4934d425a4db8c53
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
index 94e55bb..0e041ad 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml
@@ -1,12 +1,19 @@
groups:
- - name: zone0_fans
- description: Group of fan inventory objects for zone 0
+ - name: air_cooled_zone0_fans
+ description: Group of fan inventory objects for air cooled zone 0
type: inventory
members:
- /system/chassis/motherboard/fan0
- /system/chassis/motherboard/fan1
- /system/chassis/motherboard/fan2
- /system/chassis/motherboard/fan3
+ - name: water_and_air_cooled_zone0_fans
+ description: Group of fan inventory objects for water/air cooled zone 0
+ type: inventory
+ members:
+ - /system/chassis/motherboard/fan0
+ - /system/chassis/motherboard/fan2
+ - /system/chassis/motherboard/fan3
actions:
- name: count_state_before_speed
@@ -17,12 +24,12 @@
- speed
events:
- - name: missing_before_high_speed
+ - name: missing_before_high_speed_air
zone_conditions:
- name: air_cooled_chassis
zones:
- 0
- group: zone0_fans
+ group: air_cooled_zone0_fans
interface: xyz.openbmc_project.Inventory.Item
property:
name: Present
@@ -34,12 +41,12 @@
speed:
value: 10500
type: uint64_t
- - name: fails_before_high_speed
+ - name: fails_before_high_speed_air
zone_conditions:
- name: air_cooled_chassis
zones:
- 0
- group: zone0_fans
+ group: air_cooled_zone0_fans
interface: xyz.openbmc_project.State.Decorator.OperationalStatus
property:
name: Functional
@@ -51,3 +58,38 @@
speed:
value: 10500
type: uint64_t
+ - name: missing_before_high_speed_water_and_air
+ zone_conditions:
+ - name: water_and_air_cooled_chassis
+ zones:
+ - 0
+ group: water_and_air_cooled_zone0_fans
+ interface: xyz.openbmc_project.Inventory.Item
+ property:
+ name: Present
+ type: bool
+ action:
+ name: count_state_before_speed
+ count: 1
+ property: false
+ speed:
+ value: 10500
+ type: uint64_t
+ - name: fails_before_high_speed_water_and_air
+ zone_conditions:
+ - name: water_and_air_cooled_chassis
+ zones:
+ - 0
+ group: water_and_air_cooled_zone0_fans
+ interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+ property:
+ name: Functional
+ type: bool
+ action:
+ name: count_state_before_speed
+ count: 1
+ property: false
+ speed:
+ value: 10500
+ type: uint64_t
+