| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add a new udev rule to start the phosphor-hwmon instance for
the MAX31785 fan controller differently than other hwmon devices.
Also introduce different hwmon config files for air and water cooled
systems where the water cooled system doesn't use fan 1.
The new udev rule starts a service that will check the cooling type
and then link in the appropriate config file before starting the
actual phosphor-hwmon service.
Note that this phosphor-hwmon service is still stopped the same as
any other phosphor-hwmon service.
Tested: Test that phosphor-hwmon is started using the correct
config files on air and water cooled systems.
Change-Id: Ia93d97df024e7b6bff5eb379ddea4730fe34b55b
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This service will be started in the udev rule for the MAX31785
hotplug add event. It will wait for the phosphor-cooling-type
service to be done, and then run the script to start the
phosphor-hwmon instance for the MAX31785 fan controller after it
chooses the correct config file to use.
Tested: Test that this service correctly runs the script and that
phosphor-hwmon does get started.
Change-Id: I4495f7073d63004d4dd8333df8964d69beaae4ea
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The phosphor-hwmon instance for the MAX31785 fan controller
chip needs to use different config files based on if the system
is air or water cooled, since different numbers of fans are used.
This script will check the cooling type, link in the correct file
based on that cooling type, and then start the actual hwmon
service.
Tested: Tested as part of end to end testing of this feature.
Change-Id: Ie3efee5d3c6671911b505223152d32f3f5c5c259
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We have 236 commits, 127 files changed, 17766 insertions(+), 2128
deletions(-). Some of these are backports from upstream. This list
does not include patches from the 4.13 stable releases, but we do
include those in the dev-4.13 branch.
1 Alexey Khoroshilov
34 Andrew Jeffery
1 Arnd Bergmann
1 Benjamin Herrenschmidt
1 Bhumika Goyal
1 Brad Bishop
1 Brendan Higgins
11 Christopher Bostic
1 Cyril Bur
14 Cédric Le Goater
49 Edward A. James
3 Gavin Shan
1 Guenter Roeck
8 Ivan Mikhaylov
1 Jacek Anaszewski
1 James Feist
7 Jeremy Kerr
72 Joel Stanley
2 Julia Lawall
1 Ken Chen
6 Lei YU
3 Milton Miller
1 Mykola Kostenok
1 Patrick Venture
2 Philipp Zabel
1 Rick Altherr
11 Samuel Mendoza-Jonas
2 Wei Yongjun
1 Xo Wang
1 Yong Li
Note that the 4.13 branch is EOL'd by the Linux community, and as such
should not be used for any products beyond development.
React to removal of occ hwmon instances from device trees with a
new startup/shutdown mechanism for phosphor-hwmon.
To fix this, a helper script will be used to start the service that
will pass the service the device tree name if it is present, or the
udev device path if it isn't. This script will still run from the
udev rule as before, but it will stop and start the service itself
without using the SYSTEMD_WANTS attribute.
As the path to the hwmon environment file matches the service
template argument, the paths for the OCC .conf files need to change
to match the device path instead of the previous device tree path.
Note that the pure device path would have the hwmon instance number
in it, but since that can't be known ahead of time it is stripped
off by the script that starts the service.
In addition, the pure device path for the OCCs contain several
':'s, meaning the associated environment files would also need to.
However, Yocto/Bitbake cannot handle a ':' in a file path, so they
are converted to '--'s by the script that starts the service and
phosphor-hwmon will convert them back internally when it starts.
The service file also needed some changes now that the service
lifetime is no longer controlled by systemd via SYSTEMD_WANTS.
This script will be called by a udev rule to start and
stop phosphor-hwmon when the hwmon device driver is started
and stopped.
It is passed both the device path and the OF_FULLNAME device
tree attribute. If OF_FULLNAME is present, it will start the
service with that as its template argument, otherwise it will
use the device path. This is to handle devices that aren't in
the device tree so they won't have OF_FULLNAME.
If a '/hwmon/hwmonN' is in the path it is removed, as this path
is also used as a path to an environment file and so must be
known ahead of time, which the hwmon instance N is not.
If there is a ':' in the path name, it is converted to a '--'.
Yocto/Bitbake cannot handle a ':' in file paths.
Resolves openbmc/openbmc#2953
Change-Id: I815be4d6d9e1cbea8428bb1bb8c332776ee71ece
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
| |
|
|
|
| |
Change-Id: Id3116f6922ebe25e3b6b698f86cf2d2ae8121edb
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Run the MAX31785 firmware revision checking MSL (minimum ship level)
script on Witherspoon systems. MSL can be used to prevent downlevel
fan cards escapes from manufacturing environments.
The script is configured to run on the way to BMC standby and
sets the MSL interfacee property on the configured fan inventory items.
Validation of the fan MSL interface is beyond the scope of this commit.
On Witherspoon, MSL enforcement is enabled by default. For information
on disabling the MSL consult:
https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/xyz/openbmc_project/Control/MinimumShipLevel.interface.yaml
Change-Id: Iaf5dbf8fc29bd497c9b2e610ba23ee98ee749d24
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
| |
|
|
|
|
|
|
|
|
| |
Puts current, voltage, and power properties on D-Bus
for the two power supplies.
Resolves openbmc/openbmc#2115
Change-Id: I52e85297a70f40854e141db9a25358511033ac02
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Use a hardcoded hwmon config file for the Witherspoon
max31785 chip.
Hopefully somewhat temporary workaround of missing tags in the
Witherspoon MRW.
Change-Id: Ibf03b6c566d600b34b52a0288e1c511b9ff07e4e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The occ has some special characteristics, in this case
its sysfs path ends with occ-hwmon@<instance> in order
to support the other layers of drivers (i.e. occ fifo).
The hwmon conf file needs to match with the sysfs path
so aligning it with this change.
Change-Id: Id582ac6f2184d04841456d56f0e6bcab07027e4d
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
OCC hwmon sensor support is more complicated then other hwmon
sensors. It requires that software look at the label and
include that in the generated dbus sensor. A separate
commit in phosphor-hwmon will handle this new function.
The hwmon conf file indicates this new functionial requirement
to hwmon by including a new MODE_*=label for each sensor
that requires this function.
Resolves openbmc/openbmc#1183
Change-Id: I55bff27d3eab478559ae42e290dfe74e2f627e12
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
|
| |
|
|
|
|
|
|
| |
The IR35221 is a new chip which provides temperature information
on the VRMs installed in the system.
Change-Id: I49e24e14f74400e948c2ed98132ebf5ef66346ff
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
|
| |
|
|
|
|
|
|
|
|
| |
The DPS310 is a new chip coming soon to provide ambient
temperature to the openbmc. The config file may need
a few tweaks when the chip arrives but this at least
provides a base that will not hurt anything.
Change-Id: Id5264ddcab7245f9ec9b3dbb5898f76ccf45e82b
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
|
| |
|
|
|
| |
Change-Id: If5137be315dd7b8f087b79f75a9e5e1f2f112113
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
|
| |
|
|
|
|
|
|
| |
This minor tweak removes the need for MRW using systems
to append the phosphor-hwmon recipe in their layer.
Change-Id: I3d9dcfff452e26d191df37ae7d759c6c2c3f2cd4
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
|
Generate Witherspoon's hwmon conf files from
the mrw.
Change-Id: I120f4f91de48b36ba4b610eab35df98e3e84b534
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
|
