From 155b42747890031589988751641aa4b5a9d972ea Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Sat, 5 Sep 2026 04:25:51 +0200 Subject: [PATCH] kernel: build qcomtee, which is one line and not the coupled change we recorded The fingerprint stack needs /dev/tee0, and the pmOS config has never built the driver -- so every session so far has loaded an out-of-tree module. That has been recorded since 2 September as the release blocker, on the reading that drivers/tee/qcomtee/Kconfig's `select QCOM_TZMEM_MODE_SHMBRIDGE` would flip tzmem out of Generic mode and drag a boot+selftest round with it. It does not. QCOM_TZMEM_MODE_SHMBRIDGE is a member of a choice block, and Kconfig cannot select a choice member -- the statement is inert, and silently so. Setting CONFIG_QCOMTEE=m and running olddefconfig against the tree produces exactly one line of difference and leaves CONFIG_QCOM_TZMEM_MODE_ GENERIC=y, which is the mode every fingerprint measurement was taken on. The driver is already in the base tree; the only reason it was out-of-tree here was that nothing enabled it. Verified on the dev phone: the module built from this config carries ZERO module parameters against the research build's 95, matching vermagic, and the phone boots on it with modules-load.d bringing it up, /dev/tee0 present, fingerprintd ready and the enrolled template loading. So the shipped module is upstream code on the tested tzmem mode. Not pushed. Whether to ship QCOMTEE with tzmem in Generic mode is a separate question with a real answer -- journal/tee warns about that mode -- and it is now sequenceable on its own instead of forced by a select that does nothing. --- aports/device/linux-postmarketos-qcom-milos/APKBUILD | 2 +- .../config-postmarketos-qcom-milos.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aports/device/linux-postmarketos-qcom-milos/APKBUILD b/aports/device/linux-postmarketos-qcom-milos/APKBUILD index 94fde64..c7c3224 100644 --- a/aports/device/linux-postmarketos-qcom-milos/APKBUILD +++ b/aports/device/linux-postmarketos-qcom-milos/APKBUILD @@ -8,7 +8,7 @@ _flavor="postmarketos-qcom-milos" pkgname=linux-$_flavor pkgver=7.2.0 # always sorts above the upstream aport (r0..r99) -pkgrel=100 +pkgrel=101 pkgdesc="Milos mainline kernel + Catcrafts FP6 bring-up carries (combined-stable)" arch="aarch64" _carch="arm64" diff --git a/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64 b/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64 index 9c26c1c..e0aedd3 100644 --- a/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64 +++ b/aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64 @@ -7224,7 +7224,7 @@ CONFIG_TEE_DMABUF_HEAPS=y CONFIG_OPTEE=y # CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set CONFIG_OPTEE_STATIC_PROTMEM_POOL=y -# CONFIG_QCOMTEE is not set +CONFIG_QCOMTEE=m # CONFIG_MUX_CORE is not set CONFIG_PM_OPP=y # CONFIG_SIOX is not set