[*]power-supply-monitor setupSILABMC-198

8 files changed, 76 insertions, 1 deletions

diff --git a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb
index 4fdcfb582f..4190cc9160 100644
--- a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb
+++ b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb
@@ -54,7 +54,9 @@ RDEPENDS:${PN}-system = " \
     ${PN}-cli \
     peci-pcie \
     phosphor-power-monitor \
+    phosphor-power-systemd-links-monitor \
     phosphor-power \
+    phosphor-power-utils \
     gdbserver \
     "
 
diff --git a/meta-ibs/meta-cp2-5422/conf/machine/cp2-5422.conf b/meta-ibs/meta-cp2-5422/conf/machine/cp2-5422.conf
index 893dcc3fce..185acb1dff 100644
--- a/meta-ibs/meta-cp2-5422/conf/machine/cp2-5422.conf
+++ b/meta-ibs/meta-cp2-5422/conf/machine/cp2-5422.conf
@@ -1 +1,2 @@
 require conf/machine/include/sila-ast2500.inc
+OBMC_POWER_SUPPLY_INSTANCES = "0 1"
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power%.bbappend
deleted file mode 100644
index fb7efc066e..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:append = " monitor"
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf
new file mode 100644
index 0000000000..bf950b594d
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf
@@ -0,0 +1,3 @@
+DEVPATH=/sys/bus/i2c/devices/7-0058
+INSTANCE=0
+INVENTORY=/system/chassis/motherboard/powersupply0
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf
new file mode 100644
index 0000000000..531d8f494d
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf
@@ -0,0 +1,3 @@
+DEVPATH=/sys/bus/i2c/devices/7-0059
+INSTANCE=1
+INVENTORY=/system/chassis/motherboard/powersupply1
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/power-supply-monitor b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/power-supply-monitor
new file mode 100644
index 0000000000..ac1d69bcca
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/power-supply-monitor
@@ -0,0 +1,11 @@
+[Unit]
+Description=Power Supply %I Monitor
+ConditionPathExists=/etc/default/obmc/power-supply-monitor/power-supply-monitor-%i.conf
+
+[Service]
+EnvironmentFile=/etc/default/obmc/power-supply-monitor/power-supply-monitor-%i.conf
+ExecStart=/usr/bin/env psu-monitor --path=${DEVPATH} --instance=${INSTANCE} --inventory=${INVENTORY} --num-history-records=${NUM_HISTORY_RECORDS} --sync-gpio-path=${SYNC_GPIO_PATH} --sync-gpio-num=${SYNC_GPIO_NUM}
+SyslogIdentifier=psu-monitor
+
+[Install]
+RequiredBy=multi-user.target
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/psu.json b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/psu.json
new file mode 100644
index 0000000000..6b32d3d803
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power/psu.json
@@ -0,0 +1,34 @@
+{
+  "inventoryPMBusAccessType": "Hwmon",
+  "fruConfigs": [
+    {
+      "propertyName": "PartNumber",
+      "fileName": "part_number",
+      "interface": "xyz.openbmc_project.Inventory.Decorator.Asset"
+    },
+    {
+      "propertyName": "SerialNumber",
+      "fileName": "serial_number",
+      "interface": "xyz.openbmc_project.Inventory.Decorator.Asset"
+    },
+    {
+      "propertyName": "Manufacturer",
+      "fileName": "manufacturer",
+      "interface": "xyz.openbmc_project.Inventory.Decorator.Asset"
+    },
+    {
+      "propertyName": "Model",
+      "fileName": "model",
+      "interface": "xyz.openbmc_project.Inventory.Decorator.Asset"
+    },
+    {
+      "propertyName": "Version",
+      "fileName": "fw_version",
+      "interface": "xyz.openbmc_project.Software.Version"
+    }
+  ],
+  "psuDevices": {
+    "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/7-0058",
+    "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/7-0059"
+  }
+}
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power_%.bbappend
new file mode 100644
index 0000000000..46b951e42d
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+inherit obmc-phosphor-systemd
+
+SRC_URI += "file://psu.json \
+            file://power-supply-monitor \
+	   "
+
+PACKAGECONFIG:append = " monitor"
+
+PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+
+do_update_service() {
+    cp ${WORKDIR}/power-supply-monitor ${S}/services/power-supply-monitor@.service
+}
+
+do_install:append() {
+    install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json
+}
+
+FILES:${PN} += "${datadir}/phosphor-power/psu.json"
+addtask do_update_service after do_unpack before do_configure