Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / 169975cf30bc41c5b83edd34bf95e913ac0a6fa1
commit169975cf30bc41c5b83edd34bf95e913ac0a6fa1[log] [tgz]
authorAdriana Kobylak <anoo@us.ibm.com>Sat Mar 06 15:19:55 2021 +0000
committerAdriana Kobylak <anoo@us.ibm.com>Sat Mar 06 16:18:45 2021 +0000
treef5167936a2010bff20db05e30fef7cf758d64b04
parent0635df219c24cc9b052bd0b1e877d309fd4223fa [diff]
psu-ng: Remove Min Power Supplies and cleanup

The psu manager would not prevent a power on based on the number of
power supplies, it's only concerned about the max number so that if the
number of plugged power supplies is less than the specified max, then it
can take action such as log an error.

Therefore there's not a current use case for the min setting, so
removing it.

Also cleanup the function that parses that information from the JSON
config file, like removing passing parameters that are class members,
and adding a doxygen description. In addition, have the structure of
system properties as part of the class instead of individual variables,
since it's duplicate work to set the structure values then set the
individual variables.

Tested: With debug traces verified that maxPowerSupplies was set to 2
        which is the value in the JSON config file.

Change-Id: Id98900d213fcbef38dc3879b425161a8af172716
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
4 files changed
tree: f5167936a2010bff20db05e30fef7cf758d64b04
  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",
  }