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 --- .../fans/phosphor-fan/witherspoon/phosphor-fan-control@.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-ibm/recipes-phosphor/fans') 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 -- 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/fans') 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 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/fans') 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