Skip to content

omamobile-modem-sit 0.3.36: [network] nr_after_radio_on, the NR mode only after radio on - #701

Merged
derekross merged 1 commit into
derekross:mainfrom
ikegam:omamobile-sit-nr-after-radio
Nov 13, 2026
Merged

derekross merged 1 commit into
derekross:mainfrom
ikegam:omamobile-sit-nr-after-radio

Conversation

@ikegam

@ikegam ikegam commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

What and why

Split from #556, as asked. [network] nr_after_radio_on = yes makes sitd set the NR mode only right after radio on. Off by default: every phone (the 9a and the 6 Pro included) keeps today's order until its owner turns it on.

Why: on my 7 Pro the modem sometimes accepts SET_NR_MODE with the radio off, and then never registers. Main's retry only covers a refusal. Journal, 2026-11-11, kernel 7.3.0-rc6-omamobile-push1-g33179249011e (#232 on the then omamobile):

22:45:16 Startup: radio state 0 (off)
22:45:16 SIT SET_NR_MODE: error=0 length=12
22:45:16 verified NR mode 0
22:54:17 TimeoutError: Modem registration deadline exceeded

A registering boot that evening, on a bisect build (…-g80f9610feb26):

23:16:52 SIT SET_NR_MODE: error=2 length=12
23:16:52 NR mode refused with the radio off (...); setting it after radio on
23:21:00 Registration: packet registered 7.4 s after radio on, RAT 14

Four of five boots that night failed. Correction to #556: a353a0190 is also in kernel-2026.11.08, so the newer base alone isn't the trigger. What differs from your unit isn't known. My SIM (LTE data and SMS, no voice) is on a different network, and the modem firmware comes from my phone's own factory image. With EAS off, or sitd pinned to CPUs 4-7, the refusal came back on my phone.

Device and build

  • Phone: Pixel 7 Pro (cheetah), my second one
  • Kernel release (uname -r): 7.3.0-rc6-omamobile-g1a9d1d4e9289 (the setting ran on …-g1668d1e8d1b0 before)
  • Packages changed, with versions: omamobile-modem-sit 0.3.36

Checks (no phone needed)

  • tools/pr-check origin/main passes
  • tests/all passes
  • tests/packages passes (or the packages I touched: omamobile-modem-sit)
  • Each changed package has its version bumped, and the new version is in the commit subject
  • Commits have area prefixes and bodies that say why; any AI help is a Co-Authored-By: or Assisted-by: trailer, never a Signed-off-by:

On the phone

🤖 Generated with Claude Code

…only after radio on

On a second Pixel 7 Pro the modem sometimes accepted SET_NR_MODE with the
radio off (error 0) instead of refusing it (error 2), then never reported
packet registration until the deadline. With energy-aware scheduling
(a353a0190) it happened in every boot there: sitd on the little cores
reached the modem later in its start-up. Pinned to the big cores, or with
EAS off, it was refused again.

nr_after_radio_on = yes sets the mode only right after radio on. It is off
by default, so every phone keeps today's order (the reference 7 Pro
registers with it).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@derekross

Copy link
Copy Markdown
Owner

Thank you for splitting this out, and for making it an option that is off by default. That is more careful than what I asked for: every phone, mine included, stays on today's order until its owner turns the option on.

I checked two things beyond the tests. With the option off, the start-up path is main's code exactly (I compared the two versions of bringup.py with the new branch taken out). With it on, it is the same path as the always-on commit you ran on your phone on the 12th. Your new test fails when I remove the gate's effect, and three of main's order tests fail when I make it always on, so both directions are pinned. The package's tests pass on a merge with main. CI is waiting for my approval; I'll start it, and merge when it is green. 0.3.36 is free, so the version stays.

Three small things, none of them holding this up:

Thank you also for the honest "what differs from your unit isn't known". On my 7 Pro the modem still refuses the request with the radio off at every boot; I'll note the lines from tomorrow's first boot here.

@derekross
derekross merged commit 9ec6d26 into derekross:main Nov 13, 2026
2 checks passed
@ikegam

ikegam commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

Thanks for merging! I'll add the boot counts and the two journal lines to #556's plan, and do the fallback for a mistyped value in a follow-up.

ikegam added a commit to ikegam/omarchy-mobile that referenced this pull request Nov 14, 2026
…radio_on on this phone

Asked in derekross#701's review: the plan says which boots each count covers, and
the two journal lines from a boot of the merged option.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KgnCmDwY8r4r1jCa2SVYLN
ikegam added a commit to ikegam/omarchy-mobile that referenced this pull request Nov 14, 2026
…radio_on on this phone

Asked in derekross#701's review: the plan says which boots each count covers, and
the two journal lines from a boot of the merged option.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KgnCmDwY8r4r1jCa2SVYLN
derekross added a commit that referenced this pull request Nov 15, 2026
…1.57, omamobile-shell 0.2.131: sleep with the modem up on by default on the 7 Pro (carries #555 and #556) (#791)

* omamobile-modem 0.1.24, omamobile-shell 0.2.128: turn the modem on or off from the Mobile network page

On the Pixel 7 Pro the modem stack starts at boot through device-cheetah's
vendor wants link, so keeping it off meant `systemctl mask
omamobile-modem-boot.target` over SSH. A phone whose modem drivers have
loaded never sleeps (omamobile-modem-inhibit holds until the reboot) and
runs warm, so the owner needs that switch on the phone.

omamobile-modem-switch (pkexec, org.omamobile.modem.switch, the active
local user without a password) masks the target for "off" and stops
nothing in this boot: a stopped modem can't start again before a reboot,
the sleep inhibitor stays anyway, and every modem power-off costs a UFS
error-handler pass (MODEM-PLAN M2.6). "on" unmasks it and starts the stack
only when this boot's modem never started. Its status reads without root;
props.conf sits in a root-only folder, which counts as provisioned there.

The switch exists only where the target is wanted at boot
(`systemctl show -p WantedBy`, which sees vendor and /etc links) or
masked. On the 9a, with its own modem start, and the 6 Pro, nothing wants
it: status says "available": false, the page hides the switch, and "on"
and "off" refuse, so the shell never starts a modem outside that phone's
own starter.

The Mobile network page shows the switch in its ready and off states,
says when the change takes effect at the next restart, says the phone
can't sleep only while the modem's sleep block is held (a start refused
before any driver releases it), and offers "Restart now".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-shell: the Mobile network page with the modem off, from the 7 Pro test of #555

Found on the reference phone on 2026-11-13, testing #555's modem switch:

- With the modem switched off for the boot, the only way to the page that
  turns it back on (the Mobile data tile's chevron) was hidden, and once
  shown it was greyed out with the tile. tile-state.sh now reports
  data_switch=off from omamobile-modem-switch, the tile says Modem off and
  keeps a working chevron (only in that case).
- Right after switching it on, the page said the modem service isn't
  running and starts once the modem is set up; it now says it is starting
  until the phone service reports.
- The heading was centred on the glyph and clipped when taller than it.
- The page had no back arrow; it now has one, as the Wi-Fi and Bluetooth
  pages do, and Escape goes back to quick settings too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-modem-sit 0.3.37: tell the modem the screen state, only with [control] follow_screen

The screen-state request (SET_SCREEN_STATE, then SET_IND_CMD_FILTER) was
in the service but never sent, so the modem reported as for a lit screen
all the time; each report wakes the AP and the link. With follow_screen =
yes (off by default) sitd follows the panel's bl_power, never "off" during
a call, and a systemd-sleep hook asks for "off" before a sleep. Without it
sitd sends nothing new and the hook answers "not told".

On a second 7 Pro (mine; LTE, idle): 47 indications in 60 s with the screen on, none
with it off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-modem 0.1.25, device-cheetah 0.1.56: modem-suspend-enable, only on the Pixel 7 Pro

/etc/omamobile/modem-suspend-enable lifts the modem's sleep inhibitor
for MODEM-PLAN M6, but only beside /usr/lib/omamobile-modem/suspend-runbook,
a comment-only marker that only device-cheetah ships. The inhibitor unit
is skipped only when both exist; the start script follows the same two
files and says when the enable file is ignored. Without both, nothing
changes. The link tests no longer read the machine's own enable file.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* MODEM-PLAN: M6, suspend with the modem online

The plan, the runbook and the results so far, on a second Pixel 7 Pro.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-modem-sit 0.3.37: the cellular default route steps aside for a system sleep

With the modem up and Wi-Fi connected, a system sleep was refused every time on the Pixel 9a: NetworkManager takes Wi-Fi down at logind's announcement, the bearer's metric-700 default route is then the only one, whatever was talking over Wi-Fi sends through the bearer at once, and the modem's link is up when the kernel looks (linux-omarchy-mobile#232's sleep guard).

omamobile-sit-data now listens for logind's PrepareForSleep (a busctl monitor, no new dependency) and takes its default route away when a sleep is announced; the bearer's address stays. After the sleep the route waits for another default route to be back, or ten seconds without one: put back at once it carried a few seconds of traffic at every wake, and the answers ended the next sleeps early. A route that wasn't there (a silent bearer, roaming) is not brought back, and without busctl nothing changes.

* MODEM-PLAN: which boots the NR counts cover, and the merged nr_after_radio_on on this phone

Asked in #701's review: the plan says which boots each count covers, and
the two journal lines from a boot of the merged option.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KgnCmDwY8r4r1jCa2SVYLN

* omamobile-modem 0.1.26: one sleep policy for the inhibitor, with a kernel guard and an owner's opt-out

Whether the phone may sleep with the modem up was two path conditions on
omamobile-modem-inhibit.service and the same two files in the start
script. It is now one script, omamobile-modem-sleep-policy, that both ask:
the unit through ExecCondition= (inhibit: exit 0 holds the lock, 1 skips
it) and the start script through check. Yes needs all of:

- the device package's declaration, /usr/lib/omamobile-modem/suspend-verified
  (device-cheetah only, after MODEM-PLAN M6 passed on the reference 7 Pro
  on 2026-11-14), or the attended runbook's pair from before (the owner's
  modem-suspend-enable beside a device's suspend-runbook);
- no /etc/omamobile/modem-suspend-disable, the owner's opt-out;
- a running kernel whose modem link refuses a sleep early, from a
  PM_SUSPEND_PREPARE notifier, while the link is up
  (linux-omarchy-mobile#232, da171eae4cb7). Without it a sleep with the
  link up is refused only at noirq, and a run of those left mobile data
  dead until a reboot on 2026-11-13. The kernel adds no sysfs attribute or
  module parameter for it and development releases don't order, so the
  policy reads the running kernel's pcie-gs201-cp module file (modinfo -n;
  the start script hasn't loaded it yet) for the notifier's log line or
  its function name. kernel-2026.11.13's module has neither; the M6 test
  kernels' modules have both.

Anything else, an error included, keeps the inhibitor. A policy that
can't run skips the unit (systemd counts a failed exec as a skip), but
the start script's call then fails too, it waits for a lock that never
comes and loads no driver: the phone never sleeps with the modem up by
accident. No other device ships the declaration, so the 9a and the 6 Pro
keep the inhibitor. The tests run the policy for every combination and
the start script with it (old kernel, opt-out, missing policy, the old
pair), and the unit check in place of systemd-analyze condition.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-modem-sit 0.3.40: a device may turn follow_screen on in its drop-in

A device's modem-sit.conf.d file was read for [audio] only. sitd now
also takes [control] follow_screen from it (and nothing else from
[control]: the socket's group stays the owner's), so the Pixel 7 Pro can
tell its modem the screen state by default now that MODEM-PLAN M6 passed
there, with texts and calls arriving and waking the phone with the
screen dark (2026-11-14). A value in /etc/omamobile/modem-sit.conf still
wins, and without a device default it stays off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-device-cheetah 0.1.57: sleep with the modem up on by default (MODEM-PLAN M6)

The maintainer approved it on 2026-11-14 ("approve modem sleep by default
on the 7 Pro"), after the reference phone passed every step of M6: two
sleeps, ten sleeps refused before the freeze with data busy and the ping
unbroken, a text and a call each waking the phone, audio both ways.

The package now ships /usr/lib/omamobile-modem/suspend-verified, the
phone's declaration that omamobile-modem 0.1.26's sleep policy reads, in
place of the runbook marker, and [control] follow_screen = yes in its
modem-sit defaults. No file of the owner's is needed; the policy still
keeps the inhibitor on a kernel without linux-omarchy-mobile#232's early
refusal and where the owner has made /etc/omamobile/modem-suspend-disable.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* MODEM-PLAN, SUSPEND-PLAN, DEVICES: M6 done on the 7 Pro, on by default from kernel-2026.11.15

MODEM-PLAN section 7's status says M6 passed on the reference phone on
2026-11-14 and links SUSPEND-PLAN's record of it; 7.5 says what turns it
on by default (the device's declaration, follow_screen, the sleep policy),
the kernel guard and why it reads the module, the owner's opt-out, and the
check after Updates. SUSPEND-PLAN's status line says the same. DEVICES'
Suspend cell stays "partial", now saying the modem-up gap closes with
kernel-2026.11.15 and these packages; it moves to "works" only after the
release is checked on the phone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* AGENTS: sleep with the modem up is on by default on the 7 Pro with kernel-2026.11.15

The maintainer approved it on 2026-11-14. The suspend-and-modem entry now
says that on the Pixel 7 Pro with a kernel carrying
linux-omarchy-mobile#232 and omamobile-modem 0.1.26 with device-cheetah
0.1.57 the phone sleeps with the modem up, that the sleep policy keeps the
inhibitor on an older kernel, and that the owner can opt out. The rest of
the entry, the 9a's rules among it, stands unchanged for every other
phone, and going round a held inhibitor on a 7 Pro stays the maintainer's
attended test.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* omamobile-shell 0.2.131: above main's 0.2.129 for #555's Mobile network page

#555's page and the page fixes carried in this branch were numbered
0.2.128, which main has since passed (0.2.129), and 0.2.130 is taken by
an open pull request. No code change here.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Hiroyuki Ikegami <ikegam@mixallow.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: W4HO <87742609+W4HO-ham@users.noreply.github.com>
ikegam added a commit to ikegam/omarchy-mobile that referenced this pull request Nov 15, 2026
…fault order

A value that isn't yes or no (nr_after_radio_on = ja) stopped the start
with "Not a boolean" after the attach settings were sent. Now it logs the
value and sets the NR mode as by default, as [control] follow_screen does
in derekross#556. Asked in derekross#701's review.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01KgnCmDwY8r4r1jCa2SVYLN
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants