From patchwork Fri Jan 24 13:22:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 13949367 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 52C21C0218D for ; Fri, 24 Jan 2025 13:22:53 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.web10.11707.1737724970278423009 for ; Fri, 24 Jan 2025 05:22:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=HEyM+SfG; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-51332-20250124132247427553fcf3f97ba154-7e9bhq@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20250124132247427553fcf3f97ba154 for ; Fri, 24 Jan 2025 14:22:47 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=MjqFPvwsBRBlRHUSzUPX5/la5IAT3ARaPgoy0XEiIaw=; b=HEyM+SfGWhA+qSI+EiM5LqPitNnrnZ7cSewKmikjDXMv2SNg8T+3r0tuKSeT9WlYHQCthK bF0Y8eR7k+ALvkvjBZwbZQwfOI24k21u/35q4CdYf/ADi9CRxaXWP1pG2J/z9ZBgs6R8pIBF vviUrXcER4JbDnBJrq2yzFZS3WAn6hUmqE1QC9Uq8LXjHewKf0nxBwCsrjmLf8YMJ/1x3UV/ 1hYhKgfhTKrPHw7SwBMkdONzVPyGvfWOuFLwn+RVUwL5Y1ph45dtHkMVY531Guq1tc4gAZBT xbCtVuGUCorK4KOlXBqNU9LfC7Ot12CwlE8yRgF9G7aqP+XxQGDZ14tw==; From: Quirin Gylstorff To: Sai.Sathujoda@toshiba-tsip.com, jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 1/3] build x86-uefi with secure boot Date: Fri, 24 Jan 2025 14:22:19 +0100 Message-ID: <20250124132246.64738-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20250124132246.64738-1-Quirin.Gylstorff@siemens.com> References: <20250124132246.64738-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 24 Jan 2025 13:22:53 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/17659 From: Quirin Gylstorff Signed-off-by: Quirin Gylstorff --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4bd283..42e247d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -241,6 +241,16 @@ build:qemu-amd64-secure-boot-encrypt: deploy: disable encrypt: enable +build:x86-uefi-secure-boot: + extends: + - .build_base + variables: + target: x86-uefi + extension: security + use_rt: disable + targz: disable + encrypt: disable + build:qemu-amd64-swupdate: extends: - .build_base From patchwork Fri Jan 24 13:22:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 13949364 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 3B4DEC0218C for ; Fri, 24 Jan 2025 13:22:53 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web10.11708.1737724970328834013 for ; Fri, 24 Jan 2025 05:22:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=bABtjGT1; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-51332-20250124132247de25fc1bba761b294c-1o85fm@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20250124132247de25fc1bba761b294c for ; Fri, 24 Jan 2025 14:22:47 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=7e0uEODWrFUwl9U1/6XANRfw491QZF2ZgjNAqy1l8Os=; b=bABtjGT1qfTG60Jvx1M5BfjVkSJjJYoF/aMSqPGpwWK0xc1YTYLtN3tQ369Pgma+wwbx0w dDRrU5QxvjiVFZ+W9D1eDLgUnlMRBxo0K158SJXmIYpRH2fw8rtYF4q6sidxfZyp+IATRGEp /7lDn9wYwOgqB2/m1QEz74KHiqL2qC6Al1/7l1dOaEKDbVpIUPOLg+HDDnc02Wdb7D9Lee/r pN8ahdGI7NdwwDpnsxjuA1v1ydJV8fyDFnwqgLJ7AJF798OBdg6iO2H9Nmm3NODmCKzEz9Xq BD5w3NKcw5ks1t1lqkBu+lEWg3pnpW0nQ71Ouu/53HWIUlmHsZPy7KFg==; From: Quirin Gylstorff To: Sai.Sathujoda@toshiba-tsip.com, jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 2/3] x86-uefi: disable watchdog for testing on mcom Date: Fri, 24 Jan 2025 14:22:20 +0100 Message-ID: <20250124132246.64738-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20250124132246.64738-1-Quirin.Gylstorff@siemens.com> References: <20250124132246.64738-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 24 Jan 2025 13:22:53 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/17656 From: Quirin Gylstorff Due to the multiple watchdogs available on the mcom device efibootguard select the iTCO watchdog and the Linux kernel selects the WDAT watchdog which leads to an system reboot during booting as the Linux kernel no longer drives the iTCO watchdog. Signed-off-by: Quirin Gylstorff --- .gitlab-ci.yml | 2 ++ kas/opt/disable-watchdog.yml | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 kas/opt/disable-watchdog.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42e247d..686ce48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,7 @@ default: - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi - if [ "${release}" = "trixie" ]; then base_yaml="${base_yaml}:kas/opt/trixie.yml"; fi - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-data.yml"; fi + - if [ "${watchdog}" = "disable" ]; then base_yaml="${base_yaml}:kas/opt/disable-watchdog.yml"; fi - if [ "${swupdate_version}" = "2022.12" ]; then base_yaml="${base_yaml}:kas/opt/swupdate-2022.12.yaml"; fi - echo "Building ${base_yaml}" - kas build ${base_yaml} @@ -250,6 +251,7 @@ build:x86-uefi-secure-boot: use_rt: disable targz: disable encrypt: disable + watchdog: disable build:qemu-amd64-swupdate: extends: diff --git a/kas/opt/disable-watchdog.yml b/kas/opt/disable-watchdog.yml new file mode 100644 index 0000000..88ece6b --- /dev/null +++ b/kas/opt/disable-watchdog.yml @@ -0,0 +1,15 @@ +# +# Copyright (c) Siemens AG, 2025 +# +# Authors: +# Quirin Gylstorff +# +# SPDX-License-Identifier: MIT +# + +header: + version: 14 + +local_conf_header: + no-watchdog: | + WDOG_TIMEOUT = "0" From patchwork Fri Jan 24 13:22:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 13949366 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 44644C02181 for ; Fri, 24 Jan 2025 13:22:53 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web11.11678.1737724970363913637 for ; Fri, 24 Jan 2025 05:22:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm2 header.b=ce5JHKDZ; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-51332-202501241322489520572730c19214bf-netaph@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202501241322489520572730c19214bf for ; Fri, 24 Jan 2025 14:22:48 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=hVg+W+mNL6/nBnedKkg4uiAPGnBQ/mlwnpxjlj2+KEg=; b=ce5JHKDZUTXqiFogJHEnLf7pplDcAiAu33DRpiq569gVlyCN9wrddG12Th2/9Vkf5bFHIQ On+DFCul8dS+fEbeZfEBmBJg65TBbvkDDH8LEZajxVgaDPWCdVi3LbuW4C1FXF0iWbV2GRw9 JN9S/06AKUngV3iFkZdxrLnZmVIzB6OtztZ/JTlVvPBPAVHymI+YKtJjDg5bcAmGKj9991uj V3z1i0k5WKIwlaahjBcHnfEdSv9Dp5Qp/ewqhne2ZSvWXOL2ku6zQsJ9zNyLcekdNwNVh332 9uf00q8Ke2ddbG5rvu4FXsyPl1BGjd6uNcU3iGZlVDyK2qd2oPBccthA==; From: Quirin Gylstorff To: Sai.Sathujoda@toshiba-tsip.com, jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Subject: [cip-dev][isar-cip-core][PATCH v2 3/3] customizations-security: add curl to download LAVA overlay Date: Fri, 24 Jan 2025 14:22:21 +0100 Message-ID: <20250124132246.64738-4-Quirin.Gylstorff@siemens.com> In-Reply-To: <20250124132246.64738-1-Quirin.Gylstorff@siemens.com> References: <20250124132246.64738-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer 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 ; Fri, 24 Jan 2025 13:22:53 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/17658 From: Quirin Gylstorff Lava generates an directory, in LAVA called overlay, which contains all scripts and tests of the test stage. The Device-under-test needs to be instrumented with with this overlay. LAVA provides the possibility to download the overlay via http or NFS. We use curl to download to the overlay from a http server. Signed-off-by: Quirin Gylstorff --- .gitlab-ci.yml | 3 ++- kas/opt/test.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 686ce48..d63ef2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,6 +65,7 @@ default: - if [ "${release}" = "trixie" ]; then base_yaml="${base_yaml}:kas/opt/trixie.yml"; fi - if [ "${encrypt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/encrypt-data.yml"; fi - if [ "${watchdog}" = "disable" ]; then base_yaml="${base_yaml}:kas/opt/disable-watchdog.yml"; fi + - if [ "${test}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/test.yml"; fi - if [ "${swupdate_version}" = "2022.12" ]; then base_yaml="${base_yaml}:kas/opt/swupdate-2022.12.yaml"; fi - echo "Building ${base_yaml}" - kas build ${base_yaml} @@ -250,8 +251,8 @@ build:x86-uefi-secure-boot: extension: security use_rt: disable targz: disable - encrypt: disable watchdog: disable + test: enable build:qemu-amd64-swupdate: extends: diff --git a/kas/opt/test.yml b/kas/opt/test.yml index 4a60ad4..b23f437 100644 --- a/kas/opt/test.yml +++ b/kas/opt/test.yml @@ -17,3 +17,6 @@ local_conf_header: IMAGE_PREINSTALL += "rt-tests stress-ng" DESCRIPTION:append = " with test packages" IMAGE_FULLNAME:append = "-test" + lava-testing-add-curl: | + IMAGE_PREINSTALL += "curl" +