From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: "Su, Bao Cheng (RC-CN DF FA R&D)" <baocheng.su@siemens.com>,
"Lopes Ivo, Diogo Miguel (T CED IFD-PT)" <diogo.ivo@siemens.com>
Subject: [PATCH] meta: optee-client: Generalize and update shutdown rule
Date: Wed, 11 Oct 2023 16:36:46 +0200 [thread overview]
Message-ID: <caf544f2-86fc-4fe8-8c00-a8b4ab7aba3d@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
.../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
next reply other threads:[~2023-10-11 14:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 14:36 Jan Kiszka [this message]
2023-10-12 7:01 ` Jan Kiszka
2023-10-12 7:15 ` Uladzimir Bely
2023-10-12 7:23 ` Jan Kiszka
2023-10-12 17:24 ` Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=caf544f2-86fc-4fe8-8c00-a8b4ab7aba3d@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=baocheng.su@siemens.com \
--cc=diogo.ivo@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox