From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7256873191762558976 X-Received: by 2002:a17:907:3da3:b0:98e:738c:6d39 with SMTP id he35-20020a1709073da300b0098e738c6d39mr13231759ejc.36.1689622456984; Mon, 17 Jul 2023 12:34:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:741:b0:51d:9f71:50bc with SMTP id p1-20020a056402074100b0051d9f7150bcls3120743edy.0.-pod-prod-03-eu; Mon, 17 Jul 2023 12:34:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlFNHvMS27bE8f/Kcyuha4XzEHBxVnBLOQOni/t50dLyAg2KZdSkLkusPT/tdl1VeI8Y/zOK X-Received: by 2002:a05:6402:1847:b0:51d:f7b2:e95b with SMTP id v7-20020a056402184700b0051df7b2e95bmr12266358edy.34.1689622454635; Mon, 17 Jul 2023 12:34:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689622454; cv=pass; d=google.com; s=arc-20160816; b=ax0pelq3YUUl0L0NGVf2AYUPbEWsZZRZdM/9NkwDP5EjonZFCVJfRk47HxRd6F5w5i TvcUJKFjAGz10NPxO+9kNclIslJkULc/0zISYR/lHvU5xM/UUvwiCblI5WTkj/ClLEA9 X29qV3gEfntKd54Quk6d+NIDOkP22TnG58s9k2CZyWFh0ZM31w1FP/fQII96gKJTVWtl YzJP8gPenI/HvT2Ep3OBbca6KzJmTQP+0ArSR8J4O8x0KSTsJCnqQCXNA61VAHFehykB r8ooMU4J6AsprzsIFXk0AThWxRM6Qy0dlCO+hK8xwZ68AoYHI33RMAjZvv3SDmeHWDEt VtKg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=U0YXrfxnNGGgnvCbB/LoOvRXz9WEjJxZAbdanKB7BN0=; fh=J+x5QrMr9Po22qFxre0Bcov0br/SvYwDuMNM52M7ZZk=; b=aW7FR4SOUxm/seT13kH/2fMP8XS5rtIpc+mFgenMsOshjJeGqbgOZ6fHNkyBkxKRjV oCypMjkh8YaEObKHoCuZ1HGiQduEY+MzSMjctxhmjLQ63utE4SfL3XgBdrYc75zQXnXN POQq0hOip1XYlEiqSCPc8YUyxZeo22pd+5nxCDATZ+g+u/NvsYQlZ+LOsm7HiV7rSROI 6nSs0SHYTGURz5K4P599N0x51vAoUqOYp5tPM7LvRFBT5e2UOWj8UBihMGWlhzCIzyHU 2b1cQxkayKNJNm7AofAkoJSVE3brzW/AUPpFth+3dvy61dqQ6U0mqRCLnmNlJzr1GMWA lc4g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Y+HJs2jD; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1a::62e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062e.outbound.protection.outlook.com. [2a01:111:f400:7e1a::62e]) by gmr-mx.google.com with ESMTPS id eq22-20020a056402299600b0051e5da60f04si6359edb.4.2023.07.17.12.34.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2023 12:34:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1a::62e as permitted sender) client-ip=2a01:111:f400:7e1a::62e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Y+HJs2jD; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1a::62e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HfJGwl8ErpUyqRzuD6lshdMyqeIbgyzRDTfftVZdjjFulMAscKUb/looyMtc4OhaRXrwiY9ihkhw5LL5lF4QexK9+CkqVG7LtoWymiTId5BIM+QGs4CfjJ9rDrWVluKa5oYNfej4U6Rw86pXjvNMLk83mMawm4kE24xIgC26Lx7QbvCBfoD88jE9Qe9jtM66UGRpqakCAxeSTNInTxuwoBc2cXgPCf28EH9rIx3O743Svh9CJ+mc2JcmVEcDJZDHdMfAkMc7eauQBc/hiYssT1nWHovm1rh8//Wepvw3gRkKhxVFzDCZP/X0DOIRcdGObAwREJBgK97mZbCb3WNJQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U0YXrfxnNGGgnvCbB/LoOvRXz9WEjJxZAbdanKB7BN0=; b=QVlpS0Ku9O8D3lrroimvJ0lFnT0CgieXzEEE94vbMJruUcNBwwBDMBRXXza3ZovjSCsVgiTR/6bA0vmE3JsEQl5u2Qbdd8sZiiJNm9xb08A4dFcyC+cdaL/ttE38VICEWa/shFcClb+eHLJNBjjGDBArkUKnupzK+OlpNkthHq8ApOVByUKbhI5y5DdDWTV0kiPgdHwW65qH1s45n69kro4fcebMwLr/Q6zepbfa87l+jrE0rg6jTprzQbg9/tMru3G+Y11w6/g+kOOzCyCt4ZKMe3FnnvLkx6vSnm+W9PJyire1qucMSb+ywQ8WnQGbUjrIigwu+skDN/+g/zzQ5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U0YXrfxnNGGgnvCbB/LoOvRXz9WEjJxZAbdanKB7BN0=; b=Y+HJs2jDvXunIA8FzQINlgxSGcCQm+SixsG/mjYcMaLu5dldR61IRIXIsY5ivly6WHz6+XeOD4NvG9psVmZfXYvdcjZC4YQvwikpJlvkjMx6ppGI+vC9UBfteMO6bIL8e8O9mp53Je87T3rMIWWZJ6dnM9n5nE2/VOgbkNBm/w/4DNvtx7NA2iGEBGOSJrHwlQqwi+4JAKi3S1fwFpGr2GwdeYf7PBxpwt/Z2mCevPbDsgKlin82yIFLXbIyG6pJ6UXEmGzzSQBgdKkiPVLD33Xn4n54wHWtQ+E7MuRhzMpsTugZgk/T5mLiAb6hjZS+0C0v/R7SDmtwlrb6PLnGBQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AM0PR10MB3969.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:157::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.32; Mon, 17 Jul 2023 19:34:13 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::77d2:3a68:9741:67cf]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::77d2:3a68:9741:67cf%4]) with mapi id 15.20.6588.031; Mon, 17 Jul 2023 19:34:13 +0000 Message-ID: <3b085270-97c8-57d3-b89c-3406a2f7641e@siemens.com> Date: Mon, 17 Jul 2023 21:34:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 From: Jan Kiszka Subject: [PATCH 1/2] initramfs-tee-{ftpm,supplicant}-hook: Move sync loop to ftpm-hook Content-Language: en-US To: isar-users Cc: "Su, Bao Cheng (RC-CN DF FA R&D)" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0191.namprd03.prod.outlook.com (2603:10b6:610:e4::16) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AM0PR10MB3969:EE_ X-MS-Office365-Filtering-Correlation-Id: 472f3bcc-be17-4a35-b5f4-08db86fccd0c X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0YRObw4p9V/ETb9Gk2CRLhFihKLfrgrsagSFpxcHTCudH3FW4t1qemOt2Q781D8Wkxy7UgT0jnl9fUHGgu0/v5UHzKdNVxoWeBpvhn1N7wucNRPFhDS1XweW828dFWfSa1kJU4x+tHvzu0eoXmPE0xBIdoUXjsGsOzeDJDUyl21KdX1eEXC4I9Ua171w3yHiv4baSpd+NxrcEJLln07yl0Czoqe0HwCJZ71M1c7p9VVuq5le0e1RGuWivtyUFJ67NWiwJa6zE65iKGbU16ms68C522o1k3yrVinXxa/wzy9vlKLz2F9EKvI6RuaBSaVDhR54nHksZLAX8v0HJw27grZtSGAqir9/+QchCN+SHZ4YWo4ou3ev0T1UwYG1CCQgjMO8AFHAS50wf3DsgRxTr60c+721DnJZWz33j99hCPufSIZ5aQcKe+G8D/lZAYOr1pwVZncIb/IkLGw3UGPS3XYElNUq0AmUPcqwSBfqR9FQqz9CHAgjLZoWLfvF/mccFHNlMauecV5W1lRYfzbHz/TSmX1hhg1u0+aBxsDhef5ooAXt4u4ly/jdtzd1GUz4QlWu6MU+DbVo6CodDGHAwAYpmUFtBQsZ+E70JPdDWlA0lsjG1u/3Ndp6k13wry9aEyAMnkrNRkFUyRTr3wH0Vg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(366004)(396003)(39860400002)(346002)(136003)(451199021)(31686004)(6486002)(6666004)(478600001)(83380400001)(2616005)(31696002)(86362001)(2906002)(44832011)(186003)(6506007)(26005)(6512007)(107886003)(82960400001)(6916009)(66476007)(38100700002)(41300700001)(66946007)(66556008)(4326008)(316002)(36756003)(8676002)(5660300002)(8936002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGZKVlBpMlFMblpZakc3bzNaS2JqRjNzNXByeHI3MC92RTBGd3d5S0lzZEJy?= =?utf-8?B?Z29Odnp4MGtaMWxQdzZBcml4cHoyT2d6eFF6WVFtNFN3ZjZsWXlrREw3ZlAx?= =?utf-8?B?c3h3VmhUMmwrWmRZMGplRmhZNXZ1NWsxN0tFNG9qUFllb1UrUWlCbHRjbGtv?= =?utf-8?B?Qk1EZWo5eHpXS0pXMWhsUjdPUTdvTHptN1p4dTJEaTNXVzAyM0ROd1JwNjNJ?= =?utf-8?B?YUI2VVpqaHkrckRsSEU2NGQ2SU1XdUxVdEo4TDlGaVJVYkZYY2lHeGgwZUc2?= =?utf-8?B?MVdxZElnT2dLWjJOMnQySkV3VUhBeUhLS0x2VzQvMGJBVE5zSGJqNFBTR0F3?= =?utf-8?B?Tm9valRGa1FFU0xBUEw0eHM1MFlEZFNoYUdCU21qRVZNR1BvQmU1dDNRTlV0?= =?utf-8?B?M2VLc2ZoOUo2blJCZFVYNWdrQ0hvcGltbXE3MEZCb1NLNGxNckpQMnIzc20v?= =?utf-8?B?VlNyRUpvQ2hEdVNnVzRlbTFGR1VvMVJOaUszSzRmWWJObjJCMTl2TFpqNkgy?= =?utf-8?B?RXNUempEM01wRkNkaElNV3N2YnRXRVhkQTlaNjZTK3hhMUJjcGY0UDN2L3JJ?= =?utf-8?B?WDhRTUFqamFPMTFGeUR4UkdNUkdUKzVINytWbnBvUEplQmJVNmFUd01oUTJS?= =?utf-8?B?cWhSWmZzYk5CdWw0OERNQWMzYWFIUEJQK3FISUJaNlB1ZGtHSmg2dWNKdjky?= =?utf-8?B?YXVrUVpNeUVhNmNocDYwRlpsWXI4L2hzODMvWURQQjFHUHk3bUdjUHNzL20w?= =?utf-8?B?QmlLeWVVdXhoaG03aFBNOXV4aURVNjQxMEtsbVZHVGp1dnU5TUVweThaMkJh?= =?utf-8?B?K2Q5K0V1UWxFU3Qxc0t2Zlk4L2xiQStKbWc4NStER2JlUFZEN3lRL1F3aUlX?= =?utf-8?B?azg1QWVoWlZvSVNidnczMi9uN0orTzZOM2hEUEczZHRrYnVRV2ZSSytHYWMv?= =?utf-8?B?RWUrcC9BemwvYTlhaWVVU2poaURlNEllcGJJYlRDL2poRXk5dG5obDEzOW9Q?= =?utf-8?B?bytXZEk1dmlqU2pKWjZvWWVzSG1xWk1rOVFEQmRGaW83UFRpT0ZSSW92VXNR?= =?utf-8?B?RVJHdnh2VldVTWsyT3JVSCtydEREWnh3Q3lYeUZ2cW1DQ0MrZ2RsVkpxcFhO?= =?utf-8?B?emlacE9UT3M4QThXUkxvRjA0dmpiR1YveWR1d3VwNXNWemJKOE1TZ1hZVzRE?= =?utf-8?B?VXVjaDd5SFFyaUxMUWVzTnkwK2xBdmoxVStUell6cElRaHdEcSt2VXFJMGVh?= =?utf-8?B?T2JWUmxxdmF3UGVVQXVIbnI3MGRtTTJtdmowN0pKOUtTNVZaNEdyTVFoRElZ?= =?utf-8?B?LzZtbGFZeUJvbUQ2QXZ0cGozUzJJZ21ZRXJ0c3BLN1NsWWJwQ0ZiRjVRTTRm?= =?utf-8?B?SUdidmN3b0gycG92d2lxRFJ2eVduT201bjlCOUJNT0J5YVh3NUhzOXZDSm81?= =?utf-8?B?Z3ZyeFo1RGNnVitlK0JoUWJuUC8yLzc2U1U0K1lYL1NQTkhZOEJGT1JpNHQ4?= =?utf-8?B?NEt1U1pTWkQ4eU8yVmMyUGRMSk1ndDdNdTBaeVYwelpGZk9RaXpGZlpIazN3?= =?utf-8?B?Q29yUVZqZ1pHRmthcFkwd0NKNnRBc0RLamNlanQxVTZrVms1YnY1UjRRVGFI?= =?utf-8?B?Rms3MTFuaG4yNDdlcmd2bll6VTNFaDhOOTJtekV6bEMxbEN2RG1uc3pwMXFI?= =?utf-8?B?QzAyYWFkQU5wQWZVMjVZWndmd0VZQXhPVlVKV3RDRFRJMXJGazBwQ1JNVWtq?= =?utf-8?B?UGdhRDh1N2ZsMWVWOENIa01LM1BnUnFUMFZrUzRjdW11VTU2aytyVHhaNHhs?= =?utf-8?B?MGlGVmNNUzJRelVSajFiMmlzemlGYU1xM05XMU56OGFZU1FZMGpRU3IzTGQ3?= =?utf-8?B?N1hWMjE4Nis0bVBQQjNwSC81UE40aHdDaGFRY3QyeGNDcVRqQUtvOUM0T1dE?= =?utf-8?B?SlA2Q2FDTFBxWkMrWStCWEFEdWlDMzVzZUhzZngxWjZrL0VKVVFVcXBsLytn?= =?utf-8?B?bXI3SEMxRzc1clRxeGFTRnBIbzFEU1JpOVVPRVQvS3pjS2x2dlpVcTUyRi9P?= =?utf-8?B?NFNKdEFSNEtXYVNYMFpuc2Ivc09PQTlKdFpnZmhwSFhEM0ZraGhWUFBUSzJR?= =?utf-8?B?dXE1WTg0SjZCTmtjTGkzMXZoOHB0d0xBUTExWlBlcW5JUWVEQnhZOHk1dDJr?= =?utf-8?B?ZlE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 472f3bcc-be17-4a35-b5f4-08db86fccd0c X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2023 19:34:13.5594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gQwxZieDCwA10b3KeINYF0hH9SIddUqxWXUcWqWXoWgTUtjCWu3BgCgEwEx8GZHdAvaP1rlDoOCIv1OQHEGmoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3969 X-TUID: IbfInFuWV1W0 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