Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 46 additions & 2 deletions packages/omamobile-modem/lib/omamobile-modem-cp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ BOOT = os.environ.get('OMAMOBILE_MODEM_BOOT', '/dev/umts_boot0')
ALLOW = Path('/sys/module/cpif/parameters/allow_poweroff')
CRASH_LOG = Path(os.environ.get('OMAMOBILE_MODEM_CRASH_LOG', '/var/log/omamobile/modem-crashes.log'))
RUN = Path(os.environ.get('OMAMOBILE_MODEM_RUN', '/run/omamobile-modem'))
# watch's poll interval (OMAMOBILE_MODEM_WATCH_SECONDS overrides it; read in
# watch(), so a bad value can't break the other subcommands). On the Pixel
# 9a each open and close of umts_boot0 woke the CP's PCIe link for about
# 100 ms: the old watch, one open per 0.5 s poll, woke it about 120 times a
# minute. The status ioctl on a file held open doesn't wake it at all (0
# link-ups in a minute at 0.5 s, measured 2026-10-29), so the file is held
# for the whole watch and the interval stays at 0.5 s. The watcher was one
# source of link cycling; the hang seen while gnssd reloaded Kepler
# (device/tegu/MODEM-PLAN.md G3) is still open, it happened with the held
# file too. A crash shows within a second.
WATCH_SECONDS_DEFAULT = 0.5
WATCH_SECONDS_RANGE = (0.2, 60.0)

IOCTL_POWER_OFF = 0x6f20 # _IO('o', 0x20)
IOCTL_GET_CP_STATUS = 0x6f27 # _IO('o', 0x27)
Expand Down Expand Up @@ -128,11 +140,43 @@ def record_crash():
os.fsync(out.fileno())


def watch_seconds():
"""OMAMOBILE_MODEM_WATCH_SECONDS within WATCH_SECONDS_RANGE, else the
default (with a note), so a typo there can't stop the watch."""
value = os.environ.get('OMAMOBILE_MODEM_WATCH_SECONDS')
if value is None:
return WATCH_SECONDS_DEFAULT
try:
seconds = float(value)
except ValueError:
seconds = float('nan')
low, high = WATCH_SECONDS_RANGE
if not low <= seconds <= high:
say(f'OMAMOBILE_MODEM_WATCH_SECONDS={value!r} is not {low:g}-{high:g} s: '
f'polling every {WATCH_SECONDS_DEFAULT:g} s')
return WATCH_SECONDS_DEFAULT
return seconds


def watch(marker=None):
seconds = watch_seconds()
was_online = False
crashed = False
fd = None
while True:
now = state()
# one open file for the whole watch, so each poll is a single ioctl
# (the open and close woke the 9a's CP link; see WATCH_SECONDS_DEFAULT)
try:
if fd is None:
fd = os.open(BOOT, os.O_RDWR | os.O_CLOEXEC)
now = fcntl.ioctl(fd, IOCTL_GET_CP_STATUS)
except FileNotFoundError:
now = 0
except OSError:
if fd is not None:
os.close(fd)
fd = None
now = state()
if now == ONLINE and not was_online:
was_online = True
say('CP ONLINE')
Expand All @@ -146,7 +190,7 @@ def watch(marker=None):
(RUN / 'crashed').write_text(STATES.get(now, str(now)) + '\n')
say('the CP left ONLINE: crash recorded; nothing restarts it. '
'Reboot to recover (the reboot powers it off).')
time.sleep(.5)
time.sleep(seconds)


def baseband_version(path):
Expand Down
13 changes: 13 additions & 0 deletions packages/omamobile-modem/test/all
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ python3 "$cp" baseband-version "$t/noinfo.bin" 2>/dev/null && fail "a TOC withou
python3 "$cp" baseband-version "$t/notoc.bin" 2>/dev/null && fail "a file without a TOC is refused"
pass "baseband version"

# watch's poll interval is read inside watch(): a value outside the range,
# or not a number, falls back to the default, and never stops another
# subcommand (power-off at the profile's stop runs with the same environment).
ws() {
OMAMOBILE_MODEM_WATCH_SECONDS=$1 python3 -c '
import sys; g = {"__name__": "cp"}; exec(open(sys.argv[1]).read(), g); print(g["watch_seconds"]())' "$cp" 2>/dev/null
}
[[ $(ws 5) == 5.0 && $(ws 60) == 60.0 && $(ws five) == 0.5 && $(ws 0) == 0.5 && $(ws 600) == 0.5 && $(ws nan) == 0.5 ]] ||
fail "watch interval: $(ws 0.5) $(ws 60) $(ws five) $(ws 0) $(ws 600) $(ws nan)"
[[ $(OMAMOBILE_MODEM_WATCH_SECONDS=five python3 "$cp" baseband-version "$t/modem.bin" 2>/dev/null) == test-version-001 ]] ||
fail "a bad watch interval leaves other subcommands alone"
pass "watch interval"

mkdir -p "$t/efs" "$t/efs_backup"
for f in efs/nv_normal.bin efs/nv_protected.bin efs_backup/nv_protected.bak; do
printf 'made-up %s' "$f" > "$t/$f"
Expand Down
2 changes: 1 addition & 1 deletion packages/omamobile-modem/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.8
0.1.9