Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / bdca49383bffe70cbfe98829db40fe008eebbbe4
commitbdca49383bffe70cbfe98829db40fe008eebbbe4[log] [tgz]
authorAndrew Geissler <geissonator@yahoo.com>Fri Jan 15 10:26:15 2021 -0600
committerAndrew Geissler <geissonator@yahoo.com>Fri Jan 15 10:26:15 2021 -0600
treebaa1a5c36e6d65b70cf75d7a9591578527f1ca93
parente35831f675880f4688ece11508322952275cd495 [diff]
fix pseq-monitor and chassis power off race cond

Downstream testing recently found an issue where chassis power would be
removed before the pseq-monitor had stopped. This caused the
pseq-monitor to log errors.

Reviewing the systemd Conflicts documentation out at
https://www.freedesktop.org/software/systemd/man/systemd.unit.html
highlights some special caveats with the Conflicts statement.
Mainly that ordering is not guaranteed without an After or Before
clause. Testing also showed that when it comes to a service vs. target
conflicts, the most systemd will do is guarantee the conflicting service
is stopped before the target completes.

Give the above constraints, move the pseq-monitor Conflicts to the
obmc-power-stop-pre@.target and add an After clause. The
obmc-power-stop-pre@.target is the target which runs prior to power
being removed from the chassis.

Tested:
- Verified pseq monitor services consistently stop before the power is
  removed from the chassis.

Change-Id: Ic73efc6281c3c422e0b483d4c24cb92228fd5875
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2 files changed
tree: baa1a5c36e6d65b70cf75d7a9591578527f1ca93
  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",
  }