| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
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>
|
|
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 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. 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
|
|
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
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
