diff options
2 files changed, 17 insertions, 2 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 91a7e2903..feda64638 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,5 +1,6 @@ fans: - inventory: /system/chassis/motherboard/fan0 + functional_delay: 5 allowed_out_of_range_time: 30 deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 @@ -10,6 +11,7 @@ fans: has_target: false - inventory: /system/chassis/motherboard/fan1 + functional_delay: 5 allowed_out_of_range_time: 30 deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 @@ -20,6 +22,7 @@ fans: has_target: false - inventory: /system/chassis/motherboard/fan2 + functional_delay: 5 allowed_out_of_range_time: 30 deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 @@ -30,6 +33,7 @@ fans: has_target: false - inventory: /system/chassis/motherboard/fan3 + functional_delay: 5 allowed_out_of_range_time: 30 deviation: 15 num_sensors_nonfunc_for_fan_nonfunc: 1 @@ -41,8 +45,19 @@ fans: sensor_trust_groups: - class: NonzeroSpeed - sensors: + group: + # Include all _1 fans to determine trust - name: fan0_1 - name: fan1_1 - name: fan2_1 - name: fan3_1 + # Add all _0 fans to be included in trust result effects, + # but not in determining trust + - name: fan0_0 + in_trust: false + - name: fan1_0 + in_trust: false + - name: fan2_0 + in_trust: false + - name: fan3_0 + in_trust: false diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc index e232bbb01..528755c76 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 = "069e4405a6926cdacc33c0826075356da2cd9dbd" +SRCREV = "e11cbc605e79bbf6b2651c30ef8f64a9ae4167b0" |