Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / b70eae9af652c38eb6aa8f2e4e71075106fa41d9
commitb70eae9af652c38eb6aa8f2e4e71075106fa41d9[log] [tgz]
authorAdriana Kobylak <anoo@us.ibm.com>Thu Jan 20 22:09:56 2022 +0000
committerShawn McCarney <shawnmm@us.ibm.com>Wed Jan 26 21:50:23 2022 +0000
tree689fe83559e1520fcd17331e61dbec7d45c4b141
parentc2906f471f3ecb4fe021efc657a32c4266a88589 [diff]
psu-ng: Check if mismatched PSU is supported

The function that checks that all PSUs have the same model currently
calls out the first mismatched PSU. If the mismatched PSU is listed in
the supported configurations and the base model is not, the error log
may cause confusion because it would indicate in the callout data to
replace the PSU that it is supposed to be supported instead of the one
that it is not supported on that system.

Therefore check the supported configurations to determine which PSU to
callout in case of a mismatch.

Tested: On p10bmc with ps0 model 2B1D (no supported) and ps1 model 2B1E
(supported):
- Before change:
    "ACTUAL_MODEL": "2B1E",
    "CALLOUT_INVENTORY_PATH":
"/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
    "EXPECTED_MODEL": "2B1D",
- After change:
    "ACTUAL_MODEL": "2B1D",
    "CALLOUT_INVENTORY_PATH":
"/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
    "EXPECTED_MODEL": "2B1E",

Change-Id: I0b2d487e12f55e08a93e77b6c569726dde9d4e68
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
1 file changed
tree: 689fe83559e1520fcd17331e61dbec7d45c4b141
  1. cold-redundancy/
  2. example/
  3. org/
  4. phosphor-power-sequencer/
  5. phosphor-power-supply/
  6. phosphor-regulators/
  7. power-sequencer/
  8. power-supply/
  9. services/
  10. test/
  11. tools/
  12. .clang-format
  13. .gitignore
  14. .shellcheck
  15. argument.hpp
  16. device.hpp
  17. device_monitor.hpp
  18. elog-errors.hpp
  19. file_descriptor.hpp
  20. gpio.cpp
  21. gpio.hpp
  22. LICENSE
  23. MAINTAINERS
  24. meson.build
  25. meson_options.txt
  26. names_values.hpp
  27. OWNERS
  28. pmbus.cpp
  29. pmbus.hpp
  30. README.md
  31. types.hpp
  32. utility.cpp
  33. utility.hpp
README.md

Overview

This repository contains applications for configuring and monitoring devices that deliver power to the system.

  • cold-redundancy: Application that makes power supplies work in Cold Redundancy mode and rotates them at intervals.
  • phosphor-power-sequencer: Applications for configuring and monitoring power sequencer and related devices that support JSON-driven configuration.
  • phosphor-power-supply: Next generation power supply monitoring application.
  • phosphor-regulators: JSON-driven application that configures and monitors voltage regulators.
  • power-sequencer: A power sequencer monitoring application.
  • power-supply: Original power supply monitoring application.
  • tools/power-utils: Power supply utilities.

Build

To build all applications in this repository:

  meson build
  ninja -C build

To clean the repository and remove all build output:

  rm -rf build

You can specify meson options to customize the build process. For example, you can specify:

  • Which applications to build and install.
  • Application-specific configuration data, such as power sequencer type.
  • Whether to build tests.

Power Supply Monitor and Util JSON config

Several applications in this repository require a PSU JSON config to run. The JSON config file provides information for:

  • Where to access the pmbus attributes
  • Which attribute file in pmbus maps to which property and interface in D-Bus
  • Which kernel device directory is used on which PSU

There is an example psu.json to describe the necessary configurations.

  • inventoryPMBusAccessType defines the pmbus access type, which tells the service which sysfs type to use to read the attributes. The possible values are:
    • Base: The base dir, e.g. /sys/bus/i2c/devices/3-0069/
    • Hwmon: The hwmon dir, e.g. /sys/bus/i2c/devices/3-0069/hwmon/hwmonX/
    • Debug: The pmbus debug dir, e.g. /sys/kernel/debug/pmbus/hwmonX/
    • DeviceDebug: The device debug dir, e.g. '/sys/kernel/debug/./`
    • HwmonDeviceDebug: The hwmon device debug dir, e.g. /sys/kernel/debug/pmbus/hwmonX/cffps1/
  • fruConfigs defines the mapping between the attribute file and the FRU inventory interface and property. The configuration example below indicates that the service will read part_number attribute file from a directory specified by the above pmbus access type, and assign to PartNumber property in xyz.openbmc_project.Inventory.Decorator.Asset interface.
      "fruConfigs": [
    {
      "propertyName": "PartNumber",
      "fileName": "part_number",
      "interface": "xyz.openbmc_project.Inventory.Decorator.Asset"
    }
  ]
  • psuDevices defines the kernel device dir for each PSU in inventory. The configuration example below indicates that powersupply0's device is located in /sys/bus/i2c/devices/3-0069.
      "psuDevices": {
    "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0069",
  }