diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-09-09 16:57:07 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-09-09 17:06:20 +0300 |
| commit | c7d1cd9477b2f14e48524da420e1528f6036c8b6 (patch) | |
| tree | 22c0f5f735b505b82610cc0f8190aae12a80347e /meta-amd | |
| parent | ef2307412f38a174f511852bedcbe9974e68674d (diff) | |
| download | openbmc-c7d1cd9477b2f14e48524da420e1528f6036c8b6.tar.xz | |
meta-amd: subtree update:0ec4f9ff17..496d83825e
Supreeth Venkatesh (22):
meta-amd: Add recipe for power control.
meta-amd: Override watchdog recipe.
meta-amd: Override fans and sel-logger recipes.
meta-amd: Define OpenBMC AMD package group applications.
meta-amd: Add Linux kernel recipe for EthanolX.
meta-amd: EthanolX platform configuration
meta-amd: Enable bmcweb and phosphor-webui
meta-amd: Enable LED Group Management for Ethanolx
meta-amd: Enable OOB BMC firmware update
meta-amd: Enable SOL host console
meta-amd: Modify device tree to enable thermal sensors for EthanolX
meta-amd: Enable hwmon to monitor thermal sensors and fan
meta-amd: Enable ipmi fru and sensor configuration
meta-amd: Add ipmi config, host and fru .bbappend files
meta-amd: Add entity-manager and ipmitool modules
meta-amd:linux: Added I2c0 and I2c1 which cater to AMD's APML Interface
meta-amd: Remove device tree patch
meta-amd: Add device tree patch
meta-amd: Add chassis control application
meta-amd: Add phosphor host logger application
meta-amd: Add fan tach sensor for fan 0 and fan 1
meta-amd: Remove bmcweb bbappend file
Change-Id: I53d6f4be203eefce1475d588b55fdf785b2b2024
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-amd')
38 files changed, 2433 insertions, 0 deletions
diff --git a/meta-amd/meta-ethanolx/conf/bblayers.conf.sample b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample new file mode 100644 index 000000000..d84dbc759 --- /dev/null +++ b/meta-amd/meta-ethanolx/conf/bblayers.conf.sample @@ -0,0 +1,29 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-amd \ + ##OEROOT##/meta-amd/meta-ethanolx \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-amd \ + ##OEROOT##/meta-amd/meta-ethanolx \ + " diff --git a/meta-amd/meta-ethanolx/conf/conf-notes.txt b/meta-amd/meta-ethanolx/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-amd/meta-ethanolx/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf new file mode 100644 index 000000000..0d9d81c99 --- /dev/null +++ b/meta-amd/meta-ethanolx/conf/layer.conf @@ -0,0 +1,12 @@ +# 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 += "ethanolx-layer" +BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/" +BBFILE_PRIORITY_ethanolx-layer = "6" + +LAYERSERIES_COMPAT_ethanolx-layer = "warrior zeus dunfell" diff --git a/meta-amd/meta-ethanolx/conf/local.conf.sample b/meta-amd/meta-ethanolx/conf/local.conf.sample new file mode 100644 index 000000000..937de74b4 --- /dev/null +++ b/meta-amd/meta-ethanolx/conf/local.conf.sample @@ -0,0 +1,238 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +# You need to select a specific machine to target the build with. There are a selection +# of emulated machines available which can boot and run in the QEMU emulator: +# +#MACHINE ?= "qemuarm" +#MACHINE ?= "qemuarm64" +#MACHINE ?= "qemumips" +#MACHINE ?= "qemuppc" +#MACHINE ?= "qemux86" +#MACHINE ?= "qemux86-64" +# +# There are also the following hardware board target machines included for +# demonstration purposes: +# +#MACHINE ?= "beaglebone" +#MACHINE ?= "genericx86" +#MACHINE ?= "genericx86-64" +#MACHINE ?= "mpc8315e-rdb" +#MACHINE ?= "edgerouter" +# +# This sets the default machine to be qemux86 if no other machine is selected: +MACHINE ??= "ethanolx" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_rpm" + +# +# SDK/ADT target architecture +# +# This variable specifies the architecture to build SDK/ADT items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686 and x86_64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES = "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +# - 'image-mklibs' to reduce shared library files size for an image +# - 'image-prelink' in order to prelink the filesystem image +# - 'image-swab' to perform host system intrusion detection +# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink +# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +USER_CLASSES ?= "buildstats image-mklibs image-prelink" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. To +# enable this uncomment this line. See classes/testimage(-auto).bbclass for +# further details. +#TEST_IMAGE = "1" +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +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" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + + +# +# Qemu configuration +# +# By default qemu will build with a builtin VNC server where graphical output can be +# seen. The two lines below enable the SDL backend too. This assumes there is a +# libsdl library available on your build system. +PACKAGECONFIG_append_pn-qemu-native = " sdl" +PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#ASSUME_PROVIDED += "libsdl-native" + + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "1" diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf new file mode 100644 index 000000000..7469c9a1c --- /dev/null +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -0,0 +1,39 @@ + +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-amd-${MACHINE}.dtb" + +UBOOT_MACHINE_ethanolx = "ast_g5_phy_config" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc + +SERIAL_CONSOLES = "115200;ttyS4" + +FLASH_SIZE = "32768" + +OBMC_MACHINE_FEATURES += "\ + obmc-bmc-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-host-state-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-host-ipmi \ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-flash-mgmt \ + " + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" +VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" + +OVERRIDES .= ":amd" + + diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch new file mode 100644 index 000000000..a8d560c28 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch @@ -0,0 +1,64 @@ +From 29fe80d452e598e15b26d3570b8f460bf14a7e42 Mon Sep 17 00:00:00 2001 +From: Supreeth Venkatesh <supreeth.venkatesh@amd.com> +Date: Tue, 18 Aug 2020 10:56:37 -0500 +Subject: [PATCH 1/1] ARM:dts:aspeed: Add GPIO line names for AMD EthanolX +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit + +Add GPIO line names for AMD EthanolX customer reference board. +It populates AST2500 GPIO lines (A0-A7 to AC0-AC7) with AMD EthanolX +designated names. + +Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@amd.com> +--- + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 34 +++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +index 60ba86f3e5bc..008001f95399 100644 +--- a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts ++++ b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +@@ -82,6 +82,40 @@ + &pinctrl_adc4_default>; + }; + ++&gpio { ++ status = "okay"; ++ gpio-line-names = ++ /*A0-A7*/ "","","FAULT_LED","CHASSIS_ID_LED","","","","", ++ /*B0-B7*/ "","","","","","","","", ++ /*C0-C7*/ "CHASSIS_ID_BTN","INTRUDER","AC_LOSS","","","","","", ++ /*D0-D7*/ "HDT_DBREQ","LOCAL_SPI_ROM_SEL","FPGA_SPI_ROM_SEL","JTAG_MUX_S","JTAG_MUX_OE","HDT_SEL","ASERT_WARM_RST_BTN","FPGA_RSVD", ++ /*E0-E7*/ "","","MON_P0_PWR_BTN","MON_P0_RST_BTN","MON_P0_NMI_BTN","MON_P0_PWR_GOOD","MON_PWROK","MON_RESET", ++ /*F0-F7*/ "MON_P0_PROCHOT","MON_P1_PROCHOT","MON_P0_THERMTRIP","MON_P1_THERMTRIP","P0_PRESENT","P1_PRESENT","MON_ATX_PWR_OK","", ++ /*G0-G7*/ "BRD_REV_ID_3","BRD_REV_ID_2","BRD_REV_ID_1","BRD_REV_ID_0","P0_APML_ALERT","P1_APML_ALERT","FPGA ALERT","", ++ /*H0-H7*/ "BRD_ID_0","BRD_ID_1","BRD_ID_2","BRD_ID_3","PCIE_DISCONNECTED","USB_DISCONNECTED","SPARE_0","SPARE_1", ++ /*I0-I7*/ "","","","","","","","", ++ /*J0-J7*/ "","","","","","","","", ++ /*K0-K7*/ "","","","","","","","", ++ /*L0-L7*/ "","","","","","","","", ++ /*M0-M7*/ "ASSERT_PWR_BTN","ASSERT_RST_BTN","ASSERT_NMI_BTN","ASSERT_LOCAL_LOCK","ASSERT_P0_PROCHOT","ASSERT_P1_PROCHOT","ASSERT_CLR_CMOS","ASSERT_BMC_READY", ++ /*N0-N7*/ "","","","","","","","", ++ /*O0-O7*/ "","","","","","","","", ++ /*P0-P7*/ "P0_VDD_CORE_RUN_VRHOT","P0_VDD_SOC_RUN_VRHOT","P0_VDD_MEM_ABCD_SUS_VRHOT","P0_VDD_MEM_EFGH_SUS_VRHOT","P1_VDD_CORE_RUN_VRHOT","P1_VDD_SOC_RUN_VRHOT","P1_VDD_MEM_ABCD_SUS_VRHOT","P1_VDD_MEM_EFGH_SUS_VRHOT", ++ /*Q0-Q7*/ "","","","","","","","", ++ /*R0-R7*/ "","","","","","","","", ++ /*S0-S7*/ "","","","","","","","", ++ /*T0-T7*/ "","","","","","","","", ++ /*U0-U7*/ "","","","","","","","", ++ /*V0-V7*/ "","","","","","","","", ++ /*W0-W7*/ "","","","","","","","", ++ /*X0-X7*/ "","","","","","","","", ++ /*Y0-Y7*/ "","","","","","","","", ++ /*Z0-Z7*/ "","","","","","","","", ++ /*AA0-AA7*/ "","SENSOR THERM","","","","","","", ++ /*AB0-AB7*/ "","","","","","","","", ++ /*AC0-AC7*/ "","","","","","","",""; ++}; ++ + //APML for P0 + &i2c0 { + status = "okay"; +-- +2.17.1 + diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg new file mode 100644 index 000000000..4a0a61e38 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed/ethanolx.cfg @@ -0,0 +1,2 @@ +CONFIG_SENSORS_LM75=y +CONFIG_I2C_ASPEED=y diff --git a/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..343a0105b --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://ethanolx.cfg \ + file://0001-ARM-dts-aspeed-Add-GPIO-line-names-for-AMD-EthanolX.patch" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb new file mode 100644 index 000000000..efa208374 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config.bb @@ -0,0 +1,33 @@ +SUMMARY = "YAML configuration for Ethanolx" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch + +SRC_URI = " \ + file://ethanolx-ipmi-fru.yaml \ + file://ethanolx-ipmi-fru-properties.yaml \ + file://ethanolx-ipmi-sensors.yaml \ + " + +S = "${WORKDIR}" + +do_install() { + cat ethanolx-ipmi-fru.yaml > fru-read.yaml + + install -m 0644 -D ethanolx-ipmi-fru-properties.yaml \ + ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml + install -m 0644 -D fru-read.yaml \ + ${D}${datadir}/${BPN}/ipmi-fru-read.yaml + install -m 0644 -D ethanolx-ipmi-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-sensors.yaml +} + +FILES_${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-extra-properties.yaml \ + ${datadir}/${BPN}/ipmi-fru-read.yaml \ + ${datadir}/${BPN}/ipmi-sensors.yaml \ + " + +ALLOW_EMPTY_${PN} = "1" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-fru-properties.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-fru-properties.yaml new file mode 100644 index 000000000..a4eab8a6d --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-fru-properties.yaml @@ -0,0 +1,140 @@ +/system: + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' +/system/chassis/motherboard: + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Item: + Present: 'true' +/system/chassis/motherboard/cpu0: + xyz.openbmc_project.Inventory.Decorator.Cacheable: + Cached: 'true' + xyz.openbmc_project.Inventory.Decorator.Replaceable: + FieldReplaceable: 'true' + xyz.openbmc_project.Inventory.Item: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + 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: + Present: 'true' diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-fru.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-fru.yaml new file mode 100644 index 000000000..b4708da41 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-fru.yaml @@ -0,0 +1,582 @@ +0: + /system/chassis/bmc: + entityID: 6 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: FRU File ID + IPMIFruSection: Board + +1: + /system/chassis/motherboard/cpu0: + entityID: 3 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + IPMIFruValueDelimiter: 58 + 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.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Custom Field 2 + IPMIFruSection: Board + IPMIFruValueDelimiter: 58 + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board + Value: false +3: + /system: + entityID: 7 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + Model: + IPMIFruProperty: Part Number + IPMIFruSection: Chassis + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Chassis + /system/chassis/motherboard: + entityID: 7 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Board + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Board + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Board + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Board + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Board +4: + /system/chassis/motherboard/dimm0: + entityID: 32 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +5: + /system/chassis/motherboard/dimm1: + entityID: 32 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +6: + /system/chassis/motherboard/dimm2: + entityID: 32 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +7: + /system/chassis/motherboard/dimm3: + entityID: 32 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +8: + /system/chassis/motherboard/dimm4: + entityID: 32 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +9: + /system/chassis/motherboard/dimm5: + entityID: 32 + entityInstance: 6 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +10: + /system/chassis/motherboard/dimm6: + entityID: 32 + entityInstance: 7 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +11: + /system/chassis/motherboard/dimm7: + entityID: 32 + entityInstance: 8 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +12: + /system/chassis/motherboard/dimm8: + entityID: 32 + entityInstance: 9 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +13: + /system/chassis/motherboard/dimm9: + entityID: 32 + entityInstance: 10 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +14: + /system/chassis/motherboard/dimm10: + entityID: 32 + entityInstance: 11 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +15: + /system/chassis/motherboard/dimm11: + entityID: 32 + entityInstance: 12 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +16: + /system/chassis/motherboard/dimm12: + entityID: 32 + entityInstance: 13 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +17: + /system/chassis/motherboard/dimm13: + entityID: 32 + entityInstance: 14 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +18: + /system/chassis/motherboard/dimm14: + entityID: 32 + entityInstance: 15 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +19: + /system/chassis/motherboard/dimm15: + entityID: 32 + entityInstance: 16 + interfaces: + xyz.openbmc_project.Inventory.Decorator.Asset: + BuildDate: + IPMIFruProperty: Mfg Date + IPMIFruSection: Product + Manufacturer: + IPMIFruProperty: Manufacturer + IPMIFruSection: Product + Model: + IPMIFruProperty: Model Number + IPMIFruSection: Product + PartNumber: + IPMIFruProperty: Part Number + IPMIFruSection: Product + SerialNumber: + IPMIFruProperty: Serial Number + IPMIFruSection: Product + xyz.openbmc_project.Inventory.Decorator.Revision: + Version: + IPMIFruProperty: Version + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Name + IPMIFruSection: Product +20: + /system/chassis/motherboard/fan1: + entityID: 29 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product + +21: + /system/chassis/motherboard/fan2: + entityID: 29 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Inventory.Item: + PrettyName: + IPMIFruProperty: Product Name + IPMIFruSection: Product diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml new file mode 100644 index 000000000..8083ee54c --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml @@ -0,0 +1,202 @@ +1: + sensorType: 0x01 + entityID: 0x06 + path: /xyz/openbmc_project/sensors/temperature/BMC + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +2: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/DIMM_P0_ABCD_P1_EFGH + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +3: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/DIMM_P1_EFGH + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +4: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/PCIe_Slots + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +5: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/DIMM_P0_EFGH_P1_ABCD + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +6: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/DIMM_P1_ABCD + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +7: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/DIMM_P0_EFGH + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +8: + sensorType: 0x01 + entityID: 0x20 + path: /xyz/openbmc_project/sensors/temperature/DIMM_P0_ABCD + sensorReadingType: 0x01 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + offsetB: 0 + bExp: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t + +9: + entityID: 0x1D + sensorType: 0x04 + path: /xyz/openbmc_project/sensors/fan_tach/P0_Fan_Speed + sensorReadingType: 0x01 + multiplierM: 1 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS + scale: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0x0: + type: int64_t + + +10: + entityID: 0x1D + sensorType: 0x04 + path: /xyz/openbmc_project/sensors/fan_tach/P1_Fan_Speed + sensorReadingType: 0x01 + multiplierM: 1 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS + scale: 0 + rExp: 0 + mutability: Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0x0: + type: int64_t
\ No newline at end of file diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 000000000..66444b9ce --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json new file mode 100644 index 000000000..0c53f576e --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json @@ -0,0 +1,11 @@ +{ + "inlet": [ + + ], + "baseboard": [ + + ], + "cpu": [ + + ] +} diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..706e192d2 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_ethanolx = " ethanolx-yaml-config" + +EXTRA_OECONF_ethanolx = " \ + YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-extra-properties.yaml \ + " diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..8e60f458e --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,6 @@ +DEPENDS_append_ethanolx = " ethanolx-yaml-config" + +EXTRA_OECONF_ethanolx = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-sensors.yaml \ + FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ + " diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config-native.bb b/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config-native.bb new file mode 100644 index 000000000..18281e40a --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config-native.bb @@ -0,0 +1,19 @@ +SUMMARY = "Phosphor LED Group Management for EthanolX" +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-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml new file mode 100644 index 000000000..818872fe2 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/leds/ethanolx-led-manager-config/led.yaml @@ -0,0 +1,199 @@ +BmcBooted: +PowerOn: +enclosure_fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' + +enclosure_identify: + identify: + Action: 'Blink' + DutyOn: 50 + Period: 1000 + +lamp_test: + fault: + Action: 'Blink' + DutyOn: 50 + Period: 1000 + Priority: 'Blink' + identify: + Action: 'On' + +# All kinds of faults using the same action as enclosure_fault +Fan0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan2Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan3Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan4Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan5Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan6Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +Fan7Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +bmcFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +cpu0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +cpu1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm2Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm3Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm4Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm5Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm6Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm7Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm8Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm9Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm10Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm11Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm12Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm13Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm14Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +dimm15Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +motherboardFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' +systemFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'Blink' diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf new file mode 100644 index 000000000..9cd98bb25 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "BMC" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf new file mode 100644 index 000000000..8e4a2afb6 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "DIMM_P0_ABCD_P1_EFGH" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf new file mode 100644 index 000000000..5c5c230be --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "DIMM_P1_EFGH" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf new file mode 100644 index 000000000..3570aafdf --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "PCIe_Slots" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf new file mode 100644 index 000000000..68143291a --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "DIMM_P0_EFGH_P1_ABCD" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf new file mode 100644 index 000000000..51a5e29d4 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "DIMM_P1_ABCD" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf new file mode 100644 index 000000000..0c28e5d25 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "DIMM_P0_EFGH" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf new file mode 100644 index 000000000..9a0eb7565 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf @@ -0,0 +1,8 @@ +LABEL_temp1= "DIMM_P0_ABCD" +WARNLO_temp1= "5000" +WARNHI_temp1= "38000" +CRITHI_temp1 = "40000" +CRITLO_temp1 = "0" +MINVALUE_temp1 = "-128" +MAXVALUE_temp1 = "127" +EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf new file mode 100644 index 000000000..0620d1640 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -0,0 +1,23 @@ +# EthanolX has 8 fan ports but only 2 are standard 4-wire fans with PWM and TACH. +LABEL_fan1 = "P0_Fan_Speed" +LABEL_fan2 = "P1_Fan_Speed" + +PWM_TARGET_fan1 = "1" +PWM_TARGET_fan2 = "2" + +WARNLO_fan1= "10" +WARNHI_fan1= "8000" +CRITHI_fan1 = "10000" +CRITLO_fan1 = "0" +MINVALUE_fan1 = "100" +MAXVALUE_fan1 = "6000" +EVENT_fan1= "WARNHI,WARNLO,CRITHI,CRITLO" + +WARNLO_fan2= "10" +WARNHI_fan2= "8000" +CRITHI_fan2 = "10000" +CRITLO_fan2 = "0" +MINVALUE_fan2 = "100" +MAXVALUE_fan2 = "6000" +EVENT_fan2= "WARNHI,WARNLO,CRITHI,CRITLO" + diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..fc565dc6e --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,20 @@ +FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:" +EXTRA_OECONF_append_ethanolx = " --enable-negative-errno-on-fail" + + +CHIPS = " \ + bus@1e78a000/i2c-bus@300/lm75a@48 \ + bus@1e78a000/i2c-bus@300/lm75a@49 \ + bus@1e78a000/i2c-bus@300/lm75a@4a \ + bus@1e78a000/i2c-bus@300/lm75a@4b \ + bus@1e78a000/i2c-bus@300/lm75a@4c \ + bus@1e78a000/i2c-bus@300/lm75a@4d \ + bus@1e78a000/i2c-bus@300/lm75a@4e \ + bus@1e78a000/i2c-bus@300/lm75a@4f \ + pwm-tacho-controller@1e786000 \ + " +ITEMSFMT = "ahb/apb/{0}.conf" +ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" + +ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ethanolx = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/0001-Amd-power-control-modifications-for-EthanolX.patch b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/0001-Amd-power-control-modifications-for-EthanolX.patch new file mode 100644 index 000000000..eb1f62cd5 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/0001-Amd-power-control-modifications-for-EthanolX.patch @@ -0,0 +1,650 @@ +From 707a3a52d5884078e2173571d421829449b54225 Mon Sep 17 00:00:00 2001 +From: Supreeth Venkatesh <supreeth.venkatesh@amd.com> +Date: Tue, 18 Aug 2020 13:47:55 -0500 +Subject: [PATCH 1/1] Amd power control modifications for EthanolX +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit + +This patch modifies recipes-x86 chassis manager code to support AMD +EthanolX customer reference board. +The configuration Json file is updated with the GPIO signals present on +AMD EthanolX file. +The Service file is updated to indicate this is modified version of x86 +power control suitable for AMD platforms. +The source file is modified to remove Intel specific SIO signals and +functions, modify it to support AMD specific GPIO signals. + +Further, Beep() is replaced by lighting up Fault LED, as AMD CRBs does +not have a beeper. + +Signed-off-by: Supreeth Venkatesh <supreeth.venkatesh@amd.com> +--- + .../config/power-config-host0.json | 23 +- + ...nbmc_project.Chassis.Control.Power.service | 2 +- + power-control-x86/src/power_control.cpp | 335 ++---------------- + 3 files changed, 44 insertions(+), 316 deletions(-) + +diff --git a/power-control-x86/config/power-config-host0.json b/power-control-x86/config/power-config-host0.json +index 567f419..9e1a54a 100644 +--- a/power-control-x86/config/power-config-host0.json ++++ b/power-control-x86/config/power-config-host0.json +@@ -1,15 +1,14 @@ + { +- "IdButton": "ID_BUTTON", +- "NMIButton": "NMI_BUTTON", +- "NMIOut": "NMI_OUT", +- "PostComplete": "POST_COMPLETE", +- "PwrButton": "POWER_BUTTON", +- "PwrOK": "PS_PWROK", +- "PwrOut": "POWER_OUT", +- "RstButton": "RESET_BUTTON", +- "RstOut": "RESET_OUT", +- "SIOOnCtl": "SIO_ONCONTROL", +- "SIOPwrGd": "SIO_POWER_GOOD", +- "SIOS5": "SIO_S5" ++ "IdButton": "CHASSIS_ID_BTN", ++ "NMIButton": "MON_P0_NMI_BTN", ++ "NMIOut": "ASSERT_NMI_BTN", ++ "PostComplete": "MON_PWROK", ++ "PwrButton": "MON_P0_PWR_BTN", ++ "PwrOK": "MON_P0_PWR_GOOD", ++ "PwrOut": "ASSERT_PWR_BTN", ++ "RstButton": "MON_P0_RST_BTN", ++ "RstOut": "ASSERT_RST_BTN", ++ "BmcReady": "ASSERT_BMC_READY", ++ "FaultLed": "FAULT_LED" + } + +diff --git a/power-control-x86/service_files/xyz.openbmc_project.Chassis.Control.Power.service b/power-control-x86/service_files/xyz.openbmc_project.Chassis.Control.Power.service +index a80235e..43cf1a7 100644 +--- a/power-control-x86/service_files/xyz.openbmc_project.Chassis.Control.Power.service ++++ b/power-control-x86/service_files/xyz.openbmc_project.Chassis.Control.Power.service +@@ -1,5 +1,5 @@ + [Unit] +-Description=Intel Power Control ++Description=Amd Power Control + + [Service] + Restart=always +diff --git a/power-control-x86/src/power_control.cpp b/power-control-x86/src/power_control.cpp +index b8bb313..73ddf71 100644 +--- a/power-control-x86/src/power_control.cpp ++++ b/power-control-x86/src/power_control.cpp +@@ -42,9 +42,8 @@ static std::string powerOutName; + static std::string powerOkName; + static std::string resetOutName; + static std::string nmiOutName; +-static std::string sioPwrGoodName; +-static std::string sioOnControlName; +-static std::string sioS5Name; ++static std::string bmcReadyName; ++static std::string faultLedName; + static std::string postCompleteName; + static std::string powerButtonName; + static std::string resetButtonName; +@@ -70,11 +69,9 @@ const static constexpr int powerPulseTimeMs = 200; + const static constexpr int forceOffPulseTimeMs = 15000; + const static constexpr int resetPulseTimeMs = 500; + const static constexpr int powerCycleTimeMs = 5000; +-const static constexpr int sioPowerGoodWatchdogTimeMs = 1000; + const static constexpr int psPowerOKWatchdogTimeMs = 8000; + const static constexpr int gracefulPowerOffTimeMs = 60000; + const static constexpr int warmResetCheckTimeMs = 500; +-const static constexpr int buttonMaskTimeMs = 60000; + const static constexpr int powerOffSaveTimeMs = 7000; + + const static std::filesystem::path powerControlDir = "/var/lib/power-control"; +@@ -93,24 +90,14 @@ static boost::asio::steady_timer gracefulPowerOffTimer(io); + static boost::asio::steady_timer warmResetCheckTimer(io); + // Time power supply power OK assertion on power-on + static boost::asio::steady_timer psPowerOKWatchdogTimer(io); +-// Time SIO power good assertion on power-on +-static boost::asio::steady_timer sioPowerGoodWatchdogTimer(io); + // Time power-off state save for power loss tracking + static boost::asio::steady_timer powerStateSaveTimer(io); + // POH timer + static boost::asio::steady_timer pohCounterTimer(io); +-// Time when to allow restart cause updates +-static boost::asio::steady_timer restartCauseTimer(io); + + // GPIO Lines and Event Descriptors + static gpiod::line psPowerOKLine; + static boost::asio::posix::stream_descriptor psPowerOKEvent(io); +-static gpiod::line sioPowerGoodLine; +-static boost::asio::posix::stream_descriptor sioPowerGoodEvent(io); +-static gpiod::line sioOnControlLine; +-static boost::asio::posix::stream_descriptor sioOnControlEvent(io); +-static gpiod::line sioS5Line; +-static boost::asio::posix::stream_descriptor sioS5Event(io); + static gpiod::line powerButtonLine; + static boost::asio::posix::stream_descriptor powerButtonEvent(io); + static gpiod::line resetButtonLine; +@@ -123,31 +110,10 @@ static gpiod::line postCompleteLine; + static boost::asio::posix::stream_descriptor postCompleteEvent(io); + static gpiod::line nmiOutLine; + +-static constexpr uint8_t beepPowerFail = 8; +- +-static void beep(const uint8_t& beepPriority) +-{ +- std::cerr << "Beep with priority: " << (unsigned)beepPriority << "\n"; +- +- conn->async_method_call( +- [](boost::system::error_code ec) { +- if (ec) +- { +- std::cerr << "beep returned error with " +- "async_method_call (ec = " +- << ec << ")\n"; +- return; +- } +- }, +- "xyz.openbmc_project.BeepCode", "/xyz/openbmc_project/BeepCode", +- "xyz.openbmc_project.BeepCode", "Beep", uint8_t(beepPriority)); +-} +- + enum class PowerState + { + on, + waitForPSPowerOK, +- waitForSIOPowerGood, + off, + transitionToOff, + gracefulTransitionToOff, +@@ -167,9 +133,6 @@ static std::string getPowerStateName(PowerState state) + case PowerState::waitForPSPowerOK: + return "Wait for Power Supply Power OK"; + break; +- case PowerState::waitForSIOPowerGood: +- return "Wait for SIO Power Good"; +- break; + case PowerState::off: + return "Off"; + break; +@@ -210,17 +173,12 @@ enum class Event + { + psPowerOKAssert, + psPowerOKDeAssert, +- sioPowerGoodAssert, +- sioPowerGoodDeAssert, +- sioS5Assert, +- sioS5DeAssert, + postCompleteAssert, + postCompleteDeAssert, + powerButtonPressed, + resetButtonPressed, + powerCycleTimerExpired, + psPowerOKWatchdogTimerExpired, +- sioPowerGoodWatchdogTimerExpired, + gracefulPowerOffTimerExpired, + powerOnRequest, + powerOffRequest, +@@ -240,18 +198,6 @@ static std::string getEventName(Event event) + case Event::psPowerOKDeAssert: + return "power supply power OK de-assert"; + break; +- case Event::sioPowerGoodAssert: +- return "SIO power good assert"; +- break; +- case Event::sioPowerGoodDeAssert: +- return "SIO power good de-assert"; +- break; +- case Event::sioS5Assert: +- return "SIO S5 assert"; +- break; +- case Event::sioS5DeAssert: +- return "SIO S5 de-assert"; +- break; + case Event::postCompleteAssert: + return "POST Complete assert"; + break; +@@ -270,9 +216,6 @@ static std::string getEventName(Event event) + case Event::psPowerOKWatchdogTimerExpired: + return "power supply power OK watchdog timer expired"; + break; +- case Event::sioPowerGoodWatchdogTimerExpired: +- return "SIO power good watchdog timer expired"; +- break; + case Event::gracefulPowerOffTimerExpired: + return "graceful power-off timer expired"; + break; +@@ -314,7 +257,6 @@ static void logEvent(const std::string_view stateHandler, const Event event) + // Power state handlers + static void powerStateOn(const Event event); + static void powerStateWaitForPSPowerOK(const Event event); +-static void powerStateWaitForSIOPowerGood(const Event event); + static void powerStateOff(const Event event); + static void powerStateTransitionToOff(const Event event); + static void powerStateGracefulTransitionToOff(const Event event); +@@ -333,9 +275,6 @@ static std::function<void(const Event)> getPowerStateHandler(PowerState state) + case PowerState::waitForPSPowerOK: + return powerStateWaitForPSPowerOK; + break; +- case PowerState::waitForSIOPowerGood: +- return powerStateWaitForSIOPowerGood; +- break; + case PowerState::off: + return powerStateOff; + break; +@@ -399,7 +338,6 @@ static constexpr std::string_view getHostState(const PowerState state) + return "xyz.openbmc_project.State.Host.HostState.Running"; + break; + case PowerState::waitForPSPowerOK: +- case PowerState::waitForSIOPowerGood: + case PowerState::off: + case PowerState::transitionToOff: + case PowerState::transitionToCycleOff: +@@ -425,7 +363,6 @@ static constexpr std::string_view getChassisState(const PowerState state) + return "xyz.openbmc_project.State.Chassis.PowerState.On"; + break; + case PowerState::waitForPSPowerOK: +- case PowerState::waitForSIOPowerGood: + case PowerState::off: + case PowerState::cycleOff: + return "xyz.openbmc_project.State.Chassis.PowerState.Off"; +@@ -593,7 +530,7 @@ static void systemPowerGoodFailedLog() + "MESSAGE=PowerControl: system power good failed to assert (VR failure)", + "PRIORITY=%i", LOG_INFO, "REDFISH_MESSAGE_ID=%s", + "OpenBMC.0.1.SystemPowerGoodFailed", "REDFISH_MESSAGE_ARGS=%d", +- sioPowerGoodWatchdogTimeMs, NULL); ++ psPowerOKWatchdogTimeMs, NULL); + } + + static void psPowerOKFailedLog() +@@ -1081,54 +1018,24 @@ static int setGPIOOutputForMs(const std::string& name, const int value, + + static void powerOn() + { +- setGPIOOutputForMs(power_control::powerOutName, 0, powerPulseTimeMs); ++ setGPIOOutputForMs(power_control::powerOutName, 1, powerPulseTimeMs); + } + + static void gracefulPowerOff() + { +- setGPIOOutputForMs(power_control::powerOutName, 0, powerPulseTimeMs); ++ setGPIOOutputForMs(power_control::powerOutName, 1, powerPulseTimeMs); + } + + static void forcePowerOff() + { +- if (setGPIOOutputForMs(power_control::powerOutName, 0, +- forceOffPulseTimeMs) < 0) +- { +- return; +- } ++ setGPIOOutputForMs(power_control::powerOutName, 1, forceOffPulseTimeMs); + +- // If the force off timer expires, then the PCH power-button override +- // failed, so attempt the Unconditional Powerdown SMBus command. +- gpioAssertTimer.async_wait([](const boost::system::error_code ec) { +- if (ec) +- { +- // operation_aborted is expected if timer is canceled before +- // completion. +- if (ec != boost::asio::error::operation_aborted) +- { +- std::cerr << "Force power off async_wait failed: " +- << ec.message() << "\n"; +- } +- return; +- } +- std::cerr << "PCH Power-button override failed. Issuing Unconditional " +- "Powerdown SMBus command.\n"; +- const static constexpr size_t pchDevBusAddress = 3; +- const static constexpr size_t pchDevSlaveAddress = 0x44; +- const static constexpr size_t pchCmdReg = 0; +- const static constexpr size_t pchPowerDownCmd = 0x02; +- if (i2cSet(pchDevBusAddress, pchDevSlaveAddress, pchCmdReg, +- pchPowerDownCmd) < 0) +- { +- std::cerr << "Unconditional Powerdown command failed! Not sure " +- "what to do now.\n"; +- } +- }); ++ return; + } + + static void reset() + { +- setGPIOOutputForMs(power_control::resetOutName, 0, resetPulseTimeMs); ++ setGPIOOutputForMs(power_control::resetOutName, 1, resetPulseTimeMs); + } + + static void gracefulPowerOffTimerStart() +@@ -1373,43 +1280,16 @@ static void currentHostStateMonitor() + }); + } + +-static void sioPowerGoodWatchdogTimerStart() +-{ +- std::cerr << "SIO power good watchdog timer started\n"; +- sioPowerGoodWatchdogTimer.expires_after( +- std::chrono::milliseconds(sioPowerGoodWatchdogTimeMs)); +- sioPowerGoodWatchdogTimer.async_wait( +- [](const boost::system::error_code ec) { +- if (ec) +- { +- // operation_aborted is expected if timer is canceled before +- // completion. +- if (ec != boost::asio::error::operation_aborted) +- { +- std::cerr << "SIO power good watchdog async_wait failed: " +- << ec.message() << "\n"; +- } +- std::cerr << "SIO power good watchdog timer canceled\n"; +- return; +- } +- std::cerr << "SIO power good watchdog timer completed\n"; +- sendPowerControlEvent(Event::sioPowerGoodWatchdogTimerExpired); +- }); +-} +- + static void powerStateOn(const Event event) + { ++ gpiod::line line; + logEvent(__FUNCTION__, event); + switch (event) + { + case Event::psPowerOKDeAssert: + setPowerState(PowerState::off); +- // DC power is unexpectedly lost, beep +- beep(beepPowerFail); +- break; +- case Event::sioS5Assert: +- setPowerState(PowerState::transitionToOff); +- addRestartCause(RestartCause::softReset); ++ // DC power is unexpectedly lost, Light Up fault LED ++ power_control::setGPIOOutput(power_control::faultLedName, 1, line); + break; + case Event::postCompleteDeAssert: + setPowerState(PowerState::checkForWarmReset); +@@ -1461,37 +1341,12 @@ static void powerStateWaitForPSPowerOK(const Event event) + // Cancel any GPIO assertions held during the transition + gpioAssertTimer.cancel(); + psPowerOKWatchdogTimer.cancel(); +- sioPowerGoodWatchdogTimerStart(); +- setPowerState(PowerState::waitForSIOPowerGood); ++ setPowerState(PowerState::on); + break; + case Event::psPowerOKWatchdogTimerExpired: + setPowerState(PowerState::off); + psPowerOKFailedLog(); + break; +- case Event::sioPowerGoodAssert: +- psPowerOKWatchdogTimer.cancel(); +- setPowerState(PowerState::on); +- break; +- default: +- phosphor::logging::log<phosphor::logging::level::INFO>( +- "No action taken."); +- break; +- } +-} +- +-static void powerStateWaitForSIOPowerGood(const Event event) +-{ +- logEvent(__FUNCTION__, event); +- switch (event) +- { +- case Event::sioPowerGoodAssert: +- sioPowerGoodWatchdogTimer.cancel(); +- setPowerState(PowerState::on); +- break; +- case Event::sioPowerGoodWatchdogTimerExpired: +- setPowerState(PowerState::off); +- systemPowerGoodFailedLog(); +- break; + default: + phosphor::logging::log<phosphor::logging::level::INFO>( + "No action taken."); +@@ -1505,12 +1360,6 @@ static void powerStateOff(const Event event) + switch (event) + { + case Event::psPowerOKAssert: +- setPowerState(PowerState::waitForSIOPowerGood); +- break; +- case Event::sioS5DeAssert: +- setPowerState(PowerState::waitForPSPowerOK); +- break; +- case Event::sioPowerGoodAssert: + setPowerState(PowerState::on); + break; + case Event::powerButtonPressed: +@@ -1572,11 +1421,11 @@ static void powerStateCycleOff(const Event event) + { + case Event::psPowerOKAssert: + powerCycleTimer.cancel(); +- setPowerState(PowerState::waitForSIOPowerGood); ++ setPowerState(PowerState::on); + break; +- case Event::sioS5DeAssert: ++ case Event::psPowerOKDeAssert: + powerCycleTimer.cancel(); +- setPowerState(PowerState::waitForPSPowerOK); ++ setPowerState(PowerState::off); + break; + case Event::powerButtonPressed: + powerCycleTimer.cancel(); +@@ -1635,21 +1484,18 @@ static void powerStateGracefulTransitionToCycleOff(const Event event) + + static void powerStateCheckForWarmReset(const Event event) + { ++ gpiod::line line; + logEvent(__FUNCTION__, event); + switch (event) + { +- case Event::sioS5Assert: +- warmResetCheckTimer.cancel(); +- setPowerState(PowerState::transitionToOff); +- break; + case Event::warmResetDetected: + setPowerState(PowerState::on); + break; + case Event::psPowerOKDeAssert: + warmResetCheckTimer.cancel(); + setPowerState(PowerState::off); +- // DC power is unexpectedly lost, beep +- beep(beepPowerFail); ++ // DC power is unexpectedly lost, Light up Fault LED ++ power_control::setGPIOOutput(power_control::faultLedName, 1, line); + break; + default: + phosphor::logging::log<phosphor::logging::level::INFO>( +@@ -1681,71 +1527,6 @@ static void psPowerOKHandler() + }); + } + +-static void sioPowerGoodHandler() +-{ +- gpiod::line_event gpioLineEvent = sioPowerGoodLine.event_read(); +- +- Event powerControlEvent = +- gpioLineEvent.event_type == gpiod::line_event::RISING_EDGE +- ? Event::sioPowerGoodAssert +- : Event::sioPowerGoodDeAssert; +- +- sendPowerControlEvent(powerControlEvent); +- sioPowerGoodEvent.async_wait( +- boost::asio::posix::stream_descriptor::wait_read, +- [](const boost::system::error_code ec) { +- if (ec) +- { +- std::cerr << "SIO power good handler error: " << ec.message() +- << "\n"; +- return; +- } +- sioPowerGoodHandler(); +- }); +-} +- +-static void sioOnControlHandler() +-{ +- gpiod::line_event gpioLineEvent = sioOnControlLine.event_read(); +- +- bool sioOnControl = +- gpioLineEvent.event_type == gpiod::line_event::RISING_EDGE; +- std::cerr << "SIO_ONCONTROL value changed: " << sioOnControl << "\n"; +- sioOnControlEvent.async_wait( +- boost::asio::posix::stream_descriptor::wait_read, +- [](const boost::system::error_code ec) { +- if (ec) +- { +- std::cerr << "SIO ONCONTROL handler error: " << ec.message() +- << "\n"; +- return; +- } +- sioOnControlHandler(); +- }); +-} +- +-static void sioS5Handler() +-{ +- gpiod::line_event gpioLineEvent = sioS5Line.event_read(); +- +- Event powerControlEvent = +- gpioLineEvent.event_type == gpiod::line_event::FALLING_EDGE +- ? Event::sioS5Assert +- : Event::sioS5DeAssert; +- +- sendPowerControlEvent(powerControlEvent); +- sioS5Event.async_wait(boost::asio::posix::stream_descriptor::wait_read, +- [](const boost::system::error_code ec) { +- if (ec) +- { +- std::cerr << "SIO S5 handler error: " +- << ec.message() << "\n"; +- return; +- } +- sioS5Handler(); +- }); +-} +- + static void powerButtonHandler() + { + gpiod::line_event gpioLineEvent = powerButtonLine.event_read(); +@@ -2007,7 +1788,7 @@ static void postCompleteHandler() + gpiod::line_event gpioLineEvent = postCompleteLine.event_read(); + + bool postComplete = +- gpioLineEvent.event_type == gpiod::line_event::FALLING_EDGE; ++ gpioLineEvent.event_type == gpiod::line_event::RISING_EDGE; + if (postComplete) + { + sendPowerControlEvent(Event::postCompleteAssert); +@@ -2095,19 +1876,14 @@ static int loadConfigValues() + resetOutName = data["RstOut"]; + } + +- if (data.contains("SIOOnCtl")) +- { +- sioOnControlName = data["SIOOnCtl"]; +- } +- +- if (data.contains("SIOPwrGd")) ++ if (data.contains("BmcReady")) + { +- sioPwrGoodName = data["SIOPwrGd"]; ++ bmcReadyName = data["BmcReady"]; + } + +- if (data.contains("SIOS5")) ++ if (data.contains("FaultLed")) + { +- sioS5Name = data["SIOS5"]; ++ faultLedName = data["FaultLed"]; + } + + return 0; +@@ -2155,60 +1931,6 @@ int main(int argc, char* argv[]) + return -1; + } + +- // Request SIO_POWER_GOOD GPIO events +- if (!power_control::sioPwrGoodName.empty()) +- { +- if (!power_control::requestGPIOEvents( +- power_control::sioPwrGoodName, +- power_control::sioPowerGoodHandler, +- power_control::sioPowerGoodLine, +- power_control::sioPowerGoodEvent)) +- { +- return -1; +- } +- } +- else +- { +- std::cerr +- << "sioPwrGood name should be configured from json config file\n"; +- return -1; +- } +- +- // Request SIO_ONCONTROL GPIO events +- if (!power_control::sioOnControlName.empty()) +- { +- if (!power_control::requestGPIOEvents( +- power_control::sioOnControlName, +- power_control::sioOnControlHandler, +- power_control::sioOnControlLine, +- power_control::sioOnControlEvent)) +- { +- return -1; +- } +- } +- else +- { +- std::cerr +- << "sioOnControl name should be configured from json config file\n"; +- return -1; +- } +- +- // Request SIO_S5 GPIO events +- if (!power_control::sioS5Name.empty()) +- { +- if (!power_control::requestGPIOEvents( +- power_control::sioS5Name, power_control::sioS5Handler, +- power_control::sioS5Line, power_control::sioS5Event)) +- { +- return -1; +- } +- } +- else +- { +- std::cerr << "sioS5 name should be configured from json config file\n"; +- return -1; +- } +- + // Request POWER_BUTTON GPIO events + if (!power_control::powerButtonName.empty()) + { +@@ -2286,12 +2008,12 @@ int main(int argc, char* argv[]) + + // Initialize POWER_OUT and RESET_OUT GPIO. + gpiod::line line; +- if (!power_control::setGPIOOutput(power_control::powerOutName, 1, line)) ++ if (!power_control::setGPIOOutput(power_control::powerOutName, 0, line)) + { + return -1; + } + +- if (!power_control::setGPIOOutput(power_control::resetOutName, 1, line)) ++ if (!power_control::setGPIOOutput(power_control::resetOutName, 0, line)) + { + return -1; + } +@@ -2299,6 +2021,13 @@ int main(int argc, char* argv[]) + // Release line + line.reset(); + ++ // DRIVE BMC_READY HIGH ++ gpiod::line bmcReadyline; ++ if (!power_control::setGPIOOutput(power_control::bmcReadyName, 1, bmcReadyline)) ++ { ++ return -1; ++ } ++ + // Initialize the power state + power_control::powerState = power_control::PowerState::off; + // Check power good +-- +2.17.1 + diff --git a/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend new file mode 100644 index 000000000..1780bac8e --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-Amd-power-control-modifications-for-EthanolX.patch" diff --git a/meta-amd/meta-ethanolx/recipes.txt b/meta-amd/meta-ethanolx/recipes.txt new file mode 100644 index 000000000..3ec3f4a42 --- /dev/null +++ b/meta-amd/meta-ethanolx/recipes.txt @@ -0,0 +1,2 @@ +recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies +recipes-phosphor - Phosphor OpenBMC applications and configuration diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb new file mode 100644 index 000000000..13d59f5f4 --- /dev/null +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -0,0 +1,45 @@ +SUMMARY = "OpenBMC for AMD - Applications" +PR = "r1" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-chassis \ + ${PN}-fans \ + ${PN}-flash \ + ${PN}-system \ + " + +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-fan-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY_${PN}-chassis = "AMD Chassis" +RDEPENDS_${PN}-chassis = " \ + x86-power-control \ + obmc-host-failure-reboots \ + " + +SUMMARY_${PN}-fans = "AMD Fans" +RDEPENDS_${PN}-fans = "" + +SUMMARY_${PN}-flash = "AMD Flash" +RDEPENDS_${PN}-flash = " \ + phosphor-software-manager \ + " + +SUMMARY_${PN}-system = "AMD System" +RDEPENDS_${PN}-system = " \ + bmcweb \ + entity-manager \ + ipmitool \ + phosphor-hostlogger \ + phosphor-webui \ + " diff --git a/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf b/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf new file mode 100644 index 000000000..88d84d7ca --- /dev/null +++ b/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf @@ -0,0 +1,2 @@ +local-tty = ttyS0 +baud = 115200 diff --git a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..7f9c460e2 --- /dev/null +++ b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +OBMC_CONSOLE_HOST_TTY = "ttyS0" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://server.ttyS0.conf" + +do_install_append() { + # Remove upstream-provided configuration + rm -rf ${D}${sysconfdir}/${BPN} + + # Install the server configuration + install -m 0755 -d ${D}${sysconfdir}/${BPN} + install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ + +} diff --git a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 000000000..83567e906 --- /dev/null +++ b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +EXTRA_OECONF_append = " --enable-configure-dbus=yes" diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf new file mode 100644 index 000000000..c75186415 --- /dev/null +++ b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf @@ -0,0 +1,7 @@ +SOCKET_ID= +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host0 +OUT_DIR=/var/lib/obmc/hostlogs +MAX_FILES=10 diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend new file mode 100644 index 000000000..9ae1d42c6 --- /dev/null +++ b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" + +# Default service instance to install (single-host mode) +DEFAULT_INSTANCE = "ttyS0" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://ttyS0.conf" + diff --git a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend new file mode 100644 index 000000000..4948cb4cb --- /dev/null +++ b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -0,0 +1,3 @@ +# Enable threshold monitoring +EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +EXTRA_OECMAKE += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" |