Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / b7131a12ee603264a90b55dd7afde929434424e9
commitb7131a12ee603264a90b55dd7afde929434424e9[log] [tgz]
authorFaisal Awada <faisal@us.ibm.com>Thu Oct 26 19:38:45 2023 -0500
committerFaisal Awada <faisal@us.ibm.com>Tue Nov 14 20:34:08 2023 +0000
treee56c083fa65a27340f59934c685c2a516135572e
parent319b0dddfa34c46e487923788c5dddf9f691860d [diff]
psu-ng: Fixed PSU monitor app to bind/unbind device driver appropriately.

Modified bindOrUnbind function:
      Bind the  device driver when the PSU present and i2cbus-i2caddr
      does not exist. Unbind the device driver when i2cbus-i2caddr exists
      and the PSU not present.

      bindOrUnbind does not do anything when:
      * PSU device driver bind exist and the device present
      * PSU device driver bind does not exist and device not present

Added new function populateDriverName:
      Search for device driver name in all PSUs, then assign the device
      driver name to all PSUs including missing PSUs.

Testing:
    Verified in the following test, there is no bind/unbind error log.
        1 - Removed 1 PSU and powered on the BMC with 3 PSUs
        2 - Use step 1, after power on plugged in the 4th PSU and verified
            /sys/bus/i2c/drivers/-ibm-cffps/3-006b exist
        3 - Removed 2 PSUs and powered on the BMC with 2 PSUs.
        4 - Use step 3, after power on plugged in the missing PSUs, verified
            bind/Unbind /sys/bus/i2c/drivers/-ibm-cffps/3-006x for appropriate PSU.
        5 - Powered on system with 4 PSUs then removed 2 PSUs. Verified
            unbind done for appropriate PSU.

Change-Id: I325fc0dbb16f9c3b582b739e8440a74e34aae753
Signed-off-by: Faisal Awada <faisal@us.ibm.com>
4 files changed
tree: e56c083fa65a27340f59934c685c2a516135572e
  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. subprojects/
  11. test/
  12. tools/
  13. .clang-format
  14. .gitignore
  15. .shellcheck
  16. device.hpp
  17. device_monitor.hpp
  18. elog-errors.hpp
  19. file_descriptor.hpp
  20. gpio.cpp
  21. gpio.hpp
  22. LICENSE
  23. meson.build
  24. meson.options
  25. names_values.hpp
  26. OWNERS
  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",
  }