From patchwork Mon Nov 15 14:00:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 932 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57EC0C433F5 for ; Mon, 15 Nov 2021 14:07:15 +0000 (UTC) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by mx.groups.io with SMTP id smtpd.web08.22852.1636985233740008611 for ; Mon, 15 Nov 2021 06:07:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Q0QIBoKd; spf=pass (domain: linaro.org, ip: 209.85.208.44, mailfrom: maxim.uvarov@linaro.org) Received: by mail-ed1-f44.google.com with SMTP id g14so8825663edb.8 for ; Mon, 15 Nov 2021 06:07:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Sep/MNfUKbePSN9uXGfC3xQc+xrMz7DDX/PNGViK42w=; b=Q0QIBoKdrGJ0bzWSfupTEGXKNVV+21I0dRs877x8ZFBvu7V2FVQNqFMTaISodPMqvY gQR3NOOoqnNFS6k6wa5y/Od+zrtiyrJ+oSDyPkVqxVSVn8udTsN2TP+RsM1ujRLoCEg1 md5rTM2FbPZR27SCpv2iGnDqJPRUevAQfz75fS27CpZ8j86/GNKDzX70drCANt6tmjix tKsdMHejDI04EyiEUnyqJd4IvajYHTlFdPF5HRA7uEcT3CgY0ONVIL7Ee1XpIdvgGQS9 qC+jfsYixnGlOyY1lbrOMyf5LgPH+xor3Yjl6OyRFzkwrMJbTCZur/RecTkdfSmfgRLi fXtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Sep/MNfUKbePSN9uXGfC3xQc+xrMz7DDX/PNGViK42w=; b=789LQhBKRh0/D7QTnX5x71M4Ux8odS4BkUy3ghIsPM5gKWGiN5cShHKNlNWnkyTO9w PexFshk91DsjMTmnzXqN4PxOYElMZ86WJU0+YYnGq2zKeI/Ut11cY+XERkSGF26cCHmE IJZPO6VkHH+DRgpH0xi+2xozCZrc8RR5b2MJL38XlD6q/GgImxxFVy3GZTuxGrsVkKWt xsHXk9yzyQmM9o9oexwjSUxb/vz7qsKK/aGsIw11Z7TgttQpK5/n0AOKCIeuraare8Ri eiq4VoZZBO96Wxnu1QdFFckO/bCHrAwHUPGxeJWwH2IEEk0aOFXPdXaHZzZmYX8BP3j3 moKw== X-Gm-Message-State: AOAM532nLKlWhn/ykeG5YhQ2R9pmbL6MjA9Xgr9hOfwPMcgHRVzhMWHF wDa33zu8HnO+Kz17gBGolywGd/6oMJifhw== X-Google-Smtp-Source: ABdhPJzzkY+JsFxut+uka7KYYUpAZjQnLOi5IWz9m28Dx5VrphCg2+pLWD2x06yMS+I6ZIkIf6+00w== X-Received: by 2002:a19:5006:: with SMTP id e6mr36161260lfb.535.1636984863662; Mon, 15 Nov 2021 06:01:03 -0800 (PST) Received: from maximlap.d-systems.local ([45.87.143.160]) by smtp.gmail.com with ESMTPSA id d3sm1513699ljl.93.2021.11.15.06.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:01:03 -0800 (PST) From: Maxim Uvarov To: meta-arm@lists.yoctoproject.org Cc: jon.mason@arm.com, ross.burton@arm.com, Maxim Uvarov Subject: [PATCHv3 1/5] optee: updae optee-os.inc to support external TAs Date: Mon, 15 Nov 2021 17:00:56 +0300 Message-Id: <20211115140100.24634-1-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Nov 2021 14:07:15 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2391 Separate recipe for TA devkit is needed to solve circular dependency to build TAs withthe devkit and integrate it inside optee-os. Signed-off-by: Maxim Uvarov --- .../recipes-security/optee/optee-examples.inc | 2 +- .../optee/optee-os-tadevkit_3.14.0.bb | 20 +++++++++++++++++++ meta-arm/recipes-security/optee/optee-os.inc | 7 ------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb diff --git a/meta-arm/recipes-security/optee/optee-examples.inc b/meta-arm/recipes-security/optee/optee-examples.inc index 921fa18..656722e 100644 --- a/meta-arm/recipes-security/optee/optee-examples.inc +++ b/meta-arm/recipes-security/optee/optee-examples.inc @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/linaro-swg/optee_examples" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" -DEPENDS = "optee-client optee-os python3-pycryptodome-native" +DEPENDS = "optee-client optee-os-tadevkit python3-pycryptodome-native" inherit python3native diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb new file mode 100644 index 0000000..0d37a52 --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_3.14.0.bb @@ -0,0 +1,20 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:" +require optee-os_3.14.0.bb + +SUMMARY = "OP-TEE Trusted OS TA devkit" +DESCRIPTION = "OP-TEE TA devkit for build TAs" +HOMEPAGE = "https://www.op-tee.org/" + +do_install() { + #install TA devkit + install -d ${D}${includedir}/optee/export-user_ta/ + for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do + cp -aR $f ${D}${includedir}/optee/export-user_ta/ + done +} + +do_deploy() { + echo "Do not inherit do_deploy from optee-os." +} + +FILES:${PN} = "${includedir}/optee/" diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index 277646e..1506a58 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -46,12 +46,6 @@ do_install() { #install core in firmware install -d ${D}${nonarch_base_libdir}/firmware/ install -m 644 ${B}/core/*.bin ${B}/core/tee.elf ${D}${nonarch_base_libdir}/firmware/ - - #install TA devkit - install -d ${D}${includedir}/optee/export-user_ta/ - for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do - cp -aR $f ${D}${includedir}/optee/export-user_ta/ - done } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -66,7 +60,6 @@ addtask deploy before do_build after do_install SYSROOT_DIRS += "${nonarch_base_libdir}/firmware" FILES:${PN} = "${nonarch_base_libdir}/firmware/" -FILES:${PN}-dev = "${includedir}/optee/" # note: "textrel" is not triggered on all archs INSANE_SKIP:${PN} = "textrel" From patchwork Mon Nov 15 14:00:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 347C9C4332F for ; Mon, 15 Nov 2021 14:01:11 +0000 (UTC) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by mx.groups.io with SMTP id smtpd.web08.22748.1636984870400071544 for ; Mon, 15 Nov 2021 06:01:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=i/kCpSRL; spf=pass (domain: linaro.org, ip: 209.85.167.43, mailfrom: maxim.uvarov@linaro.org) Received: by mail-lf1-f43.google.com with SMTP id y26so43808489lfa.11 for ; Mon, 15 Nov 2021 06:01:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6NSu/XgxriFe4mWVu6+aJhdqcOR/8Qq86Mxp1DY94LE=; b=i/kCpSRL36J4CbBIOzPRjXtJXjiKd9V8SbPvCMODPF0zgSaBec13wAvcFliMQiXrOg 9/28MLl4fTdaQPH+qkqYXg1MaUW9FV0wgsN/CdGacWh0a9zDiSNaDRyqSiiJxq2hfqrm tuD6jZ6a+6qJaGMJ2/pIFoalAl+3GEq0Q005eSuxCpGaS123Of7xWqniXJYqEXbyaDrr jSa8Wv9nZkj02lwJPKTeHsjQFmDdbu4qt/tvvcVisFKgCNjZkIbQoN+TT3AhAtOsboIh EJNwpt6jnSGoqm6rjv3fikmpVa8+BrU1JXUZF5i6CGHC0MRzwqTU8QDdXZDthABwiOG8 m2VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6NSu/XgxriFe4mWVu6+aJhdqcOR/8Qq86Mxp1DY94LE=; b=Zb4lXdbxbyI1UXdo6Nv8/6qa+V5oKsu+qaAkpGYGYZgmPJnhKk4ZZGDMb0wFsziM8O qfapeJZfbP8T/Gbtm5EuFP+1FzyY+RWYJMDLRq9pkejSETbswfzsZmopr4Rf4BgmWaub BsgCih7cq/ZG6gX5VH43aQo+XUXwyvlkmqB+zISCTJI5FZ8kS38l18pUVW5TvTCrSK4r w6V8brOpOFYFHelKlHrVotno6G/yhwn14B+QqiJN36I5pezrxUfcEgKal339QLexOMhX h/hTY5QVkTvI2owIb12UvVhAXe6HZ/f4bBe6OitNlJ022VQ8AmV0kk2O69OGblrLb3nj MegA== X-Gm-Message-State: AOAM533/jpjtPiIY1TrUH6gHSalfwO26cJ1HClHGH2gt4wmRlCN5cGFS KAFhM5TvsfQ3RS8D72Oq1eFirOOPVPCeLg== X-Google-Smtp-Source: ABdhPJy0GI3cQ8J2eAzk7OD/EUFTZuaWIYygoIQuPlaxd6Hy0wy5O0nsCEQehgLAtpNI8E8OnFR70g== X-Received: by 2002:a19:4312:: with SMTP id q18mr36006784lfa.299.1636984865152; Mon, 15 Nov 2021 06:01:05 -0800 (PST) Received: from maximlap.d-systems.local ([45.87.143.160]) by smtp.gmail.com with ESMTPSA id d3sm1513699ljl.93.2021.11.15.06.01.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:01:04 -0800 (PST) From: Maxim Uvarov To: meta-arm@lists.yoctoproject.org Cc: jon.mason@arm.com, ross.burton@arm.com, Maxim Uvarov Subject: [PATCHv3 2/5] add optee-ftpm Date: Mon, 15 Nov 2021 17:00:57 +0300 Message-Id: <20211115140100.24634-2-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211115140100.24634-1-maxim.uvarov@linaro.org> References: <20211115140100.24634-1-maxim.uvarov@linaro.org> List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Nov 2021 14:01:11 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2387 Add software TPM emulated in the OPTEE-OS. Signed-off-by: Maxim Uvarov --- .../optee-ftpm/0000-fix-ssl-fallthrough.patch | 20 ++++++ .../0002-add-enum-to-ta-flags.patch | 30 ++++++++ .../optee-ftpm/optee-ftpm_git.bb | 71 +++++++++++++++++++ .../optee-ftpm/optee-os_%.bbappend | 14 ++++ 4 files changed, 135 insertions(+) create mode 100644 meta-arm/recipes-security/optee-ftpm/optee-ftpm/0000-fix-ssl-fallthrough.patch create mode 100644 meta-arm/recipes-security/optee-ftpm/optee-ftpm/0002-add-enum-to-ta-flags.patch create mode 100644 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb create mode 100644 meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0000-fix-ssl-fallthrough.patch b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0000-fix-ssl-fallthrough.patch new file mode 100644 index 0000000..08acde2 --- /dev/null +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0000-fix-ssl-fallthrough.patch @@ -0,0 +1,20 @@ +fix gcc compilation + +just fix compilation under gcc. +Upstream-Status: Submitted [https://github.com/wolfSSL/wolfssl/pull/4563] + +Signed-off-by: Maxim Uvarov + +diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h +index 7b3a953aebda..e156ae5c7909 100755 +--- a/external/wolfssl/wolfssl/wolfcrypt/types.h ++++ b/external/wolfssl/wolfssl/wolfcrypt/types.h +@@ -181,7 +181,7 @@ + /* GCC 7 has new switch() fall-through detection */ + #if defined(__GNUC__) + #if ((__GNUC__ > 7) || ((__GNUC__ == 7) && (__GNUC_MINOR__ >= 1))) +- #define FALL_THROUGH __attribute__ ((fallthrough)); ++ #define FALL_THROUGH __attribute__ ((__fallthrough__)); + #endif + #endif + #ifndef FALL_THROUGH diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0002-add-enum-to-ta-flags.patch b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0002-add-enum-to-ta-flags.patch new file mode 100644 index 0000000..bbc1107 --- /dev/null +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0002-add-enum-to-ta-flags.patch @@ -0,0 +1,30 @@ +From 2d00f16058529eb9f4d4d2bcaeed91fd53b43989 Mon Sep 17 00:00:00 2001 +From: Maxim Uvarov +Date: Fri, 17 Apr 2020 12:05:53 +0100 +Subject: [PATCH 2/2] add enum to ta flags + +If we compile this TA into OPTEE-OS we need to define a flag +that this TA can be discovered on the optee bus. +Upstream-Status: Submitted [https://github.com/microsoft/MSRSec/pull/34] + +Signed-off-by: Maxim Uvarov +--- + TAs/optee_ta/fTPM/user_ta_header_defines.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/TAs/optee_ta/fTPM/user_ta_header_defines.h b/TAs/optee_ta/fTPM/user_ta_header_defines.h +index 6ff62d1..685b54a 100644 +--- a/TAs/optee_ta/fTPM/user_ta_header_defines.h ++++ b/TAs/optee_ta/fTPM/user_ta_header_defines.h +@@ -44,7 +44,7 @@ + + #define TA_UUID TA_FTPM_UUID + +-#define TA_FLAGS (TA_FLAG_SINGLE_INSTANCE | TA_FLAG_INSTANCE_KEEP_ALIVE ) ++#define TA_FLAGS (TA_FLAG_SINGLE_INSTANCE | TA_FLAG_INSTANCE_KEEP_ALIVE | TA_FLAG_DEVICE_ENUM_SUPP) + #define TA_STACK_SIZE (64 * 1024) + #define TA_DATA_SIZE (64 * 1024) + +-- +2.17.1 + diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb new file mode 100644 index 0000000..6c72c7f --- /dev/null +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb @@ -0,0 +1,71 @@ +SUMMARY = "OPTEE fTPM Microsoft TA" +DESCRIPTION = "TCG reference implementation of the TPM 2.0 Specification." +HOMEPAGE = "https://github.com/microsoft/ms-tpm-20-ref/" + +inherit autotools-brokensep deploy pkgconfig gettext python3native + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=27e94c0280987ab296b0b8dd02ab9fe5" + +DEPENDS = "python3-pycryptodome-native python3-pycryptodomex-native python3-pyelftools-native" +DEPENDS += " optee-os-tadevkit" + +FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" + +# SRC_URI = "git://github.com/Microsoft/ms-tpm-20-ref;branch=master" +# Since this is not built as a pseudo TA, we can only use it as a kernel module and not built in. +# The TEE supplicant is also needed to provide access to secure storage. +# Secure storage access required by OP-TEE fTPM TA +# is provided via OP-TEE supplicant that's not available during boot. +# Fix this once we replace this with the MS implementation +SRC_URI = "gitsm://github.com/microsoft/MSRSec;protocol=https;branch=master" +SRC_URI += "file://0000-fix-ssl-fallthrough.patch" +SRC_URI += "file://0002-add-enum-to-ta-flags.patch" +SRCREV = "76f81b36efbb1a366b0d382bc0defe677f1f0534" + +S = "${WORKDIR}/git" + +OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}" +TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}" +TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta" + +EXTRA_OEMAKE += '\ + CFG_FTPM_USE_WOLF=y \ + TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ + TA_CROSS_COMPILE=${TARGET_PREFIX} \ + CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_HOST} -I${WORKDIR}/optee-os" \ +' + +EXTRA_OEMAKE:append:aarch64:qemuall = "\ + CFG_ARM64_ta_arm64=y \ +" + +B = "${S}" + +# fails with j > 1 +PARALLEL_MAKE = "" + +do_compile() { + sed -i 's/-mcpu=$(TA_CPU)//' TAs/optee_ta/fTPM/sub.mk + # there's also a secure variable storage TA called authvars + cd ${S}/TAs/optee_ta + oe_runmake ftpm +} + +do_install () { + mkdir -p ${D}/lib/optee_armtz + install -D -p -m 0644 ${S}/TAs/optee_ta/out/fTPM/${FTPM_UUID}.ta ${D}/lib/optee_armtz/ +} + +do_deploy () { + install -d ${DEPLOYDIR}/optee + install -D -p -m 0644 ${S}/TAs/optee_ta/out/fTPM/${FTPM_UUID}.stripped.elf ${DEPLOYDIR}/optee/ +} + +addtask deploy before do_build after do_install + +FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.ta" + +# Imports machine specific configs from staging to build +PACKAGE_ARCH = "${MACHINE_ARCH}" +INSANE_SKIP:${PN} += "ldflags" diff --git a/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend new file mode 100644 index 0000000..0cfa949 --- /dev/null +++ b/meta-arm/recipes-security/optee-ftpm/optee-os_%.bbappend @@ -0,0 +1,14 @@ +FTPM_UUID="bc50d971-d4c9-42c4-82cb-343fb7f37896" + +DEPENDS:append = "\ + ${@bb.utils.contains('MACHINE_FEATURES', \ + 'optee-ftpm', \ + 'optee-ftpm', \ + '' , \ + d)}" + +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', \ + 'optee-ftpm', \ + 'CFG_EARLY_TA=y EARLY_TA_PATHS="${DEPLOY_DIR_IMAGE}/optee/${FTPM_UUID}.stripped.elf"', \ + '', \ + d)} " From patchwork Mon Nov 15 14:00:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ECBCC433EF for ; Mon, 15 Nov 2021 14:01:11 +0000 (UTC) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mx.groups.io with SMTP id smtpd.web12.22760.1636984870095623270 for ; Mon, 15 Nov 2021 06:01:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=TXSdXoIA; spf=pass (domain: linaro.org, ip: 209.85.167.46, mailfrom: maxim.uvarov@linaro.org) Received: by mail-lf1-f46.google.com with SMTP id z34so43806703lfu.8 for ; Mon, 15 Nov 2021 06:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mX/TJoDVH8v+7KzzzR+2FdEzoqUbPtpdLLYq0Qo6ens=; b=TXSdXoIAEbgkkTzCfWUcxtaApzfWIHbVR2M1Iz8M0HiTLl7ygdkqXCouPQyq3clkaC Mq6j3qBebrunz5XTeAMC7YyE3TFa0mdEdI7iocD5ajy1+LPT3EAM9QxEkalttx9rCi6d 4PgZ/HjOULRSqJ/5Ek4wuNia8EfN+jontxrzoGGuNItqvghEl78U2xmx3zgDPgJ97D5X aTKudfiamu1ICCadJILKN27oNNkoKxR6bGbkYtqZjelcpC4kdKCR3u43XtBViIY/PJcF BUZXZ79t8U1HbbGFmfuK8CeAM6jpTS03k3qhXsLG5/mPjcOLzpS6oLUW8xTYf23MY+VA RUvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mX/TJoDVH8v+7KzzzR+2FdEzoqUbPtpdLLYq0Qo6ens=; b=0QPNhQzJPw7em8SYyBCuJLlNPZhBfQawi99lBCgh51hG3n4gaeoAIHhblZ9mwONBm7 QHgIQ+YuwAEQCt3W+rECyymRfSUjnzwS/bLZMAHHI65GZeKQN7KbVffGio32iZMOATRX /XSYM7sG/OjWMAldO7mb9/qRH0MdlZeiPqMfGe6ef+4Dz/3zAQM6U/+pOivsIUWgZASD NiDMxTiGoJVmU4dxxDLDCJPe5ZK1cAdjxv4Jy/ItMVU0ZmEmbPet9T6BGAUdU3+8C1ap +z5Y1al9xSO0iUYaVnl596i+o0O5H/nBbolrZO97S3LzLAzwNPua321AQErHRTNAbE7P 876g== X-Gm-Message-State: AOAM533PeiRhvs0CxhFB/xPulL9xVOvfeaump3xs1ODzmf3ZrA6UB2EF RNAa1E6haDgu3DQ25ywsr4EtbDT0t9VIxA== X-Google-Smtp-Source: ABdhPJxkvugzYQ5Ko0Xbt1zTWsaW8tcfgLlunkPWeC+gb+T0jOxNvu+8uPX7GOWqsVpvR08UjilbGg== X-Received: by 2002:a19:5f0d:: with SMTP id t13mr34278208lfb.185.1636984866355; Mon, 15 Nov 2021 06:01:06 -0800 (PST) Received: from maximlap.d-systems.local ([45.87.143.160]) by smtp.gmail.com with ESMTPSA id d3sm1513699ljl.93.2021.11.15.06.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:01:05 -0800 (PST) From: Maxim Uvarov To: meta-arm@lists.yoctoproject.org Cc: jon.mason@arm.com, ross.burton@arm.com, Maxim Uvarov Subject: [PATCHv3 3/5] ci/qemuarm64-secureboot.yml: add optee and tf-a Date: Mon, 15 Nov 2021 17:00:58 +0300 Message-Id: <20211115140100.24634-3-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211115140100.24634-1-maxim.uvarov@linaro.org> References: <20211115140100.24634-1-maxim.uvarov@linaro.org> List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Nov 2021 14:01:11 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2386 Signed-off-by: Maxim Uvarov --- ci/qemuarm64-secureboot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/qemuarm64-secureboot.yml b/ci/qemuarm64-secureboot.yml index b7f3cb4..a7e89d4 100644 --- a/ci/qemuarm64-secureboot.yml +++ b/ci/qemuarm64-secureboot.yml @@ -14,3 +14,5 @@ target: - core-image-base - perf - optee-examples + - optee-os + - trusted-firmware-a From patchwork Mon Nov 15 14:00:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D024C43217 for ; Mon, 15 Nov 2021 14:01:13 +0000 (UTC) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by mx.groups.io with SMTP id smtpd.web11.22492.1636984871584276804 for ; Mon, 15 Nov 2021 06:01:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=FCgT9n78; spf=pass (domain: linaro.org, ip: 209.85.208.170, mailfrom: maxim.uvarov@linaro.org) Received: by mail-lj1-f170.google.com with SMTP id e9so35742173ljl.5 for ; Mon, 15 Nov 2021 06:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YnIcng55NGOcGOmLvnzuGaaa3Iu3rFoShQlhZq5Ucq0=; b=FCgT9n78+a3EELeIYixWr13HeWnLHoFKLPz8sO5uxOemAhaR3HXqZmiY1vsZ1/kcik 7sjVBALO8WsU0fOeTgwenZAyoW1TBhQKsIkmFWaxS0cuHWGWJ2u5752UhddgEKzjnxNl WOqCRv5dupOk6IHuys0GnkbStTx/E7xp7YoybF3usaUyrc9pxKWaN3TctlBcG3Nk7ONe 4SfcxfSwgYayU9T+Xyucc6yZRngp0VlhkUs7aI9hCJftfHwwavTHdAjngTyt73Unm9l5 azv+HZDF7lMSApMmL5gXbnjiGtbguztIVenDJXZtCELp92cIu1Sfx0f+OoSLLvUydtoO KvUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YnIcng55NGOcGOmLvnzuGaaa3Iu3rFoShQlhZq5Ucq0=; b=DdZ0h5RI2p1I0TO6FFvqUN8s6yJr8o8EDmhH6fucAwKdnb6pi/IzApXIWPfPT+VtnJ SHlOoolDlnGHDfsS6f+rU+NpcZy7YV0NMRPlo7GozWqGIGuie+X4Rt6CGE5QH6OR5sbE 51xNiKJHfgocnHMFyWuMsEM3niUwWW2Orf/TtumXhm3nStxIGDsTzKu06J9j6ZT1C0jR pHJCDnVi4V4KhxCp+0DI+/m+plOOf2I04YDWPmvHY2dBYUnPuXKSnGoIBBQxgxxcI+kp h08yyNy+navQAIaJ1/FVInabc6gdDv3lZKtwK6eG+TfZ9eUZzPm8sxTko74mG8e7+RhE s+XA== X-Gm-Message-State: AOAM530vFveF/EgY82WlSrrnCNaSxShynxjq61NGKutT1z9h4KIzCw70 yeL20U/RmrixfTWHbqAickgapUGvld7M1w== X-Google-Smtp-Source: ABdhPJw8WXa44V8wyYQMZvr92GMs1q8vBxJ+V2z+cCLEVfiGC+BccPVEH3KWbtZObOtqrOrnv3b2pA== X-Received: by 2002:a2e:a588:: with SMTP id m8mr40110535ljp.23.1636984867912; Mon, 15 Nov 2021 06:01:07 -0800 (PST) Received: from maximlap.d-systems.local ([45.87.143.160]) by smtp.gmail.com with ESMTPSA id d3sm1513699ljl.93.2021.11.15.06.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:01:07 -0800 (PST) From: Maxim Uvarov To: meta-arm@lists.yoctoproject.org Cc: jon.mason@arm.com, ross.burton@arm.com, Maxim Uvarov Subject: [PATCHv3 4/5] machine/qemuarm64-secureboot.conf: add optee-ftpm Date: Mon, 15 Nov 2021 17:00:59 +0300 Message-Id: <20211115140100.24634-4-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211115140100.24634-1-maxim.uvarov@linaro.org> References: <20211115140100.24634-1-maxim.uvarov@linaro.org> List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Nov 2021 14:01:13 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2388 Signed-off-by: Maxim Uvarov --- meta-arm/conf/machine/qemuarm64-secureboot.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf index c45924a..b664dac 100644 --- a/meta-arm/conf/machine/qemuarm64-secureboot.conf +++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf @@ -20,4 +20,6 @@ WKS_FILE ?= "qemuarm64.wks" WKS_FILE_DEPENDS = "trusted-firmware-a" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" +MACHINE_FEATURES += "optee-ftpm" + PREFERRED_VERSION_linux-yocto ?= "5.10%" From patchwork Mon Nov 15 14:01:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1491DC433EF for ; Mon, 15 Nov 2021 14:01:15 +0000 (UTC) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by mx.groups.io with SMTP id smtpd.web09.22791.1636984873980757824 for ; Mon, 15 Nov 2021 06:01:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=sSCuQIfU; spf=pass (domain: linaro.org, ip: 209.85.208.175, mailfrom: maxim.uvarov@linaro.org) Received: by mail-lj1-f175.google.com with SMTP id 207so35699288ljf.10 for ; Mon, 15 Nov 2021 06:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/3bTR9BWDny2Ek7OeqfRSvXTVB0A7POLE7G7Mw2F0Gs=; b=sSCuQIfUtGxDWLVkYlSwpJ7OYw8I4MER+PxmIlGNZEUN4rJ8Ny6RB/mHewDSGCx6ND dpgv6Xay/pD7PH6CHFFxVCScmvbo0f/GhovyN0zXohqvdxr+Xj6KG9g6TG+FCqNy2GUW ZNNrO6kCJ24ycidx40hOeNqyOTJYCR6xxnSOxnWZoRvq6oV/CgcOxENPCIc+uSmdHAgb Ud8/EuBHwcvPuipe9xnepTdEUNkgPBR8PN6JkBMnAkx4AXNZ9PiEr2pUFC5I5PbTJWFL kWSZimh+DKqWEZ/MuT9giV/a+y0eMf8NsejZ0RekD0VJcdVpaXBNuAn6FecyqLeXS3sT aJRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/3bTR9BWDny2Ek7OeqfRSvXTVB0A7POLE7G7Mw2F0Gs=; b=ierrTNVj8K0ADmmGUqpO7CbWl00HHO0Oku6A10RAWms5vrKJE1lTfhkOWATNu9xXUK phFOWIncSgjZOcBi/Ky2cw4rfVDIG35rYaT38FreHGzZ0GT38KNTBMCyDzW2F1aFh294 rUUajotA6wMzGeksvNLLczUW6meosi/t36vqqetmQ+iU2X3o7BLcugvUbm/BpvTMRaIu +sdYXSXFfv6E8bk1OsxxV8LwaKZhuCxyBYIuptKfhKLqYJxeRt7GCYDDMBObCNYbjHoL Mkplq+65D4qsy6PuQoUwB4DdRwGbhikeJnyVegznhNgXneaRJLm8VjtXm49TTAjEfvXh ZZxg== X-Gm-Message-State: AOAM530nqdDLggmzPswSHY0TkS5xWFaHy3ny0az+AaCr47tTmah1shbr sgp+SZxa6DM7692TlX+TTVxrNPcMpCmFuQ== X-Google-Smtp-Source: ABdhPJzEt9VGLicmTcpuxfzawIqGg8fuKfsqvlFd637i7wh8CbKCkgLyCicv1yD2MUIB+ufrllircw== X-Received: by 2002:a05:651c:1505:: with SMTP id e5mr24292298ljf.232.1636984869147; Mon, 15 Nov 2021 06:01:09 -0800 (PST) Received: from maximlap.d-systems.local ([45.87.143.160]) by smtp.gmail.com with ESMTPSA id d3sm1513699ljl.93.2021.11.15.06.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 06:01:08 -0800 (PST) From: Maxim Uvarov To: meta-arm@lists.yoctoproject.org Cc: jon.mason@arm.com, ross.burton@arm.com, Maxim Uvarov Subject: [PATCHv3 5/5] tfa: add depends on openssl Date: Mon, 15 Nov 2021 17:01:00 +0300 Message-Id: <20211115140100.24634-5-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211115140100.24634-1-maxim.uvarov@linaro.org> References: <20211115140100.24634-1-maxim.uvarov@linaro.org> List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Nov 2021 14:01:15 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2389 build ci/corstone1000-fvp.yml: generated the following error for me: libcrypto.so.3: cannot open shared object file: No such file or directory Add openssl to DEPENDS. Signed-off-by: Maxim Uvarov --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 243e641..0f7d3de 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -87,7 +87,7 @@ DEPENDS:remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc" # We need dtc for dtbs compilation # We need openssl for fiptool -DEPENDS = "dtc-native openssl-native" +DEPENDS = "dtc-native openssl-native openssl" DEPENDS:append:toolchain-clang = " compiler-rt" # CC and LD introduce arguments which conflict with those otherwise provided by