From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7257948820735000576 X-Received: by 2002:a19:670d:0:b0:4fd:d32b:2333 with SMTP id b13-20020a19670d000000b004fdd32b2333mr2292975lfc.39.1689872895782; Thu, 20 Jul 2023 10:08:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:2051:b0:51d:8056:da3f with SMTP id bc17-20020a056402205100b0051d8056da3fls641898edb.1.-pod-prod-09-eu; Thu, 20 Jul 2023 10:08:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlGWwrSQ9I5tdhK/cr5071uXe9MYYKSojdvJFG4GPKSkO7dHJhZSEQuxhGBqmU5MQQKV6bzA X-Received: by 2002:aa7:d941:0:b0:51e:1690:1b9a with SMTP id l1-20020aa7d941000000b0051e16901b9amr5319371eds.29.1689872893845; Thu, 20 Jul 2023 10:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689872893; cv=none; d=google.com; s=arc-20160816; b=mX3qCiY9hO8pJCfwuqf4ajSSCR2nxSTslYWEuQMLMhUNaO8rPJiBWxN5jfMTN2xT6N 8VFFwRAoJSZt/pXfT+ynnkt/Yq+NfsoxWJeAH+/cftMTrQb/mSeJXLCfa1o2pDA8Y11G KEOCuuBOA0svRmjlCH+I1hVa0JQwlR57yvELMv8HE7JyISywIFFjcpY6KnDFluxnyYra mSXN4tH4YtbqiZ0po87fZ2NrxVktdqlS7thOKRj8VaitykHnKXEGy4BxUVCzjy/DWM9C 7Pkefg1l5iBVWA2X6RXVQR5Gi30FY1oJNfh0d/QmcVg69vfE+rhdUb+ycbJhMLLtsS0T aETA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=U0YXrfxnNGGgnvCbB/LoOvRXz9WEjJxZAbdanKB7BN0=; fh=i2rMp76O4OuqKOrPWESC/E2VYXjzqUtPdBv0yMcUYYM=; b=NrVoow8d5FySckdRYborgtbDR3oaQnOvTEudLOFAylZQ/n1vFw1qxWKJjvDGaE454t 3SBp1Py4fQGeO4xcorkEIkV7fCgKIEhpMZ9k+L0gyyE9e75bIM4NQk8VbV3lhsszGNQh o+fUzXFLt81CvysvzF5X8gSLAhe1WUBRUiuWI6P91pP0CYf/B9NYhxUJp2BUgTByuxsc yiK1+0EJNb29c6Z/Tn2pfKWo3dNLR28vnUKtT5pT/aLwiolB8LmAvaJOc6wDkIYvGefg 91IUTYPDqvFgKRy8xi+SWGqRn/AOObirbw//lmJHBqra9WWR1+RAtATeJUXZeGXT/IKg 6o2A== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FOTwkEuV; spf=pass (google.com: domain of fm-294854-20230720170813c6fa167f9e5ab2586b-x4rxlw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20230720170813c6fa167f9e5ab2586b-X4RXlW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id z9-20020a05640235c900b0052171bda268si79174edc.3.2023.07.20.10.08.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2023 10:08:13 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20230720170813c6fa167f9e5ab2586b-x4rxlw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FOTwkEuV; spf=pass (google.com: domain of fm-294854-20230720170813c6fa167f9e5ab2586b-x4rxlw@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20230720170813c6fa167f9e5ab2586b-X4RXlW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20230720170813c6fa167f9e5ab2586b for ; Thu, 20 Jul 2023 19:08:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=U0YXrfxnNGGgnvCbB/LoOvRXz9WEjJxZAbdanKB7BN0=; b=FOTwkEuVWHLbeSMh4oF2r2QH3EMl5V2SugFDEWwTQjnR0uzmep9a7scH//MvHVD6LASp+s WQseU26NcjnSnRxXtqTrcemyPZLYeQTDF9WRQc/zd6CRvplQWrVWG5/OJZlJo/1pa4dCZXtd Vdl6gkVCA2k2u0WNyeimL7fOKrGKw=; From: Jan Kiszka To: isar-users Cc: Bao Cheng Su Subject: [PATCH v3 05/11] initramfs-tee-{ftpm,supplicant}-hook: Move sync loop to ftpm-hook Date: Thu, 20 Jul 2023 19:08:06 +0200 Message-Id: <0ab7de2a3e94f8dc62c2407e355f39621d722b39.1689872892.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: gNfojqitd7N+ From: Jan Kiszka There is no FTPM_DEV defined in tee-supplicant.script, and it also makes no sense to wait for an unrelated fTPM device in the tee-supplicant starter hook. That is better done in tee-ftpm.script. Signed-off-by: Jan Kiszka --- .../initramfs-tee-ftpm-hook/files/tee-ftpm.script | 9 +++++++++ .../files/tee-supplicant.script | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/tee-ftpm.script b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/tee-ftpm.script index ce321a09..6e12e6df 100644 --- a/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/tee-ftpm.script +++ b/meta/recipes-initramfs/initramfs-tee-ftpm-hook/files/tee-ftpm.script @@ -21,6 +21,15 @@ esac . /scripts/functions FTPM_DEV=/dev/tpmrm0 + +# The tee-supplicant would take some time to be discovered, 10 seconds should be +# enough +wait_sec=10 +until test $wait_sec -eq 0 || test -c "${FTPM_DEV}" ; do + wait_sec=$((wait_sec-1)) + sleep 1 +done + if ! test -c "${FTPM_DEV}"; then panic "Can't discover the fTPM device ${FTPM_DEV}!" fi diff --git a/meta/recipes-initramfs/initramfs-tee-supplicant-hook/files/tee-supplicant.script b/meta/recipes-initramfs/initramfs-tee-supplicant-hook/files/tee-supplicant.script index bb6dcc16..76efc1ad 100644 --- a/meta/recipes-initramfs/initramfs-tee-supplicant-hook/files/tee-supplicant.script +++ b/meta/recipes-initramfs/initramfs-tee-supplicant-hook/files/tee-supplicant.script @@ -22,12 +22,4 @@ esac /usr/sbin/tee-supplicant -d -# The tee-supplicant would take some time to be discovered, 10 seconds should be -# enough -wait_sec=10 -until test $wait_sec -eq 0 || test -c "${FTPM_DEV}" ; do - wait_sec=$((wait_sec-1)) - sleep 1 -done - /usr/bin/pgrep tee-supplicant > /dev/null || panic "Can't start the tee-supplicant daemon!" -- 2.35.3