Catcrafts/fp6-img
Watch
2
0
Fork
You've already forked fp6-img
 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

kernel: build qcomtee, which is one line and not the coupled change we recorded

Browse source 
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.
This commit is contained in:
Jorijn van der Graaf 2026-09-05 04:25:51 +02:00
commit 2da26cc42b
Signed by: jorijnvdgraaf
GPG key ID: 2937E59CDCC1BCFB
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aports/device/linux-postmarketos-qcom-milos/APKBUILD
View file

@ -8,7 +8,7 @@ _flavor="postmarketos-qcom-milos"
pkgname=linux-$_flavor pkgname=linux-$_flavor
pkgver=7.2.0 pkgver=7.2.0
# always sorts above the upstream aport (r0..r99) # always sorts above the upstream aport (r0..r99)
pkgrel=100 pkgrel=101
pkgdesc="Milos mainline kernel + Catcrafts FP6 bring-up carries (combined-stable)" pkgdesc="Milos mainline kernel + Catcrafts FP6 bring-up carries (combined-stable)"
arch="aarch64" arch="aarch64"
_carch="arm64" _carch="arm64"

2
aports/device/linux-postmarketos-qcom-milos/config-postmarketos-qcom-milos.aarch64
View file

@ -7224,7 +7224,7 @@ CONFIG_TEE_DMABUF_HEAPS=y
CONFIG_OPTEE=y CONFIG_OPTEE=y
# CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set # CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set
CONFIG_OPTEE_STATIC_PROTMEM_POOL=y CONFIG_OPTEE_STATIC_PROTMEM_POOL=y
# CONFIG_QCOMTEE is not set CONFIG_QCOMTEE=m
# CONFIG_MUX_CORE is not set # CONFIG_MUX_CORE is not set
CONFIG_PM_OPP=y CONFIG_PM_OPP=y
# CONFIG_SIOX is not set # CONFIG_SIOX is not set