Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / da369c792c06204a7e74ae56da3dcc741567f9ed
commitda369c792c06204a7e74ae56da3dcc741567f9ed[log] [tgz]
authorBrandon Wyman <bjwyman@gmail.com>Fri Oct 08 18:43:30 2021 +0000
committerShawn McCarney <shawnmm@us.ibm.com>Thu Oct 28 17:22:41 2021 +0000
tree7bb7b9042f8985ac401e3ca50c47eda97bd41790
parentb85b9dded072889faf937e29af32b2600dcc8d64 [diff]
psu-ng: Use a separate map for required PSUs data

Use a different map for collecting the additional error data from the
hasRequiredPSUs() check, to avoid polluting other faults with data
collected from that call. Only make the hasRequiredPSUs() call if a
power supply is seen as not present, to avoid needlessly calling it
every time the analyze() function is called. If there is a power supply
detected as not present, then merge the data into the additionalData.

Tested:
    Verified comm fault error details did not include additional data.
    Prior to change, doubled up PSU call out, and expected/actual count.

Change-Id: Ib3fb125b56a74d3b70136897c007fd077306716f
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
1 file changed
tree: 7bb7b9042f8985ac401e3ca50c47eda97bd41790
  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",
  }