diff options
Diffstat (limited to 'meta-ibm/recipes-phosphor')
13 files changed, 63 insertions, 6 deletions
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 index b2c96070b..006f45fd8 100644 --- 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 @@ -1,8 +1,8 @@ [ { "name": "0", - "full_speed": 6000, - "default_floor": 6000, + "full_speed": 10000, + "default_floor": 10000, "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 index b2c96070b..006f45fd8 100644 --- 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 @@ -1,8 +1,8 @@ [ { "name": "0", - "full_speed": 6000, - "default_floor": 6000, + "full_speed": 10000, + "default_floor": 10000, "increase_delay": 5, "decrease_interval": 30 } diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 2f0ace22b..ac43352c2 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -8,6 +8,10 @@ SRC_URI_append_p10bmc = " file://ibm,rainier-4u_dev_callouts.json" FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json" FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json" +#Enable phal feature, if available. +PACKAGECONFIG_append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" + do_install_append_p10bmc() { install -d ${D}/${datadir}/phosphor-logging/pels install -m 0644 ${WORKDIR}/ibm,rainier-2u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json diff --git a/meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp b/meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp new file mode 100644 index 000000000..f9062205b --- /dev/null +++ b/meta-ibm/recipes-phosphor/mctp/files/p10bmc/mctp @@ -0,0 +1 @@ +DEMUX_BINDING_OPTS=astlpc diff --git a/meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp b/meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp new file mode 100644 index 000000000..f9062205b --- /dev/null +++ b/meta-ibm/recipes-phosphor/mctp/files/witherspoon-tacoma/mctp @@ -0,0 +1 @@ +DEMUX_BINDING_OPTS=astlpc diff --git a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend new file mode 100644 index 000000000..0c8f41a02 --- /dev/null +++ b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append_p10bmc = " file://mctp" +SRC_URI_append_witherspoon-tacoma = " file://mctp" + +PACKAGECONFIG_append_p10bmc = " astlpc-raw-kcs" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index a7bf5740f..7cd4cd2ac 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -29,14 +29,15 @@ RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " fan-watchdog" RDEPENDS_${PN}-fan-control_append_p10bmc = " fan-watchdog sensor-monitor" RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" RDEPENDS_${PN}-extras_append_p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg" +RDEPENDS_${PN}-extras_append_p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg" RDEPENDS_${PN}-extras_remove_p10bmc = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-host-state-mgmt_remove_p10bmc = "checkstop-monitor" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller phosphor-webui" RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" -RDEPENDS_${PN}-extras_append_p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd" RDEPENDS_${PN}-leds_remove_witherspoon-tacoma = "phosphor-led-manager-faultmonitor" ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json index df51c66ab..8df08f94e 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor/p10bmc/virtual_sensor_config.json @@ -27,5 +27,31 @@ ] }, "Expression": "T0" + }, + { + "Desc": + { + "Name": "Altitude", + "SensorType": "altitude" + }, + "Threshold" : + { + "WarningHigh": 3050 + }, + "Params": + { + "DbusParam": + [ + { + "ParamName": "P0", + "Desc": + { + "Name": "Station_Pressure", + "SensorType": "pressure" + } + } + ] + }, + "Expression": "44330.0 * (1.0 - ((P0/101325.0) ^ (1/5.255)))" } ] diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml index 9a4dcb616..4dc4f473c 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ibm_settings.override.yml @@ -9,3 +9,9 @@ Properties: Enabled: Default: 'true' + +/xyz/openbmc_project/control/host0/power_mode: + - Interface: xyz.openbmc_project.Control.Power.Mode + Properties: + PowerMode: + Default: Mode::PowerMode::MaximumPerformance diff --git a/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend new file mode 100644 index 000000000..f8ff90168 --- /dev/null +++ b/meta-ibm/recipes-phosphor/state/phosphor-post-code-manager_%.bbappend @@ -0,0 +1,4 @@ +# Set MaxBootCycleCount to 5 on IBM systems +EXTRA_OECMAKE_append_p10bmc = "-DMAX_BOOT_CYCLE_COUNT=5" +EXTRA_OECMAKE_append_witherspoon-tacoma = "-DMAX_BOOT_CYCLE_COUNT=5" + diff --git a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 47201122b..5b35a0a64 100644 --- a/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,4 +1,4 @@ -EXTRA_OEMESON_witherspoon += "-Dwarm-reboot=disabled" +EXTRA_OEMESON_append_witherspoon = " -Dwarm-reboot=disabled" # The scheduled-host-transition package provides support to # schedule power on and off operations for the host at some diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron new file mode 100644 index 000000000..d0b6e1024 --- /dev/null +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron @@ -0,0 +1,4 @@ +DEVPATH=/xyz/openbmc_project/watchdog/host0 +SERVICE=xyz.openbmc_project.Watchdog +TARGET=obmc-host-timeout@0.target +TIMEOUT_IN_MSEC=600000 diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend new file mode 100644 index 000000000..0d9704fcc --- /dev/null +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +# utilize a 600s default timer config for p10bmc +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc = " obmc/watchdog/poweron" |