diff --git a/packages/omamobile-device-cheetah/PKGBUILD b/packages/omamobile-device-cheetah/PKGBUILD index a78a5ac26..932d52227 100644 --- a/packages/omamobile-device-cheetah/PKGBUILD +++ b/packages/omamobile-device-cheetah/PKGBUILD @@ -8,6 +8,8 @@ arch=(aarch64) url="https://github.com/derekross/omarchy-mobile" license=(MIT Apache-2.0) depends=(bash systemd util-linux omamobile-keyring i2c-tools) +# Keep CPIF and its link driver behind the modem's guarded startup. +provides=(omamobile-modem-policy) backup=(etc/pacman.d/omamobile-mirrorlist) install=omamobile-device-cheetah.install optdepends=('omamobile-boot-update: writes kernel package updates to slot B from the boot files this package ships') diff --git a/packages/omamobile-device-cheetah/version b/packages/omamobile-device-cheetah/version index 5786113b6..528bd040e 100644 --- a/packages/omamobile-device-cheetah/version +++ b/packages/omamobile-device-cheetah/version @@ -1 +1 @@ -0.1.38 +0.1.39 diff --git a/packages/omamobile-device-tegu/PKGBUILD b/packages/omamobile-device-tegu/PKGBUILD index a35c8d62b..da1e2b777 100644 --- a/packages/omamobile-device-tegu/PKGBUILD +++ b/packages/omamobile-device-tegu/PKGBUILD @@ -8,7 +8,7 @@ arch=(aarch64) url="https://github.com/derekross/omarchy-mobile" license=(MIT) depends=(bash systemd kmod bluez-utils omamobile-keyring) -provides=(omamobile-device) +provides=(omamobile-device omamobile-modem-policy) conflicts=(omamobile-device) backup=(etc/pacman.d/omamobile-mirrorlist) install=omamobile-device-tegu.install diff --git a/packages/omamobile-device-tegu/test/all b/packages/omamobile-device-tegu/test/all index df46ffb5f..3a55ebd03 100755 --- a/packages/omamobile-device-tegu/test/all +++ b/packages/omamobile-device-tegu/test/all @@ -149,6 +149,12 @@ for absent in usr/bin/omamobile-boot-success usr/bin/omamobile-bootctl \ done pass "install stages the package, enables only the guards, and nothing that marks a slot" +for m in cpif shm_ipc pcie_gs201_cp; do + grep -qx "blacklist $m" "$tmp/root/usr/lib/modprobe.d/omamobile-tegu-guards.conf" \ + || fail "the modem policy must prevent $m from autoloading" +done +pass "the modem drivers stay behind their guarded startup" + # Every driver the graphics guard loads is kept from autoloading (gs_dsim_cmd # aside: it autoloads from its node and sends nothing until allow_tx is on, # which only the guard sets), and nothing in modprobe.d would break the diff --git a/packages/omamobile-device-tegu/vendor/modprobe.d/omamobile-tegu-guards.conf b/packages/omamobile-device-tegu/vendor/modprobe.d/omamobile-tegu-guards.conf index 51f8604cc..d3be2d0da 100644 --- a/packages/omamobile-device-tegu/vendor/modprobe.d/omamobile-tegu-guards.conf +++ b/packages/omamobile-device-tegu/vendor/modprobe.d/omamobile-tegu-guards.conf @@ -16,3 +16,9 @@ blacklist pcie_gs201 blacklist phy_zuma_pcie blacklist brcmfmac blacklist nxp_nci_i2c + +# Modem policy: only the attended modem startup may load CPIF and its link. +# Installing the runtime must not let a DT node start these at boot. +blacklist cpif +blacklist shm_ipc +blacklist pcie_gs201_cp diff --git a/packages/omamobile-device-tegu/version b/packages/omamobile-device-tegu/version index b0032849c..a45be4627 100644 --- a/packages/omamobile-device-tegu/version +++ b/packages/omamobile-device-tegu/version @@ -1 +1 @@ -0.2.7 +0.2.8 diff --git a/packages/omamobile-modem/PKGBUILD b/packages/omamobile-modem/PKGBUILD index 38f5aa05f..b3bba56d9 100644 --- a/packages/omamobile-modem/PKGBUILD +++ b/packages/omamobile-modem/PKGBUILD @@ -7,7 +7,7 @@ pkgdesc="Omarchy Mobile modem runtime for the Pixel 7 Pro: stock rfsd and cbd in arch=(aarch64) url="https://github.com/derekross/omarchy-mobile" license=(MIT) -depends=(bash python util-linux coreutils kmod systemd omamobile-gnss omamobile-device-cheetah) +depends=(bash python util-linux coreutils kmod systemd omamobile-gnss omamobile-modem-policy) install=omamobile-modem.install check() { diff --git a/packages/omamobile-modem/version b/packages/omamobile-modem/version index 9767cc98e..20f49513e 100644 --- a/packages/omamobile-modem/version +++ b/packages/omamobile-modem/version @@ -1 +1 @@ -0.1.10 +0.1.11