From c184a0f08fbfbf94c84578a6390d5077f922413d Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Tue, 28 Sep 2021 21:08:04 +0000 Subject: ibm: Drop hwmon support for water cooled wspoon There is an upcoming systemd change that doesn't handle what was being done, which was to delay starting phosphor-hwmon from udev until the chassis cooling type was on D-Bus. This commit removes this method and goes down to a single hwmon config file that only supports the air cooled system, which has 2 more fan rotors than the water cooled one does. This change also applies to the similar systems witherspoon-tacoma and swift. Resolves openbmc/phosphor-hwmon/#19. Signed-off-by: Matt Spinler Change-Id: Ic4ed46a5bf310fb1fef8704dcafc0376c441f8c4 --- .../witherspoon/phosphor-fan-control@.service | 4 ++-- .../sensors/phosphor-hwmon/70-max31785-hwmon.rules | 1 - .../phosphor-hwmon/max31785-hwmon-helper@.service | 9 -------- .../sensors/phosphor-hwmon/start_max31785_hwmon.sh | 26 ---------------------- .../apb/bus@1e78a000/i2c-bus@100/max31785@52.conf | 9 ++++++++ .../bus@1e78a000/i2c-bus@100/max31785@52_air.conf | 9 -------- .../i2c-bus@100/max31785@52_water.conf | 9 -------- .../apb/bus@1e78a000/i2c-bus@200/max31785@52.conf | 17 ++++++++++++++ .../bus@1e78a000/i2c-bus@200/max31785@52_air.conf | 17 -------------- .../i2c-bus@200/max31785@52_water.conf | 13 ----------- .../apb/bus@1e78a000/i2c-bus@100/max31785@52.conf | 17 ++++++++++++++ .../bus@1e78a000/i2c-bus@100/max31785@52_air.conf | 17 -------------- .../i2c-bus@100/max31785@52_water.conf | 13 ----------- .../sensors/phosphor-hwmon_%.bbappend | 20 +++-------------- 14 files changed, 48 insertions(+), 133 deletions(-) delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service delete mode 100755 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf create mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf delete mode 100644 meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf (limited to 'meta-ibm/recipes-phosphor') 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..5e555a275 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,7 @@ [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 [Service] Restart=on-failure 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.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf new file mode 100644 index 000000000..0b97ed559 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf @@ -0,0 +1,9 @@ +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/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_air.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_air.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/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.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf new file mode 100644 index 000000000..d3df21599 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan2 = "fan1_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan6 = "fan1_1" + +LABEL_fan7 = "fan2_1" + +LABEL_fan8 = "fan3_1" + +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_air.conf deleted file mode 100644 index d3df21599..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan2 = "fan1_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -LABEL_fan5 = "fan0_1" - -LABEL_fan6 = "fan1_1" - -LABEL_fan7 = "fan2_1" - -LABEL_fan8 = "fan3_1" - -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_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.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf new file mode 100644 index 000000000..d3df21599 --- /dev/null +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan2 = "fan1_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan6 = "fan1_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_air.conf deleted file mode 100644 index d3df21599..000000000 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_fan1 = "fan0_0" - -LABEL_fan2 = "fan1_0" - -LABEL_fan3 = "fan2_0" - -LABEL_fan4 = "fan3_0" - -LABEL_fan5 = "fan0_1" - -LABEL_fan6 = "fan1_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_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} -} -- cgit v1.2.3 From 8cda93935c03b7d1b053b60524fbc3150d2558d8 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Mon, 4 Oct 2021 19:24:32 +0000 Subject: wspoon: Add cooling-type dep to fan control With commit c184a0f08, the phosphor-hwmon instance for the max31785 fan control device no longer waited for the cooling-type application to finish before starting. Since the fan control service depends on the phosphor-hwmon instance, it is now starting earlier than before, before cooling-type, which was causing a crash. To fix this, add the cooling-type dependency into the witherspoon fan control service file. Tested: Can see in the journal that fan control now starts after phosphor-cooling-type, and it doesn't crash on a genesis reboot when the inventory had previously been cleared. Signed-off-by: Matt Spinler Change-Id: I4bf9d8eb7f39acea71b790a61edfe1e8c4dae788 --- .../fans/phosphor-fan/witherspoon/phosphor-fan-control@.service | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-ibm/recipes-phosphor') 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 5e555a275..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 @@ -2,6 +2,8 @@ Description=Phosphor Fan Control Daemon 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 -- cgit v1.2.3 From 14d29c2fdfacccdba4622faf159c573466bd0b7c Mon Sep 17 00:00:00 2001 From: Abhishek Patel Date: Wed, 29 Sep 2021 22:44:11 -0500 Subject: VUART1 socket name updated to Hypervisor The Rainier and Tacoma using of both virtual UARTs provided by the AST2600. Expose them both to the network via obmc-console. where ttyVUART0 Exposer name is @obmc-console and ttyVUART1 Exposer name is @obmc-console.guests @obmc-console.guests initial exposed to access to phyp guests over that interface that why its name is guests, but now we are using that socket-it to run PHYP debug shell. So it is good to change the name of that exposer socket-id "guests" as "hypervisor". Signed-off-by: Abhishek Patel Change-Id: I47dc71095795afbda8fb544fde4bcae78712093a --- .../recipes-phosphor/console/obmc-console/p10bmc/client.2201.conf | 2 +- .../console/obmc-console/p10bmc/server.ttyVUART1.conf | 2 +- .../console/obmc-console/witherspoon-tacoma/client.2201.conf | 2 +- .../console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf | 2 +- meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-ibm/recipes-phosphor') 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 \ -- cgit v1.2.3 From b1b0159896c0995e225ca024b7fea56bc6e6c42a Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Wed, 15 Sep 2021 12:42:03 -0500 Subject: meta-ibm: Tacoma uses witherspoon machine's JSON configs The `witherspoon-tacoma` machine utilizes the same JSON config files as the `witherspoon` machine so override the PKG_DEFAULT_MACHINE variable for tacoma to be set to the witherspoon machine name "witherspoon". This will then install the witherspoon machine JSON config files into the tacoma image. Signed-off-by: Matthew Barth Change-Id: I6ce40547ebe536ca149930c439b0ee21d66061fb --- meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-ibm/recipes-phosphor') 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" -- cgit v1.2.3 From 5523a1aba0c45959666b2ac0fac8cececf8e2a67 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Wed, 29 Sep 2021 12:39:01 +0930 Subject: meta-ibm: phosphor-led-manager: Fix LED group manager dependency The dependency is required to be the base name of the service file path, otherwise we see: ``` Jan 01 00:00:33 p10bmc systemd[1]: /lib/systemd/system/obmc-led-set-all-groups-asserted@.service:3: Failed to add dependency on xyz.openbmc_project.LED.GroupManager, ignoring: Invalid argument Jan 01 00:00:33 p10bmc systemd[1]: /lib/systemd/system/obmc-led-set-all-groups-asserted@.service:4: Failed to add dependency on xyz.openbmc_project.LED.GroupManager, ignoring: Invalid argument ``` Change-Id: Ide813cb3298e7f815b5f42b82473ab2a434193f7 Signed-off-by: Andrew Jeffery --- .../phosphor-led-manager/obmc-led-set-all-groups-asserted@.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-ibm/recipes-phosphor') 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 -- cgit v1.2.3 From 5170cc88253567d9a82a2fd7d424764b71b558fb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Sep 2021 16:39:33 -0500 Subject: witherspoon-tacoma: disable host watchdog function Hostboot utilizes inband IPMI on witherspoon-tacoma. They relied on OPAL firmware to continue pinging the watchdog and eventually disabling it. For the most part though, IBM utilizes PHYP on witherspoon-tacoma machines and they do not have the needed in-band IPMI support to do this. IBM needs either both firmware stacks (hostboot and PHYP) to use PLDM (i.e. p10bmc) or IPMI (witherspoon). Tacoma is an outlier so just disable the host watchdog function on Tacoma. Tested: - Verified a witherspoon-tacoma with PHYP booted successfully Signed-off-by: Andrew Geissler Change-Id: Ibceb2ad6933973b97e122b83c89f6be7e7b8f868 --- meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') 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 + " -- cgit v1.2.3 From eef9ff6020afa84f05c7ad866b5184055f672f16 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Oct 2021 22:10:21 +0000 Subject: ibm-logging: srcrev bump 1eb63675af..bf9ea8ad30 Patrick Williams (1): catch exceptions as const Change-Id: I52b8b7321a4051ea327a1b3e245269e4cdeb8a7f Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index ec9edcc18..22df506bb 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 = "bf9ea8ad30b158433a2f51808dd0e356d498cf27" inherit autotools inherit pkgconfig -- cgit v1.2.3 From 7b04e2e0fda258b9bc094b92867dd475a283456e Mon Sep 17 00:00:00 2001 From: Rashmica Gupta Date: Fri, 13 Aug 2021 11:54:47 +1000 Subject: rainier: Get virtual temp sensor config from D-Bus This tells phosphor-virtual-sensors to look on D-Bus for a virtual sensor config of type ModifiedMedian. This way we can use the same recipe for different hardware configurations. Change-Id: I3ebd0a636f07a0854251e06b952ad9646f12f637 Signed-off-by: Rashmica Gupta --- .../p10bmc/virtual_sensor_config.json | 28 +++------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'meta-ibm/recipes-phosphor') 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": -- cgit v1.2.3 From 3fc98fdca6aa7512a4656bec7422f557c8e17555 Mon Sep 17 00:00:00 2001 From: Chris Cain Date: Wed, 22 Sep 2021 16:31:12 -0500 Subject: Set default idle power saver parameters and valid ranges Change-Id: Ic02f28215c02caf9d00d339b3b0643e990b83598 Signed-off-by: Chris Cain --- .../ibm_settings.override.yml | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'meta-ibm/recipes-phosphor') 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: -- cgit v1.2.3 From 8c561eecb190655d51249c37286cc2c904dee7c0 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 14:20:12 -0500 Subject: treewide: clean up recipe checks in OBMC_MACHINE_FEATURES OBMC_MACHINE_FEATURES is a variable that probably shouldn't even exist as all it does is provide a level of indirection to the real MACHINE_FEATURES (in phosphor-base.inc, OBMC_ is added to the base). There are a few recipes that have developed checks against OBMC_MACHINE_FEATURES for enabling recipe-level features when they should be checking the standard MACHINE_FEATURES variable. Clean up this recipe-level indirection. Signed-off-by: Patrick Williams Change-Id: Id437b93aa6c1de9a27726eea9b7e2c30e71ab3bf --- .../logging/phosphor-logging_%.bbappend | 2 +- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- .../openpower-debug-collector-systemd-links.inc | 4 ++-- .../debug/openpower-debug-collector_git.bb | 2 +- .../host/op-proc-control-systemd-links.bb | 4 ++-- .../recipes-phosphor/host/op-proc-control_git.bb | 26 +++++++++++----------- .../logging/openpower-hw-diags_git.bb | 2 +- .../occ/openpower-occ-control_git.bb | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'meta-ibm/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 361417410..aa69617da 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -11,7 +11,7 @@ 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:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" do_install:append:p10bmc() { diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 8208a9cbb..30e7c6b75 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -15,5 +15,5 @@ SRCREV = "ebb9771055a3bb03ed753530870199607559ab63" DEPENDS = "cli11" -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Ddevtree=enabled, -Ddevtree=disabled, pdata pdbg" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index 9c522c1cd..b252e6c11 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -15,7 +15,7 @@ pkg_postinst:${PN}:append() { TARGET="../openpower-debug-collector-watchdog@.service" ln -s $TARGET $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" TARGET="../openpower-debug-collector-watchdog-timeout@.service" ln -s $TARGET $LINK @@ -29,7 +29,7 @@ pkg_prerm:${PN}:append() { fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" rm $LINK fi diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 68965af0a..cdb1da621 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" APPS = " \ checkstop \ watchdog \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ " DEBUG_TMPL = "openpower-debug-collector-{0}@.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 8cedb62a5..f3c63adad 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -48,7 +48,7 @@ pkg_postinst:${PN}() { ln -s $TARGET $LINK # Only install certain units if phal enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" TARGET="../phal-reinit-devtree.service" @@ -115,7 +115,7 @@ pkg_prerm:${PN}() { rm $LINK # Remove phal specific units if enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" rm $LINK diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 32a7d4778..92287f529 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -31,16 +31,16 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE:${PN} += " \ - xyz.openbmc_project.Control.Host.NMI.service \ - op-stop-instructions@.service \ - op-cfam-reset.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ - op-continue-mpreboot@.service \ - op-enter-mpreboot@.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ - " + op-cfam-reset.service \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ + op-stop-instructions@.service \ + xyz.openbmc_project.Control.Host.NMI.service \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + " diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4a61ba3bd..fc7c39dfc 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -30,6 +30,6 @@ DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index b78b85bfb..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -43,7 +43,7 @@ EXTRA_OEMESON = " \ -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OEMESON:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" -- cgit v1.2.3 From 519bc6736a7e78e92906871f7220c4fa0f7db24e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Oct 2021 21:40:17 +0000 Subject: ibm-dbus-interfaces: srcrev bump 109271bb4d..89d04feb5d Manojkiran Eda (1): Add OWNERS file Change-Id: Icb83eac96a7ab1a9e57439768ef3b5dc685ef43e Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') 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] = " \ -- cgit v1.2.3 From e430370905512419004c33e57e51a90a2e50e32f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Oct 2021 16:30:16 +0000 Subject: ibm-logging: srcrev bump bf9ea8ad30..e841b05fc7 Manojkiran Eda (1): Add OWNERS file Change-Id: Ic4bc0b1c8e3913db8406a0ec75cb28327a41230b Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 22df506bb..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 = "bf9ea8ad30b158433a2f51808dd0e356d498cf27" +SRCREV = "e841b05fc724c691c2f1bab0427de6168cd57f7a" inherit autotools inherit pkgconfig -- cgit v1.2.3 From d45f17293c429d61e43a78edcc801133ed23600f Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 15 Oct 2021 01:58:23 -0500 Subject: openpower: sbe-pel-parsers: Python parsers from sbe This recipe adds SBE UserData and SRC parsers in BMC images for use by peltool. Signed-off-by: Jayanth Othayoth Change-Id: Ia6d3e2296fa1b874341eeade3e518de1576e0e98 --- .../packagegroups/packagegroup-obmc-apps.bbappend | 4 +++- .../logging/python3-sbe-log-parsers_git.bb | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb (limited to 'meta-ibm/recipes-phosphor') 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-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb new file mode 100644 index 000000000..588f750df --- /dev/null +++ b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb @@ -0,0 +1,15 @@ +SUMMARY = "SBE log python parsers" +DESCRIPTION = "Used by peltool to parse SBE UserData sections and SRC details" +HOMEPAGE = "https://github.ibm.com/open-power/sbe" + +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_PROLOG;md5=d8e5f403c98fd80dcea90b9cc8cd083c" + +S = "${WORKDIR}/git" +SRC_URI += "git://git@github.com/open-power/sbe;branch="master-p10";protocol=ssh" +SRCREV = "f8ee8cfad2cf2a53e78789633ddffc192f5a197e" + +inherit setuptools3 -- cgit v1.2.3 From 1cc1a21533c7e430ee629c27abafe5e6d10a4b25 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Oct 2021 08:50:15 +0000 Subject: wistron-ipmi-oem: srcrev bump ba89a1ea57..572a22ad0a Manojkiran Eda (1): Add OWNERS file Change-Id: Iadf9a75728ff8321a6745d843abe649adbb6cf19 Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') 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}" -- cgit v1.2.3 From e6eef4f32824ed887cbaddf92268c8b2b49d1de4 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 27 Oct 2021 09:34:15 -0500 Subject: meta-ibm: mihawk: fix invalid JSON `eslint` reported an issue with the supplied JSON and it appeared to be missing a simple comma to separate two values in an array. Signed-off-by: Patrick Williams Change-Id: I2dd167143ea31c730c26254b3ddc2ad25109e34f --- .../recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') 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": [ -- cgit v1.2.3 From 0a5df1ee4cc479cde2ef7edbd1b95d2806fe2066 Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Thu, 11 Nov 2021 06:44:50 -0600 Subject: meta-ibm: add libphal library support for log manager Added "ipl" dependency to enable libphal library usage in phosphor logging. libphal library provides C++ wrapper functions for phal based libraries provided API. Signed-off-by: Jayanth Othayoth Change-Id: I754cc549af7af56e7026aaf0bea079ea562b84c2 --- meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index aa69617da..034b43ac5 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -12,7 +12,7 @@ FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_c #Enable phal feature, if available. PACKAGECONFIG:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" -PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" +PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg ipl" do_install:append:p10bmc() { install -d ${D}/${datadir}/phosphor-logging/pels -- cgit v1.2.3 From 1970a5046c38edf04a17e1fbbc807be194523785 Mon Sep 17 00:00:00 2001 From: Asmitha Karunanithi Date: Mon, 15 Nov 2021 11:08:08 -0600 Subject: Enable dumps for IBM systems Dumps are disabled by default. This commit enables the dump feature for ibm based systems. Tested By: * Dump flag enabled: GET https://${bmc}/redfish/v1/Managers/bmc/LogServices { "@odata.id": "/redfish/v1/Managers/bmc/LogServices", "@odata.type": "#LogServiceCollection.LogServiceCollection", "Description": "Collection of LogServices for this Manager", "Members": [ { "@odata.id": "/redfish/v1/Managers/bmc/LogServices/Dump" } ], "Members@odata.count": 1, "Name": "Open BMC Log Services Collection" } * Dump flag disabled: GET https://${bmc}/redfish/v1/Managers/bmc/LogServices { "@odata.id": "/redfish/v1/Managers/bmc/LogServices", "@odata.type": "#LogServiceCollection.LogServiceCollection", "Description": "Collection of LogServices for this Manager", "Members": [], "Members@odata.count": 0, "Name": "Open BMC Log Services Collection" } Signed-off-by: Asmitha Karunanithi Change-Id: Iad5a364ac46b5bf62bc2186eb29786454f650802 --- meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm/recipes-phosphor') 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 -- cgit v1.2.3