From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7288709884549267456 X-Received: by 2002:a2e:840b:0:b0:2c2:956d:3e3f with SMTP id z11-20020a2e840b000000b002c2956d3e3fmr16256073ljg.19.1697035013019; Wed, 11 Oct 2023 07:36:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1509:b0:2b9:4989:4f1a with SMTP id e9-20020a05651c150900b002b949894f1als133697ljf.1.-pod-prod-00-eu; Wed, 11 Oct 2023 07:36:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfMQ5FKj5X4qGE/OGdzThr28SMfGpW+7Sj1wPRFICUHFpsZ8ZGLfthJJChkBaThTQpN/qK X-Received: by 2002:a2e:b524:0:b0:2c0:1a80:d87 with SMTP id z4-20020a2eb524000000b002c01a800d87mr11210325ljm.19.1697035010758; Wed, 11 Oct 2023 07:36:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697035010; cv=pass; d=google.com; s=arc-20160816; b=071+k0477qeurdFJLbZOY9+TFcVQeSKaegbZs82C5xadChkDHPKHZZAEM4s1hPWI+S lXTDU3kYRaJZka9eWD7SvgEnysOVeAHeR62V0g19Qf+PhSPKA3z1bNg5Ae7BO4asHsnV hsaUwoqIwpxYEUOyXOAh4MjSo8+mrje8QQufJIwGaAteR9JQ8ndZPUvYoBgZ+ite81C7 Vq3NAFd9vRZv4g2GM1AmWQ379Vnt9tcpEZ0oYTYWSA/xZxMd2QNRiJU+z1BPFNxOdWGk jqQZ0eqkGPRQRmIUY/sOJ+SnYnTSTx5In8Phom1dUrHVm6HwiRBHJj3ETgqk7gpk7NIF fLSA== 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=EXh5k9Vfw2+mLUGAovMfuwI2aHVfDxRIMVGqivK2IPA=; fh=wQMwUWoL5CsngHNzQjdAPg8Uf6CUEUFNH4i1iKOUhNw=; b=i69fOvRwNAOvaIf+eH+6t29V+BiZpnVzlYi59gJIZvq4QNIVuDQZLxD5jQ7fw3GhnO l2gXuMIzL9V9L8nh5YNxqxL0M4WLD53Nj75N9+/np6hVCGz6J8fPAbkKLNzSCt4Kvbn6 4OvQOLv5bvSrQRTem7/SOv6XObjmgE7Q42sPzV3OlrF78ZeS2Ww6lohom2D/9xh7L7Hm avJKcyAoc3jfU3jzoqc3pMJzkD5+DJsfYfxmfswMroha/DKCqTa6CVI83S4VHDjYwOf4 iICPWtZMAllKHR6DMECRJ/adh5UJPyuqvYuQUxTlvMJiPew2oFYl/ajmFHeZgZrfBeIW 04Nw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ztk4lrhN; 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:fe1e::611 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 EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0611.outbound.protection.outlook.com. [2a01:111:f400:fe1e::611]) by gmr-mx.google.com with ESMTPS id b30-20020a05651c0b1e00b002c17e2e5fb9si801398ljr.5.2023.10.11.07.36.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Oct 2023 07:36:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe1e::611 as permitted sender) client-ip=2a01:111:f400:fe1e::611; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ztk4lrhN; 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:fe1e::611 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=G2TPvEoLA7cqykTYcR6tn19Fukxux/ziD3IeAc8uK2sdzyIkGLMGeXdiflyX3BQSLKnEO4JqBHunU5pXlrHFL9iklXKo2x4P0cVSOZN+Y8oFxGU3i7kKXHl9CxVJsV7hl+cwuvO3t6ypeCfF9eUlokqiTG+8tXO9PiodMGKCejtogGjE3MXgdugS2XuFmFVo1QuP1EFIsQY01EDWNe9+e/zP3CzXrLq4Da7w7nxJY8Y6ahfxqVFXWE9itFWnnz5HPzv2gqUEz+Ta4zJPD+9gF1zvfySI0cVs5G4WgSljFafVa5lAc/eocbFYMskExmdMizZ2SbEhOKf7D2XrdykjEA== 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=EXh5k9Vfw2+mLUGAovMfuwI2aHVfDxRIMVGqivK2IPA=; b=ZMC6ayWql2l4yYKPLcmH9N5p6oSoYCaiI53o8GipJJJvGgVaeBoCP/XaCOGanaNdodlpelV+BAh2CbPpzbfuJ5kcvUzepQcxoNY0eIc/K/EvnOybxw5Dufy+EPgTzbC8njjcldUPCsDUpYAcpvMS6dR/64NoWCuUbM4bMGEi6e1t0xwYGENu5142dQZEXFH9TTNQg7gPUML1/Nj5qN/5RdtrBV3GGWPduD3nuzlwuQhUS+P7cN3XVh1bE6d9OJYfl9WJZ6/Oev6rc6jagzZFFvXx9dZMQ3oGoVaMShxRUbg91qb/pjCmVWFY4c+uI/4nBfUb16fH38kLk6MrEwk0uA== 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=EXh5k9Vfw2+mLUGAovMfuwI2aHVfDxRIMVGqivK2IPA=; b=ztk4lrhNNxFA9dotBJp4hMU3R4os47XFrOpwGuI7Ry+MTG+9X3DqGevXSrftpbV9bzRca/srS2dhqjb/YMzPsMie12XT8YPPL+8IZ7wK0SRHjkMGHA0fNRn3Z43detBwbRZPBMXD9DNhx4HPOwPGRi/VbCAcRbccbEll5UhbryRm+/v165j6yfYw8cyw4CdLsFFBI3t0BWlGXqklvM9WgLdpxOw0jJfCnHwB0QtjpmZl5gPgf/5Ul10Wvm7vvctxSMIToayUyxApF0FcHNxwEEv4wiUj3we0602XvwZrumLvuMlAOaf77Gj2yF6OgU5wmy25ZFQr1gOgD0g/U11qHw== 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 DU0PR10MB6536.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:403::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Wed, 11 Oct 2023 14:36:49 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2a90:96cb:b3f:6e5]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2a90:96cb:b3f:6e5%2]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 14:36:48 +0000 Message-ID: Date: Wed, 11 Oct 2023 16:36:46 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH] meta: optee-client: Generalize and update shutdown rule Content-Language: en-US To: isar-users Cc: "Su, Bao Cheng (RC-CN DF FA R&D)" , "Lopes Ivo, Diogo Miguel (T CED IFD-PT)" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0050.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::13) 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_|DU0PR10MB6536:EE_ X-MS-Office365-Filtering-Correlation-Id: 85191a76-df62-4f1f-4626-08dbca67806c 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: OEb2JL+e/TaYTJSYeJ4nnXJP0QSJkoOXMWudDTdY9axTQ8UgMVSTmJcfSgvF+mfOqHP6Zdmq6dTo7RAYS6dL6iUrPTgw2/5uWoA92bk5FjYjefISFw1BK8F378skoU5suwxA9E7BIgEIAkplbXB84DXh5c+VZzl6HZ5v9dCVcuvnsqoZB/e+q6EQc9/NHNxmLN4tY10Ljx3bHe+WH6DTjQ8xTPtQ15zgmreVC7OV9jf4qkAM3CnIWa2IDxkVpEP2opaRJekxfmGOB7erx/pGDmVyzJQ6GQe1uZBIrMFpb8SxTSK6nEFjYnWPeE0wLqbPOfyeYiBvHsQra4k+dBHZ7Uwx4HALxxxMZ+i9Y+s3u4CB6LfGenZJFi4fKNRAXs8SEOfvPxGmsWt7N129FDfTcxj4h3+gaQB58UJ1tFTrnZUf0C8Ul7HoRGlZ+04blbDDrUZbKmyWzOaypdG0ocCBBzyr5Qy+cv10Q/sEvkl9RxNzU4p+GDeXRhAttYLHsnvHrJKMHmcUdxC+7TcrZTVQoufpHn5cIx7w+G9mCJEqEi+w/6HT0mIahrTZGu/Zcussc4n0R8xUif2lgGfsV5rRUv4fYi/rBODoh/+7QsQxvd2Ol2e6gHZonPILZuoMdHKzUJsfHJvCgLwamAsEjvEgeA== 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:(13230031)(39860400002)(376002)(396003)(136003)(366004)(346002)(230922051799003)(451199024)(64100799003)(186009)(1800799009)(6916009)(6486002)(2906002)(107886003)(83380400001)(26005)(2616005)(66556008)(66476007)(66946007)(8676002)(54906003)(5660300002)(6506007)(44832011)(41300700001)(6512007)(15650500001)(478600001)(4326008)(316002)(8936002)(36756003)(31696002)(82960400001)(38100700002)(86362001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YkdSbWRGQldnVkJ4eHpsM0dmYWUrelEwZWZFc0xxWEZBR1pOZW1WTm50OXgw?= =?utf-8?B?UmdKRGVBVUhLdzBsa2wvWmN2NTM3Zit3dU1LZ0pjR1NpQjFvUUMwTnJqUndF?= =?utf-8?B?S1NSd05CMWdxYXhwS08rdmVEMGpvQ2FVRHJWL1Q0Y2JLYzBpdjBvSlJORWtz?= =?utf-8?B?dy9rbDhXRUIyRVpLc3graVcvOHhBWFlrdjdUMmJPL0ZDNGtiSHg0Tm5wL0lK?= =?utf-8?B?US9sd0dOeTE5TTVhYWtRWEJCa1Jqd0pHbUNSSk5UMUFweWEzRFN4SHZPMCtH?= =?utf-8?B?THJrVTJ5Q3V5enZ5MVdmcDRoRFBaV2RNaDJOTzh2VGUyaEJjRUVBUm5wd0w5?= =?utf-8?B?VUJKVXkvS3RqbHFGalQxek9xTkZydm5BMFZlT214NUdiMVJqTWt2Vm9OdmhS?= =?utf-8?B?ckhMZExwRzlVdUk5blJOampzUWkyeldNUHN1SUhJOXY4b204Vkt3TFRvUVQ1?= =?utf-8?B?TlBHMVl5TFA5SDBCVFJuQjR3MzRWUTd6RkNoa3kzeGJhSUdJMWtqSCt6bWMx?= =?utf-8?B?dVNLaTJXbzVyYjZzQmlSaVh5RmZlUnZoZXZlRTNzdWVJeStrWE5CRzNhRkU3?= =?utf-8?B?bVdLWjJpRXFsREdESktrZTF5MlpWRzhtQUZIZVM3amhBUU42UzJXaFFTeHQx?= =?utf-8?B?enNxdlpqVWpGL0dTMmMwZVBiRURwZnlyZWhJZjBSbGh6WHNwOFA0NjNwTFVp?= =?utf-8?B?SGw1d04yZG51VmVvZ2xYTkVmaEpNbDZ0allYMmIrZWRyRFpKLzdKZHgxcDdV?= =?utf-8?B?M3ZkU0Rxc29tQW5TVFlmMGtjNXdiNzhTWCtJeFFIUWZIWnFIaEVWMXkvZlBw?= =?utf-8?B?Q1BSQnN3Wm5KckQyM0xtSTFFWmFQNjRrdmpoTHIzVDk4ajBNZng5aEw5TGk1?= =?utf-8?B?T0hHRmFVM0xzeUNhTFJVaHdFM003Q2FwZjdnNGdwOFJtN3JXK2JCRnpRWi9t?= =?utf-8?B?UWZWNzVHcVY1ZklGbU55Q3RJUjhETFR5MG11YlJ0TTh6UTgyU1FUZHUzaU11?= =?utf-8?B?cmN5ZDJHKzltenNBek9LdndJKy9Ya1hGRk9aRXN4QXFRcVpRRVY2M2cyS3ZX?= =?utf-8?B?TG14WklKcjNEZ3EzaEhpTElaMEorRFk3c2h5RGNQVjMyMm1IakFyYitZZERy?= =?utf-8?B?cVpyK2w2LzdiUDVyN1MwZGtQOVRHY2FURko1YWFJQU9ROHdmczhzUEc0TEJY?= =?utf-8?B?RFhLTjJnQy9tcHZTQVNUUFcxSGJQTFdZMDZ6ZHF4QXpXeGt3MmNaRU1SNUNM?= =?utf-8?B?dUxkclJaSHFRWkZUR0dZQVovTC9NS0JKbU93US9zOTQ0dTE4cTVHR01mZm1n?= =?utf-8?B?Q3g4TS90WUdPM1dmZ3FlMTMxVGVrSVZBTGJNcEtUWk5SaVp2M0J1RjhnKy9F?= =?utf-8?B?c0xLVWx2YUlNM0VrcFB0aWNMM3VzbzNycHBrUytkRDlyMWpqdCsyVDV4a3Nn?= =?utf-8?B?VEQzK3lHMSszQ3JzOCtieERRU0xvZ01tMG9zc1dmYjZFZzRVbzM5RHkxNE5x?= =?utf-8?B?Z2xmd3JsWlRwak5SZmxSVDlQeHZjSUd2a2Roc1BvcjA1aXI1cGVSaitESWs3?= =?utf-8?B?SWwrSzdGcTR0akpGYTk0K2JzbHAxOUZKd29WcDUyQld2dEdTb0dNMDR3dDJa?= =?utf-8?B?ZUdGUHkwNVZwN3lTcUloMU1ZVE00M3pKTElsZUhjNGk2TnNTZmVUdzAxUDQ1?= =?utf-8?B?NzlPZStBTmJoN3g5NEZXWHA2WTRIRDBBcUJNaWJ5Mys5dE8xc0JFK05aY1NP?= =?utf-8?B?aTUvVEtkcnFIV3ltdkNqMmdoN2xkYlpRQUJwVzRYR3ZBQTBId3hFd3hGME1q?= =?utf-8?B?N1VyRGJrQVN4TGVnek1JRlE3NjhrY281S21BUGUrY2djUkdkSHdhVEJmcUVD?= =?utf-8?B?a3d6M2JxcHgvWWI5L0JNWThuVTMvMWo1N0RNejJKR1ZjWWRNY1JLZVQxd1Vn?= =?utf-8?B?dk9jMHdyUDExK3dPekNKeGVYeWpIeHZuSnJvc01VcTI4akVNQkJ4UC8ySXpG?= =?utf-8?B?c2N2ODU5VW5GN0tZWkFXQjllbkZubzVwaUxiU2hoZ283R3JFYkJRa3hpV3VG?= =?utf-8?B?alZVWWM2RzVPMWtsekJEcVU5ZEJXalpjSVlLZ29yNkJTbWx5TzdVK202Wncy?= =?utf-8?B?dUFacGZLbjRCcWxscVRadExKTHlQZEhNVVYrOWUrbzlObGFTMnlncHFOa2U0?= =?utf-8?B?Snc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85191a76-df62-4f1f-4626-08dbca67806c X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 14:36:48.9264 (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: JV2l1j2sU6YgbyrnjHoqbW5GCJBjlxoxYuif5dwP2sUHXkK7x805UEP1td4o2IvoH4mLRFYu0i8ky44Jl+B6wg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB6536 X-TUID: 7VBQ5aWUrZO2 From: Jan Kiszka First, naming changed somewhere between kernel 5.10 and 6.1 so that optee-ta-bc50d971... is now optee-ta-supp-bc50d971... And then we should account for possibly more devices that need to be unbound. Use POSIX-compliant shell code for this. The generic loop allows to drop the explicit unmounting of efivarfs because the corresponding driver will already get unbound. Signed-off-by: Jan Kiszka --- .../optee-client/files/debian/tee-supplicant.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service b/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service index cc92a5fd..d8b630a4 100644 --- a/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service +++ b/meta/recipes-bsp/optee-client/files/debian/tee-supplicant.service @@ -13,8 +13,7 @@ Type=oneshot RemainAfterExit=yes # Start if not already started by the initramfs hook ExecStart=/bin/sh -c '/usr/bin/pgrep tee-supplicant >/dev/null || /usr/sbin/tee-supplicant -d' -ExecStop=/bin/sh -c '/usr/bin/findmnt /sys/firmware/efi/efivars >/dev/null && /usr/bin/umount /sys/firmware/efi/efivars || true' -ExecStop=/bin/sh -c 'echo -n optee-ta-bc50d971-d4c9-42c4-82cb-343fb7f37896 > /sys/bus/tee/drivers/optee-ftpm/unbind || true' +ExecStop=/bin/sh -c 'for dev in /sys/bus/tee/devices/*; do case "$dev" in *optee-ta-*) basename "$dev" > "$dev"/driver/unbind;; esac done' ExecStop=/usr/bin/pkill tee-supplicant [Install] -- 2.35.3