Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openpower-vpd-parser / 6c7a84e4e1e8e087da8df9daa23496dbd5d11721
commit6c7a84e4e1e8e087da8df9daa23496dbd5d11721[log] [tgz]
authorSantosh Puranik <santosh.puranik@in.ibm.com>Wed Mar 09 13:42:18 2022 +0530
committerSantosh Puranik <santosh.puranik@in.ibm.com>Thu Mar 10 08:33:01 2022 +0000
tree359ee0417064adf344ad003236bd4e915e9ef542
parentaa8a893e51c5ebae9c6b19aabbeb06242c8930e0 [diff]
Fix Force Collect Bug

Force collection option in VPD tool needs to restart the
system vpd service in order to recollect system VPD.

This commit fixes a bug where the tool would call
`systemctl stop system-vpd.service` and replaces
it with `systemctl restart system-vpd.service`.

A stop is problematic because it also stops the
services that "Require" system vpd service. A restart
ensures that system vpd service and all services that
require it are also restarted.

Also ensure that any exception thrown when executing
the underlying VPD tool impl. results in a non-zero
rc to the shell.

Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: Iacc364f29a3d8848dc5e43992f5a46e30a58af2f
2 files changed
tree: 359ee0417064adf344ad003236bd4e915e9ef542
  1. examples/
  2. subprojects/
  3. test/
  4. vpd-manager/
  5. vpd-parser/
  6. vpdecc/
  7. .clang-format
  8. .gitignore
  9. app.cpp
  10. args.cpp
  11. args.hpp
  12. common_utility.cpp
  13. common_utility.hpp
  14. const.hpp
  15. defines.hpp
  16. extra-properties-example.yaml
  17. extra-properties.mako.hpp
  18. extra-properties.py
  19. ibm_vpd_app.cpp
  20. ibm_vpd_utils.cpp
  21. ibm_vpd_utils.hpp
  22. impl.cpp
  23. impl.hpp
  24. LICENSE
  25. MAINTAINERS
  26. meson.build
  27. meson_options.txt
  28. OWNERS
  29. README.md
  30. store.hpp
  31. types.hpp
  32. utilInterface.hpp
  33. vpd_exceptions.hpp
  34. vpd_tool.cpp
  35. vpd_tool_impl.cpp
  36. vpd_tool_impl.hpp
  37. write.cpp
  38. write.hpp
  39. writefru.mako.hpp
  40. writefru.py
  41. writefru.yaml
README.md

Overview

This repository hosts code for OpenPower and IBM IPZ format VPD parsers. Both OpenPower VPD and IPZ VPD formats are structured binaries that consist of records and keywords. A record is a collection of multiple keywords. More information about the format can be found here.

The repository consists of two distinct applications, which are:

OpenPower VPD Parser

This is a build-time YAML driven application that parses the OpenPower VPD format and uses the YAML configuration (see extra-properties-example.yaml and writefru.yaml) to determine:

  • The supported records and keywords.
  • How VPD data is translated into D-Bus interfaces and properties.

The application instance must be passed in the file path to the VPD (this can, for example, be a sysfs path exposed by the EEPROM device driver) and also the D-Bus object path(s) that EEPROM data needs to be published under.

IBM VPD Parser

This parser is can be built by passing in the --enable-ibm-parser configure option. This parser differs from the OpenPower VPD parser in the following ways:

  • It parses all the records and keywords from the VPD, including large keywords (Keywords that begin with a # and are > 255 bytes in length).
  • It relies on a runtime JSON configuration (see examples/inventory.json) to determine the D-Bus object path(s) that hold interfaces and properties representing the VPD for a given VPD file path.

Making the application runtime JSON driven allows us to support multiple systems (with different FRU configurations) to be supported in a single code image as well as making the application more flexible for future improvements.

TODOs and Future Improvements

  1. The long-term goal is to completely do away with the build time YAML driven configurations and instead reconcile the OpenPower VPD parser and the IBM VPD parser applications into a single runtime JSON driven application.
  2. Add details to the README on how to configure and build the application.
  3. More JSON documentation.
  4. Support for more IBM VPD formats.
  5. VPD Write and tool documentation.