Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / 9a507db58398db80b3eb2f0f290bd6986102a1d7
commit9a507db58398db80b3eb2f0f290bd6986102a1d7[log] [tgz]
authorBrandon Wyman <bjwyman@gmail.com>Thu Feb 25 16:15:22 2021 -0600
committerBrandon Wyman <bjwyman@gmail.com>Fri Feb 26 16:45:36 2021 -0600
tree2b478e463ee6b869cb0857d54deeda38e89dbda1
parent5474c91ad5faf15bed6833abd6965e2a33c58603 [diff]
psu-ng: Fix for interfacesAdded

The presentAddedMatch was not properly being triggered when the power
supply interfaces was added in order to populate the Present property.
The method used for added is different from when it is changed. Add in a
function to handle when the inventory interface is added with the
Present property.

Tested:
    In simulator, on startup, check journal for power supply present.
    obmcutil poweron
    Verify no error logged for missing power supply
    Remove power supply
    Verify journal shows driver missing, driver unbound.
    Verify error logged for missing power supply.
    Install power supply
    Verify journal shows driver bound for present power supply.
    obmcutil poweroff
    Delete error for missing power supply.
    obmcutil poweron
    Verify no error logged for missing power supply.

Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Change-Id: I70daeac597bdbdc9f069459707768a45edfa7ef2
2 files changed
tree: 2b478e463ee6b869cb0857d54deeda38e89dbda1
  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",
  }