diff options
Diffstat (limited to 'meta-ibm/recipes-phosphor')
24 files changed, 4 insertions, 1454 deletions
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend deleted file mode 100644 index 85cc4d82e..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI:witherspoon = "file://config.json" -SRC_URI:p10bmc = "file://rainier-2u/config.json \ - file://rainier-4u/config.json \ - file://rainier-1s4u/config.json \ - file://everest/config.json \ - " - -do_install:witherspoon() { - install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ - install -m 0644 ${WORKDIR}/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ -} - -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/ - install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/ - install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-2u/ - install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-4u/ - install -m 0644 ${WORKDIR}/rainier-1s4u/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,rainier-1s4u/ - - # Install Everest fan monitor config file - install -d ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ - install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/monitor/ibm,everest/ -} - -FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/monitor/config.json" -FILES:${PN}:remove:witherspoon = "${monitor_datadir}/monitor.yaml" - -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 deleted file mode 100644 index 632c76b52..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/everest/config.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - }, - { - "name": "fan0_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan1", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - }, - { - "name": "fan1_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan2", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - }, - { - "name": "fan2_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan3", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - }, - { - "name": "fan3_1", - "threshold": 30, - "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 deleted file mode 100644 index eb519d9b4..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-1s4u/config.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan1", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan2", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan4", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "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 deleted file mode 100644 index b4143adba..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-2u/config.json +++ /dev/null @@ -1,195 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true, - "factor": 0.627, - "offset": 750 - }, - { - "name": "fan0_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan1", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true, - "factor": 0.627, - "offset": 750 - }, - { - "name": "fan1_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan2", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true, - "factor": 0.627, - "offset": 750 - }, - { - "name": "fan2_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan3", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true, - "factor": 0.627, - "offset": 750 - }, - { - "name": "fan3_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan4", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true, - "factor": 0.627, - "offset": 750 - }, - { - "name": "fan4_1", - "threshold": 30, - "has_target": false - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan5", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true, - "factor": 0.627, - "offset": 750 - }, - { - "name": "fan5_1", - "threshold": 30, - "has_target": false - } - ] - } - ], - "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 deleted file mode 100644 index 1bfb5378b..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/p10bmc/rainier-4u/config.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "fans": [ - { - "inventory": "/system/chassis/motherboard/fan0", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan1", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan2", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan3", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan4", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "has_target": true - } - ] - }, - { - "inventory": "/system/chassis/motherboard/fan5", - "method": "count", - "count_interval": 1, - "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", - "threshold": 30, - "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/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/config.json deleted file mode 100644 index f0df15788..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/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": 20, - "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": 20, - "sensors": [ - { - "name": "fan1_0", - "has_target": true - }, - { - "name": "fan1_1", - "has_target": false - } - ], - "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, - "monitor_start_delay": 20, - "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": 20, - "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" - }, - { - "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-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend deleted file mode 100644 index 64dbc758b..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI:witherspoon = "file://config.json" -SRC_URI:p10bmc = "file://rainier-2u/config.json \ - file://rainier-4u/config.json \ - file://rainier-1s4u/config.json \ - file://everest/config.json \ - " - -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: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/ - install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/ - install -m 0644 ${WORKDIR}/rainier-2u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-2u/ - install -m 0644 ${WORKDIR}/rainier-4u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-4u/ - install -m 0644 ${WORKDIR}/rainier-1s4u/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,rainier-1s4u/ - - # Install Everest fan presence config file - install -d ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/ - install -m 0644 ${WORKDIR}/everest/config.json ${D}/${datadir}/phosphor-fan-presence/presence/ibm,everest/ -} - -FILES:${PN}:append:witherspoon = " ${datadir}/phosphor-fan-presence/presence/config.json" -FILES:${PN}:remove:witherspoon = "${presence_datadir}/config.yaml" - -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 deleted file mode 100644 index 928eca25e..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/everest/config.json +++ /dev/null @@ -1,90 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 15, - "physpath": "/sys/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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 deleted file mode 100644 index 65697e557..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-1s4u/config.json +++ /dev/null @@ -1,86 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 6, - "physpath": "/sys/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan2_0" - ] - } - ], - "rpolicy": { - "type": "anyof" - } - }, - { - "name": "fan4", - "path": "/system/chassis/motherboard/fan4", - "methods": [ - { - "type": "gpio", - "key": 10, - "physpath": "/sys/bus/i2c/devices/7-0061", - "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event" - }, - { - "type": "tach", - "sensors": [ - "fan4_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 deleted file mode 100644 index a5cc1bf66..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-2u/config.json +++ /dev/null @@ -1,134 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 6, - "physpath": "/sys/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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 deleted file mode 100644 index 620a32907..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/p10bmc/rainier-4u/config.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 6, - "physpath": "/sys/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/bus/i2c/devices/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/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json deleted file mode 100644 index 52262fe35..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json +++ /dev/null @@ -1,90 +0,0 @@ -[ - { - "name": "fan0", - "path": "/system/chassis/motherboard/fan0", - "methods": [ - { - "type": "gpio", - "key": 4, - "physpath": "/sys/bus/i2c/devices/3-0060", - "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": 5, - "physpath": "/sys/bus/i2c/devices/3-0060", - "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": 6, - "physpath": "/sys/bus/i2c/devices/3-0060", - "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": 7, - "physpath": "/sys/bus/i2c/devices/3-0060", - "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/p10bmc/everest/fans.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/fans.json deleted file mode 100644 index 0e4e4d05a..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/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/p10bmc/everest/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/everest/zones.json deleted file mode 100644 index 2edfb3680..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/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/p10bmc/manager.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json deleted file mode 100644 index 1480aa30f..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index a04270076..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/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": "fan4", - "zone": "0", - "sensors": ["fan4_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 deleted file mode 100644 index 006f45fd8..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-1s4u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 10000, - "default_floor": 10000, - "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 deleted file mode 100644 index 54d3f28ca..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/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/p10bmc/rainier-4u/zones.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json deleted file mode 100644 index 006f45fd8..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/rainier-4u/zones.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name": "0", - "full_speed": 10000, - "default_floor": 10000, - "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 deleted file mode 100644 index 10465a909..000000000 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/p10bmc/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 469f76539..f9b26135f 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -59,56 +59,9 @@ SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON # Enable the use of JSON on the fan applications that support it PACKAGECONFIG:append:witherspoon = " json" 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: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:p10bmc = " \ - file://manager.json \ - file://rainier/fans.json \ - file://rainier-1s4u/fans.json \ - file://rainier-2u/zones.json \ - file://rainier-4u/zones.json \ - file://rainier-1s4u/zones.json \ - file://everest/fans.json \ - file://everest/zones.json" -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/ - - # Install Rainier-2U/4U fan config files - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u - install -m 0644 ${WORKDIR}/rainier/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier/ - install -m 0644 ${WORKDIR}/rainier-1s4u/fans.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - install -m 0644 ${WORKDIR}/rainier-2u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/ - install -m 0644 ${WORKDIR}/rainier-4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/ - install -m 0644 ${WORKDIR}/rainier-1s4u/zones.json ${D}/${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/ - - # Install Everest fan config files - install -d ${D}/${datadir}/phosphor-fan-presence/control/ibm,everest - 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: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 \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-2u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-4u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,rainier-1s4u/zones.json \ - ${datadir}/phosphor-fan-presence/control/ibm,everest/fans.json \ - ${datadir}/phosphor-fan-presence/control/ibm,everest/zones.json" # Set the appropriate i2c address used within the overridden phosphor-fan-control@.service # file that's used for witherspoon type(including witherspoon-tacoma) machines diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index e0288c5f3..cc9e507b0 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -7,6 +7,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append:mihawk = " mboxd liberation-fonts uart-render-co IMAGE_FEATURES:remove:witherspoon = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove:witherspoon = "obmc-telemetry" +# Generic IPMI FRU vpd collection not needed on p10bmc +IMAGE_FEATURES:remove:p10bmc = "obmc-fru-ipmi" + # Optionally configure IBM service accounts # # To configure your distro, add the following line to its config: diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 8e06233b0..9b8ae3182 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,6 +1,7 @@ EXTRA_OEMESON:append = " \ -Dinsecure-tftp-update=enabled \ -Dibm-management-console=enabled \ + -Dredfish-new-powersubsystem-thermalsubsystem=enabled \ " inherit obmc-phosphor-discovery-service diff --git a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index 273df37b0..95e3e1b09 100644 --- a/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend @@ -1,10 +1,6 @@ PACKAGECONFIG += "oem-ibm" PACKAGECONFIG[oem-ibm] = "-Doem-ibm=enabled, -Doem-ibm=disabled, , squashfs-tools" -EXTRA_OEMESON:append = " \ - -Dresponse-time-out=4800 \ -" - SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'oem-ibm', \ 'pldm-create-phyp-nvram.service \ pldm-create-phyp-nvram-cksum.service \ |