Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
Although 6 fanx_1 pwm targets are deleted, but fan0_1 fan1_1 and fan2_1
will have a default value that causes the issue to remain unresolved.
In this way, two Fans control the same pwm, but I think that our
current fan control event is controlled at the same time, so it does
not affect the fan control.
(From meta-ibm rev: c4ec0f10a091fe74f075d2033fe055b5bbd7d498)
Change-Id: I42647c92ffe5e20430cee28de6fd26e2716153d9
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Set warning and critical values for PSU.
(From meta-ibm rev: 1b9796d85dd41e8675d0d03132cbff8dd74a1d47)
Change-Id: Ie16955f7548e9e6fa54cea2aff767a164abb76f3
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Currently power sensor might get the wrong channel.
We have to modify it to the correct channel.
Tested:
Check sensot list user can see the correct power sensor.
(From meta-ibm rev: aaceadff166052bef63b860063ccbda66d918629)
Change-Id: I2595c727915b8e72af4f56e5383efb183e9b3638
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
According to our thermal team test report, we need to adjust the fan
control event.
Tested
Fan speed will be based on new fan control events.
(From meta-ibm rev: f242630e5a8195eeef089f01537b9be4fde000a2)
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Change-Id: Ib4c296f128d625e78387cead26c46c76faa39535
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Mihawk Every fan has two rotors but one of the rotors gets the wrong
fan pwm via REST command, so remove fanx_1 target.
Tested: Use command "curl -k -X GET https://root:0penBmc@<ip>/xyz/
openbmc_project/sensors/fan_tach/fan0_0"
This can show the correct pwm.
(From meta-ibm rev: 31a8e8430b5f2629249f80de7eb91b598fa6caca)
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Change-Id: I68e40fefdc15a7580ca819084929813dae5d43a5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
1.Correct the channel of mihawk total power sensor
2.The current mihawk is not used to external gpu power.
Avoid confusing users so delete this sensor.
(From meta-ibm rev: e65b464ca953a0d1a7db93598956db6aa2d306b9)
Change-Id: Ib4dee8181376d848364c9e92b2b5d2e67ec1fc17
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The AST2600 device tree paths for the I2C buses are different than on
the AST2500, so add a new set of hwmon conf files for the tacoma system
that are the same as witherspoon but just in a different directory.
Stopped doing CHIPS_append in the recipe since witherspoon-tacoma
inherits from witherspoon it was getting all of witherspoon's conf files
as well.
(From meta-ibm rev: b9cd483488901d6d379360317caf537fa4529f90)
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I29c61d541e58cd0113caf8584d2e5720b738d090
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The 5.3 kernel adds an 'fsi-master' directory in front of the fsi0 and
fsi1 directories in the OCC device tree paths. Update the OCC hwmon
file paths accordingly as those are based on that path.
(From meta-ibm rev: 696d1d3438499f974390c2c9c77fe4879509d9d1)
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I62b00664f2ebc18ed291d23faaf310fd15ce3e90
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Get total power from occ.
(From meta-ibm rev: 5f74841d980f274383dd0bf1c16b1c3df18142e2)
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Change-Id: I97bf6b2229890dca1a0bda421b85b10392c2a814
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Enable this config for mihawk so the fan sensors are working, otherwise
hwmon will fail and exit when fans are not working.
Tested: Verify that the fan_tach sensors return -ETIMEOUT when host is
powered off and do not exit with failure.
(From meta-ibm rev: 2e39633c12f7914b1a4a398bbff9b467930bb731)
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Change-Id: I0a7e881de5d5baa8d4db3cac9ca3cb46ec08faf4
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Most of mihawk's sensors are different from witherspoon, so I temporarily
added the mihawk part and did not change the witherspoon.
Add mihawk version of fan control and d-bus monitor.
Mihawk does not have a water cooled mode, so another independent folder is added.
Tested: 1.Shut down the system if more than three cores
have a temperature greater than 100 degrees Celcius.
2.Fan control support cpu core, dimm, Onboard.
3.Confirm that sensor is able to return normally via REST.
(From meta-ibm rev: 949f91431bba2f0139cc823d674a741f9590c885)
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: Icc401f32c67b622f0f1448e1166112e02c135a8f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
A recent kernel update added a second input current/voltage/power
reading to the hwmon sysfs attributes for the ir35221 VRMs, and it threw
off the labels in the config files since they were hardcoded for the
specific previous numbers. For example, curr2_input previously
represented an output current but now represents an input current.
Fix this by using the LABEL mode in hwmon to find which sysfs file to
use for a particular sensor by the contents of its corresponding label
file. For example, the p0_vdd_current sensor should look at the sysfs
file that has a corresponding 'iout1' value in the currX_label file.
Tested: Test that the voltages are back within thresholds again and not
showing values around 12V.
(From meta-ibm rev: bca7ed0127f9e82895fb60b66b325347970f0860)
Change-Id: I9f28c9445daf9ce6206ff9e38e271ac805768fae
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Use an override in bbappends in meta-witherspoon as described and
recommended in the "following best practices when creating layers"
section of the the Yocto development tasks manual.
ibm-ac-server represents common machine configuration shared by all of
IBMs "Accelerated Compute" class of servers. Apply it wherever any
variables are un-bounded by any override.
This enables more flexible use of meta-witherspoon in build
configurations, and easy addition of machines to the layer.
(From meta-ibm rev: bb0e1d0699a4b9905c053c94af7d882cd71779fc)
Change-Id: I82f7338b0d7a64b5e7a67e19bcdff07f48a332d4
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
(From meta-ibm rev: 8f7ff601395419a933eb0506d5cc07fd805f7708)
Change-Id: Iffb2c550511b4024b721c2ba81aec1f909ce7703
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Hard-coded values for fan tach sensor thresholds don't work because
these values vary. For accurate reporting, Redfish sensor output looks
at the functional status on the fan inventory.
Tested:
Same config files changed under /etc and change verified in the webUI
(From meta-ibm rev: 13ed7b8ed73d71206f6992a4c71294280c451446)
Signed-off-by: Aatir Manzur <aatrapps@gmail.com>
Change-Id: I80df620662d16cb677acbfe311bd2e709ae5976f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Initially configure Swift's power supply sensors as they were on
Witherspoon. Keep the config files separate between systems as they will
be different due to differences between the power supplies used.
Tested:
Built Swift image that contained the config files
Built Witherspoon image that still contained the config files
(From meta-ibm rev: d8d27673f1b277db83859408842619ae24606235)
Change-Id: I64d893c6c5dbea0e4d4a592042b17d6bad5b4596
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Create Swift's OCC sensors initially using the same thresholds as they
were on Witherspoon. Swift has 12 dimms/proc with 2 temp sensors per
dimm. Also there are 2 GPUs/proc.
Tested:
Built image that contained the config files
(From meta-ibm rev: 2bd366ab4bd4b9e085b70d46f07f5f1acdd35790)
Change-Id: Ia381c561f283c4d542e0035534375fa14c493278
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
On processor 1 in Swift, an IR35219 is used for the VDD vrm and
IR35221s are used for the VDN & VCS vrms and VIO vrm. Initially the
same warn/crit configuration values as Witherspoon will be used.
Tested:
Built image that contained the config files
(From meta-ibm rev: a296aa3c0ad4278c060c66c4ca4c1ed5913cfe06)
Change-Id: I961c12469c550d36ec03bc5f249fe46019d1c5d1
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
On processor 0 in Swift, an IR35219 is used for the VDD vrm and
IR35221s are used for the VDN & VCS vrms and VIO vrm.. Initially the
same warn/crit configuration values as Witherspoon will be used.
Tested:
Built image that contained the config files
(From meta-ibm rev: e21e2d20610744cfbf1d96345e0781ae3a47159d)
Change-Id: I94b687e77f988442e9b6a7f5583608be01a793c8
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Swift has 3 ambient temperature sensors, the si7021a20 will be labeled
as `ambient2` and initially use the same warn/crit temperature
configurations as Witherspoon.
Tested:
Built image that contained the config file
(From meta-ibm rev: 44d15151813b30aeb9f93cf4afb2818be2ed0b70)
Change-Id: Ie5e538d270ab27cd1ebd4979c79038c1b18bb1db
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Swift has 3 ambient temperature sensors, the dps310 will be labeled as
`ambient1` and initially use the same warn/crit temperature
configurations as Witherspoon.
Tested:
Built image that contained the config file
(From meta-ibm rev: b86d99ad97152a5932f0e53a3a80a422e421437b)
Change-Id: Ibd7a11b9203d6ec82b500874d6d38a3e762e4173
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Swift has 3 ambient temperature sensors, the tmp275 will be labeled as
`ambient0` and initially use the same warn/crit temperature
configurations as Witherspoon.
Tested:
Built image that contained the config file
(From meta-ibm rev: 51daebff52005f4cf40fa5a4bf8c5f779bb6c997)
Change-Id: Iebb780c517a41ec64e5ad99ebf41c401faab90e9
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Yocto automatically adds files/<MACHINE>/ to the file path, take
advantage of this feature to simplify the recipe and directory
structure.
Tested: Built witherspoon, witherspoon-128, and swift, and verified
they had the right conf file:
$ diff tmp/work/witherspoon_128-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf \
tmp/work/witherspoon-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
$
$ diff tmp/work/witherspoon-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf \
tmp/work/swift-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/etc/default/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf
2,3c2,3
< CRITLO_fan1 = "2974"
< CRITHI_fan1 = "12076"
---
...
(From meta-ibm rev: afdfaba229df3376f17ca063b53c9c8df0d84d0f)
Change-Id: Id24796c17c24aad29770fbd591e885534eeee2f7
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Swift uses 2 TMP275s to monitor the PCIE inlet temp, one between
cards 0 and 1, and the other between cards 2 and 3. They are both
on I2C bus 12.
Tested: Built an image and checked rootfs for the config files.
(From meta-ibm rev: bd2a3a2a9b6bde8207f1d4f4a81ffab27f0b14b1)
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I51c449ad9c2a212693d28ed82e79f913bb096e29
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
To support fan control for swift system bring-up, the max31785 device
needs to be configured for hwmon to expose on dbus.
Tested:
All max31785 configs and service files exist in the image
(From meta-ibm rev: 6dec46d2e34e1db46dff141f4495a4aa665af997)
Change-Id: Ib7ebea8cc376f1fb3e2e340d56512440917f1420
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
In preparation for additional systems under hte witherspoon layer, add
machine overrides to the hwmon devices and service configurations. This
allows additional machines' phosphor-hwmon configurations to be placed
in this layer.
Tested:
Witherspoon phosphor-hwmon image still contains all device configs &
services to be installed.
(From meta-ibm rev: 84b1f2e70034311853f4e417b9a29687a512cc97)
Change-Id: I28685d71bb99cd23b8a0acc34bfd117dbdef8926
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The upstream 5.0 kernel changed the labels for power sensors. Adjust
the hwmon configuration files to account for this.
(From meta-ibm rev: 222fda96aacb1971094e742e71d6d597985fc927)
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Change-Id: Ibc8921e14b3840959e0793934432ba5615d0b416
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Instead of obmc-standby.target, use multi-user.target.
(From meta-ibm rev: 85cff8cc9e66049d8ac26271c13f82d894ac572f)
Change-Id: I03c3d41c031343fa584511889c70e3def92cb83d
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
In the 5.0 Linux kernel, an I2C device path segment changed:
i2c@1e78a000 -> bus@1e78a000
(From meta-ibm rev: 706307d8891d50086206067f06f69326c7215ee3)
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Iad973b9d30b8c268515db922745dfb5a43e669ec
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The max31785 hwmon instance fails to start after a systemd patch was
removed to handle special characters in the device paths. This uses
`systemd-escape` to escape and unescape the device path when the udev
rule triggers the max31785 hwmon startup script.
Resolves openbmc/openbmc#3443
(From meta-ibm rev: 2790b22411920574b95111a44137be21e07a2e3a)
Change-Id: I46d1d1a9de8cb740bfd57cebfd5b2474ff69246c
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Add the current, voltage, and power hwmon config file
entries for the 4 IR35221 voltage regulator instances.
(From meta-ibm rev: 1ee607b82cca6d6d065ffa1106a34ed60dfd3e20)
Change-Id: Ibe4fa374efc925390ed8e47dc7b646c0b0fa6526
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Rename phosphor-hwmon%.bbappend to phosphor-hwmon_%.bbappend.
Tested: Built witherspoon and verified confs in rootfs.
(From meta-ibm rev: 8d8818d02a77c3bf1cd78e241e60f35668a6af51)
Change-Id: Iec17ed4eee5867d95331778f64dd4f9adc1825cd
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The new subtree model brings the subtrees up from the openbmc-machines
layer.
Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|