From f5979b9b7f1394f2f1f9eef75fca4d1f096c9ebf Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 5 Nov 2019 11:46:52 +0800 Subject: fp5280g2: Add phosphor-power recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add psu.json and power-supply-monitor-*.conf for fp5280g2. Parsed PSUs asset information via pmbus driver and exposed properties to D-BUS interface. Tested: Verified and built successfully on fp5280g2 and obtained correct PSUs asset information by busctl command. busctl --no-pager introspect xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0 xyz.openbmc_project.Inventory.Decorator.Asset interface - - - .BuildDate property s "" emits-change writable .Manufacturer property s "" emits-change writable .Model property s "PS-2162-5L" emits-change writable .PartNumber property s "" emits-change writable .SerialNumber property s "6L5LX01173722Z" emits-change writable xyz.openbmc_project.Inventory.Item interface - - - .Present property b true emits-change writable .PrettyName property s "powersupply0" emits-change writable xyz.openbmc_project.Inventory.Item.PowerSupply interface - - - xyz.openbmc_project.Software.Version interface - - - .Purpose property s "xyz.openbmc_project.Software.Version.V… emits-change writable .Version property s "1.000-1.00" emits-change writable (From meta-inspur rev: da7f477ed1ae83cabc291349ee6609ca1890caf5) Signed-off-by: George Liu Change-Id: Ifaad67483f7429223d2066ca233ede58dfbc3149 Signed-off-by: Brad Bishop --- .../power-supply-monitor-0.conf | 3 ++ .../power-supply-monitor-1.conf | 3 ++ .../recipes-phosphor/power/phosphor-power/psu.json | 34 ++++++++++++++++++++++ .../power/phosphor-power_%.bbappend | 12 ++++++++ 4 files changed, 52 insertions(+) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/psu.json create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend (limited to 'meta-inspur/meta-fp5280g2/recipes-phosphor/power') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf new file mode 100644 index 000000000..fa80045e6 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-0.conf @@ -0,0 +1,3 @@ +DEVPATH=/sys/bus/i2c/devices/11-0058 +INSTANCE=0 +INVENTORY=/system/chassis/motherboard/powersupply0 diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf new file mode 100644 index 000000000..de4b1194f --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/obmc/power-supply-monitor/power-supply-monitor-1.conf @@ -0,0 +1,3 @@ +DEVPATH=/sys/bus/i2c/devices/11-0059 +INSTANCE=1 +INVENTORY=/system/chassis/motherboard/powersupply1 diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/psu.json b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power/psu.json new file mode 100644 index 000000000..3669ea325 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/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/11-0058", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/11-0059" + } +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend new file mode 100644 index 000000000..ad1232a24 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://psu.json" + +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')}" + +do_install_append() { + install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json +} + +FILES_${PN} += "${datadir}/phosphor-power/psu.json" -- cgit v1.2.3