Improve PMBus handling for PSC #252
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bcantrill
approved these changes
Oct 26, 2022
| if let Some(rails) = &power.rails { | ||
| } else if d.power.is_some() | ||
| && d.power | ||
| .as_ref() |
There was a problem hiding this comment.
/me shakes fist at rust-lang/rustfmt#4306
beezow
pushed a commit
to rivosinc/humility
that referenced
this pull request
Nov 10, 2022
When bringing up the PSC firmware, I ran into a few issues.
Both Hubris and Humility assume that for an I2C device with a
```toml
power = { rails = [ ... ] }
```
field, all sensors (voltage / current / temperature / etc) correspond one-to-one
with power rails.
This is problematic for the power shelves, which have two rails (54V and 12V),
two fans (uncorrelated to voltage rails), and _three_ temperature sensors (also
unrelated to rails!).
This PR adds support for an optional `sensors = [ ... ]` field within power, e.g.
```toml
[[config.i2c.devices]]
bus = "backplane"
name = "psu0mcu"
address = 0b1011_000
device = "mwocp68"
description = "PSU 0 MCU"
power = { rails = [ "V54_PSU0", "V12_PSU0" ], sensors = ["voltage", "current"] }
sensors = { voltage = 2, current = 2, temperature = 3, speed = 2 }
```
The `sensors` field indicates that only `voltage` and `current` correspond
one-to-one with rails; other sensor types are treated as independent.
If the `sensors` field is blank (i.e. all of our existing TOML files), then
every sensor corresponds one-to-one with rails, matching the current behavior.
In addition, `humility pmbus --summarize` is modified to not `bail!` on an
error; instead, it prints the error and continues. This makes working with the
PSC nicer, because not all 6 PSUs will be populated at all times.
beezow
pushed a commit
to rivosinc/humility
that referenced
this pull request
Nov 11, 2022
When bringing up the PSC firmware, I ran into a few issues.
Both Hubris and Humility assume that for an I2C device with a
```toml
power = { rails = [ ... ] }
```
field, all sensors (voltage / current / temperature / etc) correspond one-to-one
with power rails.
This is problematic for the power shelves, which have two rails (54V and 12V),
two fans (uncorrelated to voltage rails), and _three_ temperature sensors (also
unrelated to rails!).
This PR adds support for an optional `sensors = [ ... ]` field within power, e.g.
```toml
[[config.i2c.devices]]
bus = "backplane"
name = "psu0mcu"
address = 0b1011_000
device = "mwocp68"
description = "PSU 0 MCU"
power = { rails = [ "V54_PSU0", "V12_PSU0" ], sensors = ["voltage", "current"] }
sensors = { voltage = 2, current = 2, temperature = 3, speed = 2 }
```
The `sensors` field indicates that only `voltage` and `current` correspond
one-to-one with rails; other sensor types are treated as independent.
If the `sensors` field is blank (i.e. all of our existing TOML files), then
every sensor corresponds one-to-one with rails, matching the current behavior.
In addition, `humility pmbus --summarize` is modified to not `bail!` on an
error; instead, it prints the error and continues. This makes working with the
PSC nicer, because not all 6 PSUs will be populated at all times.
bcantrill
pushed a commit
that referenced
this pull request
Jun 22, 2023
When bringing up the PSC firmware, I ran into a few issues.
Both Hubris and Humility assume that for an I2C device with a
```toml
power = { rails = [ ... ] }
```
field, all sensors (voltage / current / temperature / etc) correspond one-to-one
with power rails.
This is problematic for the power shelves, which have two rails (54V and 12V),
two fans (uncorrelated to voltage rails), and _three_ temperature sensors (also
unrelated to rails!).
This PR adds support for an optional `sensors = [ ... ]` field within power, e.g.
```toml
[[config.i2c.devices]]
bus = "backplane"
name = "psu0mcu"
address = 0b1011_000
device = "mwocp68"
description = "PSU 0 MCU"
power = { rails = [ "V54_PSU0", "V12_PSU0" ], sensors = ["voltage", "current"] }
sensors = { voltage = 2, current = 2, temperature = 3, speed = 2 }
```
The `sensors` field indicates that only `voltage` and `current` correspond
one-to-one with rails; other sensor types are treated as independent.
If the `sensors` field is blank (i.e. all of our existing TOML files), then
every sensor corresponds one-to-one with rails, matching the current behavior.
In addition, `humility pmbus --summarize` is modified to not `bail!` on an
error; instead, it prints the error and continues. This makes working with the
PSC nicer, because not all 6 PSUs will be populated at all times.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When bringing up the PSC firmware, I ran into a few issues.
Both Hubris and Humility assume that for an I2C device with a
power = { rails = [ ... ] }field, all sensors (voltage / current / temperature / etc) correspond one-to-one with power rails.This is problematic for the power shelves, which have two rails (54V and 12V), two fans (uncorrelated to voltage rails), and three temperature sensors (also unrelated to rails!).
This PR adds support for an optional
sensors = [ ... ]field within power, e.g.The
sensorsfield indicates that onlyvoltageandcurrentcorrespond one-to-one with rails; other sensor types are treated as independent.If the
sensorsfield is blank (i.e. all of our existing TOML files), then every sensor corresponds one-to-one with rails, matching the current behavior.In addition,
humility pmbus --summarizeis modified to notbail!on an error; instead, it prints the error and continues. This makes working with the PSC nicer, because not all 6 PSUs will be populated at all times.