From 6234872b26397cb8b114e4c4bc48a22666ae86cb Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 16:40:34 +0000 Subject: ibm: fans: Replace rainier with p10bmc The IBM rainier machine name is being replaced with the generic p10bmc. Tested: Built rainier and verified the fan files were installed, ex: obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-4u/zones.json obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-2u/zones.json obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,everest/zones.json Change-Id: I10edb9e30716cffa3f510fe94822eadb08326912 Signed-off-by: Adriana Kobylak --- .../p10bmc/obmc/fan-watchdog/fan-watchdog.conf | 3 + .../obmc/fan-watchdog/reset-fan-watchdog.conf | 4 + .../rainier/obmc/fan-watchdog/fan-watchdog.conf | 3 - .../obmc/fan-watchdog/reset-fan-watchdog.conf | 4 - .../fans/phosphor-fan-monitor-config.bbappend | 14 +- .../p10bmc/everest/config.json | 125 ++++++++++++++ .../p10bmc/rainier-1s4u/config.json | 90 ++++++++++ .../p10bmc/rainier-2u/config.json | 183 +++++++++++++++++++++ .../p10bmc/rainier-4u/config.json | 122 ++++++++++++++ .../rainier/everest/config.json | 125 -------------- .../rainier/rainier-1s4u/config.json | 90 ---------- .../rainier/rainier-2u/config.json | 183 --------------------- .../rainier/rainier-4u/config.json | 122 -------------- .../fans/phosphor-fan-presence-config.bbappend | 14 +- .../p10bmc/everest/config.json | 90 ++++++++++ .../p10bmc/rainier-1s4u/config.json | 86 ++++++++++ .../p10bmc/rainier-2u/config.json | 134 +++++++++++++++ .../p10bmc/rainier-4u/config.json | 128 ++++++++++++++ .../rainier/everest/config.json | 90 ---------- .../rainier/rainier-1s4u/config.json | 86 ---------- .../rainier/rainier-2u/config.json | 134 --------------- .../rainier/rainier-4u/config.json | 128 -------------- .../fans/phosphor-fan/p10bmc/everest/fans.json | 26 +++ .../fans/phosphor-fan/p10bmc/everest/zones.json | 9 + .../fans/phosphor-fan/p10bmc/manager.json | 3 + .../phosphor-fan/p10bmc/rainier-1s4u/fans.json | 26 +++ .../phosphor-fan/p10bmc/rainier-1s4u/zones.json | 9 + .../fans/phosphor-fan/p10bmc/rainier-2u/zones.json | 9 + .../fans/phosphor-fan/p10bmc/rainier-4u/zones.json | 9 + .../fans/phosphor-fan/p10bmc/rainier/fans.json | 38 +++++ .../fans/phosphor-fan/rainier/everest/fans.json | 26 --- .../fans/phosphor-fan/rainier/everest/zones.json | 9 - .../fans/phosphor-fan/rainier/manager.json | 3 - .../phosphor-fan/rainier/rainier-1s4u/fans.json | 26 --- .../phosphor-fan/rainier/rainier-1s4u/zones.json | 9 - .../phosphor-fan/rainier/rainier-2u/zones.json | 9 - .../phosphor-fan/rainier/rainier-4u/zones.json | 9 - .../fans/phosphor-fan/rainier/rainier/fans.json | 38 ----- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 26 +-- 39 files changed, 1121 insertions(+), 1121 deletions(-) create mode 100644 meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf create mode 100644 meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf delete mode 100644 meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf delete mode 100644 meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-1s4u/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-1s4u/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json create mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/zones.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json delete mode 100644 meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json (limited to 'meta-ibm/recipes-phosphor/fans') diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf new file mode 100644 index 0000000000..ce7824ccba --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/fan-watchdog.conf @@ -0,0 +1,3 @@ +TIMEOUT=5 +INTERVAL=1 +DEVICE=/dev/watchdog0 diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf new file mode 100644 index 0000000000..98cb60288d --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog/p10bmc/obmc/fan-watchdog/reset-fan-watchdog.conf @@ -0,0 +1,4 @@ +GPIO_PATH=/dev/gpiochip0 +GPIO=114 +DELAY=1 +ACTION=low_high diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf deleted file mode 100644 index ce7824ccba..0000000000 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/fan-watchdog.conf +++ /dev/null @@ -1,3 +0,0 @@ -TIMEOUT=5 -INTERVAL=1 -DEVICE=/dev/watchdog0 diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf deleted file mode 100644 index 98cb60288d..0000000000 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog/rainier/obmc/fan-watchdog/reset-fan-watchdog.conf +++ /dev/null @@ -1,4 +0,0 @@ -GPIO_PATH=/dev/gpiochip0 -GPIO=114 -DELAY=1 -ACTION=low_high diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index 8b63927ea8..2c15e034a9 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" -SRC_URI_rainier = "file://rainier-2u/config.json \ +SRC_URI_p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ file://rainier-1s4u/config.json \ file://everest/config.json \ @@ -12,7 +12,7 @@ do_install_witherspoon() { install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ } -do_install_rainier() { +do_install_p10bmc() { # Install Rainier-2U/4U fan monitor config files install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ @@ -29,8 +29,8 @@ do_install_rainier() { FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" FILES_${PN}_remove_witherspoon = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_remove_rainier = "${monitor_datadir}/monitor.yaml" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" +FILES_${PN}_remove_p10bmc = "${monitor_datadir}/monitor.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/monitor/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json new file mode 100644 index 0000000000..74bcfc425e --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json @@ -0,0 +1,125 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan1_0", + "has_target": true + }, + { + "name": "fan1_1", + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan3_0", + "has_target": true + }, + { + "name": "fan3_1", + "has_target": false + } + ] + } + ], + "sensor_trust_groups": [ + { + "class": "NonzeroSpeed", + "group": [ + { + "name": "fan0_1" + }, + { + "name": "fan1_1" + }, + { + "name": "fan2_1" + }, + { + "name": "fan3_1" + } + ] + } + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 3, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json new file mode 100644 index 0000000000..1a5e305726 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json @@ -0,0 +1,90 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan3_0", + "has_target": true + } + ] + } + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 2, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json new file mode 100644 index 0000000000..145e37f383 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json @@ -0,0 +1,183 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan0_0", + "has_target": true + }, + { + "name": "fan0_1", + "has_target": false, + "factor": 1.45, + "offset": -909 + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan1", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan1_0", + "has_target": true + }, + { + "name": "fan1_1", + "has_target": false, + "factor": 1.45, + "offset": -909 + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan2", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan2_0", + "has_target": true + }, + { + "name": "fan2_1", + "has_target": false, + "factor": 1.45, + "offset": -909 + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan3", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan3_0", + "has_target": true + }, + { + "name": "fan3_1", + "has_target": false, + "factor": 1.45, + "offset": -909 + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan4", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan4_0", + "has_target": true + }, + { + "name": "fan4_1", + "has_target": false, + "factor": 1.45, + "offset": -909 + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan5", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan5_0", + "has_target": true + }, + { + "name": "fan5_1", + "has_target": false, + "factor": 1.45, + "offset": -909 + } + ] + } + ], + "sensor_trust_groups": [ + { + "class": "NonzeroSpeed", + "group": [ + { + "name": "fan0_1" + }, + { + "name": "fan1_1" + }, + { + "name": "fan2_1" + }, + { + "name": "fan3_1" + }, + { + "name": "fan4_1" + }, + { + "name": "fan5_1" + } + ] + } + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 3, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json new file mode 100644 index 0000000000..71a4899442 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json @@ -0,0 +1,122 @@ +{ + "fans": [ + { + "inventory": "/system/chassis/motherboard/fan0", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "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, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan3_0", + "has_target": true + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan4", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan4_0", + "has_target": true + } + ] + }, + { + "inventory": "/system/chassis/motherboard/fan5", + "functional_delay": 5, + "allowed_out_of_range_time": 30, + "deviation": 15, + "num_sensors_nonfunc_for_fan_nonfunc": 1, + "monitor_start_delay": 30, + "fan_missing_error_delay": 20, + "nonfunc_rotor_error_delay": 0, + "sensors": [ + { + "name": "fan5_0", + "has_target": true + } + ] + } + ], + "fault_handling": + { + "num_nonfunc_rotors_before_error": 1, + + "power_off_config": + [ + { + "type": "hard", + "cause": "missing_fan_frus", + "count": 1, + "delay": 25, + "state": "at_pgood" + }, + { + "type": "epow", + "cause": "nonfunc_fan_rotors", + "count": 2, + "service_mode_delay": 300, + "meltdown_delay": 300 + } + ] + } +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json deleted file mode 100644 index 74bcfc425e..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/everest/config.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan1_0", - "has_target": true - }, - { - "name": "fan1_1", - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan3_0", - "has_target": true - }, - { - "name": "fan3_1", - "has_target": false - } - ] - } - ], - "sensor_trust_groups": [ - { - "class": "NonzeroSpeed", - "group": [ - { - "name": "fan0_1" - }, - { - "name": "fan1_1" - }, - { - "name": "fan2_1" - }, - { - "name": "fan3_1" - } - ] - } - ], - "fault_handling": - { - "num_nonfunc_rotors_before_error": 1, - - "power_off_config": - [ - { - "type": "hard", - "cause": "missing_fan_frus", - "count": 1, - "delay": 25, - "state": "at_pgood" - }, - { - "type": "epow", - "cause": "nonfunc_fan_rotors", - "count": 3, - "service_mode_delay": 300, - "meltdown_delay": 300 - } - ] - } -} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-1s4u/config.json deleted file mode 100644 index 1a5e305726..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-1s4u/config.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan3_0", - "has_target": true - } - ] - } - ], - "fault_handling": - { - "num_nonfunc_rotors_before_error": 1, - - "power_off_config": - [ - { - "type": "hard", - "cause": "missing_fan_frus", - "count": 1, - "delay": 25, - "state": "at_pgood" - }, - { - "type": "epow", - "cause": "nonfunc_fan_rotors", - "count": 2, - "service_mode_delay": 300, - "meltdown_delay": 300 - } - ] - } -} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json deleted file mode 100644 index 145e37f383..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-2u/config.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan0_0", - "has_target": true - }, - { - "name": "fan0_1", - "has_target": false, - "factor": 1.45, - "offset": -909 - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan1", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan1_0", - "has_target": true - }, - { - "name": "fan1_1", - "has_target": false, - "factor": 1.45, - "offset": -909 - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan2", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan2_0", - "has_target": true - }, - { - "name": "fan2_1", - "has_target": false, - "factor": 1.45, - "offset": -909 - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan3", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan3_0", - "has_target": true - }, - { - "name": "fan3_1", - "has_target": false, - "factor": 1.45, - "offset": -909 - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan4", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan4_0", - "has_target": true - }, - { - "name": "fan4_1", - "has_target": false, - "factor": 1.45, - "offset": -909 - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan5", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan5_0", - "has_target": true - }, - { - "name": "fan5_1", - "has_target": false, - "factor": 1.45, - "offset": -909 - } - ] - } - ], - "sensor_trust_groups": [ - { - "class": "NonzeroSpeed", - "group": [ - { - "name": "fan0_1" - }, - { - "name": "fan1_1" - }, - { - "name": "fan2_1" - }, - { - "name": "fan3_1" - }, - { - "name": "fan4_1" - }, - { - "name": "fan5_1" - } - ] - } - ], - "fault_handling": - { - "num_nonfunc_rotors_before_error": 1, - - "power_off_config": - [ - { - "type": "hard", - "cause": "missing_fan_frus", - "count": 1, - "delay": 25, - "state": "at_pgood" - }, - { - "type": "epow", - "cause": "nonfunc_fan_rotors", - "count": 3, - "service_mode_delay": 300, - "meltdown_delay": 300 - } - ] - } -} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json deleted file mode 100644 index 71a4899442..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/rainier/rainier-4u/config.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "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, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan3_0", - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan4", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan4_0", - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan5", - "functional_delay": 5, - "allowed_out_of_range_time": 30, - "deviation": 15, - "num_sensors_nonfunc_for_fan_nonfunc": 1, - "monitor_start_delay": 30, - "fan_missing_error_delay": 20, - "nonfunc_rotor_error_delay": 0, - "sensors": [ - { - "name": "fan5_0", - "has_target": true - } - ] - } - ], - "fault_handling": - { - "num_nonfunc_rotors_before_error": 1, - - "power_off_config": - [ - { - "type": "hard", - "cause": "missing_fan_frus", - "count": 1, - "delay": 25, - "state": "at_pgood" - }, - { - "type": "epow", - "cause": "nonfunc_fan_rotors", - "count": 2, - "service_mode_delay": 300, - "meltdown_delay": 300 - } - ] - } -} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index 8817592d47..2306ee5090 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_witherspoon = "file://config.json" -SRC_URI_rainier = "file://rainier-2u/config.json \ +SRC_URI_p10bmc = "file://rainier-2u/config.json \ file://rainier-4u/config.json \ file://rainier-1s4u/config.json \ file://everest/config.json \ @@ -11,7 +11,7 @@ do_install_witherspoon() { install -d ${D}/${datadir}/phosphor-fan-presence/presence/ install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ } -do_install_rainier() { +do_install_p10bmc() { # Install Rainier-2U/4U fan presence config files install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ @@ -28,8 +28,8 @@ do_install_rainier() { FILES_${PN}_append_witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json" FILES_${PN}_remove_witherspoon = "${presence_datadir}/config.yaml" -FILES_${PN}_remove_rainier = "${presence_datadir}/config.yaml" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json" -FILES_${PN}_append_rainier = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" +FILES_${PN}_remove_p10bmc = "${presence_datadir}/config.yaml" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/config.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-fan-presence/presence/ibm,everest/config.json" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json new file mode 100644 index 0000000000..439aedcac5 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json @@ -0,0 +1,90 @@ +[ + { + "name": "fan0", + "path": "/system/chassis/motherboard/fan0", + "methods": [ + { + "type": "gpio", + "key": 15, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan0_0", + "fan0_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan1", + "path": "/system/chassis/motherboard/fan1", + "methods": [ + { + "type": "gpio", + "key": 14, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan1_0", + "fan1_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan2", + "path": "/system/chassis/motherboard/fan2", + "methods": [ + { + "type": "gpio", + "key": 13, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan2_0", + "fan2_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan3", + "path": "/system/chassis/motherboard/fan3", + "methods": [ + { + "type": "gpio", + "key": 12, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan3_0", + "fan3_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json new file mode 100644 index 0000000000..cb9eb70dec --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json @@ -0,0 +1,86 @@ +[ + { + "name": "fan0", + "path": "/system/chassis/motherboard/fan0", + "methods": [ + { + "type": "gpio", + "key": 6, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan0_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan1", + "path": "/system/chassis/motherboard/fan1", + "methods": [ + { + "type": "gpio", + "key": 7, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan1_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan2", + "path": "/system/chassis/motherboard/fan2", + "methods": [ + { + "type": "gpio", + "key": 8, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan2_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan3", + "path": "/system/chassis/motherboard/fan3", + "methods": [ + { + "type": "gpio", + "key": 9, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan3_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json new file mode 100644 index 0000000000..7264510289 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json @@ -0,0 +1,134 @@ +[ + { + "name": "fan0", + "path": "/system/chassis/motherboard/fan0", + "methods": [ + { + "type": "gpio", + "key": 6, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan0_0", + "fan0_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan1", + "path": "/system/chassis/motherboard/fan1", + "methods": [ + { + "type": "gpio", + "key": 7, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan1_0", + "fan1_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan2", + "path": "/system/chassis/motherboard/fan2", + "methods": [ + { + "type": "gpio", + "key": 8, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan2_0", + "fan2_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan3", + "path": "/system/chassis/motherboard/fan3", + "methods": [ + { + "type": "gpio", + "key": 9, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan3_0", + "fan3_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan4", + "path": "/system/chassis/motherboard/fan4", + "methods": [ + { + "type": "gpio", + "key": 10, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan4_0", + "fan4_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan5", + "path": "/system/chassis/motherboard/fan5", + "methods": [ + { + "type": "gpio", + "key": 11, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan5_0", + "fan5_1" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json new file mode 100644 index 0000000000..94e7e69f8d --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json @@ -0,0 +1,128 @@ +[ + { + "name": "fan0", + "path": "/system/chassis/motherboard/fan0", + "methods": [ + { + "type": "gpio", + "key": 6, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan0_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan1", + "path": "/system/chassis/motherboard/fan1", + "methods": [ + { + "type": "gpio", + "key": 7, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan1_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan2", + "path": "/system/chassis/motherboard/fan2", + "methods": [ + { + "type": "gpio", + "key": 8, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan2_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan3", + "path": "/system/chassis/motherboard/fan3", + "methods": [ + { + "type": "gpio", + "key": 9, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan3_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan4", + "path": "/system/chassis/motherboard/fan4", + "methods": [ + { + "type": "gpio", + "key": 10, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan4_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + }, + { + "name": "fan5", + "path": "/system/chassis/motherboard/fan5", + "methods": [ + { + "type": "gpio", + "key": 11, + "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", + "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" + }, + { + "type": "tach", + "sensors": [ + "fan5_0" + ] + } + ], + "rpolicy": { + "type": "anyof" + } + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json deleted file mode 100644 index 439aedcac5..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/everest/config.json +++ /dev/null @@ -1,90 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 15, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan0_0", - "fan0_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan1", - "path": "/system/chassis/motherboard/fan1", - "methods": [ - { - "type": "gpio", - "key": 14, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan1_0", - "fan1_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan2", - "path": "/system/chassis/motherboard/fan2", - "methods": [ - { - "type": "gpio", - "key": 13, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan2_0", - "fan2_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan3", - "path": "/system/chassis/motherboard/fan3", - "methods": [ - { - "type": "gpio", - "key": 12, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan3_0", - "fan3_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-1s4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-1s4u/config.json deleted file mode 100644 index cb9eb70dec..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-1s4u/config.json +++ /dev/null @@ -1,86 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan0_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan1", - "path": "/system/chassis/motherboard/fan1", - "methods": [ - { - "type": "gpio", - "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan1_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan2", - "path": "/system/chassis/motherboard/fan2", - "methods": [ - { - "type": "gpio", - "key": 8, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan2_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan3", - "path": "/system/chassis/motherboard/fan3", - "methods": [ - { - "type": "gpio", - "key": 9, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan3_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json deleted file mode 100644 index 7264510289..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-2u/config.json +++ /dev/null @@ -1,134 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan0_0", - "fan0_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan1", - "path": "/system/chassis/motherboard/fan1", - "methods": [ - { - "type": "gpio", - "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan1_0", - "fan1_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan2", - "path": "/system/chassis/motherboard/fan2", - "methods": [ - { - "type": "gpio", - "key": 8, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan2_0", - "fan2_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan3", - "path": "/system/chassis/motherboard/fan3", - "methods": [ - { - "type": "gpio", - "key": 9, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan3_0", - "fan3_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan4", - "path": "/system/chassis/motherboard/fan4", - "methods": [ - { - "type": "gpio", - "key": 10, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan4_0", - "fan4_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan5", - "path": "/system/chassis/motherboard/fan5", - "methods": [ - { - "type": "gpio", - "key": 11, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan5_0", - "fan5_1" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json deleted file mode 100644 index 94e7e69f8d..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/rainier/rainier-4u/config.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 6, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan0_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan1", - "path": "/system/chassis/motherboard/fan1", - "methods": [ - { - "type": "gpio", - "key": 7, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan1_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan2", - "path": "/system/chassis/motherboard/fan2", - "methods": [ - { - "type": "gpio", - "key": 8, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan2_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan3", - "path": "/system/chassis/motherboard/fan3", - "methods": [ - { - "type": "gpio", - "key": 9, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan3_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan4", - "path": "/system/chassis/motherboard/fan4", - "methods": [ - { - "type": "gpio", - "key": 10, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan4_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan5", - "path": "/system/chassis/motherboard/fan5", - "methods": [ - { - "type": "gpio", - "key": 11, - "physpath": "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan5_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json new file mode 100644 index 0000000000..0e4e4d05ab --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json @@ -0,0 +1,26 @@ +[ + { + "name": "fan0", + "zone": "0", + "sensors": ["fan0_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan1", + "zone": "0", + "sensors": ["fan1_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan2", + "zone": "0", + "sensors": ["fan2_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan3", + "zone": "0", + "sensors": ["fan3_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json new file mode 100644 index 0000000000..2edfb36809 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json @@ -0,0 +1,9 @@ +[ + { + "name": "0", + "full_speed": 10700, + "default_floor": 10700, + "increase_delay": 5, + "decrease_interval": 30 + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json new file mode 100644 index 0000000000..1480aa30f3 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json @@ -0,0 +1,3 @@ +{ + "power_on_delay": 15 +} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json new file mode 100644 index 0000000000..0e4e4d05ab --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/fans.json @@ -0,0 +1,26 @@ +[ + { + "name": "fan0", + "zone": "0", + "sensors": ["fan0_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan1", + "zone": "0", + "sensors": ["fan1_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan2", + "zone": "0", + "sensors": ["fan2_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan3", + "zone": "0", + "sensors": ["fan3_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json new file mode 100644 index 0000000000..b2c96070b7 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json @@ -0,0 +1,9 @@ +[ + { + "name": "0", + "full_speed": 6000, + "default_floor": 6000, + "increase_delay": 5, + "decrease_interval": 30 + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json new file mode 100644 index 0000000000..54d3f28ca6 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-2u/zones.json @@ -0,0 +1,9 @@ +[ + { + "name": "0", + "full_speed": 11200, + "default_floor": 8000, + "increase_delay": 5, + "decrease_interval": 30 + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json new file mode 100644 index 0000000000..b2c96070b7 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json @@ -0,0 +1,9 @@ +[ + { + "name": "0", + "full_speed": 6000, + "default_floor": 6000, + "increase_delay": 5, + "decrease_interval": 30 + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json new file mode 100644 index 0000000000..10465a9090 --- /dev/null +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier/fans.json @@ -0,0 +1,38 @@ +[ + { + "name": "fan0", + "zone": "0", + "sensors": ["fan0_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan1", + "zone": "0", + "sensors": ["fan1_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan2", + "zone": "0", + "sensors": ["fan2_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan3", + "zone": "0", + "sensors": ["fan3_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan4", + "zone": "0", + "sensors": ["fan4_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + }, + { + "name": "fan5", + "zone": "0", + "sensors": ["fan5_0"], + "target_interface": "xyz.openbmc_project.Control.FanSpeed" + } +] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json deleted file mode 100644 index 0e4e4d05ab..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/fans.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "name": "fan0", - "zone": "0", - "sensors": ["fan0_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan1", - "zone": "0", - "sensors": ["fan1_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan2", - "zone": "0", - "sensors": ["fan2_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan3", - "zone": "0", - "sensors": ["fan3_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json deleted file mode 100644 index 2edfb36809..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/everest/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 10700, - "default_floor": 10700, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json deleted file mode 100644 index 1480aa30f3..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "power_on_delay": 15 -} diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json deleted file mode 100644 index 0e4e4d05ab..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/fans.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "name": "fan0", - "zone": "0", - "sensors": ["fan0_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan1", - "zone": "0", - "sensors": ["fan1_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan2", - "zone": "0", - "sensors": ["fan2_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan3", - "zone": "0", - "sensors": ["fan3_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/zones.json deleted file mode 100644 index b2c96070b7..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-1s4u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 6000, - "default_floor": 6000, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json deleted file mode 100644 index 54d3f28ca6..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-2u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 11200, - "default_floor": 8000, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json deleted file mode 100644 index b2c96070b7..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier-4u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 6000, - "default_floor": 6000, - "increase_delay": 5, - "decrease_interval": 30 - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json deleted file mode 100644 index 10465a9090..0000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/rainier/rainier/fans.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "name": "fan0", - "zone": "0", - "sensors": ["fan0_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan1", - "zone": "0", - "sensors": ["fan1_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan2", - "zone": "0", - "sensors": ["fan2_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan3", - "zone": "0", - "sensors": ["fan3_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan4", - "zone": "0", - "sensors": ["fan4_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - }, - { - "name": "fan5", - "zone": "0", - "sensors": ["fan5_0"], - "target_interface": "xyz.openbmc_project.Control.FanSpeed" - } -] diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index bc04bda6b4..7de4216569 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -34,16 +34,16 @@ SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf: SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor_rainier += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service @@ -61,13 +61,13 @@ EXTRA_OECONF_append_witherspoon = " --disable-json-control" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" RDEPENDS_${PN}-monitor_append_witherspoon = " phosphor-fan-monitor-config" -PACKAGECONFIG_append_rainier = " json sensor-monitor" -FAN_PACKAGES_append_rainier = " sensor-monitor" -RDEPENDS_${PN}-presence-tach_append_rainier = " phosphor-fan-presence-config" -RDEPENDS_${PN}-monitor_append_rainier = " phosphor-fan-monitor-config" +PACKAGECONFIG_append_p10bmc = " json sensor-monitor" +FAN_PACKAGES_append_p10bmc = " sensor-monitor" +RDEPENDS_${PN}-presence-tach_append_p10bmc = " phosphor-fan-presence-config" +RDEPENDS_${PN}-monitor_append_p10bmc = " phosphor-fan-monitor-config" # Install fan control JSON config files -SRC_URI_append_rainier = " \ +SRC_URI_append_p10bmc = " \ file://manager.json \ file://rainier/fans.json \ file://rainier-1s4u/fans.json \ @@ -76,7 +76,7 @@ SRC_URI_append_rainier = " \ file://rainier-1s4u/zones.json \ file://everest/fans.json \ file://everest/zones.json" -do_install_append_rainier() { +do_install_append_p10bmc() { # Install fan control manager config file install -d ${D}/${datadir}/phosphor-fan-presence/control/ install -m 0644 ${WORKDIR}/manager.json ${D}/${datadir}/phosphor-fan-presence/control/ @@ -99,7 +99,7 @@ do_install_append_rainier() { install -m 0644 ${WORKDIR}/everest/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ install -m 0644 ${WORKDIR}/everest/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest/ } -FILES_${PN}-control_append_rainier = " \ +FILES_${PN}-control_append_p10bmc = " \ ${datadir}/phosphor-fan-presence/control/manager.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier/fans.json \ ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/fans.json \ -- cgit v1.2.3