Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / cb091801fc0a6bfb11b032461f1e216a6dd25e05
commitcb091801fc0a6bfb11b032461f1e216a6dd25e05[log] [tgz]
authorBrandon Wyman <bjwyman@gmail.com>Mon Apr 26 15:26:27 2021 -0500
committerBrandon Wyman <bjwyman@gmail.com>Mon Apr 26 15:54:32 2021 -0500
tree83ccadfddba8b5341fca224c154c60bee822bff6
parente2f14a5748e2bedc926bdd7a855ff4fb368ae1a5 [diff]
psu-ng: Call updateInventory() in PSU constructor

After adding the changes to get configuration data from entity-manager,
the timing with how processes start up changed a bit.

We used to get bus, address, and inventory path information from the
JSON file, created the power supplies, prior to the
phosphor-gpio-presence application doing the interfaces added call for
the Present property. Then we would get the interfaces added signal,
which would call updateInventory().

With the entity-manager changes, it appears that we typically startup
before the Presence interface added, and before the bus, address, and
other information from entity-manager is ready. The Present property
gets added, the entity-manager adds the IBMCFFPSConnector information,
then we create the power suppplies, but now there is no call to
updateInventory() as we missed the interfaces added signal for the
Present property.

We probably should have been calling updateInventory() in the
constructor all this time. If the power supply is not present at that
time, it just skips doing anything. If it is present, it will update the
VPD properties on the D-Bus inventory interface.

Tested:
    Created rainier image containing phosphor-power changes.
    Flashed image to Rainier 2S4U system.
    Removed powersupply* directories from
     /var/lib/phosphor-inventory-manager persisted data tree.
    Rebooted BMC.
    Verify D-Bus for powersupply* has VPD keyword properties updated.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: Iabff937b25910faeca6ffe8aa1f376132e514a81
1 file changed
tree: 83ccadfddba8b5341fca224c154c60bee822bff6
  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. pmbus.cpp
  28. pmbus.hpp
  29. README.md
  30. types.hpp
  31. utility.cpp
  32. 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",
  }