Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / e1074d8e915066c1ea858321b5f6453014e86894
commite1074d8e915066c1ea858321b5f6453014e86894[log] [tgz]
authorAdriana Kobylak <anoo@us.ibm.com>Tue Mar 16 20:46:44 2021 +0000
committerAdriana Kobylak <anoo@us.ibm.com>Thu Mar 25 15:31:05 2021 +0000
tree5496e95793e622be558c1076dac9a9e3d8fea442
parent3e42913f212119fa18cf99a2462f99e4e6b90806 [diff]
psu-ng: Process all Supported Configuration sets

The chassis may have more than one Supported Configuration interface,
such as supporting 2 power supplies of a certain type or 4 power
supplies of another. Therefore need to loop through the subtree results
to process each. Create a new helper function to initialize the system
properties to avoid duplicate code with the interfaces added callback.
To account for the multiple configurations, a subsequent commit would
convert the existing sys_properties member into a vector of
sys_properties to store each configuration.

Also remove removing the interfaces added match, because with multiple
configuration interfaces, it is not known how many interfaces the system
supports, and the interfaces added signal gets trigger for each one.

Tested: Verified the maxPowerSupplies value was as expected on
        Rainier 2U and adding a second Supported Configuration interface
        it was processed (overwrote the first value).

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