Age | Commit message (Collapse) | Author | Files | Lines |
|
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 <msbarth@us.ibm.com>
Change-Id: I6ce40547ebe536ca149930c439b0ee21d66061fb
|
|
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 <spinler@us.ibm.com>
Change-Id: I4bf9d8eb7f39acea71b790a61edfe1e8c4dae788
|
|
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 <spinler@us.ibm.com>
Change-Id: Ic4ed46a5bf310fb1fef8704dcafc0376c441f8c4
|
|
The `p10bmc` machine's JSON config files should now use the JSON config
files installed from the repository.
Change-Id: Ibd9bbc055e4d00a5f799a291e9fd3a9955d774c5
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
|
The `witherspoon` and `p10bmc` machines' JSON config files should now
use the JSON config files installed from the repository.
Change-Id: I47669745aa7047c4de64ee8aedc98437593a3b62
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
|
The `witherspoon` and `p10bmc` machines' JSON config files should now
use the JSON config files installed from the repository.
Change-Id: Ie40264435ca5278a50f2aa3c688d882d72cb376b
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
|
Upstream bbclasses changed to typically use the `:${PN}` override
syntax, including the SYSTEMD_ variables. Change our systemd.bbclass
to do the same for consistency and perform a tree-wide variable
replacement.
Spot checked by building bletchley and witherspoon and checking
some of the SYSTEMD_LINK directives on installed packages under qemu.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I20a9dd809bff8af8759488734f80486c7228c6eb
|
|
Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
|
|
Witherspoon uses a specialized phosphor-fan-control@.service file and
uses the phosphor-fan-control-init@.service file still to just set the
fans ready target. To correctly be included in the FILES directive,
these services need to be explicitly added on wiherspoon machines.
Change-Id: I76129a7833337aaf74fd83b0e28f3083f1a41b0a
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
|
It's been found that the processors are generating more preheat than
anticipated and the rainier 4u systems currently being built may not
have the baffles available to be installed. Increasing the poweron fan
speed to overcome this preheat affect to the PCIE area so PCIE cards do
not overtemp.
Change-Id: I03414fc4cc9cd3aa8d248c4b1408bab658978f48
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
|
To support the new rainier 2U fan hardware, the fan monitor config needs
to be updated to reflect the factor/offset between the target and
feedback speeds of the new hardware.
Change-Id: Ic63d678e89b210da77d4681ad44a209dd2807836
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
|
Switch over to the 'count' method of determining fan faults. As a
starting point, use a count interval of 1 and a threshold of 30. This
is the preferred method as it is better at catching flakey fans.
See docs/monitor/method.md in the phosphor-fan-presence repo for more
info on how this works.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I153d05779a5a7af854f351c1be3a3448b85fc461
|
|
The fan presence detect application uses I2C device paths in its config
files to address the IO expanders that IBM systems use to monitor fan
presence detects.
Use the /sys/bus/i2c/devices/... paths in these config files instead of
the absolute paths. These new paths are links to the actual paths, and
shouldn't change even if some internal kernel change drives an actual
device path change. There are other config files today that do this the
same way.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I39ed9d703cf6bdc821a54c6d5d087f7fc080705b
|
|
The 1s4u hardware is configured with fans at 0,1,2, and 4 locations.
Tested:
- Verified that we can now power on a 1s4u machine with this change plus
a kernel device tree change to move to fan 4.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ic1415da9ab900c0e553600df89a1e26893f8b0bd
|
|
The IBM rainier machine name is being replaced with the generic p10bmc.
Tested: Built rainier and verified the fan files were installed, ex:
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-4u/zones.json
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,rainier-2u/zones.json
obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-fan-presence/control/ibm,everest/zones.json
Change-Id: I10edb9e30716cffa3f510fe94822eadb08326912
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
|
|
The 1s4u is just like the 2s4u except it has two less fans.
Tested:
- Booted up system with entity-manager loading rainier-1s4u config and
verified fan applications found and loaded new 1s4u files and system
was able to chassis power on.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I575a63edb242c1b94e1a6f1eafd86a96e4518e37
|
|
The 1s4u is just like the 2s4u except it has two less fans.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I56ed73ee573df250072bd014a0e4c8a4072e974e
|
|
The 1s4u is just like the 2s4u except it has two less fans.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I35333e49c883fb9ac8c84223545fe3b903a66d7d
|
|
The 1s4u is just like the 2s4u except it has two less fans. Thermal
profiling may change some of the variable but for now just use the same
as the 2s4u.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iab3fd9d1699de779c242bb42456d976697b4da14
|
|
Now that phosphor-fan-monitor starts at multi-user instead of the
fans-ready target, it needs a JSON config option to let it know when to
start monitoring after the fans have ramped up.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: If8eef303ee585dd30b3fbe9764a624eeab3b1a8a
|
|
This application resides in the phosphor-fan-presence repo and creates
phosphor-logging based event logs for temperature threshold alarms.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Id5a7ce7590efe82eb1f9615853cabd58ac269c24
|
|
This will start phosphor-fan-presence at the multi-user target. It
doesn't need to know about the power state when just checking GPIOs and
tach sensors, so let it run all the time. It also avoids a race
condition with phosphor-fan-monitor if it starts earlier.
This commit also adds a JSON vs YAML packageconfig so service files can
be installed to different places based on how it is configured. And
since the service file has different contents based on when it starts,
the phosphor-fan-presence-tach@.service file was moved into the repo so
that the repo itself can determine which one to install based on how the
JSON vs YAML configuration option is set.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I4c00f0854974c70efb5097d0344c45385dbcb085
|
|
Fan monitoring should not need the inlet rotors included in the nonzero
speed trust group. This causes the nonfunctional timer to start for
these rotors and immediately stop since they are never actually taken
into account in the determination of trust.
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Change-Id: I411faab9dcd67fa2409f6be39be54969a0eb2520
|
|
Fan monitoring should not need the inlet rotors included in the nonzero
speed trust group. This causes the nonfunctional timer to start for
these rotors and immediately stop since they are never actually taken
into account in the determination of trust.
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Change-Id: I043f1003319e84e3c93b59f80963525d9d7d4eac
|
|
Instead of using phosphor-dbus-monitor to create errors and handle power
offs for fan errors, use phosphor-fan-monitor instead, now that it has
the functionality. To do this, add the new rules to the fan monitor
config files, and remove the phosphor-dbus-monitor fan rules files.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ia03186132f04087be76d2fd43412c37698407f60
|
|
Corrected the gpio pins and paths for detecting fans wired to a PCA9552
behind a mux according to the Everest schematics. Fan presence will fail
to access these gpios until the Everest dts is updated to expose them.
(From meta-ibm rev: 072949a9b84112572559baa76d12b9a7c77f8547)
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Change-Id: I9456ff8bd4298f3414f41180732e8e17b738acfa
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Temporarily remove detecting fan presence by gpio on Everest until the
gpios are added within the dts and accessible in userspace.
(From meta-ibm rev: 7c4944f2dfd2ce5ab811f7e07a5a4d8de5949ee4)
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Change-Id: I62f80e494a9d0feffa45cc3a1e08f0a859fca35b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Remove extraneous commas from the Everest fan monitor JSON config so it
can be loaded/parsed.
(From meta-ibm rev: 84d05fda258fbd02650d859f6fe9a77a6e5ef7a6)
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Change-Id: Ib0b044f8657593137d67cec036ab615e265398e3
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Install all the fan application config files into a rainier image
(From meta-ibm rev: dd3117e5c3b6768ca6975b04ebc70f8e716529b2)
Change-Id: I51d017b3a6ad34595bc9dce0fd1693c0012fc52e
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
This commit adds the fan control config files for the rainier type
machines. The recipe updates to install these files into a rainier image
will collectively be done after all fan application config files are
added.
(From meta-ibm rev: 5d8b514768c45eee76bd19bffc432dc5778ca075)
Change-Id: I5fa1f5cc879d7f3a951f7972ac391767de3647f3
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
This commit adds the fan monitor config files for the rainier type
machines. The recipe updates to install these files into a rainier image
will collectively be done after all fan application config files are
added.
(From meta-ibm rev: b28c40c5cb1eeec7239f39cbf7bb0e901340b501)
Change-Id: I445d141de53577e0c151ece3e258752814a631b4
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
This commit adds the fan presence config files for the rainier type
machines. The recipe updates to install these files into a rainier image
will collectively be done after all fan application config files are
added.
(From meta-ibm rev: f131f38e89da79848595670af0d150e01aaa664a)
Change-Id: I514589fcde2a7d500e272b7d45ac90961bb46368
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Use the latest bumped upstream commit of the phosphor-fan-presence repo.
(From meta-ibm rev: a5824115356901e363c55f0d013a9821a51eba1b)
Change-Id: Ib5f3e4718de3f288bf71321680d42234512d1be9
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Witherspoon should still use YAML based configs for fan control instead
of JSON. Once all of fan control's JSON support is available and
witherspoon's YAML fan configs are converted to JSON, this can be
removed to enable JSON.
*Temporarily pin to 8e1b382122fed73e788d44f3a67cecbfbcc6972e to pass CI
(From meta-ibm rev: 7ec9b860b5ea1d986702bb978b528ddcd28f2ce5)
Change-Id: Ic31f5ab915d5478b9a2027732bd3ffd44f50b02f
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
It was found that the fan control services were constantly getting
restarted due to not failing within the previous start limits. After
experimenting with different combinations of limits, using the default
values for StartLimitBurst and StartLimitIntervalSec is sufficient.
Tested:
Changed limits, powered on, watched service fails in journal until
fan watchdog monitor started
Resolves: https://github.com/openbmc/phosphor-fan-presence/issues/23
(From meta-ibm rev: b8a65368cb39d6d82c4b025b25fdbe868dbbfe89)
Change-Id: Ibcb35028e8dbc67d7df70dfeee25d098e6041fe8
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Fan control must support 250 soc thermal sensor.
Tested: Fan speed is automatically controlled when using 250 soc
(From meta-ibm rev: 05540e77d337f466bc339715153704edff3f6b88)
Change-Id: Ic17854a8556b5878bf506bfafd64762315390c39
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Use the installed `config.json` as the fan monitoring configuration to
load at runtime. This replaces the need of the build time YAML
`monitor.yaml` configuration.
Tested:
`monitor.yaml` removed from build image staging location
Built/powered on image using the `config.json` file
(From meta-ibm rev: 27be42e03193352d7c7ee51784448cb06d1b8e2c)
Change-Id: I80c268b26dddd820e7c9c640eab2d39452ab3a29
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
In prep for switching the witherspoon machine over to using a runtime
fan monitoring JSON configuration, install the configuration file into
the image now.
Tested:
Verified both `monitor.yaml` and `config.json` in phosphor-fan
Built/installed witherspoon image and config.json file present
Verified YAML config still used instead of present JSON config
(From meta-ibm rev: 36206800a699a1429d30ad32a36e4f960ac6c7b4)
Change-Id: I75d72a2731f201d37d38c9d436eff2af522bc6da
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Configure the fan monitor and fan control services to be protected by
the fan watchdog. In the event that any of those services fail to run
on the BMC, the fan watchdog would trip and push fans to 100% PWM.
(From meta-ibm rev: 0860865b6c1003d5440a2be4990fc399931be92c)
Change-Id: I6be11de61cae544089553f8791cf599f98ca04f6
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Configure and include the fan watchdog services to drive the fans to
100% PWM if the BMC loses communication to the fan controller chip at
any time (i.e. BMC reset while powered on).
(From meta-ibm rev: 1264216bc2f10cf08f697bc1c95f10237c95515a)
Change-Id: I18865bdc06c1a2be0c2a83d5e83402b9316ee845
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Create fan watchdog configs for all ibm-ac-server machines
Tested:
Built witherspoon and verified appropriate config files in image
Built swift and verified appropriate config files in image
Built tacoma and verified appropriate config files in image
(From meta-ibm rev: ab3b7b8e234134cc4d1123817de64708712cfc1f)
Change-Id: I75790b96077575878a9115072b016ad59a2f2420
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
Remove the use of `witherspoon` in the names of the recipe, config
files, and services of the fan watchdog. This is in prep to use this
same fan watchdog on other machines within meta-ibm that have different
configurations.
Tested:
Witherspoon image matches image prior to change
Flash image to Witherspoon and force watchdog to trip
(From meta-ibm rev: 80f819efec08f7cc7de6988f64c0c77e20990f05)
Change-Id: I77295974397cd4903cd1a723b9ef97ee744d2557
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|
|
The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon. Move everything to meta-ibm.
The meta-ibm README is re-written to more accurately reflect the scope
of the layer.
Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.
(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)
Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
|