Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-power / 08cac06be3156fa836be3e554588366d9ed7e119
commit08cac06be3156fa836be3e554588366d9ed7e119[log] [tgz]
authorBrandon Wyman <bjwyman@gmail.com>Fri Nov 19 23:30:27 2021 +0000
committerBrandon Wyman <bjwyman@gmail.com>Wed Nov 24 21:14:32 2021 +0000
tree22002847ffd45fb3c305a4e8d44d9911b1ae3270
parenta61c1aa0a2006dedf0752bf7efca364a86d4dd96 [diff]
PMBus: Fix "file" name for STATUS_FANS_1_2

While attempting to look into creating and detecting power supply fan
faults, I noticed that we were attempting to read status0_fans12, but
the actual file name is status0_fan12.

Verified same file name difference/issue on Witherspoon with 5.14.6
kernel.

Tested:
    Debug commands on Witherspoon for fan fault.
    Note lack of status0_fan12 in verbose journal entry:
     MESSAGE=The power supply detected bad fan operation.
     TRANSACTION_ID=3237897146
     RAW_STATUS=STATUS_WORD=0x400|status0_mfr=0x0|status0_temp=0x0
     CALLOUT_INVENTORY_PATH=/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1
     SYSLOG_IDENTIFIER=psu-monitor
    Bitbake build phosphor-power with change.
    Overlay patch same Witherspoon system.
    Debug commands for fan fault results in expected journal entry:
     MESSAGE=The power supply detected bad fan operation.
     TRANSACTION_ID=3549612893
     RAW_STATUS=STATUS_WORD=0x400|status0_mfr=0x0|status0_temp=0x0|status0_fan12=0x20
     CALLOUT_INVENTORY_PATH=/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1

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