Add a native LLVM Morello cross compiler and a native LLVM that will build it. Add class to be inherited by users of LLVM Morello compiler, this class is required as the inital commit does not provide a proper Yocto Morello toolchain.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk Reviewed-by:Kevin Brodsky kevin.brodsky@arm.com --- COPYING.MIT | 17 +++ classes/llvm-morello-native.bbclass | 47 ++++++ recipes-devtools/llvm/llvm-13.0.1-native.bb | 31 ++++ .../llvm/llvm-morello-native_13.0.bb | 13 ++ recipes-devtools/llvm/llvm-morello.inc | 136 ++++++++++++++++++ 5 files changed, 244 insertions(+) create mode 100644 COPYING.MIT create mode 100644 classes/llvm-morello-native.bbclass create mode 100644 recipes-devtools/llvm/llvm-13.0.1-native.bb create mode 100644 recipes-devtools/llvm/llvm-morello-native_13.0.bb create mode 100644 recipes-devtools/llvm/llvm-morello.inc

diff --git a/COPYING.MIT b/COPYING.MIT new file mode 100644 index 0000000..e14c371 --- /dev/null +++ b/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/classes/llvm-morello-native.bbclass b/classes/llvm-morello-native.bbclass new file mode 100644 index 0000000..d1e2397 --- /dev/null +++ b/classes/llvm-morello-native.bbclass @@ -0,0 +1,47 @@ +MORELLO_COMPILER = "llvm-morello-native" + +LLVM_VERSION = "13.0.0" + +LLVM_PATH = "${STAGING_DIR_NATIVE}/usr/bin" + +INHIBIT_DEFAULT_DEPS = "1" + +DEPENDS += "virtual/llvm-morello-native" +DEPENDS:append:morello-linux-glibc:class-target = " virtual/musl-morello-libs-native" +DEPENDS:append:morello-linux-musl:class-target = " virtual/musl-morello-libs-native" + +# rough hack to deal with llvm-morello not being a proper toolchain in its own meta yet +DEPENDS:remove = "libgcc" + +do_configure[depends] += " ${@get_depends(d)}" + +LIBCPLUSPLUS = "-stdlib-libc++" + +export CC = "${LLVM_PATH}/clang" +export CXX = "${LLVM_PATH}/clang++" +export CPP = "${LLVM_PATH}/clang -E" +export CCLD = "${LLVM_PATH}/clang" +export RANLIB = "${LLVM_PATH}/llvm-ranlib" +export AR = "${LLVM_PATH}/llvm-ar" +export AS = "${LLVM_PATH}/llvm-as" +export NM = "${LLVM_PATH}/llvm-nm" +export OBJDUMP = "${LLVM_PATH}/llvm-objdump" +export OBJCOPY = "${LLVM_PATH}/llvm-objcopy" +export STRIP = "${LLVM_PATH}/llvm-strip" +export STRINGS = "${LLVM_PATH}/llvm-strings" +export READELF = "${LLVM_PATH}/llvm-readelf" +export LD = "${LLVM_PATH}/ld.lld" +export LTO = "-fuse-ld=lld" +export HOSTCC = "${LLVM_PATH}/clang" +export LLVM_CONFIG = "${LLVM_PATH}/llvm-config" + +def get_depends(d): + if d.getVar('DEPENDENCIES'): + return "llvm-morello-native:do_populate_sysroot" + else: + return "llvm-morello-native:do_populate_sysroot virtual/musl-morello:do_populate_sysroot" + +DEPENDENCIES:kernel = "1" +DEPENDENCIES:musl = "1" +DEPENDENCIES:musl-morello-native = "1" +DEPENDENCIES ?= "0" \ No newline at end of file diff --git a/recipes-devtools/llvm/llvm-13.0.1-native.bb b/recipes-devtools/llvm/llvm-13.0.1-native.bb new file mode 100644 index 0000000..37140ce --- /dev/null +++ b/recipes-devtools/llvm/llvm-13.0.1-native.bb @@ -0,0 +1,31 @@ +inherit native nopackages + +SUMMARY = "LLVM 13.01" +DESCRIPTION = "LLVM used purely for compiling llvm-morello" +HOMEPAGE = "http://llvm.org" +LICENSE = "Apache-2.0-with-LLVM-exception" +OUTPUTS_NAME = "llvm-13.0.1" + +PROVIDES = "virtual/${OUTPUTS_NAME}-native ${OUTPUTS_NAME}-native" + +SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+..." + +SRC_URI[md5sum] = "041e3a5c735d5f956668254b1ffd35d1" +LIC_FILES_CHKSUM = "file://include/llvm/Support/LICENSE.TXT;md5=986c03435151a0086b8aaac964939cdd" + +S = "${WORKDIR}/clang+llvm-13.0.1-x86_64-linux-gnu-ubuntu-18.04" +FILES:${PN} = "/${OUTPUTS_NAME}" + +SYSROOT_DIRS_NATIVE += "/${OUTPUTS_NAME}" + +do_install() { + install -d ${D}${libdir}/${OUTPUTS_NAME} + cp -rf ${S}/* ${D}${libdir}/${OUTPUTS_NAME} +} + +INSANE_SKIP_${PN} = "already-stripped libdir staticdev file-rdeps arch dev-so rpaths useless-rpaths" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_DEFAULT_DEPS = "1" +EXCLUDE_FROM_SHLIBS = "1" \ No newline at end of file diff --git a/recipes-devtools/llvm/llvm-morello-native_13.0.bb b/recipes-devtools/llvm/llvm-morello-native_13.0.bb new file mode 100644 index 0000000..3b7653b --- /dev/null +++ b/recipes-devtools/llvm/llvm-morello-native_13.0.bb @@ -0,0 +1,13 @@ +inherit cmake pkgconfig python3native native +require llvm-morello.inc +DESCRIPTION = "The Morello LLVM Compiler Infrastructure native" + +PROVIDES = "virtual/${OUTPUTS_NAME}-native" +PN = "${OUTPUTS_NAME}-native" + +FILES:${PN} += "${prefix}" + +do_install:append() { + install -d ${D}${prefix} + cp -rvf ${LLVM_INSTALL_DIR}/* ${D}${prefix} +} \ No newline at end of file diff --git a/recipes-devtools/llvm/llvm-morello.inc b/recipes-devtools/llvm/llvm-morello.inc new file mode 100644 index 0000000..8b59e5d --- /dev/null +++ b/recipes-devtools/llvm/llvm-morello.inc @@ -0,0 +1,136 @@ + + +SUMMARY = "LLVM Morello" +HOMEPAGE = "http://llvm.org" +LICENSE = "Apache-2.0-with-LLVM-exception" +OUTPUTS_NAME = "llvm-morello" + +DEPENDS = "zlib-native ninja-native ${COMPILER}-native" + +SRC_URI = "git://git.morello-project.org/morello/llvm-project;protocol=https;branch=${SRCBRANCH}" +SRCREV = "cac045cbb70a9c8161f2f32fa5ef056242eb28f3" + +SRCBRANCH = "morello/release-1.5" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe" + +S = "${WORKDIR}/git/llvm" +S_git = "${WORKDIR}/git" + +FILES:${PN} = "/${OUTPUTS_NAME}" +SYSROOT_DIRS_NATIVE += "/${OUTPUTS_NAME}" + +COMPILER = "llvm-13.0.1" + +LLVM_TARGETS_TO_BUILD = "X86;AArch64" +LLVM_PROJECTS = "libcxx;libcxxabi;compiler-rt;libunwind;llvm;clang;lld;lldb" +LLVM_BUILD_DIR = "${WORKDIR}/${OUTPUTS_NAME}-build" +LLVM_INSTALL_DIR = "${D}/${OUTPUTS_NAME}" + +NATIVE_LLVM_PATH = "${STAGING_LIBDIR_NATIVE}/${COMPILER}/bin" +LIB_PATH = "${STAGING_LIBDIR_NATIVE}/${COMPILER}/lib" +LIB_PATH_RT = "${STAGING_LIBDIR_NATIVE}/${COMPILER}/lib/clang/13.0.1/lib/linux" + +EXTRA_OECMAKE += "-Wno-dev -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL_DIR} \ + -DCMAKE_C_COMPILER='${NATIVE_LLVM_PATH}/clang' \ + -DCMAKE_CXX_COMPILER='${NATIVE_LLVM_PATH}/clang++' \ + -DCMAKE_ASM_COMPILER='${NATIVE_LLVM_PATH}/clang' \ + -DCMAKE_AR='${NATIVE_LLVM_PATH}/llvm-ar' \ + -DCMAKE_RANLIB='${NATIVE_LLVM_PATH}/llvm-ranlib' \ + -DCMAKE_NM='${NATIVE_LLVM_PATH}/llvm-nm' \ + -DCMAKE_OBJDUMP='${NATIVE_LLVM_PATH}/llvm-objdump' \ + -DCMAKE_OBJCOPY='${NATIVE_LLVM_PATH}/llvm-objcopy' \ + -DCMAKE_LINKER='${NATIVE_LLVM_PATH}/ld.lld' \ + -DCMAKE_C_FLAGS_RELEASE='${CFLAGS}' \ + -DCLANG_DEFAULT_LINKER='lld' \ + -DCMAKE_EXE_LINKER_FLAGS='-fuse-ld=lld' \ + -DCMAKE_SHARED_LINKER_FLAGS='-fuse-ld=lld' \ + -DCMAKE_SKIP_BUILD_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH='$ORIGIN/../lib:${LIB_PATH}' \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DLLVM_CCACHE_BUILD=FALSE \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DLLVM_ENABLE_EH=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_LLD=ON \ + -DLLVM_ENABLE_LIBCXX=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_XRAY=OFF \ + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ + -DCOMPILER_RT_BUILD_PROFILE=OFF \ + -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \ + -DLLVM_ENABLE_PROJECTS='${LLVM_PROJECTS}' \ + -DLIBCXX_CXX_ABI='libcxxabi' \ + -DLIBCXX_CXX_ABI_INCLUDE_PATHS='${WORKDIR}/git/libcxxabi/include' \ + -DLIBCXXABI_USE_LLVM_UNWINDER=ON \ + -DLIBCXXABI_USE_COMPILER_RT=ON \ + -DLIBUNWIND_ENABLE_THREADS=ON \ + -DCLANG_DEFAULT_RTLIB='compiler-rt' \ + -DCLANG_DEFAULT_CXX_STDLIB='libc++' \ + -DCLANG_DEFAULT_OBJCOPY='llvm-objcopy'\ + '-DLLVM_LIT_ARGS=--max-time 3600 --timeout 300 -s -vv' \ + -DLLVM_USE_SPLIT_DWARF=TRUE \ + -DLLVM_ENABLE_OCAMLDOC=FALSE \ + -DLLVM_ENABLE_BINDINGS=FALSE \ + -DLLVM_INCLUDE_EXAMPLES=FALSE \ + -DLLVM_INCLUDE_DOCS=FALSE \ + -DLLVM_INCLUDE_BENCHMARKS=FALSE \ + -DCLANG_ENABLE_STATIC_ANALYZER=FALSE \ + -DCLANG_ENABLE_ARCMT=FALSE \ + -DLLVM_ENABLE_Z3_SOLVER=FALSE \ + -DLLVM_TOOL_LLVM_MCA_BUILD=FALSE \ + -DLLVM_TOOL_LLVM_EXEGESIS_BUILD=FALSE \ + -DLLVM_TOOL_LLVM_RC_BUILD=FALSE \ + -DLLVM_OPTIMIZED_TABLEGEN=FALSE \ + -DLLVM_ENABLE_ZLIB=FORCE_ON \ + -DLLVM_ENABLE_LIBXML2=FALSE \ +" + +INSANE_SKIP_${PN} = "already-stripped" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_DEFAULT_DEPS = "1" + +do_unpack[depends] += "${COMPILER}-native:do_populate_sysroot" + +do_configure() { + mkdir -p ${LLVM_BUILD_DIR} + cd ${LLVM_BUILD_DIR} + cmake -S ${S} -B ${LLVM_BUILD_DIR} ${EXTRA_OECMAKE} +} + +do_compile() { + export CC="${NATIVE_LLVM_PATH}/clang" + export NM="${NATIVE_LLVM_PATH}/llvm-nm" + export CXX="${NATIVE_LLVM_PATH}/clang++" + export LD="${NATIVE_LLVM_PATH}/ld.lld" + cd ${LLVM_BUILD_DIR} + cmake --build . --target all -- -j20 +} + +do_install() { + cd ${LLVM_BUILD_DIR} + cmake --build . --target install + install -d ${LLVM_SHARED_SOURCE} +} + +python do_symlink() { + s = d.getVar("S_git") + if s[-1] == '/': + # drop trailing slash, so that os.symlink(src, s) doesn't use s as directory name and fail + s=s[:-1] + src = d.getVar("LLVM_SHARED_SOURCE") + if s != src: + bb.utils.mkdirhier(src) + bb.utils.remove(src, recurse=True) + os.symlink(s, src) + else: + import shutil + shutil.move(s, src) + os.symlink(src, s) +} +addtask do_symlink after do_install before do_build \ No newline at end of file

Append the scp firmware recipe.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- conf/machine/morello-bsp.conf | 5 ++ .../scp-firmware/scp-firmware_2.10.%.bbappend | 80 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend

diff --git a/conf/machine/morello-bsp.conf b/conf/machine/morello-bsp.conf index e5c8799..ee40190 100644 --- a/conf/machine/morello-bsp.conf +++ b/conf/machine/morello-bsp.conf @@ -1 +1,6 @@ require conf/machine/include/morello-common.inc + +PREFERRED_VERSION_scp-firmware ?= "2.10%" + + +TMPDIR = "${TOPDIR}/${TMPDIR_BSP}" \ No newline at end of file diff --git a/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend b/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend new file mode 100644 index 0000000..2c01711 --- /dev/null +++ b/recipes-bsp/scp-firmware/scp-firmware_2.10.%.bbappend @@ -0,0 +1,80 @@ +inherit cmake nopackages + +COMPATIBLE_MACHINE = "morello" +OUTPUTS_NAME = "scp-firmware" +SECTION = "firmware" + +DEPENDS += "virtual/board-firmware" + +PROVIDES += "virtual/${OUTPUTS_NAME}" + +SRC_URI = "gitsm://git.morello-project.org/morello/scp-firmware.git;protocol=https;branch=${SRCBRANCH}" +SRCREV = "${AUTOREV}" +PV = "2.10.0+git${SRCPV}" + +SRCBRANCH = "morello/master" + +SCP_PLATFORM = "morello" +SCP_LOG_LEVEL = "INFO" + +SENSOR = "${RECIPE_SYSROOT}/board-firmware/LIB/sensor.a" +B = "${WORKDIR}/build/morello" +S = "${WORKDIR}/git" +FILES:${PN} = "/${OUTPUTS_NAME}" +SYSROOT_DIRS += "/${OUTPUTS_NAME}" + +FW_TARGETS = "scp mcp" +FW_INSTALL = "ramfw_soc romfw" + +INHIBIT_DEFAULT_DEPS = "1" + +unset do_configure[noexec] +unset do_compile[cleandirs] +do_deploy[noexec] = "1" + +do_configure() { + + cd ${S} + + for FW in ${FW_TARGETS}; do + for TYPE in ${FW_INSTALL}; do + + local target="${FW}_${TYPE}" + + local extra_cmake="\ + -DSCP_ENABLE_DEBUGGER='0' \ + -DSCP_FIRMWARE_SOURCE_DIR:PATH='${SCP_PLATFORM}/${target}' \ + -DSCP_TOOLCHAIN:STRING='GNU' \ + -DDISABLE_CPPCHECK='1' \ + -DCMAKE_BUILD_TYPE=Release \ + " + + if [ "${target}" = "scp_ramfw_soc" ]; then + extra_cmake="${extra_cmake} -DSCP_MORELLO_SENSOR_LIB_PATH='${SENSOR}'" + fi + + local builddir="${B}/${target}" + cmake -S ${S} -B ${builddir} ${extra_cmake} + done + done +} + +do_compile() { + cd ${S} + for FW in ${FW_TARGETS}; do + for TYPE in ${FW_INSTALL}; do + local target="${FW}_${TYPE}" + cmake --build "${B}/${target}" + done + done +} + +do_install() { + install -d ${D}/firmware + for FW in ${FW_TARGETS}; do + for TYPE in ${FW_INSTALL}; do + local target="${FW}_${TYPE}" + cp -rf "${B}/${target}/bin/"*.bin "${D}/firmware/${target}.bin" + done + done +} \ No newline at end of file

Append the UEFI recipe. Patch was necessary for brotli, taken from [1]

[1] https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b4...

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- recipes-bsp/uefi/edk2-firmware_%.bbappend | 53 +++++++++++++++++++ ...Basetools-remove-brotli-build-errors.patch | 45 ++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 recipes-bsp/uefi/edk2-firmware_%.bbappend create mode 100644 recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch

diff --git a/recipes-bsp/uefi/edk2-firmware_%.bbappend b/recipes-bsp/uefi/edk2-firmware_%.bbappend new file mode 100644 index 0000000..e661f8a --- /dev/null +++ b/recipes-bsp/uefi/edk2-firmware_%.bbappend @@ -0,0 +1,53 @@ +inherit nopackages python3native llvm-morello-native + +COMPATIBLE_MACHINE = "morello" +SUMMARY = "EDK2 to be compiled with LLVM Morello" +OUTPUTS_NAME = "uefi" +SECTION = "firmware" + +PROVIDES += "virtual/${OUTPUTS_NAME}" +DEPENDS += "acpica-native python3-native" + +FILESEXTRAPATHS:prepend := "${THISDIR}:" + +SRC_URI = "\ + ${EDK2_SRC_URI};name=edk2;destsuffix=edk2 \ + ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms \ + ${EDK2_NON_OSI_SRC_URI};name=edk2-non-osi;destsuffix=edk2-non-osi \ + file://files/0001-Basetools-remove-brotli-build-errors.patch \ + " + +EDK2_SRC_URI = "gitsm://git.morello-project.org/morello/edk2;branch=morello/master;protocol=https" +EDK2_PLATFORMS_SRC_URI = "gitsm://git.morello-project.org/morello/edk2-platforms;branch=morello/master;protocol=https" +EDK2_NON_OSI_SRC_URI = "git://github.com/tianocore/edk2-non-osi;branch=master;protocol=https" +SRCREV_edk2-non-osi = "0320db977fb27e63424b0953a3020bb81c89e8f0" +SRCREV_edk2 = "${AUTOREV}" +SRCREV_edk2-platforms = "${AUTOREV}" +PV = "git${SRCPV}" + +B = "${WORKDIR}/build" +S = "${WORKDIR}/edk2" +FILES:${PN} = "/${OUTPUTS_NAME}" +SYSROOT_DIRS += "/${OUTPUTS_NAME}" + +EDK2_BUILD_RELEASE = "0" +EDK2_PLATFORM = "morellosoc" +EDK2_PLATFORM_DSC = "edk2-platforms/Platform/ARM/Morello/MorelloPlatformSoc.dsc" +EDK2_BIN_NAME = "BL33_AP_UEFI.fd" +EDK2_ARCH = "AARCH64" +EDK2_BUILD_FLAGS += "-D ENABLE_MORELLO_CAP=1" +EDK_COMPILER = "CLANG35" + +export CLANG35_AARCH64_PREFIX = "${TARGET_PREFIX}" +export CLANG35_BIN = "${LLVM_PATH}/" +export CLANG35_AARCH64_PREFIX = "${LLVM_PATH}/llvm-" +export PACKAGES_PATH = "${S}:${S}/edk2-platforms:${WORKDIR}/edk2-non-osi" +export CC_PATH = "${LLVM_PATH}/clang" +export LLVM_PATH_35 = "${LLVM_PATH}" + +do_deploy[noexec] = "1" + +do_install() { + install -d ${D}/firmware + install ${B}/Build/${EDK2_PLATFORM}/${EDK2_BUILD_MODE}_${EDK_COMPILER}/FV/${EDK2_BIN_NAME} ${D}/firmware/uefi.bin +} \ No newline at end of file diff --git a/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch b/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch new file mode 100644 index 0000000..53d16ad --- /dev/null +++ b/recipes-bsp/uefi/files/0001-Basetools-remove-brotli-build-errors.patch @@ -0,0 +1,45 @@ +From 27dd7265403d8e8fed99a854b9c3e1db7d79525f Mon Sep 17 00:00:00 2001 +From: Jeremy Maitin-Shepard jbms@google.com +Date: Tue, 14 Sep 2021 12:27:45 -0700 +Subject: [PATCH 09/22] Fix -Werror=vla-parameter errors with GCC 11.2.0 + +--- + BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c | 6 ++++-- + BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c | 5 +++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/c/dec/decode.c +index 114c505..4c89a73 100644 +--- a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c ++++ b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c +@@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands( + } + + BrotliDecoderResult BrotliDecoderDecompress( +- size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size, +- uint8_t* decoded_buffer) { ++ size_t encoded_size, ++ const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)], ++ size_t* decoded_size, ++ uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) { + BrotliDecoderState s; + BrotliDecoderResult result; + size_t total_out = 0; +diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c b/c/enc/encode.c +index 68548ef..dc3704e 100644 +--- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c ++++ b/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c +@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream( + + BROTLI_BOOL BrotliEncoderCompress( + int quality, int lgwin, BrotliEncoderMode mode, size_t input_size, +- const uint8_t* input_buffer, size_t* encoded_size, +- uint8_t* encoded_buffer) { ++ const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)], ++ size_t* encoded_size, ++ uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) { + BrotliEncoderState* s; + size_t out_size = *encoded_size; + const uint8_t* input_start = input_buffer; +-- +2.34.1 \ No newline at end of file

This two-step recipe takes the board firmware repo and overwrites its contents with the outputs obtained from the firmware recipes. SD card image is then created using mtools.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- conf/machine/morello-bsp.conf | 9 +- .../board-firmware/board-firmware-image.bb | 82 +++++++++++++++++++ .../board-firmware/board-firmware_1.4.bb | 29 +++++++ 3 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 recipes-bsp/board-firmware/board-firmware-image.bb create mode 100644 recipes-bsp/board-firmware/board-firmware_1.4.bb

diff --git a/conf/machine/morello-bsp.conf b/conf/machine/morello-bsp.conf index 9998fff..45b12fb 100644 --- a/conf/machine/morello-bsp.conf +++ b/conf/machine/morello-bsp.conf @@ -1,6 +1,9 @@ require conf/machine/include/morello-common.inc

-PREFERRED_VERSION_scp-firmware ?= "2.10%" -PREFERRED_VERSION_trusted-firmware-a ?= "2.7%" +PREFERRED_VERSION_scp-firmware = "2.10%" +PREFERRED_VERSION_trusted-firmware-a = "2.7%" +PREFERRED_VERSION_board-firmware = "1.4"

-TMPDIR = "${TOPDIR}/${TMPDIR_BSP}" \ No newline at end of file +TMPDIR = "${TOPDIR}/${TMPDIR_BSP}" + +TCLIBCAPPEND = "" \ No newline at end of file diff --git a/recipes-bsp/board-firmware/board-firmware-image.bb b/recipes-bsp/board-firmware/board-firmware-image.bb new file mode 100644 index 0000000..7fd6709 --- /dev/null +++ b/recipes-bsp/board-firmware/board-firmware-image.bb @@ -0,0 +1,82 @@ +inherit deploy nopackages + +COMPATIBLE_MACHINE = "morello" +SUMMARY = "SDK Card Firmware Image " +DESCRIPTION = "Image containing all the firmwares and motherboard configuration files" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +OUTPUTS_NAME = "board-firmware-sd-image" +SECTION = "firmware" + +BB_DONT_CACHE = "1" + +DEPENDS += "virtual/board-firmware virtual/scp-firmware virtual/trusted-firmware-a virtual/uefi virtual/grub-efi mtools-native" +PROVIDES = "virtual/board-firmware-image" + +MCP_BLOB_ID = "54464222-a4cf-4bf8-b1b6-cee7dade539e" + +FIP_OPTIONS = "\ + --tb-fw '${FIRMWARE_PATH}/tf-bl2.bin' \ + --soc-fw '${FIRMWARE_PATH}/tf-bl31.bin' \ + --nt-fw '${FIRMWARE_PATH}/uefi.bin' \ + --fw-config '${FIRMWARE_PATH}/morello_fw_config.dtb' \ + --tb-fw-config '${FIRMWARE_PATH}/morello_tb_fw_config.dtb' \ + --nt-fw-config '${FIRMWARE_PATH}/morello_nt_fw_config.dtb' \ + --trusted-key-cert '${FIRMWARE_PATH}/tfa_certs/trusted_key.crt' \ + --soc-fw-key-cert '${FIRMWARE_PATH}/tfa_certs/bl31_key.crt' \ + --nt-fw-key-cert '${FIRMWARE_PATH}/tfa_certs/bl33_key.crt' \ + --soc-fw-cert '${FIRMWARE_PATH}/tfa_certs/bl31.crt' \ + --nt-fw-cert '${FIRMWARE_PATH}/tfa_certs/bl33.crt' \ + --tb-fw-cert '${FIRMWARE_PATH}/tfa_certs/bl2.crt' \ + " + +FIRMWARE_PATH = "${RECIPE_SYSROOT}/firmware" +SYSROOT_SOFTWARE_PATH = "${RECIPE_SYSROOT}/board-firmware/SOFTWARE" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_install[depends] += "virtual/board-firmware:do_populate_sysroot" +do_install[depends] += "virtual/scp-firmware:do_populate_sysroot" +do_install[depends] += "virtual/uefi:do_populate_sysroot" +do_install[depends] += "virtual/trusted-firmware-a:do_populate_sysroot" + +do_install:prepend() { + + ${FIRMWARE_PATH}/fiptool create \ + --scp-fw "${FIRMWARE_PATH}/scp_ramfw_soc.bin" \ + "${FIRMWARE_PATH}/scp_fw.bin" + + ${FIRMWARE_PATH}/fiptool create \ + --blob uuid="${MCP_BLOB_ID}",file="${FIRMWARE_PATH}/mcp_ramfw_soc.bin" \ + "${FIRMWARE_PATH}/mcp_fw.bin" + + mkdir -p "${FIRMWARE_PATH}/tfa_certs" + ${FIRMWARE_PATH}/cert_create ${FIP_OPTIONS} -n --tfw-nvctr 0 --ntfw-nvctr 0 \ + --rot-key ${FIRMWARE_PATH}/arm_rotprivk_rsa.pem + + ${FIRMWARE_PATH}/fiptool update ${FIP_OPTIONS} "${FIRMWARE_PATH}/fip.bin" +} + +do_install() { + + cp -rf ${FIRMWARE_PATH}/fip.bin ${SYSROOT_SOFTWARE_PATH}/fip.bin + cp -rf ${FIRMWARE_PATH}/scp_fw.bin ${SYSROOT_SOFTWARE_PATH}/scp_fw.bin + cp -rf ${FIRMWARE_PATH}/mcp_fw.bin ${SYSROOT_SOFTWARE_PATH}/mcp_fw.bin + + install -d ${D}/board-firmware/SOFTWARE + install -m 644 ${SYSROOT_SOFTWARE_PATH}/fip.bin ${D}/board-firmware/SOFTWARE/fip.bin + install -m 644 ${SYSROOT_SOFTWARE_PATH}/scp_fw.bin ${D}/board-firmware/SOFTWARE/scp_fw.bin + install -m 644 ${SYSROOT_SOFTWARE_PATH}/mcp_fw.bin ${D}/board-firmware/SOFTWARE/mcp_fw.bin + + dd if=/dev/zero of=${OUTPUTS_NAME}.img bs=512K count=100 + mformat -i ${OUTPUTS_NAME}.img :: + mcopy -i ${OUTPUTS_NAME}.img -s -Q -p -m ${RECIPE_SYSROOT}/board-firmware/* :: + + install -d ${D}/firmware/board-firmware-image + install -m 644 ${OUTPUTS_NAME}.img ${D}/firmware/board-firmware-image/${OUTPUTS_NAME}.img +} + +do_deploy() { + cp -rf ${D}/firmware/board-firmware-image/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}.img +} +addtask deploy after do_install \ No newline at end of file diff --git a/recipes-bsp/board-firmware/board-firmware_1.4.bb b/recipes-bsp/board-firmware/board-firmware_1.4.bb new file mode 100644 index 0000000..80719a4 --- /dev/null +++ b/recipes-bsp/board-firmware/board-firmware_1.4.bb @@ -0,0 +1,29 @@ +inherit nopackages + +COMPATIBLE_MACHINE = "morello" +SUMMARY = "$DESCRIPTION" +DESCRIPTION = "The SD card image from ARM that contains non compile-able binaries." +HOMEPAGE = "https://git.morello-project.org/morello/board-firmware" +LICENSE = "STMicroelectronics&BSD-3 & BDS-2" +OUTPUTS_NAME = "board-firmware" +SECTION = "firmware" + +PROVIDES += "virtual/${OUTPUTS_NAME}" + +SRC_URI = "git://git.morello-project.org/morello/board-firmware;protocol=https;branch=${SRCBRANCH}" +SRCREV = "20e3e673f13e854109a069dd719f49e06336142d" + +SRCBRANCH = "morello/release-1.4" +LIC_FILES_CHKSUM = "file://LICENSES/MB/STM.TXT;md5=47185091e44d729bf62ed5c99d7eb9d9 \ + file://LICENSES/LIB/sensor.txt;md5=7ba201f1f1e4959d3505d9c59c6cfdfa \ + " + +S = "${WORKDIR}/git" +FILES:${PN} += "/${OUTPUTS_NAME}" +FILES:${PN}-staticdev += "/${OUTPUTS_NAME}/LIB/sensor.a" +SYSROOT_DIRS += "/${OUTPUTS_NAME}" + +do_install() { + install -d "${D}/${OUTPUTS_NAME}" + cp -rf ${S}/* "${D}/${OUTPUTS_NAME}/" +} \ No newline at end of file

The morello musl libc appends the musl_git.bb recipe. The installation path and PROVIDES depend on the machine. The native libraries that go into clang resource folder are also covered. The build order is: musl-morello-native, musl-morello-libs-native, and musl-morello-target.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- recipes-core/musl/files/compiler_rt.cmake | 5 ++ recipes-core/musl/musl-morello-1.5.inc | 4 + recipes-core/musl/musl-morello-a64-so.inc | 6 ++ recipes-core/musl/musl-morello-a64.inc | 7 ++ recipes-core/musl/musl-morello-c64-so.inc | 6 ++ recipes-core/musl/musl-morello-c64.inc | 7 ++ recipes-core/musl/musl-morello-common.inc | 65 ++++++++++++++++ recipes-core/musl/musl-morello-libs-native.bb | 74 +++++++++++++++++++ recipes-core/musl/musl-morello-native.bb | 36 +++++++++ recipes-core/musl/musl-morello-target.inc | 51 +++++++++++++ recipes-core/musl/musl_%.bbappend | 17 +++++ recipes-core/musl/override-glibc.inc | 3 + recipes-core/musl/override-musl.inc | 1 + 13 files changed, 282 insertions(+) create mode 100644 recipes-core/musl/files/compiler_rt.cmake create mode 100644 recipes-core/musl/musl-morello-1.5.inc create mode 100644 recipes-core/musl/musl-morello-a64-so.inc create mode 100644 recipes-core/musl/musl-morello-a64.inc create mode 100644 recipes-core/musl/musl-morello-c64-so.inc create mode 100644 recipes-core/musl/musl-morello-c64.inc create mode 100644 recipes-core/musl/musl-morello-common.inc create mode 100644 recipes-core/musl/musl-morello-libs-native.bb create mode 100644 recipes-core/musl/musl-morello-native.bb create mode 100644 recipes-core/musl/musl-morello-target.inc create mode 100644 recipes-core/musl/musl_%.bbappend create mode 100644 recipes-core/musl/override-glibc.inc create mode 100644 recipes-core/musl/override-musl.inc

diff --git a/recipes-core/musl/files/compiler_rt.cmake b/recipes-core/musl/files/compiler_rt.cmake new file mode 100644 index 0000000..24ea9e7 --- /dev/null +++ b/recipes-core/musl/files/compiler_rt.cmake @@ -0,0 +1,5 @@ +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_PROCESSOR aarch64) + +set(CMAKE_C_COMPILER_WORKS 1 CACHE INTERNAL "") +set(CMAKE_CXX_COMPILER_WORKS 1 CACHE INTERNAL "") \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-1.5.inc b/recipes-core/musl/musl-morello-1.5.inc new file mode 100644 index 0000000..750120d --- /dev/null +++ b/recipes-core/musl/musl-morello-1.5.inc @@ -0,0 +1,4 @@ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" + +SRCBRANCH = "morello/master" +SRCTAG = "morello-release-1.5.0" \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-a64-so.inc b/recipes-core/musl/musl-morello-a64-so.inc new file mode 100644 index 0000000..773fcf4 --- /dev/null +++ b/recipes-core/musl/musl-morello-a64-so.inc @@ -0,0 +1,6 @@ +PROVIDES += "virtual/${OUTPUTS_NAME}-a64 virtual/crypt-a64" + +do_install:append() { + install -d ${D}${nonarch_base_libdir} + ln -rs ${TARGET_INSTALL_DIR}${libdir}/libc.so ${D}${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 +} \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-a64.inc b/recipes-core/musl/musl-morello-a64.inc new file mode 100644 index 0000000..7aa18a3 --- /dev/null +++ b/recipes-core/musl/musl-morello-a64.inc @@ -0,0 +1,7 @@ +require musl-morello-common.inc + +EXTRA_CONFIGUREOPTS = "--disable-morello" + +ARCH_TRIPLE = "${A64_ARCH_TRIPLE}" +LIB_TRIPLE = "${A64_LIB_TRIPLE}" +ARCH_FLAGS = "-march=armv8" \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-c64-so.inc b/recipes-core/musl/musl-morello-c64-so.inc new file mode 100644 index 0000000..8e66505 --- /dev/null +++ b/recipes-core/musl/musl-morello-c64-so.inc @@ -0,0 +1,6 @@ +PROVIDES += "virtual/${OUTPUTS_NAME}-c64 virtual/crypt-c64" + +do_install:append() { + install -d ${D}${nonarch_base_libdir} + ln -rs ${TARGET_INSTALL_DIR}${libdir}/libc.so ${D}${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 +} \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-c64.inc b/recipes-core/musl/musl-morello-c64.inc new file mode 100644 index 0000000..761b9d2 --- /dev/null +++ b/recipes-core/musl/musl-morello-c64.inc @@ -0,0 +1,7 @@ +require musl-morello-common.inc + +EXTRA_CONFIGUREOPTS = "--enable-morello" + +ARCH_TRIPLE = "${C64_ARCH_TRIPLE}" +LIB_TRIPLE = "${C64_LIB_TRIPLE}" +ARCH_FLAGS = "-march=morello+c64 -mabi=purecap" \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-common.inc b/recipes-core/musl/musl-morello-common.inc new file mode 100644 index 0000000..f296e08 --- /dev/null +++ b/recipes-core/musl/musl-morello-common.inc @@ -0,0 +1,65 @@ +require musl-morello-${MORELLO_RELEASE_VERSION}.inc + +DESCRIPTION = "CHERI enabled musl libc" +OUTPUTS_NAME = "libc" +LICENSE = "MIT" + +FILESEXTRAPATHS:prepend := "${THISDIR}:" + +SUMMARY = "CHERI enabled musl libc" +SRC_URI = " \ + git://git.morello-project.org/morello/musl-libc;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + file://files/compiler_rt.cmake \ +" + +SRCREV ="" + +PV = "git${SRCPV}" +S = "${WORKDIR}/git" +B = "${WORKDIR}/build" + +TARGET_INSTALL_DIR = "${D}${MUSL_INSTALL_DIR}" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +CONFIGUREOPTS = " \ + --prefix=${prefix} \ + --exec-prefix=${exec_prefix} \ + --bindir=${bindir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --syslibdir=${nonarch_base_libdir} \ + --target=${ARCH_TRIPLE} \ + --disable-libshim \ +" + +COMPILERRT_CMAKE = "-Wno-dev \ + -DCMAKE_TOOLCHAIN_FILE=compiler_rt.cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_CONFIG_PATH='${LLVM_CONFIG}' \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCMAKE_SKIP_BUILD_RPATH=OFF \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ + -DLLVM_TARGETS_TO_BUILD='AArch64' \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF \ + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ + -DCOMPILER_RT_BUILD_PROFILE=OFF \ +" +do_configure() { + export CFLAGS="" + local config="${CONFIGUREOPTS}" + echo "Install dir ${TARGET_INSTALL_DIR} with ${TCLIBC} MACHINE_INC ${MACHINE_INC}" + config="${config} --target=${ARCH_TRIPLE} ${EXTRA_CONFIGUREOPTS} --disable-shared" + ${S}/configure ${config} +} + +do_compile() { + export CFLAGS="" + oe_runmake +} \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-libs-native.bb b/recipes-core/musl/musl-morello-libs-native.bb new file mode 100644 index 0000000..6318aa9 --- /dev/null +++ b/recipes-core/musl/musl-morello-libs-native.bb @@ -0,0 +1,74 @@ +inherit cmake llvm-morello-native native +require musl-morello-${MORELLO_ARCH}.inc + +DESCRIPTION = "Libraries that go into the clang resource folder, \ + search path for that folder is relative to clang directory itself." + +DEPENDS += "musl-morello-native" +PROVIDES = "virtual/musl-morello-libs-native" + +B_COMPILERRT = "${WORKDIR}/build_compiler_rt" +S_CRT = "${LLVM_SHARED_SOURCE}/compiler-rt/lib/crt" +S_COMPILER_RT = "${LLVM_SHARED_SOURCE}/compiler-rt" + +do_install[depends] += "llvm-morello-native:do_symlink" + +FILES:${PN} += "$(${CC} -print-resource-dir)/lib/${LIB_TRIPLE}" +INSANE_SKIP:${PN} += "$(${CC} -print-resource-dir)/lib/${LIB_TRIPLE}" + +BUILD_CC = "${LLVM_PATH}/clang" +BUILD_CXX = "${LLVM_PATH}/clang++" +BUILD_CPP = "${LLVM_PATH}/clang" +BUILD_CCLD = "${LLVM_PATH}/clang" +BUILD_RANLIB = "${LLVM_PATH}/llvm-ranlib" +BUILD_AR = "${LLVM_PATH}/llvm-ar" +BUILD_AS = "${LLVM_PATH}/llvm-as" +BUILD_NM = "${LLVM_PATH}/llvm-nm" +BUILD_OBJDUMP = "${LLVM_PATH}/llvm-objdump" +BUILD_OBJCOPY = "${LLVM_PATH}/llvm-objcopy" +BUILD_STRIP = "${LLVM_PATH}/llvm-strip" +BUILD_STRINGS = "${LLVM_PATH}/llvm-strings" +BUILD_READELF = "${LLVM_PATH}/llvm-readelf" +BUILD_LD = "${LLVM_PATH}/ld.lld" +BUILD_LTO = "-fuse-ld=lld" +BUILD_HOSTCC = "${LLVM_PATH}/clang" + + +do_install() { + + export CFLAGS="" + + local resourcedir=$(${CC} -print-resource-dir) + local destdir="${resourcedir}/lib/${LIB_TRIPLE}" + local builddir="${B_COMPILERRT}/${ARCH_TRIPLE}" + local sysroot="${STAGING_LIBDIR_NATIVE}/musl-morello-native/${ARCH_TRIPLE}" + local target="${LIB_TRIPLE}" + + install -d ${destdir} + mkdir -p ${builddir} + + local ccflags="--target=${target} ${ARCH_FLAGS} -nostdinc -isystem ${sysroot}/include" + ${CC} ${ccflags} -c ${S_CRT}/crtbegin.c -o ${destdir}/clang_rt.crtbegin.o + ${CC} ${ccflags} -c ${S_CRT}/crtend.c -o ${destdir}/clang_rt.crtend.o + + cp -f ${WORKDIR}/files/compiler_rt.cmake ${builddir}/compiler_rt.cmake + + local config="${COMPILERRT_CMAKE}" + config="${config} -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${LIB_TRIPLE} \ + -DCMAKE_INSTALL_RPATH=$ORIGIN/../lib \ + -DCMAKE_TOOLCHAIN_FILE='${builddir}/compiler_rt.cmake' \ + " + cmake -S ${S_COMPILER_RT} -B ${builddir} ${config} -DCMAKE_C_FLAGS="-nostdinc -isystem ${sysroot}/include" -DCMAKE_C_COMPILER_TARGET="${LIB_TRIPLE} ${ARCH_FLAGS}" + + cd ${builddir} + make ${PARALLEL_MAKE} clang_rt.builtins-aarch64 + + install ${builddir}/lib/linux/libclang_rt.builtins-aarch64.a ${destdir}/libclang_rt.builtins.a + + install -d ${D}${libdir}/clang/${LLVM_VERSION}/lib/${LIB_TRIPLE} + local install_dir=${D}${libdir}/clang/${LLVM_VERSION}/lib/${LIB_TRIPLE} + + install ${destdir}/clang_rt.crtbegin.o ${install_dir}/clang_rt.crtbegin.o + install ${destdir}/clang_rt.crtend.o ${install_dir}/clang_rt.crtend.o + install ${destdir}/libclang_rt.builtins.a ${install_dir}/libclang_rt.builtins.a +} \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-native.bb b/recipes-core/musl/musl-morello-native.bb new file mode 100644 index 0000000..e7e6792 --- /dev/null +++ b/recipes-core/musl/musl-morello-native.bb @@ -0,0 +1,36 @@ +inherit llvm-morello-native native +require musl-morello-${MORELLO_ARCH}.inc + +DESCRIPTION = " That is right, we have a native libc sysroot that is needed as an intermediate step \ +to provide crt and compiler-rt that will be used by the cross compiler, this recipe exist to avoid having \ +a native recipe dependant on a target recipe... which is actually the case, but there you go. Note that the \ +libc sysroot is NOT actually native, it is just a trick." + +PROVIDES = "virtual/musl-morello-native" + +BUILD_CC = "${LLVM_PATH}/clang" +BUILD_CXX = "${LLVM_PATH}/clang++" +BUILD_CPP = "${LLVM_PATH}/clang" +BUILD_CCLD = "${LLVM_PATH}/clang" +BUILD_RANLIB = "${LLVM_PATH}/llvm-ranlib" +BUILD_AR = "${LLVM_PATH}/llvm-ar" +BUILD_AS = "${LLVM_PATH}/llvm-as" +BUILD_NM = "${LLVM_PATH}/llvm-nm" +BUILD_OBJDUMP = "${LLVM_PATH}/llvm-objdump" +BUILD_OBJCOPY = "${LLVM_PATH}/llvm-objcopy" +BUILD_STRIP = "${LLVM_PATH}/llvm-strip" +BUILD_STRINGS = "${LLVM_PATH}/llvm-strings" +BUILD_READELF = "${LLVM_PATH}/llvm-readelf" +BUILD_LD = "${LLVM_PATH}/ld.lld" +BUILD_LTO = "-fuse-ld=lld" +BUILD_HOSTCC = "${LLVM_PATH}/clang" + +FILES:${PN} += "${libdir}/${PN}/${ARCH_TRIPLE}" +INSTALL_DIR = "${D}/${ARCH_TRIPLE}" + +do_install() { + export CFLAGS="" + make install DESTDIR="${INSTALL_DIR}" + install -d ${D}${libdir}/${PN}/${ARCH_TRIPLE} + cp -rf ${INSTALL_DIR}${prefix}/* ${D}${libdir}/${PN}/${ARCH_TRIPLE} +} \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-target.inc b/recipes-core/musl/musl-morello-target.inc new file mode 100644 index 0000000..0cb32c9 --- /dev/null +++ b/recipes-core/musl/musl-morello-target.inc @@ -0,0 +1,51 @@ +inherit llvm-morello-native + +COMPATIBLE_MACHINE = "morello" +SECTION = "libs" + +DEPENDS:append = " virtual/musl-morello-libs-native" + +MUSL_LDSO_ARCH = "aarch64_purecap" + +FILES:${PN} = "${MUSL_INSTALL_DIR}" +FILES:${PN} += "${MUSL_INSTALL_DIR}${datadir}" +FILES:${PN} += "${MUSL_INSTALL_DIR}${includedir} ${MUSL_INSTALL_DIR}${includedir}/sys \ + ${MUSL_INSTALL_DIR}${includedir}/arpa ${MUSL_INSTALL_DIR}${includedir}/bits \ + ${MUSL_INSTALL_DIR}${includedir}/net ${MUSL_INSTALL_DIR}${includedir}/netinet \ + ${MUSL_INSTALL_DIR}${includedir}/netpacket ${MUSL_INSTALL_DIR}${includedir}/arpa \ + ${MUSL_INSTALL_DIR}${includedir}/scsi ${MUSL_INSTALL_DIR}${includedir}/sys" + +FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" + + +SYSROOT_DIRS += "${sysconfdir} ${MUSL_INSTALL_DIR}${includedir}" + +do_package[noexec] = "1" +do_package_write_rpm[noexec] = "1" +do_packagedata[noexec] = "1" + +do_install() { + + echo "Installing into ${TARGET_INSTALL_DIR}" + + export CFLAGS="" + + install -d ${TARGET_INSTALL_DIR}${includedir} ${TARGET_INSTALL_DIR}${includedir}/sys ${TARGET_INSTALL_DIR}${includedir}/arpa \ + ${TARGET_INSTALL_DIR}${includedir}/bits ${TARGET_INSTALL_DIR}${includedir}/net ${TARGET_INSTALL_DIR}${includedir}/netinet \ + ${TARGET_INSTALL_DIR}${includedir}/netpacket ${TARGET_INSTALL_DIR}${includedir}/arpa ${TARGET_INSTALL_DIR}${includedir}/scsi \ + ${TARGET_INSTALL_DIR}${includedir}/sys + + local destdir="${TARGET_INSTALL_DIR}" + + local config="${CONFIGUREOPTS}" + config="${config} --target=${ARCH_TRIPLE} ${EXTRA_CONFIGUREOPTS}" + + ${S}/configure ${CONFIGUREOPTS} + oe_runmake + oe_runmake install DESTDIR="${destdir}" + + install -d ${TARGET_INSTALL_DIR}${sysconfdir} + + echo "${TARGET_INSTALL_DIR}${base_libdir}" > ${TARGET_INSTALL_DIR}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path + echo "${TARGET_INSTALL_DIR}${libdir}" >> ${TARGET_INSTALL_DIR}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path +} \ No newline at end of file diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend new file mode 100644 index 0000000..cfe23e8 --- /dev/null +++ b/recipes-core/musl/musl_%.bbappend @@ -0,0 +1,17 @@ +require musl-morello-${MORELLO_ARCH}.inc musl-morello-${MORELLO_ARCH}-so.inc musl-morello-target.inc + +MACHINE_INC ?= "" +MACHINE_INC:morello-linux-glibc = "override-glibc.inc" +MACHINE_INC:morello-linux-musl = "override-musl.inc" + +require ${MACHINE_INC} + +DEPENDS:remove = "virtual/${TARGET_PREFIX}binutils \ + virtual/${TARGET_PREFIX}gcc \ + libgcc-initial \ + linux-libc-headers \ + bsd-headers \ + libssp-nonshared \ + " + +RDEPENDS:${PN}-dev:remove = "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" \ No newline at end of file diff --git a/recipes-core/musl/override-glibc.inc b/recipes-core/musl/override-glibc.inc new file mode 100644 index 0000000..25ddb15 --- /dev/null +++ b/recipes-core/musl/override-glibc.inc @@ -0,0 +1,3 @@ +PROVIDES:append = " virtual/musl-morello" +PROVIDES:remove = "virtual/libc virtual/libiconv virtual/libintl virtual/crypt" +RPROVIDES:${PN}-dev:remove = "libc-dev virtual-libc-dev" \ No newline at end of file diff --git a/recipes-core/musl/override-musl.inc b/recipes-core/musl/override-musl.inc new file mode 100644 index 0000000..0d44bca --- /dev/null +++ b/recipes-core/musl/override-musl.inc @@ -0,0 +1 @@ +PROVIDES:append = " virtual/musl-morello" \ No newline at end of file

Add recipe for a purecap application and a class it must inherit from.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- classes/pure-cap-application.bbclass | 39 +++ .../morello-linux-glibc/files/Makefile | 36 +++ .../morello-linux-glibc/files/pure-cap-app.c | 298 ++++++++++++++++++ .../morello-linux-musl/files/Makefile | 30 ++ .../morello-linux-musl/files/pure-cap-app.c | 298 ++++++++++++++++++ .../applications/pure-cap-app.bb | 23 ++ 6 files changed, 724 insertions(+) create mode 100644 classes/pure-cap-application.bbclass create mode 100644 recipes-morello-apps/applications/morello-linux-glibc/files/Makefile create mode 100644 recipes-morello-apps/applications/morello-linux-glibc/files/pure-cap-app.c create mode 100644 recipes-morello-apps/applications/morello-linux-musl/files/Makefile create mode 100644 recipes-morello-apps/applications/morello-linux-musl/files/pure-cap-app.c create mode 100644 recipes-morello-apps/applications/pure-cap-app.bb

diff --git a/classes/pure-cap-application.bbclass b/classes/pure-cap-application.bbclass new file mode 100644 index 0000000..fd2b338 --- /dev/null +++ b/classes/pure-cap-application.bbclass @@ -0,0 +1,39 @@ +OUTPUTS_NAME ?= "pure-cap-app-default-name" + +FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/${PN}:" + +DEPENDS += "virtual/musl-morello" + +do_package[noexec] = "1" +do_package_write_rpm[noexec] = "1" +do_packagedata[noexec] = "1" + +MUSL_HOME = "${STAGING_DIR_TARGET}${MUSL_INSTALL_DIR}" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +S = "${WORKDIR}/src" + +EXTRA_OEMAKE = "\ + LLVM_PATH='${LLVM_PATH}' \ + NAME='${OUTPUTS_NAME}' \ + OUT='${S}' \ + SYSROOT_LIB='${MUSL_HOME}${libdir}' \ + SYSROOT_INC='${MUSL_HOME}${includedir}' \ + SYSROOT='${MUSL_HOME}' \ + " + +do_compile() { + cd ${S} + echo "Resource dir ${resourcedir}" + echo "Musl home ${MUSL_HOME}" + oe_runmake ${EXTRA_OEMAKE} +} + +do_install() { + install -d ${D}/${APP_DIR} ${D}${bindir} + install ${S}/${OUTPUTS_NAME} ${D}/${APP_DIR}/${OUTPUTS_NAME} + install ${S}/${OUTPUTS_NAME} ${D}${bindir} +} \ No newline at end of file diff --git a/recipes-morello-apps/applications/morello-linux-glibc/files/Makefile b/recipes-morello-apps/applications/morello-linux-glibc/files/Makefile new file mode 100644 index 0000000..32fb7f9 --- /dev/null +++ b/recipes-morello-apps/applications/morello-linux-glibc/files/Makefile @@ -0,0 +1,36 @@ +NAME=$(OUTPUTS_NAME) +CC=$(LLVM_PATH)/clang + +TARGET=aarch64-linux-musl_purecap +ARCH=-march=morello+c64 -mabi=purecap +CLANG_RESOURCE_DIR=$(shell ${CC} -print-resource-dir) +CLANG_LIB=$(CLANG_RESOURCE_DIR)/lib/aarch64-unknown-linux-musl_purecap +COMPILER_INC=$(CLANG_RESOURCE_DIR)/include +OUT=$(S) + +CFLAGS=-Wno-gnu-alignof-expression \ + -Werror \ + -Wno-macro-redefined \ + -Werror=cheri \ + -Werror=cheri-inefficient \ + -Werror=cheri-pedantic \ + -Werror=cheri-pointer-conversion \ + -Werror=cheri-unimplemented-features \ + +all: + $(CC) -c -g -O0 -isystem $(SYSROOT_INC) -I$(COMPILER_INC) \ + $(ARCH) $(NAME).c -o $(OUT)/$(NAME).c.o \ + --target=$(TARGET) + $(CC) --target=$(TARGET) $(ARCH) -fuse-ld=lld \ + $(SYSROOT_LIB)/crt1.o \ + $(SYSROOT_LIB)/crti.o \ + $(CLANG_LIB)/clang_rt.crtbegin.o \ + $(OUT)/$(NAME).c.o \ + $(CLANG_LIB)/libclang_rt.builtins.a \ + $(CLANG_LIB)/clang_rt.crtend.o \ + $(SYSROOT_LIB)/crtn.o \ + -nostdlib -L$(SYSROOT_LIB) -lc -o $(OUT)/$(NAME) -static + +clean: + rm -f $(OUT)/$(NAME).c.o + rm -f $(OUT)/$(NAME) \ No newline at end of file diff --git a/recipes-morello-apps/applications/morello-linux-glibc/files/pure-cap-app.c b/recipes-morello-apps/applications/morello-linux-glibc/files/pure-cap-app.c new file mode 100644 index 0000000..0a9e62a --- /dev/null +++ b/recipes-morello-apps/applications/morello-linux-glibc/files/pure-cap-app.c @@ -0,0 +1,298 @@ +/** + * @author Pawel Zalewski Copyright (C) 2022 <The Good Penguin> + * @email pzalewski@thegoodpenguin.co.uk + * @create date 2022-07-11 16:13:49 + * @desc Simple Morello demonstration program aimed at Linux fs. + * + */ + +#include <stdio.h> +#include <stdbool.h> +#include <signal.h> +#include <string.h> +#include <stdlib.h> +#include <stdalign.h> +#include <stdint.h> + +#include <getopt.h> +#include <memory.h> + +#include <cheriintrin.h> + +static void usage(void); +static void subPointersToPointersTest(void); +static void subPointersToPointersTest2(void); +static void outOfBoundAccess(void); +static void functionPointersTest(void); +static void atomicAccess(void); + +static void sigactionSegfault(int signal, siginfo_t *si, void *args); +static void sigactionIllegal(int signal, siginfo_t *si, void *args); +static void sigactionAlingment(int signal, siginfo_t *si, void *args); + +static void printPointer(void *pointer); + +static void * cheri_perms_set(void * pointer, cheri_perms_t perm_new); + +typedef void (*functionPointer)(void); + +static const char shortOptions[] = "habcde"; + +static const struct option longOptions[] = { + {"help", 0, NULL, 'h'}, + {"subPointersToPointersTest", 0, NULL, 'a'}, + {"subPointersToPointersTest2", 0, NULL, 'b'}, + {"outOfBoundAccess", 0, NULL, 'c'}, + {"functionPointersTest", 0, NULL, 'd'}, + {"atomicAccess", 0, NULL, 'e'}, + {NULL, 0, NULL, 0}, +}; + +static void sigactionAlingment(int signal, siginfo_t *si, void *args) +{ + printf("Signal [%d] caught an alligment fault at address %p with code %d args: %p \n", signal, si->si_addr, si->si_code, args); + exit(0); +} + +static void sigactionSegfault(int signal, siginfo_t *si, void *args) +{ + printf("Signal [%d] caught a segfault at address %p with code %d args: %p \n", signal, si->si_addr, si->si_code, args); + exit(0); +} + +static void sigactionIllegal(int signal, siginfo_t *si, void *args) +{ + printf("Signal [%d] caught an illegal access at address %p with code %d args: %p \n", signal, si->si_addr, si->si_code, args); + exit(0); +} + +int main(int argc, char **argv) +{ + + struct sigaction sa; + + memset(&sa, 0, sizeof(struct sigaction)); + sigemptyset(&sa.sa_mask); + + sa.sa_sigaction = sigactionSegfault; + sa.sa_flags = SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + + memset(&sa, 0, sizeof(struct sigaction)); + sa.sa_sigaction = sigactionIllegal; + sa.sa_flags = SA_SIGINFO; + sigaction(SIGILL, &sa, NULL); + + memset(&sa, 0, sizeof(struct sigaction)); + sa.sa_sigaction = sigactionAlingment; + sa.sa_flags = SA_SIGINFO; + sigaction(SIGBUS, &sa, NULL); + + size_t sizeInt = sizeof(int64_t); + size_t sizePointer = sizeof(uint8_t *); + + printf("The size of int64 is %lu-byte/%lu-bit and pointers are %lu-byte/%lu-bit \r\n", sizeInt, sizeInt << 3, sizePointer, sizePointer << 3); + + int optionidx = 0; + int opt; + + while ((opt = getopt_long(argc, argv, shortOptions, longOptions, &optionidx)) != EOF) + { + switch (opt) + { + case 'h': + usage(); + return 0; + + case 'a': + subPointersToPointersTest(); + break; + + case 'b': + subPointersToPointersTest2(); + break; + + case 'c': + outOfBoundAccess(); + break; + + case 'd': + functionPointersTest(); + break; + + case 'e': + atomicAccess(); + break; + + default: + printf("Got: %c\r\n", opt); + usage(); + exit(1); + } + } + + return 0; +} + +/** + * @brief Prints the pointer meta-data + * + * @param pointer teh pointer + */ +static void printPointer(void *pointer) +{ + size_t addr = cheri_address_get(pointer); + size_t base = cheri_base_get(pointer); + size_t offset = cheri_offset_get(pointer); + size_t len = cheri_length_get(pointer); + size_t perm = cheri_perms_get(pointer); + bool tag = cheri_tag_get(pointer); + + printf("Capability size %lx align %lx addr %lX base %lX offset %lX length %lu permissions %lX tag %d \r\n", sizeof(pointer), alignof(pointer), addr, base, offset, len, perm, tag); + + cheri_perms_t permissions = cheri_perms_get(pointer); + + bool issealed = cheri_is_sealed(pointer); + bool hasload = (permissions & CHERI_PERM_LOAD ) == CHERI_PERM_LOAD; + bool hasstore = (permissions & CHERI_PERM_STORE ) == CHERI_PERM_STORE; + bool hasexec = (permissions & CHERI_PERM_EXECUTE ) == CHERI_PERM_EXECUTE; + bool hassys = (permissions & CHERI_PERM_SYSTEM_REGS ) == CHERI_PERM_SYSTEM_REGS; + bool hasseal = (permissions & CHERI_PERM_SEAL ) == CHERI_PERM_SEAL; + printf("Is sealed %d, load %d, store %d, execute %d, system %d, seal %d\r\n", issealed, hasload, hasstore, hasexec, hassys, hasseal); +} + +/** + * @brief This function tests how meta-data behaves in sub-sequent pointers. + * + */ + +static void subPointersToPointersTest(void) +{ + uint8_t array[21] = {42}; + + uint8_t *pArray10 = &array[10]; + uint8_t *pArray15 = pArray10 + 5; + + printPointer(array); + printPointer(pArray10); + printPointer(pArray15); +} + +/** + * @brief This function tests changing bounds of pointers. + * + */ +static void subPointersToPointersTest2(void) +{ + uint8_t array[21] = {42}; + + uint8_t *pArray10 = &array[10]; + uint8_t *pArray10Bounded = cheri_bounds_set(pArray10, 4); + + printPointer(array); + printPointer(pArray10); + printPointer(pArray10Bounded); + + uint8_t *pArray10UnBounded = cheri_bounds_set(pArray10Bounded, 5); + + printPointer(pArray10UnBounded); + + pArray10Bounded--; + + printf("Some value is %d \r\n", *pArray10Bounded); + printf("Some value is %d \r\n", *pArray10UnBounded); +} + +/** + * @brief This function checks if we can access OOB value. + * + */ + +int someValue = 0x8000; + +static void outOfBoundAccess(void) +{ + + int *pAddress = &someValue; + printPointer(pAddress); + + pAddress++; + printPointer(pAddress); + + printf("Some value is %d \r\n", *pAddress); +} + +/** + * @brief This function checks how function pointers behave. + * + */ + +static void functionPointersTest(void) +{ + + functionPointer fp = &outOfBoundAccess; + + printPointer(fp); + + int *pData = (int *)fp; + + printPointer(pData); + + cheri_perms_t perm = cheri_perms_get((void*)fp) | CHERI_PERM_STORE; + functionPointer fpE = cheri_perms_set(fp, perm); + + printPointer(fpE); + + fpE(); + + int *pAddress = &someValue; + functionPointer fpAddr = (functionPointer)pAddress; + + printPointer(pAddress); +} + +/** + * @brief This function checks if we can atomically apply capability to a data field. + * + */ +static void atomicAccess(void) +{ + uint8_t array[21] = {42}; + + uint8_t *pWriter = cheri_perms_set(&array[0], 0b010000000001000001); + uint8_t *pReader = cheri_perms_set(&array[0], 0b100000000001000001); + + printPointer(pWriter); + printPointer(pReader); + + pWriter[0] = 1; + + uint8_t value = pReader[0]; + + pReader[0] = 1; + + printf("Value is %u array is %u \r\n", value, array[0]); +} + +static void * cheri_perms_set(void * pointer, cheri_perms_t perm_new) { + + cheri_perms_t perm_old = cheri_perms_get(pointer); + return cheri_perms_clear(pointer, perm_old & ~perm_new); +} + +/** + * @brief Teh usage + * + */ +static void usage(void) +{ + printf( + "Usage: MorelloExample [OPTION]\n" + "\n" + "-h, --help help\n" + "-a subPointersToPointersTest\n" + "-b subPointersToPointersTest2\n" + "-c outOfBoundAccess \n" + "-d functionPointersTest \n" + "-e atomicAccess\n"); +} \ No newline at end of file diff --git a/recipes-morello-apps/applications/morello-linux-musl/files/Makefile b/recipes-morello-apps/applications/morello-linux-musl/files/Makefile new file mode 100644 index 0000000..5a943f4 --- /dev/null +++ b/recipes-morello-apps/applications/morello-linux-musl/files/Makefile @@ -0,0 +1,30 @@ +NAME=$(OUTPUTS_NAME) +CC=$(LLVM_PATH)/clang + +TARGET=aarch64-linux-musl_purecap +ARCH=-march=morello+c64 -mabi=purecap +CLANG_RESOURCE_DIR=$(shell ${CC} -print-resource-dir) +CLANG_LIB=$(CLANG_RESOURCE_DIR)/lib/aarch64-unknown-linux-musl_purecap +COMPILER_INC=$(CLANG_RESOURCE_DIR)/include +OUT=$(S) + +CFLAGS=-Wno-gnu-alignof-expression \ + -Werror \ + -Wno-macro-redefined \ + -Werror=cheri \ + -Werror=cheri-inefficient \ + -Werror=cheri-pedantic \ + -Werror=cheri-pointer-conversion \ + -Werror=cheri-unimplemented-features + +all: + $(CC) -c -g -O0 -isystem $(SYSROOT_INC) -I$(COMPILER_INC) \ + $(ARCH) $(NAME).c -o $(OUT)/$(NAME).c.o \ + --target=$(TARGET) + $(CC) --target=$(TARGET) $(ARCH) -fuse-ld=lld -rtlib=compiler-rt --sysroot $(SYSROOT) \ + $(OUT)/$(NAME).c.o \ + -o $(OUT)/$(NAME) + +clean: + rm -f $(OUT)/$(NAME).c.o + rm -f $(OUT)/$(NAME) \ No newline at end of file diff --git a/recipes-morello-apps/applications/morello-linux-musl/files/pure-cap-app.c b/recipes-morello-apps/applications/morello-linux-musl/files/pure-cap-app.c new file mode 100644 index 0000000..0a9e62a --- /dev/null +++ b/recipes-morello-apps/applications/morello-linux-musl/files/pure-cap-app.c @@ -0,0 +1,298 @@ +/** + * @author Pawel Zalewski Copyright (C) 2022 <The Good Penguin> + * @email pzalewski@thegoodpenguin.co.uk + * @create date 2022-07-11 16:13:49 + * @desc Simple Morello demonstration program aimed at Linux fs. + * + */ + +#include <stdio.h> +#include <stdbool.h> +#include <signal.h> +#include <string.h> +#include <stdlib.h> +#include <stdalign.h> +#include <stdint.h> + +#include <getopt.h> +#include <memory.h> + +#include <cheriintrin.h> + +static void usage(void); +static void subPointersToPointersTest(void); +static void subPointersToPointersTest2(void); +static void outOfBoundAccess(void); +static void functionPointersTest(void); +static void atomicAccess(void); + +static void sigactionSegfault(int signal, siginfo_t *si, void *args); +static void sigactionIllegal(int signal, siginfo_t *si, void *args); +static void sigactionAlingment(int signal, siginfo_t *si, void *args); + +static void printPointer(void *pointer); + +static void * cheri_perms_set(void * pointer, cheri_perms_t perm_new); + +typedef void (*functionPointer)(void); + +static const char shortOptions[] = "habcde"; + +static const struct option longOptions[] = { + {"help", 0, NULL, 'h'}, + {"subPointersToPointersTest", 0, NULL, 'a'}, + {"subPointersToPointersTest2", 0, NULL, 'b'}, + {"outOfBoundAccess", 0, NULL, 'c'}, + {"functionPointersTest", 0, NULL, 'd'}, + {"atomicAccess", 0, NULL, 'e'}, + {NULL, 0, NULL, 0}, +}; + +static void sigactionAlingment(int signal, siginfo_t *si, void *args) +{ + printf("Signal [%d] caught an alligment fault at address %p with code %d args: %p \n", signal, si->si_addr, si->si_code, args); + exit(0); +} + +static void sigactionSegfault(int signal, siginfo_t *si, void *args) +{ + printf("Signal [%d] caught a segfault at address %p with code %d args: %p \n", signal, si->si_addr, si->si_code, args); + exit(0); +} + +static void sigactionIllegal(int signal, siginfo_t *si, void *args) +{ + printf("Signal [%d] caught an illegal access at address %p with code %d args: %p \n", signal, si->si_addr, si->si_code, args); + exit(0); +} + +int main(int argc, char **argv) +{ + + struct sigaction sa; + + memset(&sa, 0, sizeof(struct sigaction)); + sigemptyset(&sa.sa_mask); + + sa.sa_sigaction = sigactionSegfault; + sa.sa_flags = SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + + memset(&sa, 0, sizeof(struct sigaction)); + sa.sa_sigaction = sigactionIllegal; + sa.sa_flags = SA_SIGINFO; + sigaction(SIGILL, &sa, NULL); + + memset(&sa, 0, sizeof(struct sigaction)); + sa.sa_sigaction = sigactionAlingment; + sa.sa_flags = SA_SIGINFO; + sigaction(SIGBUS, &sa, NULL); + + size_t sizeInt = sizeof(int64_t); + size_t sizePointer = sizeof(uint8_t *); + + printf("The size of int64 is %lu-byte/%lu-bit and pointers are %lu-byte/%lu-bit \r\n", sizeInt, sizeInt << 3, sizePointer, sizePointer << 3); + + int optionidx = 0; + int opt; + + while ((opt = getopt_long(argc, argv, shortOptions, longOptions, &optionidx)) != EOF) + { + switch (opt) + { + case 'h': + usage(); + return 0; + + case 'a': + subPointersToPointersTest(); + break; + + case 'b': + subPointersToPointersTest2(); + break; + + case 'c': + outOfBoundAccess(); + break; + + case 'd': + functionPointersTest(); + break; + + case 'e': + atomicAccess(); + break; + + default: + printf("Got: %c\r\n", opt); + usage(); + exit(1); + } + } + + return 0; +} + +/** + * @brief Prints the pointer meta-data + * + * @param pointer teh pointer + */ +static void printPointer(void *pointer) +{ + size_t addr = cheri_address_get(pointer); + size_t base = cheri_base_get(pointer); + size_t offset = cheri_offset_get(pointer); + size_t len = cheri_length_get(pointer); + size_t perm = cheri_perms_get(pointer); + bool tag = cheri_tag_get(pointer); + + printf("Capability size %lx align %lx addr %lX base %lX offset %lX length %lu permissions %lX tag %d \r\n", sizeof(pointer), alignof(pointer), addr, base, offset, len, perm, tag); + + cheri_perms_t permissions = cheri_perms_get(pointer); + + bool issealed = cheri_is_sealed(pointer); + bool hasload = (permissions & CHERI_PERM_LOAD ) == CHERI_PERM_LOAD; + bool hasstore = (permissions & CHERI_PERM_STORE ) == CHERI_PERM_STORE; + bool hasexec = (permissions & CHERI_PERM_EXECUTE ) == CHERI_PERM_EXECUTE; + bool hassys = (permissions & CHERI_PERM_SYSTEM_REGS ) == CHERI_PERM_SYSTEM_REGS; + bool hasseal = (permissions & CHERI_PERM_SEAL ) == CHERI_PERM_SEAL; + printf("Is sealed %d, load %d, store %d, execute %d, system %d, seal %d\r\n", issealed, hasload, hasstore, hasexec, hassys, hasseal); +} + +/** + * @brief This function tests how meta-data behaves in sub-sequent pointers. + * + */ + +static void subPointersToPointersTest(void) +{ + uint8_t array[21] = {42}; + + uint8_t *pArray10 = &array[10]; + uint8_t *pArray15 = pArray10 + 5; + + printPointer(array); + printPointer(pArray10); + printPointer(pArray15); +} + +/** + * @brief This function tests changing bounds of pointers. + * + */ +static void subPointersToPointersTest2(void) +{ + uint8_t array[21] = {42}; + + uint8_t *pArray10 = &array[10]; + uint8_t *pArray10Bounded = cheri_bounds_set(pArray10, 4); + + printPointer(array); + printPointer(pArray10); + printPointer(pArray10Bounded); + + uint8_t *pArray10UnBounded = cheri_bounds_set(pArray10Bounded, 5); + + printPointer(pArray10UnBounded); + + pArray10Bounded--; + + printf("Some value is %d \r\n", *pArray10Bounded); + printf("Some value is %d \r\n", *pArray10UnBounded); +} + +/** + * @brief This function checks if we can access OOB value. + * + */ + +int someValue = 0x8000; + +static void outOfBoundAccess(void) +{ + + int *pAddress = &someValue; + printPointer(pAddress); + + pAddress++; + printPointer(pAddress); + + printf("Some value is %d \r\n", *pAddress); +} + +/** + * @brief This function checks how function pointers behave. + * + */ + +static void functionPointersTest(void) +{ + + functionPointer fp = &outOfBoundAccess; + + printPointer(fp); + + int *pData = (int *)fp; + + printPointer(pData); + + cheri_perms_t perm = cheri_perms_get((void*)fp) | CHERI_PERM_STORE; + functionPointer fpE = cheri_perms_set(fp, perm); + + printPointer(fpE); + + fpE(); + + int *pAddress = &someValue; + functionPointer fpAddr = (functionPointer)pAddress; + + printPointer(pAddress); +} + +/** + * @brief This function checks if we can atomically apply capability to a data field. + * + */ +static void atomicAccess(void) +{ + uint8_t array[21] = {42}; + + uint8_t *pWriter = cheri_perms_set(&array[0], 0b010000000001000001); + uint8_t *pReader = cheri_perms_set(&array[0], 0b100000000001000001); + + printPointer(pWriter); + printPointer(pReader); + + pWriter[0] = 1; + + uint8_t value = pReader[0]; + + pReader[0] = 1; + + printf("Value is %u array is %u \r\n", value, array[0]); +} + +static void * cheri_perms_set(void * pointer, cheri_perms_t perm_new) { + + cheri_perms_t perm_old = cheri_perms_get(pointer); + return cheri_perms_clear(pointer, perm_old & ~perm_new); +} + +/** + * @brief Teh usage + * + */ +static void usage(void) +{ + printf( + "Usage: MorelloExample [OPTION]\n" + "\n" + "-h, --help help\n" + "-a subPointersToPointersTest\n" + "-b subPointersToPointersTest2\n" + "-c outOfBoundAccess \n" + "-d functionPointersTest \n" + "-e atomicAccess\n"); +} \ No newline at end of file diff --git a/recipes-morello-apps/applications/pure-cap-app.bb b/recipes-morello-apps/applications/pure-cap-app.bb new file mode 100644 index 0000000..f1b314a --- /dev/null +++ b/recipes-morello-apps/applications/pure-cap-app.bb @@ -0,0 +1,23 @@ +inherit pure-cap-application llvm-morello-native + +COMPATIBLE_MACHINE = "morello-linux" +SUMMARY = "Simple capability application" +DESCRIPTION = "Application used in the series of blogs found @ https://www.thegoodpenguin.co.uk/blog/tag/morello/" +OUTPUTS_NAME = "pure-cap-app" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +PROVIDES = "${OUTPUTS_NAME}" + +FILES:${PN} += "/${APP_DIR} ${bindir}" +SYSROOT_DIRS +="/${APP_DIR}" + +SRC_URI = " \ + file://files/pure-cap-app.c \ + file://files/Makefile \ + " + +do_configure () { + install -d ${S} + install ${WORKDIR}/files/* ${S} +} \ No newline at end of file

Add recipes that will output a Linux image and a initramfs that contains the Morello busybox and the purecap app. The glibc version can take an arbitrary Yocto image as the rootfs. The Yocto rootfs is not tested yet but can be easily done by adding an extra grub menu option.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- conf/machine/morello-linux-glibc.conf | 23 +++ conf/machine/morello-linux-musl.conf | 15 ++ .../images/morello-initramfs-glibc.bb | 62 ++++++++ .../images/morello-initramfs-musl.bb | 59 +++++++ .../images/morello-linux-glibc/files/init.sh | 65 ++++++++ .../files/initramfs.list.template | 18 +++ .../images/morello-linux-image-glibc.bb | 145 ++++++++++++++++++ .../images/morello-linux-image-musl.bb | 97 ++++++++++++ .../images/morello-linux-musl/files/init.sh | 33 ++++ .../files/initramfs.list.template | 18 +++ 10 files changed, 535 insertions(+) create mode 100644 recipes-morello/images/morello-initramfs-glibc.bb create mode 100644 recipes-morello/images/morello-initramfs-musl.bb create mode 100644 recipes-morello/images/morello-linux-glibc/files/init.sh create mode 100644 recipes-morello/images/morello-linux-glibc/files/initramfs.list.template create mode 100644 recipes-morello/images/morello-linux-image-glibc.bb create mode 100644 recipes-morello/images/morello-linux-image-musl.bb create mode 100644 recipes-morello/images/morello-linux-musl/files/init.sh create mode 100644 recipes-morello/images/morello-linux-musl/files/initramfs.list.template

diff --git a/conf/machine/morello-linux-glibc.conf b/conf/machine/morello-linux-glibc.conf index 6ed824d..845641f 100644 --- a/conf/machine/morello-linux-glibc.conf +++ b/conf/machine/morello-linux-glibc.conf @@ -1,3 +1,26 @@ require conf/machine/include/morello-common.inc

MACHINEOVERRIDES =. "morello-linux-glibc:" + +PREFERRED_PROVIDER_virtual/kernel = "linux-morello-${MORELLO_RELEASE_VERSION}" +PREFFERED_PROVIDER_morello-linux-image = "morello-linux-image-glibc" +PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-glibc" + +BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" +BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/trusted-firmware-a" + +TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}" + +MUSL_INSTALL_DIR ?= "${libdir}/${GLOBAL_ARCH_TRIPLE}" + +IMAGE_BASENAME = "rootfs" +IMAGE_FSTYPES:append = " ext4" + +# The rootfs image that will go on a bootable drive +MORELLO_ROOTFS_IMAGE = "core-image-minimal" + +IMAGE_INSTALL:append = " linux-firmware-rtl8168" + +DISTRO ?= "poky" + +SERIAL_CONSOLES = "115200;ttyAMA0" \ No newline at end of file diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf index e22493d..c059775 100644 --- a/conf/machine/morello-linux-musl.conf +++ b/conf/machine/morello-linux-musl.conf @@ -1,3 +1,18 @@ require conf/machine/include/morello-common.inc

MACHINEOVERRIDES =. "morello-linux-musl:" + +TARGET_OS ?= "linux-musl" + +PREFERRED_PROVIDER_virtual/kernel = "linux-morello-${MORELLO_RELEASE_VERSION}" +PREFFERED_PROVIDER_morello-linux-image = "morello-linux-image-musl" +PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-musl" + +TCLIBC = "musl" + +BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" +BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/trusted-firmware-a" + +TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}" + +DISTRO = "" \ No newline at end of file diff --git a/recipes-morello/images/morello-initramfs-glibc.bb b/recipes-morello/images/morello-initramfs-glibc.bb new file mode 100644 index 0000000..cc4374d --- /dev/null +++ b/recipes-morello/images/morello-initramfs-glibc.bb @@ -0,0 +1,62 @@ +inherit deploy nopackages + +COMPATIBLE_MACHINE = "morello-linux-glibc" +SUMMARY = "Initramfs for busybox" +DESCRIPTION = "Initramfs for busybox, bypassing the Yocto way" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +OUTPUTS_NAME = "morello-initramfs" + +DEPENDS += "virtual/morello-busybox gen-init-cpio-native pure-cap-app" +PROVIDES = "${OUTPUTS_NAME}" + +BB_DONT_CACHE = "1" +INHIBIT_DEFAULT_DEPS = "1" + +FILESEXTRAPATHS:prepend := "${THISDIR}:" + +SRC_URI = "file://files/init.sh \ + file://files/initramfs.list.template \ + " +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_deploy[depends] = "virtual/morello-busybox:do_populate_sysroot" + + +do_install() { + + local sysroot_prefix="recipe-sysroot" + + sed -e "s@%FILES%@/files@" \ + "${WORKDIR}/files/initramfs.list.template" > "${WORKDIR}/files/initramfs.list.tmp1" + + sed -e "s@%BUSYBOX%@/${sysroot_prefix}/busybox@" \ + "${WORKDIR}/files/initramfs.list.tmp1" > "${WORKDIR}/files/initramfs.list.tmp2" + + sed -e "s@%PREFIX%@/${sysroot_prefix}${prefix}@" \ + "${WORKDIR}/files/initramfs.list.tmp2" > "${WORKDIR}/files/initramfs.list.tmp1" + + sed -e "s@%APP_DIR%@/${APP_DIR}@" \ + "${WORKDIR}/files/initramfs.list.tmp1" > "${WORKDIR}/files/initramfs.list.tmp2" + + sed -e "s@%MUSL%@/${sysroot_prefix}/musl@" \ + "${WORKDIR}/files/initramfs.list.tmp2" > "${WORKDIR}/files/initramfs.list" + + install -d ${D}/${OUTPUTS_NAME} + + rm -f ${D}/${OUTPUTS_NAME}/initramfs + + { + env -C ${WORKDIR} ${STAGING_BINDIR_NATIVE}/gen_init_cpio "${WORKDIR}/files/initramfs.list" + env -C "${STAGING_DIR_TARGET}/" find . -not -path "./sysroot-providers*" \ + -not -path "./lib*" -not -path "./usr*" -not -path "./busybox*" -not -path "./etc*" -print0 | \ + env -C "${STAGING_DIR_TARGET}/" cpio --null --owner +0:+0 --create --format=newc + } > ${D}/${OUTPUTS_NAME}/initramfs + +} + +do_deploy() { + install -d ${DEPLOYDIR}/${OUTPUTS_NAME} + install ${D}/${OUTPUTS_NAME}/initramfs ${DEPLOYDIR}/${OUTPUTS_NAME}/initramfs +} +addtask deploy after do_install \ No newline at end of file diff --git a/recipes-morello/images/morello-initramfs-musl.bb b/recipes-morello/images/morello-initramfs-musl.bb new file mode 100644 index 0000000..585540d --- /dev/null +++ b/recipes-morello/images/morello-initramfs-musl.bb @@ -0,0 +1,59 @@ +inherit deploy nopackages + +COMPATIBLE_MACHINE = "morello-linux-musl" +SUMMARY = "Initramfs for busybox" +DESCRIPTION = "Initramfs for busybox, bypassing the Yocto way" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +OUTPUTS_NAME = "morello-initramfs" + +DEPENDS += "virtual/morello-busybox gen-init-cpio-native pure-cap-app" +PROVIDES = "${OUTPUTS_NAME}" + +BB_DONT_CACHE = "1" +INHIBIT_DEFAULT_DEPS = "1" + +FILESEXTRAPATHS:prepend := "${THISDIR}:" + +SRC_URI = "file://files/init.sh \ + file://files/initramfs.list.template \ + " +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_deploy[depends] = "virtual/morello-busybox:do_populate_sysroot" + + +do_install() { + + local sysroot_prefix="recipe-sysroot" + + sed -e "s@%FILES%@/files@" \ + "${WORKDIR}/files/initramfs.list.template" > "${WORKDIR}/files/initramfs.list.tmp1" + + sed -e "s@%BUSYBOX%@/${sysroot_prefix}/busybox@" \ + "${WORKDIR}/files/initramfs.list.tmp1" > "${WORKDIR}/files/initramfs.list.tmp2" + + sed -e "s@%PREFIX%@/${sysroot_prefix}${prefix}@" \ + "${WORKDIR}/files/initramfs.list.tmp2" > "${WORKDIR}/files/initramfs.list.tmp1" + + sed -e "s@%APP_DIR%@/${APP_DIR}@" \ + "${WORKDIR}/files/initramfs.list.tmp1" > "${WORKDIR}/files/initramfs.list.tmp2" + + sed -e "s@%MUSL%@/${sysroot_prefix}/musl@" \ + "${WORKDIR}/files/initramfs.list.tmp2" > "${WORKDIR}/files/initramfs.list" + + install -d ${D}/${OUTPUTS_NAME} + + rm -f ${D}/${OUTPUTS_NAME}/initramfs + + { + env -C ${WORKDIR} ${STAGING_BINDIR_NATIVE}/gen_init_cpio "${WORKDIR}/files/initramfs.list" + env -C "${STAGING_DIR_TARGET}/" find . -not -path "./sysroot-providers*" -print0 | env -C "${STAGING_DIR_TARGET}/" cpio --null --owner +0:+0 --create --format=newc + } > ${D}/${OUTPUTS_NAME}/initramfs +} + +do_deploy() { + install -d ${DEPLOYDIR}/${OUTPUTS_NAME} + install ${D}/${OUTPUTS_NAME}/initramfs ${DEPLOYDIR}/${OUTPUTS_NAME}/initramfs +} +addtask deploy after do_install \ No newline at end of file diff --git a/recipes-morello/images/morello-linux-glibc/files/init.sh b/recipes-morello/images/morello-linux-glibc/files/init.sh new file mode 100644 index 0000000..18fcfec --- /dev/null +++ b/recipes-morello/images/morello-linux-glibc/files/init.sh @@ -0,0 +1,65 @@ +#!/bin/busybox sh + +mount() { + /bin/busybox mount "$@" +} + +umount() { + /bin/busybox umount "$@" +} + +grep() { + /bin/busybox grep "$@" +} + +cp() { + /bin/busybox cp "$@" +} + +mkdir() { + /bin/busybox mkdir "$@" +} + +switch_root () { + /bin/busybox switch_root "$@" +} + +sed () { + /bin/busybox sed "$@" +} + +echo "Running init script" + +mount -t proc proc /proc +grep -qE $'\t'"devtmpfs$" /proc/filesystems && mount -t devtmpfs dev /dev +mount -t sysfs sysfs /sys + +echo "Installing busybox..." + +/bin/busybox --install -s + +! grep -qE $'\t'"devtmpfs$" /proc/filesystems && mdev -s + +ROOT="/newroot" + +PARTUUID=$(cat proc/cmdline | sed 's/ /\n/g' | sed -n 's/^root=PARTUUID=*//p') + +DEVID=$(blkid | sed -n "s/UUID="$PARTUUID" TYPE="ext4"*//p" | sed 's/://') + +echo "Mounting ${DEVID} rootfs with PARTUUID: ${PARTUUID}" + +mount ${DEVID} ${ROOT} + +mkdir ${ROOT}/usr/pure-cap-apps +cp -rf pure-cap-apps ${ROOT}/usr + +ulimit -c unlimited + +cd ${ROOT} +exec switch_root . /sbin/init </dev/ttyAMA0 >dev/ttyAMA0 2>&1 + +echo "/bin/sh as PID 1!" +echo "init.sh" +exec setsid cttyhack sh +echo setsid ctty hack failed so "exec /bin/sh" fallback will be used +exec /bin/sh \ No newline at end of file diff --git a/recipes-morello/images/morello-linux-glibc/files/initramfs.list.template b/recipes-morello/images/morello-linux-glibc/files/initramfs.list.template new file mode 100644 index 0000000..3da25be --- /dev/null +++ b/recipes-morello/images/morello-linux-glibc/files/initramfs.list.template @@ -0,0 +1,18 @@ +dir /bin 755 0 0 +dir /include 755 0 0 +dir /lib 755 0 0 +dir /share 755 0 0 +dir /dev 755 0 0 +dir /proc 755 0 0 +dir /sbin 755 0 0 +dir /sys 755 0 0 +dir /newroot 755 0 0 +dir /usr 755 0 0 +dir /usr/lib 755 0 0 +dir /usr/bin 755 0 0 +dir /etc 755 0 0 + +dir /%APP_DIR% 755 0 0 + +file /bin/busybox .%BUSYBOX%/busybox 755 0 0 +file /init .%FILES%/init.sh 755 0 0 \ No newline at end of file diff --git a/recipes-morello/images/morello-linux-image-glibc.bb b/recipes-morello/images/morello-linux-image-glibc.bb new file mode 100644 index 0000000..135ce9a --- /dev/null +++ b/recipes-morello/images/morello-linux-image-glibc.bb @@ -0,0 +1,145 @@ +inherit deploy nopackages + +COMPATIBLE_MACHINE = "morello-linux-glibc" +SUMMARY = "Bootable Morello Linux Image" +DESCRIPTION = "Image that goes on a bootable device, can be DD'ed onto a USB stick" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +OUTPUTS_NAME = "morello-linux-image" + +INHIBIT_DEFAULT_DEPS = "1" + +DEPENDS += "virtual/kernel morello-initramfs mtools-native e2fsprogs-native coreutils-native bc-native util-linux-native" +PROVIDES = "${OUTPUTS_NAME}" + +ESP_SIZE = "100" +BOOT_SECTORS = "204800" + +LBA = "512" +PART_START_ALIGNMENT = "2048" + +ESP_IMAGE = "${OUTPUTS_NAME}-esp" + +ROOTFS = "${DEPLOY_DIR}/images/morello-linux-glibc/rootfs-morello-linux-glibc.ext4" + +do_compile[noexec] = "1" +do_configure[depends] += "${MORELLO_ROOTFS_IMAGE}:do_image_complete morello-initramfs:do_deploy" +do_configure[mcdepends] += "mc:${BB_CURRENT_MC}:morello-firmware:board-firmware-image:do_deploy" + +def get_next_part_start (d): + next_image_start = int(d.getVar('BOOT_SECTORS')) + int(d.getVar('PART_START_ALIGNMENT')) + int(d.getVar('PART_START_ALIGNMENT')) - 1 + next_image_start = next_image_start & ~(int(d.getVar('PART_START_ALIGNMENT')) -1) + return next_image_start + +mult() { + local ret=$(echo "${1} * ${2}" | bc) + echo ${ret} +} + +add() { + local ret=$(echo "${1} + ${2}" | bc) + echo ${ret} +} + +div() { + local ret=$(echo "${1} / ${2}" | bc) + echo ${ret} +} + +get_size() { + local link=$(readlink -f ${1}) + local size=$(stat --dereference --format="%s" ${link}) + local ret=${size% *} + echo ${ret} +} + +add_to_image() { + mcopy -i ${1} -m -D overwrite ${2} ::${3} +} + +get_uuid() { + local part="$(blkid ${1})" + local tmp=${part#*"} + local uuid=$(echo $tmp | head -c 36) + echo ${uuid} +} + +create_gpt() { + + local esp_type="C12A7328-F81F-11D2-BA4B-00A0C93EC93B" + local linux_type="0FC63DAF-8483-4772-8E79-3D69D8477DE4" + + local part_start_esp=${PART_START_ALIGNMENT} + local part_start_linux="${@get_next_part_start(d)}" + + local size=$(get_size ${ROOTFS}) + local tmp=$(add ${size} ${LBA}) + + local rootfs_sectors=$(div ${tmp} ${LBA}) + local rootfs_uuid=$(get_uuid ${ROOTFS}) + + echo "Sectors $rootfs_sectors ${BOOT_SECTORS}" + + { + echo "label: gpt" + echo "start=${part_start_esp}, size=${BOOT_SECTORS}, name=ESP, type=${esp_type}" + echo "start=${part_start_linux}, size=${rootfs_sectors}, name=root, type=${linux_type}, uuid=${rootfs_uuid}" + } | sfdisk -q "${1}" + + dd if="${2}" of="${1}" seek=$(mult ${part_start_esp} ${LBA}) bs=8M conv=notrunc,sparse oflag=seek_bytes status=progress + dd if="${3}" of="${1}" seek=$(mult ${part_start_linux} ${LBA}) bs=8M conv=notrunc,sparse oflag=seek_bytes status=progress +} + +do_configure() { + local grub="${BSP_GRUB_DIR}/grub-config.cfg" + local uuid=$(get_uuid ${ROOTFS}) + echo ${uuid} + rm -f ${BSP_GRUB_DIR}/grub-config.cfg.processed + sed -e "s@%UUID%@${uuid}@" \ + "${BSP_GRUB_DIR}/grub-config.cfg" > "${BSP_GRUB_DIR}/grub-config.cfg.processed" +} + +do_install() { + + local part0="${BSP_GRUB_DIR}/grub-efi-bootaa64.efi" + local part1="${BSP_GRUB_DIR}/grub-config.cfg.processed" + local part2="${BSP_DTB_DIR}/morello-soc.dtb" + local part3="${DEPLOY_DIR}/images/morello-linux-glibc/Image" + local part4="${DEPLOY_DIR}/images/morello-linux-glibc/morello-initramfs/initramfs" + + rm -f ${ESP_IMAGE}.img + + # create the ESP + dd if=/dev/zero of=${ESP_IMAGE}.img bs=1024K count=${ESP_SIZE} + mformat -i ${ESP_IMAGE}.img -v ESP :: + + mmd -i ${ESP_IMAGE}.img ::/EFI + mmd -i ${ESP_IMAGE}.img ::/EFI/BOOT + + add_to_image ${ESP_IMAGE}.img ${part0} /EFI/BOOT/BOOTAA64.EFI + add_to_image ${ESP_IMAGE}.img ${part1} /EFI/BOOT/grub.cfg + add_to_image ${ESP_IMAGE}.img ${part2} /morello.dtb + add_to_image ${ESP_IMAGE}.img ${part3} /Image + add_to_image ${ESP_IMAGE}.img ${part4} /initramfs + + local size=$(get_size ${ROOTFS}) + + local rootfs_size=$(div ${size} 1048576) + local total_size=$(add ${ESP_SIZE} ${rootfs_size}) + + : > ${OUTPUTS_NAME}.img + truncate --size="$(add ${total_size} 50)M" ${OUTPUTS_NAME}.img + + create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img ${ROOTFS} ${size} + + install ${OUTPUTS_NAME}.img ${D}/${OUTPUTS_NAME}.img + install ${ESP_IMAGE}.img ${D}/${ESP_IMAGE}.img +} + +do_deploy() { + install -d ${DEPLOYDIR}/ESP + install ${D}/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}-${MORELLO_ARCH}-${TCLIBC}.img + install ${D}/${ESP_IMAGE}.img ${DEPLOYDIR}/ESP/${ESP_IMAGE}.img + +} +addtask deploy after do_install \ No newline at end of file diff --git a/recipes-morello/images/morello-linux-image-musl.bb b/recipes-morello/images/morello-linux-image-musl.bb new file mode 100644 index 0000000..659ddff --- /dev/null +++ b/recipes-morello/images/morello-linux-image-musl.bb @@ -0,0 +1,97 @@ +inherit deploy nopackages + +COMPATIBLE_MACHINE = "morello-linux-musl" +SUMMARY = "Bootable Morello Linux Image" +DESCRIPTION = "Image that goes on a bootable device, can be DD'ed onto a USB stick" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +OUTPUTS_NAME = "morello-linux-image" + +BB_DONT_CACHE = "1" +INHIBIT_DEFAULT_DEPS = "1" + +DEPENDS += "virtual/kernel morello-initramfs mtools-native e2fsprogs-native coreutils-native bc-native util-linux-native" +PROVIDES = "${OUTPUTS_NAME}" + +IMAGE_SIZE = "100" + +IMAGE_SECTORS = "204800" + +LBA = "512" +PART_START_ALIGNMENT = "2048" + +ESP_IMAGE = "${OUTPUTS_NAME}-esp" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" +do_install[mcdepends] = "mc:${BB_CURRENT_MC}:morello-firmware:board-firmware-image:do_deploy" + +def get_next_part_start (d): + next_image_start = int(d.getVar('IMAGE_SECTORS')) + int(d.getVar('PART_START_ALIGNMENT')) + int(d.getVar('PART_START_ALIGNMENT')) - 1 + next_image_start = next_image_start & ~(int(d.getVar('PART_START_ALIGNMENT')) -1) + return next_image_start + +add_to_image() { + mcopy -i ${1} -m -D overwrite ${2} ::${3} +} + +mult() { + local ret=$(echo "${1} * ${2}" | bc) + echo ${ret} +} + +create_gpt() { + + local esp_type="C12A7328-F81F-11D2-BA4B-00A0C93EC93B" + local linux_type="0FC63DAF-8483-4772-8E79-3D69D8477DE4" + + local part_start_esp=${PART_START_ALIGNMENT} + local part_start_linux="${@get_next_part_start(d)}" + + { + echo "label: gpt" + echo "start=${part_start_esp}, size=${IMAGE_SECTORS}, name=ESP, type=${esp_type}" + echo "start=${part_start_linux}, size=${IMAGE_SECTORS}, name=root, type=${linux_type}" + } | sfdisk -q "${1}" + + dd if="${2}" of="${1}" seek=$(mult ${part_start_esp} ${LBA}) bs=8M conv=notrunc,sparse oflag=seek_bytes status=progress + dd if="${3}" of="${1}" seek=$(mult ${part_start_linux} ${LBA}) bs=8M conv=notrunc,sparse oflag=seek_bytes status=progress +} + +do_install() { + + local part0="${BSP_GRUB_DIR}/grub-efi-bootaa64.efi" + local part1="${BSP_GRUB_DIR}/grub-config.cfg" + local part2="${BSP_DTB_DIR}/morello-soc.dtb" + local part3="${DEPLOY_DIR}/images/morello-linux-musl/Image" + local part4="${DEPLOY_DIR}/images/morello-linux-musl/morello-initramfs/initramfs" + + # create empty ext4 rootfs + : > ${D}/root.img + truncate --size="${IMAGE_SIZE}M" ${D}/root.img + mkfs.ext4 ${D}/root.img + + # create the ESP + dd if=/dev/zero of=${ESP_IMAGE}.img bs=1024K count=${IMAGE_SIZE} + mformat -i ${ESP_IMAGE}.img -v ESP :: + + mmd -i ${ESP_IMAGE}.img ::/EFI + mmd -i ${ESP_IMAGE}.img ::/EFI/BOOT + + add_to_image ${ESP_IMAGE}.img ${part0} /EFI/BOOT/BOOTAA64.EFI + add_to_image ${ESP_IMAGE}.img ${part1} /EFI/BOOT/grub.cfg + add_to_image ${ESP_IMAGE}.img ${part2} /morello.dtb + add_to_image ${ESP_IMAGE}.img ${part3} /Image + add_to_image ${ESP_IMAGE}.img ${part4} /initramfs + + : > ${OUTPUTS_NAME}.img + truncate --size="$(mult ${IMAGE_SIZE} 3)M" ${OUTPUTS_NAME}.img + + create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img /home/pawel/Code/ArmMorello/linux/output/root.img + install ${OUTPUTS_NAME}.img ${D}/${OUTPUTS_NAME}.img +} + +do_deploy() { + install ${D}/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}-${MORELLO_ARCH}-${TCLIBC}.img +} +addtask deploy after do_install \ No newline at end of file diff --git a/recipes-morello/images/morello-linux-musl/files/init.sh b/recipes-morello/images/morello-linux-musl/files/init.sh new file mode 100644 index 0000000..7c1aa8d --- /dev/null +++ b/recipes-morello/images/morello-linux-musl/files/init.sh @@ -0,0 +1,33 @@ +#!/bin/busybox sh + +# Copyright (c) 2021 Arm Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause + +mount() { + /bin/busybox mount "$@" +} + +grep() { + /bin/busybox grep "$@" +} + +echo "Running init script" + +mount -t proc proc /proc +grep -qE $'\t'"devtmpfs$" /proc/filesystems && mount -t devtmpfs dev /dev +mount -t sysfs sysfs /sys + +echo "Installing busybox" + +/bin/busybox --install -s + +! grep -qE $'\t'"devtmpfs$" /proc/filesystems && mdev -s + +ulimit -c unlimited + +echo "/bin/sh as PID 1!" +echo "init.sh" +exec setsid cttyhack sh +echo setsid ctty hack failed so "exec /bin/sh" fallback will be used +exec /bin/sh diff --git a/recipes-morello/images/morello-linux-musl/files/initramfs.list.template b/recipes-morello/images/morello-linux-musl/files/initramfs.list.template new file mode 100644 index 0000000..3da25be --- /dev/null +++ b/recipes-morello/images/morello-linux-musl/files/initramfs.list.template @@ -0,0 +1,18 @@ +dir /bin 755 0 0 +dir /include 755 0 0 +dir /lib 755 0 0 +dir /share 755 0 0 +dir /dev 755 0 0 +dir /proc 755 0 0 +dir /sbin 755 0 0 +dir /sys 755 0 0 +dir /newroot 755 0 0 +dir /usr 755 0 0 +dir /usr/lib 755 0 0 +dir /usr/bin 755 0 0 +dir /etc 755 0 0 + +dir /%APP_DIR% 755 0 0 + +file /bin/busybox .%BUSYBOX%/busybox 755 0 0 +file /init .%FILES%/init.sh 755 0 0 \ No newline at end of file

Add README.md with references and instructions of usage.

Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk Reviewed-by:Andrew Murray amurray@thegoodpenguin.co.uk --- README.md | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 README.md

diff --git a/README.md b/README.md new file mode 100644 index 0000000..352946a --- /dev/null +++ b/README.md @@ -0,0 +1,90 @@ +meta-morello +============== + +Meta-morello provides the layer required to build the firmware that lives on the SD card and a Morello enabled +Linux kernel for the Morello System Development Platform. + +Use the provided kas scripts to get all of the dependencies. +Read on how to get and use kas here [1] + +Booting the hardware +-------------------- + +For information on how to boot the hardware and how the hardware is booting see [2] and [3]. + +Machines +-------- + +The machines have been split into: +- morello-bsp for the SD card +- morello-linux-musl for the Linux image with busybox initramfs and musl being the only libc +- morello-linux-glibc for the Linux image with an arbitrary Yocto image as the rootfs + with purecap app linked staticaly + +Building images +-------------------- +$ cd poky +$ TEMPLATECONF=meta-morello/conf . oe-init-build-env build +$ MACHINE=morello-bsp bitbake board-firmware-image + +then: + +$ TEMPLATECONF=meta-morello/conf . oe-init-build-env build +$ MACHINE=morello-linux-musl bitbake morello-linux-image + +or (mutually exclusive) + +$ TEMPLATECONF=meta-morello/conf . oe-init-build-env build +$ MACHINE=morello-linux-glibc bitbake morello-linux-image + +Alternatively one can use the kas scrips: + +kas build ./kas/morello-linux-glibc.yml + +or + +kas build ./kas/morello-linux-musl.yml + +Images +------ + +The outputs can be found under build/temp/deploy/images: +- board-firmware-sd-image.img goes on the SD card via DD +- morello-linux-image-...img goes on a drive (USB or other) via DD +- if not using kas you do need to build the board-firmware-image to be able to build the morello-linux-image + +Linux and musl-libc +------------------- + +The linux kernel and musl-libc are locked in sync so that the release tags from upstream always match. + +Known limitations +----------------- + +- the current state of this layer is meant to be just a starting point and foundation for further development, the main aim was to have working Linux images ASAP for the community, do not expect elegant Yocto solutions yet +- Yocto packaging is disabled for the Morello apps due to not fully implemented toolchain (llvm-morello is an overrride bootstrap of the env variables), one of the packaging classes will drop an error as it expects a target_prefix-objcopy being available for example (in theory only applies to linux-morello-musl machine, have not tested if one can package Morello apps onto standard Yocto rootfs images) +- it follows that the final image is assembled manually +- the rtl_nic driver is missing from the musl image + +Adding new recipes +------------------ + +Follow the coding style found in other layers, the aim here is to keep them consistent where possible +and very easy to read. Follow the order found in the "headers" of each recipe and in general. + +.bb recipes that come from Morello gitlab and are Morello "edits"" of upstream inherit the name Morello in the recipe: package-name-morello +.bbappends do not need to do this even if they come from Morello gitlab as they would only change SRC_URI + +Whether to append or start a new recipe is up to the designer, whatever is the easiest. + +Mailing list +------------ + +https://op-lists.linaro.org/mailman3/lists/linux-morello-distros.op-lists.li... + +References +---------- + +[1] https://kas.readthedocs.io/en/latest/ \ +[2] https://developer.arm.com/documentation/den0132/0100/Setting-up-the-Morello-... \ +[3] https://developer.arm.com/documentation/102278/0001/?lang=en

On 09/01/2023 17:30, Pawel Zalewski wrote:

[...]

diff --git a/recipes-kernel/linux/linux-morello-1.5/morello_transitional_pcuabi_defconfig b/recipes-kernel/linux/linux-morello-1.5/morello_transitional_pcuabi_defconfig new file mode 100644 index 0000000..20f1454 --- /dev/null +++ b/recipes-kernel/linux/linux-morello-1.5/morello_transitional_pcuabi_defconfig

I'm a little surprised by this, it's an improvement to now be using the defconfig, but couldn't you use the defconfig file in the kernel tree directly instead of copying it here?

[...]

diff --git a/recipes-kernel/linux/linux-morello.inc b/recipes-kernel/linux/linux-morello.inc new file mode 100644 index 0000000..aace774 --- /dev/null +++ b/recipes-kernel/linux/linux-morello.inc @@ -0,0 +1,42 @@ +inherit llvm-morello-native +require recipes-kernel/linux/linux-yocto.inc +COMPATIBLE_MACHINE = "morello-linux" +SUMMARY = "Morello Linux kernel fork" +DESCRIPTION = "Arm's fork of CHERI LLVM toolchain that understands capabilities"

I think you forgot to update this one.

Kevin

I'm a little surprised by this, it's an improvement to now be using the defconfig, but couldn't you use the defconfig file in the kernel tree directly instead of copying it here?

That was to temporarily avoid Yocto miss behaving with in-tree configs as it would overwrite them, anyway in V3 we can use an in-tree config :)

I think you forgot to update this one.

It has escaped my net indeed ! Thanks.

Pawel

On Thu, 12 Jan 2023 at 13:38, Kevin Brodsky kevin.brodsky@arm.com wrote:

On 09/01/2023 17:30, Pawel Zalewski wrote:

...

[...]

diff --git

a/recipes-kernel/linux/linux-morello-1.5/morello_transitional_pcuabi_defconfig b/recipes-kernel/linux/linux-morello-1.5/morello_transitional_pcuabi_defconfig

...

new file mode 100644 index 0000000..20f1454 --- /dev/null +++

b/recipes-kernel/linux/linux-morello-1.5/morello_transitional_pcuabi_defconfig

I'm a little surprised by this, it's an improvement to now be using the defconfig, but couldn't you use the defconfig file in the kernel tree directly instead of copying it here?

...

[...]

diff --git a/recipes-kernel/linux/linux-morello.inc

b/recipes-kernel/linux/linux-morello.inc

...

new file mode 100644 index 0000000..aace774 --- /dev/null +++ b/recipes-kernel/linux/linux-morello.inc @@ -0,0 +1,42 @@ +inherit llvm-morello-native +require recipes-kernel/linux/linux-yocto.inc +COMPATIBLE_MACHINE = "morello-linux" +SUMMARY = "Morello Linux kernel fork" +DESCRIPTION = "Arm's fork of CHERI LLVM toolchain that

understands capabilities"

I think you forgot to update this one.

Kevin