From 5e4a1aa7feb01e9b156c5ff2443d97287ae918da Mon Sep 17 00:00:00 2001 From: Peter Yin Date: Thu, 23 Nov 2023 13:23:39 +0800 Subject: meta-facebook: harma: initial commit Initial commit for platform harma, which is the compute card in the minerva chassis. Tested: Build Success. Kernel DTS: https://lore.kernel.org/all/20231123050415.3441429-3-peteryin.openbmc@gmail.com/ Uboot DTS: https://patchwork.ozlabs.org/project/openbmc/list/?series=379855 Change-Id: I114492a0739412409d89573ad8a41553c50f369b Signed-off-by: Peter Yin Signed-off-by: Patrick Williams --- meta-facebook/meta-harma/conf/layer.conf | 11 + meta-facebook/meta-harma/conf/machine/harma.conf | 24 ++ .../conf/templates/default/bblayers.conf.sample | 19 ++ .../conf/templates/default/conf-notes.txt | 2 + .../conf/templates/default/local.conf.sample | 258 +++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-aspeed-sdk/harma.cfg | 3 + .../u-boot/u-boot-aspeed-sdk_%.bbappend | 2 + .../u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend | 2 + .../recipes-kernel/linux/linux-aspeed/harma.cfg | 49 ++++ .../recipes-kernel/linux/linux-aspeed_%.bbappend | 3 + .../sensors/dbus-sensors_%.bbappend | 7 + .../virtual_sensor_config.json | 2 + .../sensors/phosphor-virtual-sensor_%.bbappend | 3 + .../fans/phosphor-fan/harma/host-poweroff | 5 + 14 files changed, 390 insertions(+) create mode 100644 meta-facebook/meta-harma/conf/layer.conf create mode 100644 meta-facebook/meta-harma/conf/machine/harma.conf create mode 100644 meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample create mode 100644 meta-facebook/meta-harma/conf/templates/default/conf-notes.txt create mode 100644 meta-facebook/meta-harma/conf/templates/default/local.conf.sample create mode 100644 meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk/harma.cfg create mode 100644 meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend create mode 100644 meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend create mode 100644 meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg create mode 100644 meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend create mode 100644 meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend create mode 100644 meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json create mode 100644 meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend create mode 100644 meta-facebook/recipes-phosphor/fans/phosphor-fan/harma/host-poweroff diff --git a/meta-facebook/meta-harma/conf/layer.conf b/meta-facebook/meta-harma/conf/layer.conf new file mode 100644 index 0000000000..710b11f09e --- /dev/null +++ b/meta-facebook/meta-harma/conf/layer.conf @@ -0,0 +1,11 @@ +# 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 += "harma-layer" +BBFILE_PATTERN_harma-layer := "^${LAYERDIR}/" + +LAYERSERIES_COMPAT_harma-layer := "nanbield scarthgap" diff --git a/meta-facebook/meta-harma/conf/machine/harma.conf b/meta-facebook/meta-harma/conf/machine/harma.conf new file mode 100644 index 0000000000..1599d0cb8f --- /dev/null +++ b/meta-facebook/meta-harma/conf/machine/harma.conf @@ -0,0 +1,24 @@ +# Minerva config file. + +KMACHINE = "aspeed" +#KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb" +KERNEL_DEVICETREE = "aspeed/aspeed-ast2600-evb.dtb" + +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" +UBOOT_DEVICETREE = "ast2600-bletchley" + +SPL_BINARY = "spl/u-boot-spl.bin" +SOCSEC_SIGN_ENABLE = "0" + +OBMC_COMPATIBLE_NAMES = "com.meta.Hardware.BMC.Model.Harma" + +require conf/distro/include/phosphor-static-norootfs.inc +require conf/machine/include/facebook-compute-singlehost.inc +require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/facebook-tpm2.inc + +FLASH_SIZE = "131072" + +VIRTUAL-RUNTIME_obmc-host-state-manager = "phosphor-state-manager-host" +VIRTUAL-RUNTIME_obmc-chassis-state-manager = "phosphor-state-manager-chassis" diff --git a/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample new file mode 100644 index 0000000000..b3cff8409a --- /dev/null +++ b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample @@ -0,0 +1,19 @@ +# 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-python \ + ##OEROOT##/meta-security/meta-tpm \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-facebook \ + ##OEROOT##/meta-facebook/meta-harma \ + " diff --git a/meta-facebook/meta-harma/conf/templates/default/conf-notes.txt b/meta-facebook/meta-harma/conf/templates/default/conf-notes.txt new file mode 100644 index 0000000000..9b3c01a556 --- /dev/null +++ b/meta-facebook/meta-harma/conf/templates/default/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-facebook/meta-harma/conf/templates/default/local.conf.sample b/meta-facebook/meta-harma/conf/templates/default/local.conf.sample new file mode 100644 index 0000000000..f6f8cd42c7 --- /dev/null +++ b/meta-facebook/meta-harma/conf/templates/default/local.conf.sample @@ -0,0 +1,258 @@ +# +# 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 +# +MACHINE ??= "harma" + +# +# 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 ipk: +PACKAGE_CLASSES ?= "package_ipk" + +# +# SDK target architecture +# +# This variable specifies the architecture to build SDK 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, x86_64, aarch64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS:append ?= " *" + +# +# 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) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) +# "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, 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 +USER_CLASSES ?= "buildstats" + +# +# 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. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "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 than 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 \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can be +# 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" + +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" + +# +# Qemu configuration +# +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" + +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" + +# 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 = "2" + +# Set the root password to '0penBmc' +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk/harma.cfg b/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk/harma.cfg new file mode 100644 index 0000000000..1e2a374f73 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk/harma.cfg @@ -0,0 +1,3 @@ +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS4,57600n8 root=/dev/ram rw vmalloc=768M" +CONFIG_BAUDRATE=57600 diff --git a/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..928ec469be --- /dev/null +++ b/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI +="file://harma.cfg" diff --git a/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..eb32cca434 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" +SRC_URI +="file://harma.cfg" diff --git a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg new file mode 100644 index 0000000000..72c219db92 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg @@ -0,0 +1,49 @@ +# large memory support +CONFIG_VMSPLIT_3G_OPT=y +CONFIG_HAVE_CLK=y +CONFIG_OF=y +# aspeed-adc driver +CONFIG_COMMON_CLK=y +CONFIG_ASPEED_ADC=y +# devmem +CONFIG_DEVMEM=y +# RTC +CONFIG_RTC_DRV_PCF85363=y +# USB EHCI +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +# USB UART +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y +# REGULATOR +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# IPMI & IPMB +CONFIG_IPMI_HANDLER=y +CONFIG_IPMI_DEVICE_INTERFACE=y +# Enable loadable module +CONFIG_MODULES=y + +# Aspeed OTP +CONFIG_ASPEED_OTP=y + +# Aspeed SGPIO +CONFIG_GPIO_ASPEED_SGPIO=y + +# Aspeed PCC +CONFIG_ASPEED_LPC_PCC=y + +# Sensors +#CONFIG_SENSORS_ARIES=y +CONFIG_SENSORS_INA238=y +CONFIG_SENSORS_INA2XX=y +CONFIG_SENSORS_MP5990=y +CONFIG_SENSORS_MP2856=y +CONFIG_MCP9600=y +CONFIG_SENSORS_ADC128D818=y + +# APML +CONFIG_I3C=y +CONFIG_APML_SBRMI=y +CONFIG_APML_SBTSI=y diff --git a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 0000000000..b9ef768517 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://harma.cfg" + diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 0000000000..a42dbfc8c1 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG:harma = " \ + adcsensor \ + hwmontempsensor \ + psusensor \ +" diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json new file mode 100644 index 0000000000..0d4f101c7a --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -0,0 +1,2 @@ +[ +] diff --git a/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000000..bd420f081e --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:harma = " file://virtual_sensor_config.json " diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan/harma/host-poweroff b/meta-facebook/recipes-phosphor/fans/phosphor-fan/harma/host-poweroff new file mode 100644 index 0000000000..bb1bcfc968 --- /dev/null +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan/harma/host-poweroff @@ -0,0 +1,5 @@ +#!/bin/bash +# Power off the hosts when fan sensors crossed thresholds. + +echo "This feature is not implemented in minerva harma and it will be implemented in future." + -- cgit v1.2.3