diff options
author | Brandon Wyman <bjwyman@gmail.com> | 2017-08-16 00:41:08 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-09-27 16:40:23 +0300 |
commit | 360ebeba3452a43086aa157b43789c18dca8c2b8 (patch) | |
tree | f4fa45481f6fee1fb12263231a2e49eda31c3acc /meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power | |
parent | f126a712452ad209136d7585a35648a8cf025467 (diff) | |
download | openbmc-360ebeba3452a43086aa157b43789c18dca8c2b8.tar.xz |
Power supply monitor recipe, service, and conf
Add the Witherspoon power supply monitor application, service file, and
configuration files to the witherspoon-pfault-analysis recipe.
Moved OBMC_POWER_SUPPLY_INSTANCES to the global metadata so it can be
shared between recipes.
Resolves: openbmc/openbmc#1731
Depends-On: Ie364a3dc5b7f19cbc587450fc54f231d1ec280f7
Change-Id: I340a1d48a979a97624843e59a5ab1b1ad04056bb
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power')
4 files changed, 35 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb index f9b0e2a02..2f46f7804 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.bb @@ -32,3 +32,15 @@ SEQ_PGOOD_FMT = "../${SEQ_PGOOD_SVC}:${CHASSIS_ON_TGT}.wants/${SEQ_PGOOD_SVC}" SYSTEMD_SERVICE_${PN} += "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" SYSTEMD_LINK_${PN} += "${SEQ_MONITOR_FMT} ${SEQ_PGOOD_FMT}" + +PSU_MONITOR_TMPL = "witherspoon-power-supply-monitor@.service" +PSU_MONITOR_INSTFMT = "witherspoon-power-supply-monitor@{0}.service" +PSU_MONITOR_TGT = "${SYSTEMD_DEFAULT_TARGET}" +PSU_MONITOR_FMT = "../${PSU_MONITOR_TMPL}:${PSU_MONITOR_TGT}.requires/${PSU_MONITOR_INSTFMT}" + +FILES_witherspoon-psu-monitor = "${sbindir}/witherspoon-psu-monitor" +SYSTEMD_SERVICE_${PN} += "${PSU_MONITOR_TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" + +PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..a55828da4 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,4 @@ +DEVPATH=/sys/bus/i2c/devices/3-0068 +INSTANCE=0 +INVENTORY=/system/chassis/power_supply0 + diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..fea2ad0fd --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,4 @@ +DEVPATH=/sys/bus/i2c/devices/3-0069 +INSTANCE=1 +INVENTORY=/system/chassis/power_supply1 + diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service new file mode 100644 index 000000000..e2b6b2782 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Witherspoon Power Supply %I Monitor +Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-power_supply%i.service +After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-power_supply%i.service +Wants=mapper-wait@-org-openbmc-control-power0.service +After=mapper-wait@-org-openbmc-control-power0.service +ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf + +[Service] +EnvironmentFile={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf +ExecStart=/usr/bin/env witherspoon-psu-monitor --path=${{DEVPATH}} --instance=${{INSTANCE}} --inventory=${{INVENTORY}} +SysLogIdentifier=witherspoon-psu-monitor + +[Install] +RequiredBy={SYSTEMD_DEFAULT_TARGET} |