From patchwork Mon Feb 24 14:51:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 57745 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 59837C021BE for ; Mon, 24 Feb 2025 14:51:17 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.91016.1740408673415928835 for ; Mon, 24 Feb 2025 06:51:13 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8D621152B for ; Mon, 24 Feb 2025 06:51:29 -0800 (PST) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CA6153F6A8 for ; Mon, 24 Feb 2025 06:51:12 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm/trusted-firmware-a: re-add patches Date: Mon, 24 Feb 2025 09:51:10 -0500 Message-Id: <20250224145112.71746-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 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, 24 Feb 2025 14:51:17 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6380 TF-A Patches were erroneously moved to meta-arm-bsp, despite still being needed by the recipes in meta-arm. Copy them back and make copious apologies. Signed-off-by: Jon Mason --- ...-handle-secure-SGI-at-EL1-for-OP-TEE.patch | 33 +++++++++++++++++++ ...ot.c-ignore-TPM-error-and-continue-w.patch | 33 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch new file mode 100644 index 000000000000..3dcc2de81c2f --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch @@ -0,0 +1,33 @@ +From f5b2fa90e0c0324f31e72429e7a7382f49a25912 Mon Sep 17 00:00:00 2001 +From: Shen Jiamin +Date: Wed, 24 Jul 2024 18:58:55 +0800 +Subject: [PATCH] fix(zynqmp): handle secure SGI at EL1 for OP-TEE + +OP-TEE requires SGIs to be handled at S-EL1. The +Makefile was not properly setting the flag +GICV2_G0_FOR_EL3 to 0 when the SPD is OP-TEE. + +Change-Id: I256afa37ddf4ad4a154c43d51807de670c3689bb +Signed-off-by: Shen Jiamin +--- + plat/xilinx/zynqmp/platform.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Upstream-Status: Backport + +diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk +index c340009d0..22eceb621 100644 +--- a/plat/xilinx/zynqmp/platform.mk ++++ b/plat/xilinx/zynqmp/platform.mk +@@ -21,7 +21,7 @@ ENABLE_LTO := 1 + EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT) + + # pncd SPD requires secure SGI to be handled at EL1 +-ifeq (${SPD}, $(filter ${SPD},pncd tspd)) ++ifeq (${SPD}, $(filter ${SPD},pncd tspd opteed)) + ifeq (${ZYNQMP_WDT_RESTART},1) + $(error "Error: ZYNQMP_WDT_RESTART and SPD=pncd are incompatible") + endif +-- +2.34.1 + diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch new file mode 100644 index 000000000000..75103332e32e --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch @@ -0,0 +1,33 @@ +From b91c651e6d596cfe27448b19c8fb2f1168493827 Mon Sep 17 00:00:00 2001 +From: Mikko Rapeli +Date: Mon, 15 Jan 2024 09:26:56 +0000 +Subject: [PATCH] qemu_measured_boot.c: ignore TPM error and continue with boot + +If firmware is configured with TPM support but it's missing +on HW, e.g. swtpm not started and/or configured with qemu, +then continue booting. Missing TPM is not a fatal error. +Enables testing boot without TPM device to see that +missing TPM is detected further up the SW stack and correct +fallback actions are taken. + +Upstream-Status: Pending + +Signed-off-by: Mikko Rapeli +--- + plat/qemu/qemu/qemu_measured_boot.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plat/qemu/qemu/qemu_measured_boot.c b/plat/qemu/qemu/qemu_measured_boot.c +index 76a4da17e6a9..ec7f44d3720d 100644 +--- a/plat/qemu/qemu/qemu_measured_boot.c ++++ b/plat/qemu/qemu/qemu_measured_boot.c +@@ -80,7 +80,8 @@ void bl2_plat_mboot_finish(void) + * Note: In QEMU platform, OP-TEE uses nt_fw_config to get the + * secure Event Log buffer address. + */ +- panic(); ++ ERROR("Ignoring TPM errors, continuing without\n"); ++ return; + } + + /* Copy Event Log to Non-secure memory */ From patchwork Mon Feb 24 14:51:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 57743 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 5710AC021A4 for ; Mon, 24 Feb 2025 14:51:17 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.91015.1740408673415443492 for ; Mon, 24 Feb 2025 06:51:13 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BA6651756 for ; Mon, 24 Feb 2025 06:51:29 -0800 (PST) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 021D33F6A8 for ; Mon, 24 Feb 2025 06:51:12 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/3] arm/trusted-firmware-a: update git recipe Date: Mon, 24 Feb 2025 09:51:11 -0500 Message-Id: <20250224145112.71746-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250224145112.71746-1-jon.mason@arm.com> References: <20250224145112.71746-1-jon.mason@arm.com> MIME-Version: 1.0 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, 24 Feb 2025 14:51:17 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6379 Update the TF-A git recipe to the latest commit (as it was older than the 2.12 release previously). Also, update mbedtls to 3.6.2 (per the tf-a docs in the master branch). Signed-off-by: Jon Mason --- .../trusted-firmware-a/trusted-firmware-a_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb index 91e0f86d2d38..62a5927e8fb4 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb @@ -1,15 +1,15 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc # TF-A master -SRCREV_tfa = "bcce173da397f776fc0ec14e9dac03c13ddeb722" +SRCREV_tfa = "0035ab76e580b59f88ad5a6be76b7f2bebbac654" SRCBRANCH = "master" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls -# mbedtls-3.6.1 +# mbedtls-3.6.2 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6" -SRCREV_mbedtls = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" +SRCREV_mbedtls = "107ea89daaefb9867ea9121002fbbdf926780e98" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" From patchwork Mon Feb 24 14:51:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 57744 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 58906C021BB for ; Mon, 24 Feb 2025 14:51:17 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.91684.1740408673756712497 for ; Mon, 24 Feb 2025 06:51:13 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EF5421CE0 for ; Mon, 24 Feb 2025 06:51:29 -0800 (PST) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 32F753F6A8 for ; Mon, 24 Feb 2025 06:51:13 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/3] arm/fvp-base-a-aem: update to 11.28.23 Date: Mon, 24 Feb 2025 09:51:12 -0500 Message-Id: <20250224145112.71746-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250224145112.71746-1-jon.mason@arm.com> References: <20250224145112.71746-1-jon.mason@arm.com> MIME-Version: 1.0 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, 24 Feb 2025 14:51:17 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6381 Update to the latest version. License SHA changed due to the addition of "Artistic License 2.0" and was missing entries for a few others that were there previously. Signed-off-by: Jon Mason --- ...-base-a-aem_11.27.19.bb => fvp-base-a-aem_11.28.23.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename meta-arm/recipes-devtools/fvp/{fvp-base-a-aem_11.27.19.bb => fvp-base-a-aem_11.28.23.bb} (71%) diff --git a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.27.19.bb b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb similarity index 71% rename from meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.27.19.bb rename to meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb index dc9086c9529e..8c7e4dc668eb 100644 --- a/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.27.19.bb +++ b/meta-arm/recipes-devtools/fvp/fvp-base-a-aem_11.28.23.bb @@ -1,14 +1,16 @@ require fvp-envelope.inc +LICENSE:append = " & Artistic-2.0 & BSL-1.0 & BSD-2-Clause & Unlicense" + SUMMARY = "Arm Fixed Virtual Platform - Armv-A Base RevC Architecture Envelope Model FVP" LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=1a33828e132ba71861c11688dbb0bd16 \ - file://license_terms/third_party_licenses/third_party_licenses.txt;md5=a3ce84371977a6b9c624408238309a90 \ + file://license_terms/third_party_licenses/third_party_licenses.txt;md5=c51b57b6a4731881849eb0e2e2b6d799 \ file://license_terms/third_party_licenses/arm_license_management_utilities/third_party_licenses.txt;md5=abcaafefc7b7a0cdf6664c51f9075c5b" SRC_URI = "https://developer.arm.com/-/cdn-downloads/permalink/FVPs-Architecture/${PV_URL_SHORT}/${MODEL_CODE}_${PV_URL}_${FVP_ARCH}.tgz;subdir=${BP};name=fvp-${HOST_ARCH}" -SRC_URI[fvp-aarch64.sha256sum] = "66c9939cb2b2104e415dcddb46a2ab52168e8a2b7f30a339e1c05d5d4864ed1d" -SRC_URI[fvp-x86_64.sha256sum] = "cd70946a6b632950dca5def33d7656991a29827fa2f6f72f75011d85bdcee248" +SRC_URI[fvp-aarch64.sha256sum] = "a380e271f14ce7cf99158018368ac86fe8c305f82c7d332a93eb08bf7a172571" +SRC_URI[fvp-x86_64.sha256sum] = "0f6d67d834a8ed5dff3c863e0e3545ef39c736405ea8227577ac004cffd66e93" # The CSS used in the FVP homepage make it too difficult to query with the tooling currently in Yocto UPSTREAM_VERSION_UNKNOWN = "1"