diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-23 04:40:54 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 19:39:42 +0300 |
commit | 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c (patch) | |
tree | 823835cd29daf8901a31ac14c7e6534abf199be3 /meta-ingrasys/meta-zaius | |
parent | 4feb727cd6b77a68bdaca63e121b378d814f5eaf (diff) | |
download | openbmc-194ff4f1f5d44b12e9cb06ddafa6adb20174a13c.tar.xz |
[Subtree] Bring openbmc machines to top level
The new subtree model brings the subtrees up from the openbmc-machines
layer.
Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys/meta-zaius')
47 files changed, 1107 insertions, 0 deletions
diff --git a/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample new file mode 100644 index 0000000000..42188d7f0f --- /dev/null +++ b/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample @@ -0,0 +1,35 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ingrasys \ + ##OEROOT##/meta-ingrasys/meta-zaius \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ingrasys \ + ##OEROOT##/meta-ingrasys/meta-zaius \ + " diff --git a/meta-ingrasys/meta-zaius/conf/conf-notes.txt b/meta-ingrasys/meta-zaius/conf/conf-notes.txt new file mode 100644 index 0000000000..9b3c01a556 --- /dev/null +++ b/meta-ingrasys/meta-zaius/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf new file mode 100644 index 0000000000..7467aa5f4b --- /dev/null +++ b/meta-ingrasys/meta-zaius/conf/layer.conf @@ -0,0 +1,10 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "zaius" +BBFILE_PATTERN_zaius = "" +LAYERSERIES_COMPAT_zaius = "sumo" diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample new file mode 100644 index 0000000000..f137436b50 --- /dev/null +++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample @@ -0,0 +1,21 @@ +MACHINE ??= "zaius" +DISTRO ?= "openbmc-openpower" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS_append ?= " *" +EXTRA_IMAGE_FEATURES = "debug-tweaks" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" +CONF_VERSION = "1" +INHERIT += "extrausers" +EXTRA_USERS_PARAMS = " \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf new file mode 100644 index 0000000000..9b1050a080 --- /dev/null +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -0,0 +1,14 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" + +UBOOT_MACHINE = "ast_g5_ncsi_config" + +FLASH_SIZE = "65536" + +PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "zaius-ipmi-inventory-map-native" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/ingrasys.inc +require conf/machine/include/p9.inc diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch new file mode 100644 index 0000000000..3b621e37e0 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch @@ -0,0 +1,60 @@ +From 3cd9aa92ab8ddd230cf6a9a68a27a18705b6f57c Mon Sep 17 00:00:00 2001 +From: Xo Wang <xow@google.com> +Date: Thu, 20 Oct 2016 16:26:29 -0700 +Subject: [PATCH 1/2] board/aspeed: Add reset_phy() for Zaius + +The Broadcom PHY for the Zaius BMC requires a hard reset after RGMII +clocks are enabled. Add reset_phy() implementation and configure it to +be called. + +Signed-off-by: Xo Wang <xow@google.com> +--- + board/aspeed/ast-g5/ast-g5.c | 19 +++++++++++++++++++ + include/configs/ast-common.h | 3 +++ + 2 files changed, 22 insertions(+) + +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index da79d7b..433ad18 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -33,6 +33,25 @@ int dram_init(void) + return 0; + } + ++void reset_phy(void) ++{ ++ unsigned long reg; ++ /* D3 in GPIOA/B/C/D direction and data registers */ ++ unsigned long phy_reset_mask = BIT(27); ++ ++ /* Assert MAC2 PHY hardware reset */ ++ /* Set pin low */ ++ reg = readl(AST_GPIO_BASE | 0x00); ++ writel(reg & ~phy_reset_mask, AST_GPIO_BASE | 0x00); ++ /* Enable pin for output */ ++ reg = readl(AST_GPIO_BASE | 0x04); ++ writel(reg | phy_reset_mask, AST_GPIO_BASE | 0x04); ++ udelay(3); ++ /* Set pin high */ ++ reg = readl(AST_GPIO_BASE | 0x00); ++ writel(reg | phy_reset_mask, AST_GPIO_BASE | 0x00); ++} ++ + #ifdef CONFIG_FTGMAC100 + int board_eth_init(bd_t *bd) + { +diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h +index b39ea33..3566f73 100644 +--- a/include/configs/ast-common.h ++++ b/include/configs/ast-common.h +@@ -104,4 +104,7 @@ + "spi_dma=yes\0" \ + "" + ++/* Call reset_phy() */ ++#define CONFIG_RESET_PHY_R 1 ++ + #endif /* __AST_COMMON_CONFIG_H */ +-- +2.8.0.rc3.226.g39d4020 + diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch new file mode 100644 index 0000000000..2de2d82345 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch @@ -0,0 +1,43 @@ +From cbb09e400a5283e5b543e2b01b8c0038890a5260 Mon Sep 17 00:00:00 2001 +From: Xo Wang <xow@google.com> +Date: Thu, 20 Oct 2016 17:42:13 -0700 +Subject: [PATCH 2/2] board/aspeed, aspeednic: Use MAC2 for networking + +Enable and select MAC2 for aspeednic. + +Signed-off-by: Xo Wang <xow@google.com> +--- + drivers/net/aspeednic.c | 4 ++-- + include/configs/ast-g5-ncsi.h | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/aspeednic.c b/drivers/net/aspeednic.c +index 8b85893..cff8370 100644 +--- a/drivers/net/aspeednic.c ++++ b/drivers/net/aspeednic.c +@@ -18,8 +18,8 @@ + /* From the board config file */ + #define CONFIG_MAC1_PHY_SETTING 2 + #define CONFIG_MAC2_PHY_SETTING 0 +-#define CONFIG_ASPEED_MAC_NUMBER 1 +-#define CONFIG_ASPEED_MAC_CONFIG 1 // config MAC1 ++#define CONFIG_ASPEED_MAC_NUMBER 2 ++#define CONFIG_ASPEED_MAC_CONFIG 2 // config MAC2 + #define _PHY_SETTING_CONCAT(mac) CONFIG_MAC##mac##_PHY_SETTING + #define _GET_MAC_PHY_SETTING(mac) _PHY_SETTING_CONCAT(mac) + #define CONFIG_ASPEED_MAC_PHY_SETTING \ +diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h +index f73a8f1..1408618 100644 +--- a/include/configs/ast-g5-ncsi.h ++++ b/include/configs/ast-g5-ncsi.h +@@ -22,6 +22,7 @@ + /* Ethernet */ + #define CONFIG_LIB_RAND + #define CONFIG_ASPEEDNIC ++#define CONFIG_MAC2_ENABLE + + /* platform.S settings */ + #define CONFIG_DRAM_ECC_SIZE 0x10000000 +-- +2.8.0.rc3.226.g39d4020 + diff --git a/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend new file mode 100644 index 0000000000..1686be0668 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" +SRC_URI_append_zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch \ + file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch" diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg new file mode 100644 index 0000000000..75c630ce64 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg @@ -0,0 +1,8 @@ +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA9541=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_W1=y +CONFIG_W1_MASTER_GPIO=y +CONFIG_W1_SLAVE_THERM=y +CONFIG_SENSORS_LM25066=y +CONFIG_RTC_DRV_PCF8523=y diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 0000000000..f3a83990ba --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" +SRC_URI_append_zaius = " file://zaius.cfg" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb new file mode 100644 index 0000000000..29f36a4f26 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -0,0 +1,28 @@ +SUMMARY = "Zaius AVSBus control" +DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Zaius" +PR = "r0" + +inherit obmc-phosphor-systemd +inherit obmc-phosphor-license + +TMPL_OFF = "avsbus-disable@.service" +TMPL_ON = "avsbus-enable@.service" +INSTFMT_OFF = "avsbus-disable@{0}.service" +INSTFMT_ON = "avsbus-enable@{0}.service" +TGTFMT_OFF = "obmc-host-stop@{0}.target" +TGTFMT_ON = "obmc-chassis-poweron@{0}.target" +FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" +FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" + +SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE_${PN} += "${TMPL_ON}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" + +SRC_URI += "file://zaius_avsbus.sh" +RDEPENDS_${PN} += "i2c-tools" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/zaius_avsbus.sh ${D}${bindir}/zaius_avsbus.sh +} diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service new file mode 100644 index 0000000000..9cf322b2d4 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-disable@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Disable AVSBus on VRMs +Wants=obmc-power-stop-pre@%i.target +Before=obmc-power-stop-pre@%i.target +Conflicts=obmc-host-startmin@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on + +[Service] +ExecStart=/usr/bin/env zaius_avsbus.sh disable +SyslogIdentifier=zaius_avsbus.sh +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=obmc-host-stop@%i.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service new file mode 100644 index 0000000000..24aadf5ade --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -0,0 +1,16 @@ +[Unit] +Description=Enable AVSBus on VRMs +Wants=obmc-host-start-pre@%i.target +Before=obmc-host-start-pre@%i.target +Conflicts=obmc-host-stop@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on + +[Service] +ExecStart=/usr/bin/env zaius_avsbus.sh vdn_max +ExecStart=/usr/bin/env zaius_avsbus.sh enable +SyslogIdentifier=zaius_avsbus.sh +Type=oneshot +RemainAfterExit=yes + +[Install] +RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh new file mode 100755 index 0000000000..45e60664ad --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh @@ -0,0 +1,98 @@ +#!/bin/sh -e +# AVSBus control for PMBUS voltage regulator modules (VRMs) +# Switches output voltage target between +# - VOUT_COMMAND register (AVSBus disabled, default on Zaius) +# - AVSBus target output (AVSBus enabled, voltage set by host) + +cpu0_i2c_bus="7" +cpu1_i2c_bus="8" +buses="$cpu0_i2c_bus $cpu1_i2c_bus" +vdd_i2c_addr_page="0x60:0x01" +vdn_i2c_addr_page="0x64:0x01" +vcs_i2c_addr_page="0x64:0x00" +addrs_pages="$vdd_i2c_addr_page $vdn_i2c_addr_page $vcs_i2c_addr_page" + +# Usage: vrm_set_page <bus> <i2c_address> <page> +vrm_set_page() +{ + i2cset -y $1 $2 0x00 $3 b +} + +# Usage: vrm_avs_enable <bus> <i2c_address> <page> +# Initializes the AVSBus VOUT setpoint to the value in PMBus VOUT_COMMAND +# Sets OPERATION PMBUS register to +# - Enable/Disable: On +# - VOUT Source: AVSBus Target Rail Voltage +# - AVSBus Copy: VOUT_COMMAND remains unchanged +# Writes to VOUT setpoint over AVSBus will persist after the VRM is switched to +# PMBus control. Switching back to AVSBus control restores this persisted +# setpoint rather than re-initializing to PMBus VOUT_COMMAND. This behavior is +# known to Intersil and writing VOUT_COMMAND over PMBus is the only workaround. +vrm_avs_enable() +{ + vrm_set_page "$@" + echo Enabling AVSBus on bus $1 VRM @$2 rail $3... + local vout_command=`i2cget -y $1 $2 0x21 w` + i2cset -y $1 $2 0x21 $vout_command w + i2cset -y $1 $2 0x01 0xb0 b +} + +# Usage: vrm_avs_disable <bus> <i2c_address> <page> +# Sets OPERATION PMBUS register to +# - Enable/Disable: On +# - VOUT Source: VOUT_COMMAND +# - AVSBus Copy: VOUT_COMMAND remains unchanged +vrm_avs_disable() +{ + vrm_set_page "$@" + echo Disabling AVSBus on bus $1 VRM @$2 rail $3... + i2cset -y $1 $2 0x01 0x80 b +} + +# Usage: vrm_vout_max_1v1 <bus> <i2c_address> <page> +# Sets VOUT_MAX to 1.1V +vrm_vout_max_1v1() +{ + vrm_set_page "$@" + echo Setting VOUT_MAX=[1.1V] on bus $1 VRM @$2 rail $3... + i2cset -y $1 $2 0x24 0x44c w +} + +# Usage: vrm_print <bus> <i2c_address> <page> +vrm_print() +{ + vrm_set_page "$@" + local operation=`i2cget -y $1 $2 0x01 b` + local vout=`i2cget -y $1 $2 0x8b w` + local iout=`i2cget -y $1 $2 0x8c w` + echo VRM on bus $1 @$2 rail $3: OPERATION=$operation VOUT=$vout IOUT=$iout +} + +# Usage: for_each_rail <command> +# <command> will be invoked with <bus> <i2c_address> <page> +for_each_rail() +{ + for bus in $buses + do + for addr_page in $addrs_pages + do + $1 $bus `echo $addr_page | tr : " "` + done + done +} + +if [ "$1" == "enable" ] +then + for_each_rail vrm_avs_enable +elif [ "$1" == "disable" ] +then + for_each_rail vrm_avs_disable +elif [ "$1" == "vdn_max" ] +then + addrs_pages="$vdn_i2c_addr_page" + for_each_rail vrm_vout_max_1v1 +else + for_each_rail vrm_print + echo "\"$0 <enable|disable>\" to control whether VRMs use AVSBus" + echo "\"$0 <vdn_max>\" to set VDN rails VOUT_MAX to 1.1V" +fi diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb new file mode 100644 index 0000000000..bd33c6382a --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Zaius host reference clock fixup" +PR = "r0" + +inherit obmc-phosphor-systemd +inherit obmc-phosphor-license + +TMPL = "op-refclock-fixup@.service" +INSTFMT = "op-refclock-fixup@{0}.service" +TGTFMT = "obmc-chassis-poweron@{0}.target" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" + +SRC_URI += "file://fix_zaius_refclock.sh" +RDEPENDS_${PN} += "i2c-tools" + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/fix_zaius_refclock.sh ${D}${sbindir}/fix_zaius_refclock.sh +} diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh new file mode 100755 index 0000000000..01eb72b718 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# fix up refclock by reconfiguring output of Si5338C clock generator + +i2cset="i2cset" +clkgen_i2c_bus="0" +clkgen_i2c_addr="0x70" + +# Usage: clkgen_write <address> <data> [write length] +clkgen_write() +{ + $i2cset -y $clkgen_i2c_bus $clkgen_i2c_addr $1 $2 $3 +} + +# disable outputs +clkgen_write 230 0x10 b + +# set output configurations of each of the four channels to 3.3V HCSL +clkgen_write 36 0x07 b +clkgen_write 37 0x07 b +clkgen_write 38 0x07 b +clkgen_write 39 0x07 b +clkgen_write 40 0xe7 b +clkgen_write 41 0x9c b +clkgen_write 42 0x27 b + +# enable outputs +clkgen_write 230 0x00 b diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service new file mode 100644 index 0000000000..9444b367fb --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service @@ -0,0 +1,19 @@ +[Unit] +Description=Fix up Zaius host refclock +Wants=obmc-host-start-pre@%i.target +Before=obmc-host-start-pre@%i.target +Wants=obmc-power-on@%i.target +After=obmc-power-on@%i.target +Before=fsi-scan@%i.service +Conflicts=obmc-host-stop@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on + +[Service] +Restart=no +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/env fix_zaius_refclock.sh +SyslogIdentifier=fix_zaius_refclock.sh + +[Install] +RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb new file mode 100644 index 0000000000..98fb89b5c5 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -0,0 +1,31 @@ +SUMMARY = "Zaius VCS rail control" +DESCRIPTION = "VCS voltage rail control implementation for Zaius" +PR = "r0" + +inherit obmc-phosphor-systemd +inherit obmc-phosphor-license + +PROVIDES += 'virtual/p9-vcs-workaround' +RPROVIDES_${PN} += 'virtual-p9-vcs-workaround' + +TMPL_OFF = "vcs-off@.service" +TMPL_ON = "vcs-on@.service" +INSTFMT_OFF = "vcs-off@{0}.service" +INSTFMT_ON = "vcs-on@{0}.service" +TGTFMT_OFF = "obmc-host-stop@{0}.target" +TGTFMT_ON = "obmc-chassis-poweron@{0}.target" +FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" +FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" + +SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE_${PN} += "${TMPL_ON}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" + +SRC_URI += "file://zaius_vcs.sh" +RDEPENDS_${PN} += "i2c-tools" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/zaius_vcs.sh ${D}${bindir}/zaius_vcs.sh +} diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service new file mode 100644 index 0000000000..d230781b40 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-off@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Turn VCS rails off +Wants=obmc-power-stop-pre@%i.target +Before=obmc-power-stop-pre@%i.target +Conflicts=obmc-host-startmin@%i.target + +[Service] +ExecStart=/usr/bin/env zaius_vcs.sh off +SyslogIdentifier=zaius_vcs.sh +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=obmc-host-stop@%i.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service new file mode 100644 index 0000000000..17c7cf6407 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/vcs-on@.service @@ -0,0 +1,16 @@ +[Unit] +Description=Turn VCS rails on +Wants=vcs_workaround@%i.service +After=vcs_workaround@%i.service +Wants=obmc-host-start-pre@%i.target +Before=obmc-host-start-pre@%i.target +Conflicts=obmc-host-stop@%i.target + +[Service] +ExecStart=/usr/bin/env zaius_vcs.sh on +SyslogIdentifier=zaius_vcs.sh +Type=oneshot +RemainAfterExit=yes + +[Install] +RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh new file mode 100755 index 0000000000..49bf0b04f5 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh @@ -0,0 +1,72 @@ +#!/bin/sh -e +# Read and control VCS rails by sending the UCD power sequencer I2C commands. +# This script assumes that the UCD is controlling VCS rails as GPIOs 5 and 6. +# Also assumes that those GPIOs are already enabled. + +ucd_bus="0" +ucd_addr="0x64" +ucd_path="/sys/bus/i2c/drivers/ucd9000" +ucd_driver="${ucd_bus}-00${ucd_addr#0x}" +ucd_retries="5" + +retry() +{ + local i=0 + until [ $i -ge $ucd_retries ]; do + i=$((i+1)) + retry_output=`$@` && break + done + local ret=$? + if [ $i -eq $ucd_retries ]; then exit $ret; fi +} + +# Usage: ucd_get address +# Result stored in $ucd_reg +ucd_get() +{ + retry i2cget -f -y $ucd_bus $ucd_addr $1 b + ucd_reg=$retry_output +} + +# Usage: ucd_get address value +ucd_set() +{ + retry i2cset -f -y $ucd_bus $ucd_addr $1 $2 b +} + +vcs_set_gpios() +{ + echo -e "\tSetting UCD GPIO 5 to $1" + ucd_set 0xFA 5 + ucd_set 0xFB $1 + ucd_set 0xFB $1 + echo -e "\tSetting UCD GPIO 6 to $1" + ucd_set 0xFA 6 + ucd_set 0xFB $1 + ucd_set 0xFB $1 +} + +vcs_get() +{ + echo Reading VCS settings + ucd_set 0xFA 5 + ucd_get 0xFB + local val=`echo $ucd_reg | grep -i -c 0x0f` + echo -e "\tUCD GPIO 5 state=$val" + ucd_set 0xFA 6 + ucd_get 0xFB + local val=`echo $ucd_reg | grep -i -c 0x0f` + echo -e "\tUCD GPIO 6 state=$val" +} + + +if [ "$1" == "on" ]; then + echo Turning on VCS + vcs_set_gpios 0x7 +elif [ "$1" == "off" ]; then + echo Turning off VCS + vcs_set_gpios 0x3 +else + vcs_get + echo "$0 <on|off>" to set state +fi diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf new file mode 100644 index 0000000000..a5ba3f3284 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -0,0 +1,4 @@ +lpc-address = 0x3f8 +sirq = 4 +local-tty = ttyS0 +local-tty-baud = 115200 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 0000000000..2072afd863 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend new file mode 100644 index 0000000000..801b346832 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_append_zaius := "${THISDIR}/${PN}:" + +PCIE_CARD_E2B_INSTANCE = "pcie-card-e2b" + +TMPL = "phosphor-gpio-presence@.service" +INSTFMT = "phosphor-gpio-presence@{0}.service" +TGT = "${SYSTEMD_DEFAULT_TARGET}" +FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" + +SYSTEMD_LINK_${PN}-presence_append_zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-pcie-card-e2b.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-pcie-card-e2b.conf new file mode 100644 index 0000000000..cfc5414067 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-pcie-card-e2b.conf @@ -0,0 +1,4 @@ +INVENTORY=/system/chassis/pcie_card_e2b +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=39 +NAME=pcie_card_e2b diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service new file mode 100644 index 0000000000..0f8396c7b1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Phosphor GPIO %I Presence +Wants=mapper-wait@-xyz-openbmc_project-inventory.service +After=mapper-wait@-xyz-openbmc_project-inventory.service +ConditionPathExists={envfiledir}/obmc/gpio/phosphor-pcie-card-e2b.conf + +[Service] +EnvironmentFile={envfiledir}/obmc/gpio/phosphor-pcie-card-e2b.conf +ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} +SyslogIdentifier=phosphor-gpio-presence + +[Install] +RequiredBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend new file mode 100644 index 0000000000..72d991c7e5 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop new file mode 100644 index 0000000000..a94b241733 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/checkstop-monitor/obmc/gpio/checkstop @@ -0,0 +1,4 @@ +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=47 +POLARITY=1 +TARGET=obmc-host-crash@0.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend new file mode 100644 index 0000000000..953b4b735a --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend @@ -0,0 +1,2 @@ +RDEPENDS_${PN} += 'refclock-fixup' +RDEPENDS_${PN} += 'avsbus-control' diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend new file mode 100644 index 0000000000..aa57bbfe67 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -0,0 +1 @@ +OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend new file mode 100644 index 0000000000..72d991c7e5 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml new file mode 100644 index 0000000000..bfe8e7e30d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%/extra-properties.yaml @@ -0,0 +1,15 @@ +/system/chassis/motherboard/cpu0: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' + +/system/chassis/motherboard/cpu1: + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend new file mode 100644 index 0000000000..72d991c7e5 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml new file mode 100644 index 0000000000..4fd637b62b --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%/config.yaml @@ -0,0 +1,178 @@ +0x03: + sensorType: 0x0F + path: /xyz/openbmc_project/state/host0 + sensorReadingType: 0x6F + serviceInterface: org.freedesktop.DBus.Properties + readingType: eventdata2 + mutability: Mutability::Write|Mutability::Read + interfaces: + xyz.openbmc_project.State.Boot.Progress: + BootProgress: + Offsets: + 0x13: + type: string + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart + 0x00: + type: string + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified + 0x01: + type: string + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit + 0x07: + type: string + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit + 0x14: + type: string + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit + 0x03: + type: string + set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit +0x05: + sensorType: 0x1F + path: /xyz/openbmc_project/state/host0 + sensorReadingType: 0x6F + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + mutability: Mutability::Write|Mutability::Read + interfaces: + xyz.openbmc_project.State.OperatingSystem.Status: + OperatingSystemState: + Offsets: + 0x02: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot + type: string + 0x06: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete + type: string + 0x04: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot + type: string + 0x01: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot + type: string + 0x03: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot + type: string + 0x05: + assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot + type: string +0x07: + sensorType: 0xC3 + path: /xyz/openbmc_project/state/host0 + sensorReadingType: 0x6F + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingAssertion + mutability: Mutability::Write|Mutability::Read + interfaces: + xyz.openbmc_project.Control.Boot.RebootAttempts: + AttemptsLeft: + Offsets: + 0xFF: + type: uint32_t +0x21: + sensorType: 0x07 + path: /system/chassis/motherboard/cpu0 + sensorReadingType: 0x6F + serviceInterface: xyz.openbmc_project.Inventory.Manager + readingType: assertion + mutability: Mutability::Write|Mutability::Read + interfaces: + xyz.openbmc_project.State.Decorator.OperationalStatus: + Functional: + Prereqs: + 0x07: + assert: true + deassert: false + type: bool + Offsets: + 0x08: + assert: false + deassert: true + type: bool + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 0x07: + assert: true + deassert: false + type: bool +0x6A: + sensorType: 0x07 + path: /org/open_power/control/occ0 + sensorReadingType: 0x09 + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + mutability: Mutability::Write|Mutability::Read + interfaces: + org.open_power.OCC.Status: + OccActive: + Offsets: + 0x00: + assert: false + deassert: true + type: bool + 0x01: + assert: true + deassert: false + type: bool +0x71: + sensorType: 0x07 + path: /system/chassis/motherboard/cpu1 + sensorReadingType: 0x6F + serviceInterface: xyz.openbmc_project.Inventory.Manager + readingType: assertion + mutability: Mutability::Write|Mutability::Read + interfaces: + xyz.openbmc_project.State.Decorator.OperationalStatus: + Functional: + Prereqs: + 0x07: + assert: true + deassert: false + type: bool + Offsets: + 0x08: + assert: false + deassert: true + type: bool + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 0x07: + assert: true + deassert: false + type: bool +0xBA: + sensorType: 0x07 + path: /org/open_power/control/occ1 + sensorReadingType: 0x09 + serviceInterface: org.freedesktop.DBus.Properties + readingType: assertion + mutability: Mutability::Write|Mutability::Read + interfaces: + org.open_power.OCC.Status: + OccActive: + Offsets: + 0x00: + assert: false + deassert: true + type: bool + 0x01: + assert: true + deassert: false + type: bool +0xFC: + sensorType: 0xCD + path: /system/chassis/pcie_card_e2b + sensorReadingType: 0x03 + serviceInterface: xyz.openbmc_project.Inventory.Manager + readingType: assertion + mutability: Mutability::Write|Mutability::Read + interfaces: + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 0x01: + assert: true + deassert: false + type: bool diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb new file mode 100644 index 0000000000..96d1674504 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map-native.bb @@ -0,0 +1,23 @@ +SUMMARY = "Zaius IPMI to DBus Inventory mapping." +PR = "r1" + +inherit native +inherit obmc-phosphor-license +inherit phosphor-ipmi-fru + +SRC_URI += "file://config.yaml" + +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" + +S = "${WORKDIR}" + +do_install() { + # TODO: install this to inventory_datadir + # after ipmi-fru-parser untangles the host + # firmware config from the machine inventory. + DEST=${D}${config_datadir} + + install -d ${DEST} + install config.yaml ${DEST} +} + diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml new file mode 100644 index 0000000000..8b32bd02e4 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-inventory-map/config.yaml @@ -0,0 +1,54 @@ +1: + /system/chassis/motherboard/cpu0: + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + IPMIFruValueDelimiter: 58 + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board +2: + /system/chassis/motherboard/cpu1: + entityID: 3 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + IPMIFruValueDelimiter: 58 + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/mboxd/mboxd.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/mboxd/mboxd.bbappend new file mode 100644 index 0000000000..8b6248a461 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/mboxd/mboxd.bbappend @@ -0,0 +1 @@ +MBOXD_FLASH_SIZE = "64M" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend new file mode 100644 index 0000000000..f80bdb6cf3 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -0,0 +1,3 @@ +# Support OCC pass through and general occ control +# Support for GPIO presence service +RDEPENDS_${PN}-inventory_append_zaius = " openpower-occ-control virtual/obmc-gpio-presence" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend new file mode 100644 index 0000000000..1aaa6311b1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +ZAIUS_CHIPS = "i2c@1e78a000/i2c-bus@40/ucd90160@64" +ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf" + +ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}" + +ZAIUS_OCCS = " \ + 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ + 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + " +ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" + +ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf new file mode 100644 index 0000000000..92be7fed3d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf @@ -0,0 +1,25 @@ +LABEL_in1=vout1 + +LABEL_in2=vout2 + +LABEL_in3=vout3 + +LABEL_in4=vout4 + +LABEL_in5=vout5 + +LABEL_in6=vout6 + +LABEL_in7=vout7 + +LABEL_in8=vout8 + +LABEL_in9=vout9 + +LABEL_in10=vout10 + +LABEL_in11=vout11 + +LABEL_in12=vout12 + +LABEL_in13=vout13 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 0000000000..650415131b --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,83 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp34 = "p0_core0_temp" +LABEL_temp37 = "p0_core1_temp" +LABEL_temp40 = "p0_core2_temp" +LABEL_temp43 = "p0_core3_temp" +LABEL_temp46 = "p0_core4_temp" +LABEL_temp49 = "p0_core5_temp" +LABEL_temp52 = "p0_core6_temp" +LABEL_temp55 = "p0_core7_temp" +LABEL_temp58 = "p0_core8_temp" +LABEL_temp61 = "p0_core9_temp" +LABEL_temp64 = "p0_core10_temp" +LABEL_temp67 = "p0_core11_temp" +LABEL_temp70 = "p0_core12_temp" +LABEL_temp73 = "p0_core13_temp" +LABEL_temp76 = "p0_core14_temp" +LABEL_temp79 = "p0_core15_temp" +LABEL_temp82 = "p0_core16_temp" +LABEL_temp85 = "p0_core17_temp" +LABEL_temp88 = "p0_core18_temp" +LABEL_temp91 = "p0_core19_temp" +LABEL_temp94 = "p0_core20_temp" +LABEL_temp97 = "p0_core21_temp" +LABEL_temp100 = "p0_core22_temp" +LABEL_temp103 = "p0_core23_temp" +LABEL_temp224 = "dimm0_temp" +LABEL_temp226 = "dimm1_temp" +LABEL_temp228 = "dimm2_temp" +LABEL_temp230 = "dimm3_temp" +LABEL_temp232 = "dimm4_temp" +LABEL_temp234 = "dimm5_temp" +LABEL_temp236 = "dimm6_temp" +LABEL_temp238 = "dimm7_temp" +LABEL_temp240 = "dimm8_temp" +LABEL_temp242 = "dimm9_temp" +LABEL_temp244 = "dimm10_temp" +LABEL_temp246 = "dimm11_temp" +LABEL_temp248 = "dimm12_temp" +LABEL_temp250 = "dimm13_temp" +LABEL_temp252 = "dimm14_temp" +LABEL_temp254 = "dimm15_temp" +LABEL_power2 = "p0_power" +LABEL_power3 = "p0_vdd_power" +LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 0000000000..ba615812a2 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,83 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp114 = "p1_core0_temp" +LABEL_temp117 = "p1_core1_temp" +LABEL_temp120 = "p1_core2_temp" +LABEL_temp123 = "p1_core3_temp" +LABEL_temp126 = "p1_core4_temp" +LABEL_temp129 = "p1_core5_temp" +LABEL_temp132 = "p1_core6_temp" +LABEL_temp135 = "p1_core7_temp" +LABEL_temp138 = "p1_core8_temp" +LABEL_temp141 = "p1_core9_temp" +LABEL_temp144 = "p1_core10_temp" +LABEL_temp147 = "p1_core11_temp" +LABEL_temp150 = "p1_core12_temp" +LABEL_temp153 = "p1_core13_temp" +LABEL_temp156 = "p1_core14_temp" +LABEL_temp159 = "p1_core15_temp" +LABEL_temp162 = "p1_core16_temp" +LABEL_temp165 = "p1_core17_temp" +LABEL_temp168 = "p1_core18_temp" +LABEL_temp171 = "p1_core19_temp" +LABEL_temp174 = "p1_core20_temp" +LABEL_temp177 = "p1_core21_temp" +LABEL_temp180 = "p1_core22_temp" +LABEL_temp183 = "p1_core23_temp" +LABEL_temp192 = "dimm16_temp" +LABEL_temp194 = "dimm17_temp" +LABEL_temp196 = "dimm18_temp" +LABEL_temp198 = "dimm19_temp" +LABEL_temp200 = "dimm20_temp" +LABEL_temp202 = "dimm21_temp" +LABEL_temp204 = "dimm22_temp" +LABEL_temp206 = "dimm23_temp" +LABEL_temp208 = "dimm24_temp" +LABEL_temp210 = "dimm25_temp" +LABEL_temp212 = "dimm26_temp" +LABEL_temp224 = "dimm27_temp" +LABEL_temp216 = "dimm28_temp" +LABEL_temp218 = "dimm29_temp" +LABEL_temp220 = "dimm30_temp" +LABEL_temp222 = "dimm31_temp" +LABEL_power2 = "p1_power" +LABEL_power3 = "p1_vdd_power" +LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager.bbappend new file mode 100644 index 0000000000..813a09d556 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_append_zaius := ":${THISDIR}/${PN}" +SRC_URI_append_zaius = " file://powerpolicy-default-ALWAYS_POWER_ON.override.yml" +SRC_URI_append_zaius = " file://timeowner-host-no-ntp.override.yml" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml new file mode 100644 index 0000000000..7aff754151 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml @@ -0,0 +1,6 @@ +--- +/xyz/openbmc_project/control/host0/power_restore_policy: + - Interface: xyz.openbmc_project.Control.Power.RestorePolicy + Properties: + PowerRestorePolicy: + Default: RestorePolicy::Policy::AlwaysOn diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml new file mode 100644 index 0000000000..abb1316c87 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/timeowner-host-no-ntp.override.yml @@ -0,0 +1,12 @@ +--- +/xyz/openbmc_project/time/owner: + - Interface: xyz.openbmc_project.Time.Owner + Properties: + TimeOwner: + Default: Owner::Owners::Host + +/xyz/openbmc_project/time/sync_method: + - Interface: xyz.openbmc_project.Time.Synchronization + Properties: + TimeSyncMethod: + Default: Synchronization::Method::Manual diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config.bb new file mode 100644 index 0000000000..56117c4bcf --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config.bb @@ -0,0 +1,5 @@ +SUMMARY = "Zaius board wiring" +DESCRIPTION = "Board wiring information for the Zaius OpenPOWER system." +PR = "r1" + +inherit config-in-skeleton diff --git a/meta-ingrasys/meta-zaius/recipes.txt b/meta-ingrasys/meta-zaius/recipes.txt new file mode 100644 index 0000000000..c583668477 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes.txt @@ -0,0 +1 @@ +recipes-phosphor - Phosphor OpenBMC applications and configuration |