diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-04-22 21:06:02 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-27 19:52:12 +0300 |
commit | e161514219e0dc8a957dabbb8529fb9fcac4e115 (patch) | |
tree | 5de46006517d690f5793eec41281d60611228ecd /meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config | |
parent | a3f54c8b8cbd50bc86efdc52cfb7d348d8c19d21 (diff) | |
download | openbmc-e161514219e0dc8a957dabbb8529fb9fcac4e115.tar.xz |
meta-ibm: move all meta-witherspoon metadata
The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon. Move everything to meta-ibm.
The meta-ibm README is re-written to more accurately reflect the scope
of the layer.
Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.
(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)
Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config')
3 files changed, 205 insertions, 0 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml new file mode 100644 index 000000000..076349de5 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml @@ -0,0 +1,96 @@ +fans: + - inventory: /system/chassis/motherboard/fan0 + allowed_out_of_range_time: 10 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan0_0 + has_target: true + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + - name: fan0_1 + has_target: false + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + + - inventory: /system/chassis/motherboard/fan1 + allowed_out_of_range_time: 10 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan1_0 + has_target: true + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + - name: fan1_1 + has_target: false + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + + - inventory: /system/chassis/motherboard/fan2 + allowed_out_of_range_time: 10 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan2_0 + has_target: true + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + - name: fan2_1 + has_target: false + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + + - inventory: /system/chassis/motherboard/fan3 + allowed_out_of_range_time: 10 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan3_0 + has_target: true + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + - name: fan3_1 + has_target: false + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + + - inventory: /system/chassis/motherboard/fan4 + allowed_out_of_range_time: 10 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan4_0 + has_target: true + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + - name: fan4_1 + has_target: false + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + + - inventory: /system/chassis/motherboard/fan5 + allowed_out_of_range_time: 10 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan5_0 + has_target: true + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 + - name: fan5_1 + has_target: false + target_interface: xyz.openbmc_project.Control.FanPwm + factor: 70 + offset: 1200 diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml new file mode 100644 index 000000000..2c93e65c8 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml @@ -0,0 +1,36 @@ +fans: + - inventory: /system/chassis/motherboard/fan0 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan0_0 + has_target: true + + - inventory: /system/chassis/motherboard/fan1 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan1_0 + has_target: true + + - inventory: /system/chassis/motherboard/fan2 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan2_0 + has_target: true + + - inventory: /system/chassis/motherboard/fan3 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan3_0 + has_target: true diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml new file mode 100644 index 000000000..5db7966fa --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml @@ -0,0 +1,73 @@ +fans: + - inventory: /system/chassis/motherboard/fan0 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan0_0 + has_target: true + - name: fan0_1 + 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 + sensors: + - name: fan1_0 + has_target: true + - name: fan1_1 + has_target: false + # Create fan1 inventory & sensors on air cooled only + condition: + name: propertiesMatch + properties: + - object: /xyz/openbmc_project/inventory/system/chassis + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + property: + name: WaterCooled + type: bool + value: false + + - inventory: /system/chassis/motherboard/fan2 + functional_delay: 5 + allowed_out_of_range_time: 30 + deviation: 15 + num_sensors_nonfunc_for_fan_nonfunc: 1 + sensors: + - name: fan2_0 + has_target: true + - name: fan2_1 + 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 + sensors: + - name: fan3_0 + has_target: true + - name: fan3_1 + has_target: false + +sensor_trust_groups: + - class: NonzeroSpeed + 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 |