diff options
Diffstat (limited to 'meta-ibm')
30 files changed, 68 insertions, 133 deletions
diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 4956f8772..b714f78d3 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -10,11 +10,12 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc include conf/machine/include/ibm-power10-cpu.inc require conf/distro/include/openpower-virtual-pnor.inc +require conf/distro/include/openpower-hostfw-over-pldm.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc DISTRO_FEATURES += "ibm-service-account-policy" -OBMC_MACHINE_FEATURES += 'phal' +MACHINE_FEATURES += 'phal' SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg index 5cda19abb..2714966c1 100644 --- a/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg @@ -8,7 +8,6 @@ CONFIG_IIO=y CONFIG_SI7020=y CONFIG_BMP280=y CONFIG_PSTORE=y -CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_RAM=y CONFIG_MAGIC_SYSRQ=y diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf index 7264e8278..7a4459123 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf @@ -1 +1 @@ -socket-id = guests +socket-id = hypervisor diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf index 32e8bd467..8b3e8caee 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART1.conf @@ -1,5 +1,5 @@ lpc-address = 0x2f8 sirq = 3 -socket-id = guests +socket-id = hypervisor logsize = 256k logfile = /var/log/obmc-console1.log diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf index 7264e8278..7a4459123 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf @@ -1 +1 @@ -socket-id = guests +socket-id = hypervisor diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf index e98587f15..0bc52cc85 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf @@ -1,3 +1,3 @@ lpc-address = 0x2f8 sirq = 3 -socket-id = guests +socket-id = hypervisor diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index 2ca97e165..436be4d74 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -30,7 +30,7 @@ install_concurrent_console_config() { SRC_URI:append:p10bmc = " file://client.2201.conf" SRC_URI:append:p10bmc = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES:${PN}:append:p10bmc = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES:${PN}:append:p10bmc = " obmc_console_hypervisor:tcp:2201:" SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ @@ -48,7 +48,7 @@ do_install:append:p10bmc() { SRC_URI:append:witherspoon-tacoma = " file://client.2201.conf" SRC_URI:append:witherspoon-tacoma = " file://server.ttyVUART1.conf" -REGISTERED_SERVICES:${PN}:append:witherspoon-tacoma = " obmc_console_guests:tcp:2201:" +REGISTERED_SERVICES:${PN}:append:witherspoon-tacoma = " obmc_console_hypervisor:tcp:2201:" SYSTEMD_SERVICE:${PN}:append:witherspoon-tacoma = " obmc-console-ssh@2200.service \ obmc-console-ssh@2201.service \ diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb index f8b3da2a5..129be3563 100644 --- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb +++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb @@ -15,7 +15,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "${PYTHON_PN}-sdbus++-native" SRC_URI += "git://github.com/openbmc/ibm-dbus-interfaces" -SRCREV = "109271bb4de159b9cf13c56acded3eb79bff61fb" +SRCREV = "89d04feb5d05a8ac01d734eed8889f6800324459" PACKAGECONFIG ??= "libibm_dbus" PACKAGECONFIG[libibm_dbus] = " \ diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service index 267907776..95c34d3dc 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service @@ -1,7 +1,9 @@ [Unit] Description=Phosphor Fan Control Daemon -Requires=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service -After=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service +Requires=xyz.openbmc_project.Hwmon@-ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service +After=xyz.openbmc_project.Hwmon@-ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service +Requires=phosphor-cooling-type@%i.service +After=phosphor-cooling-type@%i.service [Service] Restart=on-failure diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index f9b26135f..a6d0357b0 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -67,3 +67,7 @@ FAN_PACKAGES:append:p10bmc = " sensor-monitor" # file that's used for witherspoon type(including witherspoon-tacoma) machines SYSTEMD_SUBSTITUTIONS:witherspoon = "ADDR:100:phosphor-fan-control@.service" SYSTEMD_SUBSTITUTIONS:witherspoon-tacoma = "ADDR:200:phosphor-fan-control@.service" + +# Set the PKG_DEFAULT_MACHINE name to "witherspoon" for tacoma so witherspoon's +# JSON config files are installed on tacoma machines (since they use the same ones) +PKG_DEFAULT_MACHINE:witherspoon-tacoma = "witherspoon" diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 9b8ae3182..deb76361d 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -2,6 +2,7 @@ EXTRA_OEMESON:append = " \ -Dinsecure-tftp-update=enabled \ -Dibm-management-console=enabled \ -Dredfish-new-powersubsystem-thermalsubsystem=enabled \ + -Dredfish-dump-log=enabled \ " inherit obmc-phosphor-discovery-service diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json index cd72656e2..ed4cb0b28 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json @@ -3,7 +3,7 @@ {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient_temp", "record_id": 255} ], "baseboard": [ - {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253} + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253}, {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_pcie_temp", "record_id": 254} ], "cpu": [ diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 38fbd717c..45678d981 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,9 @@ DEPENDS:append:ibm-ac-server = " acx22-yaml-config" DEPENDS:append:mihawk = " acx22-yaml-config" +# host watchdog does not work with witherspoon-tacoma host firmware +RDEPENDS:${PN}:remove:witherspoon-tacoma = "virtual/obmc-watchdog" + EXTRA_OECONF:ibm-ac-server = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ @@ -10,4 +13,4 @@ EXTRA_OECONF:mihawk = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ - "
\ No newline at end of file + " diff --git a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb index e72755d0c..91dbfe031 100644 --- a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb +++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem" -SRCREV = "ba89a1ea570cb010c2e929ac11ada3714878ca7d" +SRCREV = "572a22ad0a72142db434b5b78ec28182e27a57fd" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service index 82763ea20..69d9bb0f4 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager/obmc-led-set-all-groups-asserted@.service @@ -1,7 +1,7 @@ [Unit] Description=Set the Asserted property of all the LED groups to %i -Wants=xyz.openbmc_project.LED.GroupManager -After=xyz.openbmc_project.LED.GroupManager +Wants=xyz.openbmc_project.LED.GroupManager.service +After=xyz.openbmc_project.LED.GroupManager.service After=op-reset-chassis-running@0.service ConditionPathExists=!/run/openbmc/chassis@0-on diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index ec9edcc18..498d9fd8a 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "1eb63675af793e9c183c89afdb6e0d5a428b727d" +SRCREV = "e841b05fc724c691c2f1bab0427de6168cd57f7a" inherit autotools inherit pkgconfig diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 361417410..034b43ac5 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -11,8 +11,8 @@ FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_de FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_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" +PACKAGECONFIG:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg ipl" do_install:append:p10bmc() { install -d ${D}/${datadir}/phosphor-logging/pels diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index acd8c6ba2..e40e15280 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -21,7 +21,9 @@ EXTRA_IBM_LOGGING_PKGS = "" EXTRA_IBM_LOGGING_PKGS:witherspoon = "ibm-logging" EXTRA_IBM_LOGGING_PKGS:witherspoon-tacoma = "" EXTRA_IBM_LOGGING_PKGS:mihawk = "ibm-logging" - +EXTRA_IBM_LOGGING_PKGS:p10bmc = " \ + python3-sbe-log-parsers \ +" RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules deleted file mode 100644 index fd63e0549..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="hwmon", ACTION=="add", ENV{OF_NAME}=="max31785", PROGRAM="/bin/systemd-escape -p '%E{OF_FULLNAME}'", RUN="/bin/systemctl start max31785-hwmon-helper@%c.service" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service deleted file mode 100644 index c7ed6f113..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=MAX31785 hwmon helper -Wants=phosphor-cooling-type@0.service -After=phosphor-cooling-type@0.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/env start_max31785_hwmon.sh %i -SyslogIdentifier=max31785-hwmon-helper diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh deleted file mode 100755 index 5eff17450..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Copy in the correct MAX31785 phosphor-hwmon config file to use based on the -# WaterCooled property, and then start the hwmon service. - -# $1: The escaped OF_FULLNAME udev attribute for the MAX31785 - -base="/etc/default/obmc/hwmon/"$(systemd-escape -u "$1") -target=$base".conf" - -service=$(mapper get-service /xyz/openbmc_project/inventory/system/chassis) - -if [ $(busctl get-property $service \ - /xyz/openbmc_project/inventory/system/chassis \ - xyz.openbmc_project.Inventory.Decorator.CoolingType \ - WaterCooled | grep true | wc -l) != 0 ]; -then - source=$base'_water.conf' -else - source=$base'_air.conf' -fi - -cp $source $target - -instance='-'$1 -systemctl start xyz.openbmc_project.Hwmon@$instance.service diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf index 0b97ed559..0b97ed559 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf deleted file mode 100644 index 0b97ed559..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ /dev/null @@ -1,9 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan2 = "fan1_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf index d3df21599..d3df21599 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf deleted file mode 100644 index c96bfa76b..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf +++ /dev/null @@ -1,13 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -LABEL_fan5 = "fan0_1" - -LABEL_fan7 = "fan2_1" - -LABEL_fan8 = "fan3_1" - -TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf index d3df21599..d3df21599 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf deleted file mode 100644 index c96bfa76b..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ /dev/null @@ -1,13 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -LABEL_fan5 = "fan0_1" - -LABEL_fan7 = "fan2_1" - -LABEL_fan8 = "fan3_1" - -TARGET_MODE = "RPM" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 7932eb3a0..e4b8e27eb 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -4,13 +4,10 @@ EXTRA_OEMESON:append:mihawk = "-Dnegative-errno-on-fail=true" SRC_URI:append:ibm-ac-server = " \ file://70-hwmon.rules \ - file://70-max31785-hwmon.rules \ - file://start_max31785_hwmon.sh \ " CHIPS:witherspoon = " \ - bus@1e78a000/i2c-bus@100/max31785@52_air \ - bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/max31785@52 \ bus@1e78a000/i2c-bus@100/power-supply@68 \ bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@100/bmp280@77 \ @@ -22,8 +19,7 @@ CHIPS:witherspoon = " \ bus@1e78a000/i2c-bus@380/tmp275@4a \ " CHIPS:swift = " \ - bus@1e78a000/i2c-bus@100/max31785@52_air \ - bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/max31785@52 \ bus@1e78a000/i2c-bus@100/power-supply@68 \ bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@440/tmp275@4a \ @@ -61,8 +57,7 @@ CHIPS:mihawk = " \ " CHIPS:witherspoon-tacoma = " \ - bus@1e78a000/i2c-bus@200/max31785@52_air \ - bus@1e78a000/i2c-bus@200/max31785@52_water \ + bus@1e78a000/i2c-bus@200/max31785@52 \ bus@1e78a000/i2c-bus@200/power-supply@68 \ bus@1e78a000/i2c-bus@200/power-supply@69 \ bus@1e78a000/i2c-bus@200/bmp280@77 \ @@ -117,12 +112,3 @@ PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" -SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" - -do_install:append:ibm-ac-server() { - install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ - - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir} -} 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 8df08f94e..15bf45607 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 @@ -2,31 +2,9 @@ { "Desc": { - "Name": "Ambient_Virtual_Temp", - "SensorType": "temperature" - }, - "Threshold" : - { - "CriticalHigh": 100, - "CriticalLow": 0, - "WarningHigh": 100, - "WarningLow": 0 - }, - "Params": - { - "DbusParam": - [ - { - "ParamName": "T0", - "Desc": - { - "Name": "Ambient_0_Temp", - "SensorType": "temperature" - } - } - ] - }, - "Expression": "T0" + "Config" : "D-Bus", + "Type" : "ModifiedMedian" + } }, { "Desc": 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 37dace693..4cd176842 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 @@ -16,6 +16,36 @@ PowerMode: Default: Mode::PowerMode::MaximumPerformance +/xyz/openbmc_project/control/host0/power_ips: + - Interface: xyz.openbmc_project.Control.Power.IdlePowerSaver + Properties: + Enabled: + Default: 'false' + EnterUtilizationPercent: + Default: 8 + Validation: + Type: "range" + Validator: 1..95 + Unit: "percent" + EnterDwellTime: + Default: 240000 + Validation: + Type: "range" + Validator: 10000..600000 + Unit: "milliseconds" + ExitUtilizationPercent: + Default: 12 + Validation: + Type: "range" + Validator: 5..95 + Unit: "percent" + ExitDwellTime: + Default: 12000 + Validation: + Type: "range" + Validator: 10000..600000 + Unit: "milliseconds" + /xyz/openbmc_project/hardware_isolation/allow_hw_isolation: - Interface: xyz.openbmc_project.Object.Enable Properties: |