summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2017-09-28 21:40:26 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-10-11 22:45:40 +0300
commitfbcbdc55e60a1b5c197a2594e2ddaeae507fadc3 (patch)
tree76bf5c232fd02f4b909df0f84d76b270b36f9d6a
parent3a907194857db7abf2b9e8c31060e6c59a83361b (diff)
downloadopenbmc-fbcbdc55e60a1b5c197a2594e2ddaeae507fadc3.tar.xz
Add tach trust groups to witherspoon monitor YAML
These will be used to specify that the 2nd rotor tach values shouldn't be trusted when all of them are zero, because that just means the fans are moving to a new target. Resolves openbmc/openbmc#2336 Change-Id: I4b2ca6bb732d214dca67096817612025e1319226 Signed-off-by: Matt Spinler <spinler@us.ibm.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml9
-rw-r--r--meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc2
2 files changed, 10 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
index dc5680dee..0d68c70ca 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
@@ -1,3 +1,4 @@
+fans:
- inventory: /system/chassis/motherboard/fan0
allowed_out_of_range_time: 20
deviation: 15
@@ -37,3 +38,11 @@
has_target: true
- name: fan3_1
has_target: false
+
+sensor_trust_groups:
+ - class: NonzeroSpeed
+ sensors:
+ - name: fan0_1
+ - name: fan1_1
+ - name: fan2_1
+ - name: fan3_1
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
index 6a821fafc..4665a23ff 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
SRC_URI += "git://github.com/openbmc/phosphor-fan-presence"
-SRCREV = "6fa181c781e59961e61f9cf5755ed220c2428c16"
+SRCREV = "c39e859b44c7d9152c76462ab4848060c840ab29"