diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-16 23:15:45 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-12-16 23:15:45 +0300 |
commit | 506611d226c82d05215ec3d2dab50a43a531b691 (patch) | |
tree | 302e0e255b959be532f5e26329db97740118f5f5 /meta-ibm/meta-witherspoon/recipes-phosphor/fans | |
parent | 243c130a919c7037b5edd3a8097317340796ce85 (diff) | |
parent | 9dfc7e69bc505f474dd4117a8d690b1287e2a48f (diff) | |
download | openbmc-506611d226c82d05215ec3d2dab50a43a531b691.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/fans')
2 files changed, 65 insertions, 0 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index ade4567ce..386f4b7c7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml @@ -301,6 +301,65 @@ actions: - altevents events: + - name: default_fan_floor_on_service_fail + precondition: + name: services_missing_owner + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + events: + - name: default_fan_floor + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: timer + interval: 5000000 + type: oneshot + actions: + - name: default_floor_on_missing_owner + - name: high_speed_on_occ_service_fails + groups: + - name: occ0_object + interface: org.open_power.OCC.Status + property: + name: OccActive + type: bool + - name: occ1_object + interface: org.open_power.OCC.Status + property: + name: OccActive + type: bool + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + actions: + - name: call_actions_based_on_timer + timer: + interval: 5000000 + type: oneshot + actions: + - name: set_speed_on_missing_owner + speed: + value: 255 + type: uint64_t - name: missing_or_fails_before_high_speed_air groups: - name: air_cooled_zone0_fans diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml index 9133fa1fa..d0a09004e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml @@ -3,29 +3,35 @@ fans: cooling_zone: 0 sensors: - fan0_0 + - fan0_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan1 cooling_zone: 0 sensors: - fan1_0 + - fan1_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan2 cooling_zone: 0 sensors: - fan2_0 + - fan2_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan3 cooling_zone: 0 sensors: - fan3_0 + - fan3_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan4 cooling_zone: 0 sensors: - fan4_0 + - fan4_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan5 cooling_zone: 0 sensors: - fan5_0 + - fan5_1 target_interface: xyz.openbmc_project.Control.FanPwm |