diff --git a/device/cheetah/MODEM-PLAN.md b/device/cheetah/MODEM-PLAN.md index 0b6ce7015..c6a4e44e5 100644 --- a/device/cheetah/MODEM-PLAN.md +++ b/device/cheetah/MODEM-PLAN.md @@ -2724,9 +2724,10 @@ What the packages now do, opt-in and nothing enabled by them: sitd; `sit-data` and `mmd` restart themselves only (routes and a D-Bus bridge). -The next release enables the target by default once the carrier -configuration is automatic (#373): today the carrier files in the chroot -and the `modem-sit.conf` keys (IMS-SHANNON.md section 12) are set by hand. +Superseded on 2026-11-03 by M4.6b below: the target is on by default, +before the carrier configuration is automatic (#373); today the carrier +files in the chroot and the `modem-sit.conf` keys (IMS-SHANNON.md section +12) are set by hand. Preconditions: the stack registered by hand on this boot's packages (IMS, an SMS); the charger in (no sleep, and upower's critical action @@ -2822,6 +2823,188 @@ at, the time from `systemctl start omamobile-sitd` to "ready", the UFS handler count at each step, CP crashes. Not the carrier, the APN, the PLMN or any number (TELEPHONY-APPS-PLAN Q8). +### M4.6b: on by default (`omamobile-modem` 0.1.16, device-cheetah 0.1.43, omamobile-shell 0.2.100; written 2026-11-03) + +The maintainer's decision of 2026-11-03: the next release ships the +modem working out of the box, so the switch of M4.6 is on by default on +this phone. M4.6 (three reboots on 2026-11-03) is the evidence it rests +on; what changes is how the stack is turned on, and what a boot does when +it can't or shouldn't start the modem. + +- **On by default:** `omamobile-device-cheetah` 0.1.43 ships a vendor + wants link, `multi-user.target.wants/omamobile-modem-boot.target`, as it + does for the AoC and Wi-Fi units. `omamobile-modem` still enables + nothing (its test holds it to that), and neither does tegu's or raven's + device package. Off: `systemctl mask omamobile-modem-boot.target` (a + vendor link survives `disable`), on again with `unmask`. The stack's + packages (`omamobile-modem-sit`, `omamobile-mmd`) are in cheetah's + `ROOTFS_PACKAGES`, so the release image carries them. +- **A phone that isn't provisioned costs nothing.** `omamobile-modem.service` + and `omamobile-modem-inhibit.service` carry three + `ConditionPathExists=`: the chroot (`/usr/lib/omamobile-vendor/modem/root`), + the NV checksums (`/etc/omamobile/modem-nv.sha256`) and the board id + (`/var/lib/omamobile-vendor/modem/props.conf`), the three things + `tools/phone-provision` puts there. Without them both units are skipped + (not failed: nothing to restart, and the inhibitor isn't held, so the + phone keeps sleeping; the inhibitor needs its own copy because the modem + unit's `Requires=` pulls it in even when that unit's conditions skip + it), sitd and sit-data are skipped by their own conditions on + `/dev/umts_ipc0` (sit-data's is this device's new drop-in + `omamobile-sit-data.service.d/20-cp-online.conf`: without it a sitd + skipped by its condition counted as started for sit-data's `Requires=`, + and the fallback would have failed after 60 s and restarted every 10 s + all boot), and only `omamobile-mmd` runs, logging once that sitd isn't + reachable and retrying quietly. The start script checks the same three + paths first, for a start by hand or `--retry`. +- **The modem-up guard allows one automatic retry, then holds.** A boot + that finds a stale `modem-up` still refuses (the previous boot ended + with the modem up and no clean stop: a hang or a reset), logs + `journalctl -b -1 -u omamobile-modem` and `journalctl -b -1 -k` as + where to look, and moves the marker to `modem-up.refused-