From 20f990fae4bfd8a64998aeafff827946ad317aaa Mon Sep 17 00:00:00 2001 From: George Liu Date: Thu, 1 Aug 2019 10:14:21 +0800 Subject: fp5280g2: phosphor-hwmon: Add power supply sensors configs Tested: Build fp5280g2 board and load on the target hardware successfully and manually verified via DBUS interface (From meta-inspur rev: cb39b871faa21244a3d1bb55f8d153ba87bfd3a6) Signed-off-by: George Liu Change-Id: I3adb14da90f72bdbac0cefcf64ff1b8a274dd916 Signed-off-by: Andrew Geissler --- .../obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf | 4 ++++ .../obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf | 4 ++++ .../meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf new file mode 100644 index 000000000..362b4b017 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@58.conf @@ -0,0 +1,4 @@ +LABEL_in1 = "psu0_vin" +LABEL_in2 = "psu0_vout" +LABEL_power1 = "psu0_pin" +LABEL_power2 = "psu0_pout" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf new file mode 100644 index 000000000..8ffe44179 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/power-supply@59.conf @@ -0,0 +1,4 @@ +LABEL_in1 = "psu1_vin" +LABEL_in2 = "psu1_vout" +LABEL_power1 = "psu1_pin" +LABEL_power2 = "psu1_pout" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index ed2bf19d7..2dd9ee5c2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -8,6 +8,8 @@ CHIPS = " \ bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@0/tmp112@4a \ bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@1/tmp112@4a \ bus@1e78a000/i2c-bus@c0/i2c-switch@70/i2c@2/tmp112@4a \ + bus@1e78a000/i2c-bus@400/power-supply@58 \ + bus@1e78a000/i2c-bus@400/power-supply@59 \ pwm-tacho-controller@1e786000 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3 From 49ef136b60eb977b1fdb451efd7a64fd6cca00e8 Mon Sep 17 00:00:00 2001 From: George Liu Date: Mon, 5 Aug 2019 09:05:13 +0800 Subject: fp5280g2: Add ipmi configs for psu Tested: Manually verified sensor and sel are corrected on fp5280g2 for psu via ipmitool commands. (From meta-inspur rev: 74822749ef5e8a7197658af3eb1715cd85255d6d) Signed-off-by: George Liu Change-Id: I0a0fe8d837be3817b6dc7048d35ffda7892e62c7 Signed-off-by: Brad Bishop --- .../fp5280g2-ipmi-sensors.yaml | 170 ++++++++++++++++++++- 1 file changed, 169 insertions(+), 1 deletion(-) (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml index bd1059f90..420c5ecba 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml @@ -3918,6 +3918,174 @@ sensorType: 2 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +178: + bExp: 0 + entityID: 10 + entityInstance: 13 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/power/psu0_pin + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +179: + bExp: 0 + entityID: 10 + entityInstance: 14 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/power/psu1_pin + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +180: + bExp: 0 + entityID: 10 + entityInstance: 15 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/power/psu0_pout + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +181: + bExp: 0 + entityID: 10 + entityInstance: 16 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/power/psu1_pout + rExp: 0 + readingType: readingData + scale: -6 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +182: + bExp: 0 + entityID: 10 + entityInstance: 17 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/voltage/psu0_vin + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +183: + bExp: 0 + entityID: 10 + entityInstance: 18 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/voltage/psu1_vin + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +186: + bExp: 0 + entityID: 10 + entityInstance: 21 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/voltage/psu0_vout + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts +187: + bExp: 0 + entityID: 10 + entityInstance: 22 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + mutability: Mutability::Write|Mutability::Read + multiplierM: 1 + path: /xyz/openbmc_project/sensors/voltage/psu1_vout + rExp: 0 + readingType: readingData + scale: -3 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 8 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts 205: bExp: 0 entityID: 10 @@ -4172,4 +4340,4 @@ sensorReadingType: 1 sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties - unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS \ No newline at end of file + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -- cgit v1.2.3 From 4c36238257a58827053382a1b04597f068ede36b Mon Sep 17 00:00:00 2001 From: George Liu Date: Mon, 5 Aug 2019 18:30:53 +0800 Subject: fp5280g2: Add recipe file for phosphor-gpio-monitor Add the power supply monitor application and configuration files Tested: Built phosphor-gpio-monitor and ran successfully on the fp5280g2 via dbus interfaces. (From meta-inspur rev: ea9932d3b56af3ff9a12689731bd8081b66af856) Signed-off-by: George Liu Change-Id: I5e365d7a979834f093b2a1b978ce22624be5bd8a Signed-off-by: Brad Bishop --- meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf | 2 ++ .../obmc/gpio/phosphor-power-supply-0.conf | 6 ++++++ .../obmc/gpio/phosphor-power-supply-1.conf | 6 ++++++ .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 12 ++++++++++++ .../packagegroups/packagegroup-obmc-apps.bbappend | 2 +- 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf index 22eedaf2e..233f6ab17 100644 --- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf +++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf @@ -3,6 +3,8 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb" UBOOT_MACHINE = "ast_g5_ncsi_config" +OBMC_POWER_SUPPLY_INSTANCES = "0 1" + PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "fp5280g2-openpower-fru-vpd-layout-native" PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "fp5280g2-openpower-fru-inventory-native" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf new file mode 100644 index 000000000..f97d8398f --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply0 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=40 +NAME=powersupply0 +DRIVERS=/sys/bus/i2c/drivers/pmbus,11-0058 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..78c665834 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply1 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=41 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/pmbus,11-0059 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend new file mode 100644 index 000000000..04d1c07cb --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" +INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" +POWERSUPPLY_TGT = "multi-user.target" +FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" + +SYSTEMD_LINK_${PN}-presence_append_fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" + +POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" + +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 220f7b4e1..0cd358a06 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,2 @@ -RDEPENDS_${PN}-inventory_append_fp5280g2 = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type" +RDEPENDS_${PN}-inventory_append_fp5280g2 = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS_${PN}-extras_append_fp5280g2 = " phosphor-webui" -- cgit v1.2.3 From 697f17de7a71b3dd9a6a0f37a2394b5525970c1c Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:07:33 -0400 Subject: meta-inspur: Remove references to INSPURBASE INSPURBASE is only used for pointing at licenses...point at the licenses in oe-core in meta/files/common-licenses instead. to match the defacto convention used in other oe layers like meta-openembedded. (From meta-inspur rev: 052786ad38fa172500a9f641ed26e95e25e6fbc6) Change-Id: I5394fc045042a30bdc958a6e528d9a7f947d49b9 Signed-off-by: Brad Bishop --- meta-inspur/conf/layer.conf | 2 -- .../recipes-phosphor/configuration/fp5280g2-yaml-config.bb | 2 +- .../recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb | 2 +- .../recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb | 2 +- .../recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 3ba10679e..bdec1db47 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -8,5 +8,3 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" LAYERSERIES_COMPAT_inspur-layer = "thud warrior" - -INSPURBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb index 147f30988..c10330b9b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "YAML configuration for FP5280G2" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb index ba31df378..4cf267794 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/occ/fp5280g2-occ-control-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Fp5280g2 OCC Control sensor IDs" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-occ-control diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb index 915af76c7..f731bfe54 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inspur FP5280G2 Inventory config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb index 46611fa55..ba684fb88 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inspur FP5280G2 VPD layout for openpower-fru-vpd" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd -- cgit v1.2.3 From 7529e78f276e90d28c00f7333fbc8c05a53145fd Mon Sep 17 00:00:00 2001 From: Chicago Duan Date: Thu, 19 Sep 2019 15:15:13 +0800 Subject: fp5280g2: Add led manager configure Use the "init-ok" gpio to notify CPLD that the BMC has been initialized. CPLD will cause the power button led to blink. Tested: When BMC is booted complete, the power button will blink (From meta-inspur rev: 66361442598357012e8c2357ab94ed3323a1d20b) Signed-off-by: Chicago Duan Change-Id: I5bbadd6de8058814d8765e02e137b58ea3f07278 Signed-off-by: Brad Bishop --- meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf | 1 + .../leds/fp5280g2-led-manager-config-native.bb | 19 +++++++++++++++++++ .../leds/fp5280g2-led-manager-config/led.yaml | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf index 233f6ab17..455e22a0a 100644 --- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf +++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf @@ -8,6 +8,7 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "fp5280g2-openpower-fru-vpd-layout-native" PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "fp5280g2-openpower-fru-inventory-native" +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "fp5280g2-led-manager-config-native" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb new file mode 100644 index 000000000..22aadad8e --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Phosphor LED Group Management for fp5280g2" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit native + +PROVIDES += "virtual/phosphor-led-manager-config-native" + +SRC_URI += "file://led.yaml" +S = "${WORKDIR}" + +# Overwrite the example led layout yaml file prior +# to building the phosphor-led-manager package +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml new file mode 100644 index 000000000..922d67bb7 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/fp5280g2-led-manager-config/led.yaml @@ -0,0 +1,20 @@ +bmc_booted: + power: + Action: 'Blink' + DutyOn: 50 + Period: 1000 + Priority: 'On' + init-ok: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' + +#fp5280g2 does not use "power" and "power_on". but the led.yaml needs it, otherwise the machine won't power on. +power_on: + power: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' + -- cgit v1.2.3 From 9a0211de12e4bbd3b5928a9edc1bda089e945851 Mon Sep 17 00:00:00 2001 From: John Wang Date: Fri, 20 Sep 2019 09:51:24 +0800 Subject: meta-inspur: layer.conf: add zeus compatibility (From meta-inspur rev: de520bd0ba379715784a0060ca941c3c272d6054) Signed-off-by: John Wang Change-Id: I4e64add8166b48b3528473a1ef86fcde5c3dc550 Signed-off-by: Brad Bishop --- meta-inspur/conf/layer.conf | 2 +- meta-inspur/meta-fp5280g2/conf/layer.conf | 2 +- meta-inspur/meta-on5263m5/conf/layer.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index bdec1db47..ba1464abb 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_inspur-layer = "thud warrior" +LAYERSERIES_COMPAT_inspur-layer = "warrior zeus" diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index 56da4ba91..b855dbd29 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "thud warrior" +LAYERSERIES_COMPAT_fp5280g2-layer = "warrior zeus" diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index b49d300bf..b2d393514 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "on5263m5-layer" BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_on5263m5-layer = "thud warrior" +LAYERSERIES_COMPAT_on5263m5-layer = "warrior zeus" -- cgit v1.2.3 From 998598716f733d524a036a8102737e160b42cd4c Mon Sep 17 00:00:00 2001 From: George Liu Date: Mon, 23 Sep 2019 17:29:46 +0800 Subject: sync MAC from VPD to shared NIC There are two MACs on the fp5280g2 machine. eth0 is the shared NIC and eth1 is the dedicated NIC. Testd: Correctly read MAC for eth0 and eth1 from eeprom and expose it to D-BUS interface. (From meta-inspur rev: 18417299bbe04a1728ff58f588f26c6a16d06bb8) Signed-off-by: George Liu Change-Id: Id2c7a9551e5c0fc2115a7021a103095439dc242f Signed-off-by: Brad Bishop --- .../recipes-phosphor/network/first-boot-set-mac_%.bbappend | 2 +- .../recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory | 4 ++-- .../vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend index 11c52952e..934b328c7 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend @@ -1 +1 @@ -SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth1.service" +SYSTEMD_SERVICE_${PN} += " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory index 2e6b39198..c4ba3ad2c 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory @@ -1,3 +1,3 @@ -FRUS=BMC,ETHERNET -PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/ethernet +FRUS=BMC,ETHERNET,ETHERNET1 +PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1 EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a080.i2c-bus/i2c-1/1-0050/eeprom diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml index aab99dbe2..c26af4fdc 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml @@ -10,3 +10,7 @@ ETHERNET: xyz.openbmc_project.Inventory.Item.NetworkInterface: OPFR,B1: MACAddress xyz.openbmc_project.Inventory.Item.Ethernet: +ETHERNET1: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + VINI,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: -- cgit v1.2.3 From b1009646e7d2b5426ea3450bd9e51a570bab0f6c Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 1 Oct 2019 15:25:06 +0800 Subject: fp5280g2: Fix FRU property interfaces Add a specific interface for the Cpu and Dimm`s FRU properties and find all Cpu and Dimm`s paths below the `/xyz/openbmc_project/inventory` path thought this interface. Testd: Saw the addition of `xyz.openbmc_project.Inventory.Item.Cpu` or `xyz.openbmc_project.Inventory.Item.Dimm` interfaces via the D-Bus command. busctl introspect xyz.openbmc_project.Inventory.Manager /system/chassis/motherboard/cpu* or busctl introspect xyz.openbmc_project.Inventory.Manager /system/chassis/motherboard/dimm*. (From meta-inspur rev: 65a4f861c7adbbbc6b4ab8308beaea1c8b4fab5f) Signed-off-by: George Liu Change-Id: I8d89316be4308d6eb57cf8899d44cc78df5a9b6d Signed-off-by: Brad Bishop --- .../fp5280g2-ipmi-fru-properties.yaml | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml index a4eab8a6d..c44450460 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-fru-properties.yaml @@ -17,124 +17,124 @@ Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Cpu: Present: 'true' /system/chassis/motherboard/cpu1: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Cpu: Present: 'true' /system/chassis/motherboard/dimm0: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm1: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm10: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm11: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm12: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm13: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm14: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm15: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm2: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm3: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm4: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm5: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm6: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm7: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm8: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' /system/chassis/motherboard/dimm9: xyz.openbmc_project.Inventory.Decorator.Cacheable: Cached: 'true' xyz.openbmc_project.Inventory.Decorator.Replaceable: FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Item: + xyz.openbmc_project.Inventory.Item.Dimm: Present: 'true' -- cgit v1.2.3 From 5d92901b3e61b3fbc0be97506ca12ef4b1f3ceac Mon Sep 17 00:00:00 2001 From: George Liu Date: Wed, 9 Oct 2019 10:02:39 +0800 Subject: fp5280g2: Enable TFTP updates via Redfish TFTP is already support within bmcweb via Redfish and by default that was disabled. We need to enable it by default on fp5280g2 machine Testd: Updated successfully via the following Redfish curl -k -H "X-Auth-Token: $token" -X POST https://${bmc}/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate -d '{"TransferProtocol":"TFTP","ImageURI":"/obmc-phosphor-image-fp5280g2-20190924042243.static.mtd.tar"}' (From meta-inspur rev: a39ad069b6d9b0f9021495661da077a07ead1132) Signed-off-by: George Liu Change-Id: Ic6b2e44b0680e4f4472e702aa51bff1416f6b944 Signed-off-by: Brad Bishop --- meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend new file mode 100644 index 000000000..934bb28dd --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend @@ -0,0 +1,3 @@ +EXTRA_OECMAKE_append = " \ + -DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE=ON \ + " -- cgit v1.2.3