Skip to content

Airs: Wi-Fi wake on the M4 Airs, and deep sleep with WoWLAN on - #2662

Open
RyanTheTide wants to merge 4 commits into
integration/aurorafrom
airs-wifibt/j713-wlan-wake
Open

RyanTheTide wants to merge 4 commits into
integration/aurorafrom
airs-wifibt/j713-wlan-wake

Conversation

@RyanTheTide

@RyanTheTide RyanTheTide commented Nov 21, 2026 •

Copy link
Copy Markdown
Contributor

Problem

On the M4 MacBook Airs (J713, J715) Wake-on-WLAN cannot end suspend-to-idle. brcmfmac arms the BCM4388's PCIe MSI as a wake interrupt only when the WLAN node is a wakeup source, and the J713/J715 node is not one. The same gap on the 15-inch M3 Air was fixed in #2581.

Change

  1. wifi: brcmfmac: sleep without WoWLAN when only s2idle can wake: when the wake is the in-band MSI, the PCIe suspend callback refuses every system sleep other than suspend-to-idle with WoWLAN configured, which fails the whole suspend-to-RAM or hibernation attempt while magic-packet WoWLAN is on (the user-space default). The bus is now marked s2idle-only and the cfg80211 suspend callback handles any deeper target like a suspend without WoWLAN (leave the network, power the radio down). Suspend-to-idle keeps WoWLAN.
  2. arm64: dts: apple: t8132-j713-j715: enable WLAN wake: mark &wifi0 in t8132-j713-j715.dtsi as wakeup-source, as t8112-j413/j415 and t8122-j615 already do. The board also has a WLAN WAKE# line on AP GPIO 16, like the J615; it stays undescribed, as on the J615, because the wake that works is the in-band MSI.

Testing

  • J713, lab 7.3.0 kernel with this commit (stock command line): the property is live in the running DT, power/wakeup is enabled on 01:00.0, WoWLAN magic-packet is enabled, Wi-Fi is unchanged (5 GHz TX 295 / RX 253 Mbit/s, WPA3-SAE joins, BSSID roaming, power save on/off), 0 failed units over several warm boots.
  • The same one-line property on the J615 (M3 Air, same BCM4388 MSI wake path), production kernel and Stage 2 with only the DT property added: magic packet sent 30 s into suspend-to-idle ended it at +30.40 / +30.46 / +30.50 s (3/3), wake IRQ brcmf_pcie_intr. Control without the property: the packet did not end the sleep, the RTC alarm woke it at +120 s.
  • make CHECK_DTBS=y apple/t8132-j713.dtb apple/t8132-j715.dtb: no warnings. brcmfmac builds W=1 clean.
  • J713 deep sleep with WoWLAN armed (patch 1), lab deep-sleep kernel: 10/10 deep sleeps completed, Wi-Fi back after each, wowlan still magic-packet afterwards: Airs: Wi-Fi wake on the M4 Airs, and deep sleep with WoWLAN on #2662 (comment)
  • J713 magic-packet wake from suspend-to-idle (patch 2), with phy: apple: atc: admit suspend-to-idle with DWC3 running in device role #2700 so the tethered J713 can enter s2idle: woke at +30.5 / +31.5 s on brcmf_pcie_intr (RTC fallback at +120 s): Airs: Wi-Fi wake on the M4 Airs, and deep sleep with WoWLAN on #2662 (comment)
  • Host tests: run-host-tests.py --only brcmf-suspend 8/8 (control + 7 mutations), --only brcmf 46/46.

Still to run

  • J715: not tested (no unit); it shares the dtsi.
Details for reviewers
  • Without patch 1, a J713 deep-sleep attempt with patch 2 and WoWLAN on fails at the brcmfmac PCIe suspend (brcmf_pcie_pm_enter_D3() returns -EOPNOTSUPP), so the system never sleeps.
  • brcmfmac: brcmf_pcie_request_irq() only calls device_init_wakeup() and sets wowl_irq when the node has wakeup-source and no interrupts; without it bus->wowl_wake falls back to PCI PME, which these Macs do not deliver.
  • J713 b3 kernel without the property: same driver, WoWLAN shows as enabled, but the MSI is never armed for wake.
  • J615 rows: suspend-to-idle with the PMU RTC as the safety alarm at +120 s; magic packets (UDP 9, unicast + subnet broadcast) from a wired host at +30 s; Wi-Fi association survives the sleep (link up 0.01-0.02 s and the gateway answers 0.02 s after resume).

Assisted-by: LLM (Claude:Opus 5.5)

The BCM4388 in the M4 MacBook Airs wakes the host the way it does in
the 15-inch M3 Air: brcmfmac arms the PCIe endpoint's MSI as the wake
interrupt, and only when the WLAN node is a wakeup source. The J713's
node is not one, so a magic packet cannot end s2idle even with WoWLAN
enabled.

Mark the node as a wakeup source, as t8112-j413/j415 and t8122-j615
already do. The board also routes a WLAN WAKE# line to AP GPIO 16, as
the J615 does; it is left undescribed here, like on the J615.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
On the Apple laptops brcmfmac arms the PCIe endpoint's MSI as the
Wake-on-WLAN interrupt when the WLAN node is a DT wakeup source. That
MSI can only wake the host while the link stays up, so the PCIe
suspend callback refuses every system sleep other than suspend-to-idle
with -EOPNOTSUPP once WoWLAN is configured. With magic-packet WoWLAN
enabled, as user space does by default, that refusal fails the whole
suspend-to-RAM (and hibernation) attempt.

Mark such a bus as s2idle-only and, in the cfg80211 suspend callback,
handle any other target like a suspend without WoWLAN: leave the
network and let the firmware power down. Suspend-to-idle keeps WoWLAN
as before. The PCIe refusal stays as a guard.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
@RyanTheTide RyanTheTide changed the title arm64: dts: apple: t8132-j713-j715: enable WLAN wake Airs: Wi-Fi wake on the M4 Airs, and deep sleep with WoWLAN on Nov 21, 2026
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Deep-sleep row on the J615 (M3 Air 15, T8122, BCM4388, wifi0 wakeup source, magic-packet WoWLAN armed by the image's default) with this PR's brcmfmac commit (b5f37f8) on a T8122 deep-sleep trial kernel:

  • Deep (firmware) sleep, dry run: brcmf_cfg80211_suspend: WoWLAN wakes only from suspend-to-idle here, sleeping without it. brcmfmac no longer returns -EOPNOTSUPP, and the sleep driver reports every check passed. Without the commit, the same boot path failed in dpm_suspend with brcmf_pcie_pm_enter_D3 returns -95.
  • After the resume: gateway ping in 2 s, WoWLAN config still magic packet.
  • s2idle on the same boot: rc=0, gateway ping in 1 s (WoWLAN kept for s2idle as before).

The T8122 sleep itself doesn't complete a power-down yet (see #2572), so this covers suspend and resume through brcmfmac's deep path, not a real wake.

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change is small and the shape is right. An in-band MSI can't wake the host once the link goes down, so a sleep deeper than suspend-to-idle drops WoWLAN, the way it would without WoWLAN, instead of failing the whole suspend with brcmf_pcie_pm_enter_D3 returns -95. The flag is cleared with the IRQ in brcmf_pcie_release_irq(), and s2idle keeps WoWLAN as before. The J615 row shows both paths.

Before this leaves draft:

  1. host-tests fails (run 44865785227): brcmf-suspend-tests exits 1 in the control case and in all six mutations. The harness likely needs the new wowl_s2idle_only field, pm_suspend_target_state and bphy_info_once stubs. Since even the control fails, the harness itself is out of step with the driver, not catching a mutation.
  2. Reach: wowl_s2idle_only is set wherever brcmfmac uses the MSI wake path, so every brcmfmac Mac that takes the firmware sleep loses WoWLAN for it, not only the Airs. T8132 (the M4 mini as well as the Airs) and any deep-sleep brcmfmac Mac take this path. Without the commit that suspend fails outright, as on the J615, so this should only turn a failed sleep into a working one. Please confirm with one non-T8122 deep sleep with WoWLAN armed, the M4 mini or J713 if it can, showing the sleep completes, the network comes back, and wowlan is still magic-packet after the resume.
  3. The J713/J715 wakeup-source (the "Wi-Fi wake on the M4 Airs" half): add one J713 s2idle row where a magic packet actually wakes the Mac. The J615 row covers the deep path's suspend and resume, not a wake.

Assisted-by: LLM (Claude:Opus 5.5)

The brcmfmac suspend harness no longer compiled against the driver:
struct brcmf_bus gained wowl_s2idle_only and brcmf_cfg80211_suspend()
now logs through bphy_info_once(), whose stub referenced a drvr the
extracted function does not have. Even the control case failed.

Add the field to the stub bus, give bphy_info_once() the driver's
argument shape, and cover the new behaviour: with magic-packet WoWLAN
on an s2idle-only bus, a deeper sleep target leaves the network as a
suspend without WoWLAN does, while suspend-to-idle, or a bus with a
real wake line, keeps WoWLAN. A new wowl-s2idle-only mutation, which
drops that check, must be killed.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Item 1 (host-tests) fixed in cf3fae5, a new commit on top (no force push).

The harness was out of step with the driver, as you said: the stub struct brcmf_bus had no wowl_s2idle_only, and the bphy_info_once() stub referenced a drvr that the extracted brcmf_cfg80211_suspend() doesn't have, so the control case didn't even compile. The commit adds the field, gives the stub the driver's argument shape, and adds 4 cases for the new branch: on an s2idle-only bus, a deeper target with magic-packet WoWLAN suspends without WoWLAN (WoWLAN turned off on the bus, suspend returns 0). Suspend-to-idle, or a bus with a real wake line, keeps WoWLAN. A new wowl-s2idle-only mutation that removes the check has to be killed.

Local run on the buildbox: run-host-tests.py --only brcmf-suspend 8/8 (control passes with 37 cases, all 7 mutations killed), --only brcmf 46/46.

Items 2 and 3 need a non-T8122 Mac (M4 mini or J713): deep sleep with WoWLAN armed, and a magic-packet s2idle wake on the J713. They are queued with the J713 side. The J615 can't stand in for either.

Assisted-by: LLM (Claude:Opus 5.5)

@RyanTheTide

RyanTheTide commented Nov 21, 2026 •

Copy link
Copy Markdown
Contributor Author

Status of items 2 and 3 (item 1 is fixed in cf3fae5):

  • Item 3 (J713 s2idle, woken by a magic packet): the J713 cannot enter s2idle on its current kernel. Suspend is refused while the tether port's dwc3 is a USB device (genpd_prepare returns -EAGAIN), so this PR can't be the cause. The row (about 3 min: magic packet at +30 s, RTC fallback at +120 s) runs as soon as that is fixed.
  • Item 2 (non-T8122 deep sleep with WoWLAN armed): the J713 deep sleep currently hangs in the platform stage. The prime suspect is the Thunderbolt NHI suspend path, not brcmfmac, and pm_test=devices passes on that kernel. The full deep row (sleep completes, network comes back, wowlan still magic-packet after resume) runs once that hang is fixed.

The PR stays a draft until both rows are posted.

@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Row: deep sleep with WoWLAN armed, M4 MacBook Air (J713), macOS 27.2 stub. Lab kernel = J713 batch-4 + this PR's fix b5f37f8 + the 27.2 deep-sleep fixes (#2660, #2691, #2692).

  • iw phy phy0 wowlan show before: magic packet enabled.
  • 10/10 real deep sleeps (rtc1, 30 s): suspend_stats success 10 / fail 0. Each logs brcmf_cfg80211_suspend: WoWLAN wakes only from suspend-to-idle here, sleeping without it. Before b5f37f8 the same setup was refused at brcmf_pcie_pm_enter_D3 returns -95.
  • After each wake, Wi-Fi reassociates and gets its DHCP lease in about 4 s, and the gateway answers ping. No brcmfmac errors.
  • After the 10 cycles, iw phy phy0 wowlan show still reports magic packet enabled.

The s2idle magic-packet row is still to run: s2idle on this J713 is currently refused by the ATC PHY on its tethered port.

@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Item 3, magic-packet wake from s2idle on the J713 (M4 MacBook Air, T8132, BCM4388), with this PR's wakeup-source in the DT and magic-packet WoWLAN on (image default). The J713 used to refuse s2idle with a computer on its USB-C port; that is fixed separately in #2700. The row ran on a lab kernel = J713 batch 7 (which carries this PR) + that one commit, stock command line:

  • Magic packet sent from another machine on the LAN at +30 s, PMU RTC fallback at +120 s: woke at +30.5 s and +31.5 s, wake IRQ brcmf_pcie_intr both times. Wi-Fi link back 0.01 s and gateway ping 0.02 s after resume. iw phy phy0 wowlan show = magic packet before each run.
  • Plain s2idle 3/3 on the same boot, Wi-Fi back the same way. suspend_stats 9 / 0.
  • Three later sleeps ended early without a wake IRQ. The first event in those sleep windows is the USB-C port's PD controller, after the USB4 link on that port dropped (open, separate from Wi-Fi). Those runs don't count either way.

A correction to the item-2 row above: WoWLAN wakes only from suspend-to-idle here, sleeping without it is an info-once message, so it appears once per boot, not on each of the 10 deep sleeps.

Assisted-by: LLM (Claude:Opus 5.5)

@RyanTheTide
RyanTheTide marked this pull request as ready for review November 21, 2026 14:10
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

No blockers. The s2idle-only state comes from the wake mechanism (MSI wake source without a HOST_WAKE interrupt), not from the machine, and it is cleared with the IRQ. On every brcmfmac Mac using the MSI wake it only turns a refused deep sleep or hibernation with WoWLAN configured into one without WoWLAN. s2idle is unchanged. The J713 10/10 deep-sleep row and the J713 s2idle magic-packet wake (+30.5/+31.5 s on brcmf_pcie_intr) cover the earlier review items, and CI is green at cf3fae5. One suggestion: in brcmf_cfg80211_suspend(), return 1 (after clearing scan_status, as the other refusal branches do) instead of setting wowl = NULL. wiphy_suspend() then runs cfg80211_leave_all() and calls suspend(NULL) itself. With wowl = NULL the driver returns 0, leave_all is skipped, and only station/P2P-client links are torn down, so an AP or P2P-GO interface that is up while WoWLAN is configured is not stopped through cfg80211 before a deep sleep. Not tested yet: J715, hibernation with WoWLAN on, and a deep sleep with a hotspot up.

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed at cf3fae5d99aa.

All three items from the earlier review are satisfied:

  1. host-tests fixed in cf3fae5d (dt-checks and host-tests both green).
  2. Non-T8122 deep sleep with WoWLAN armed: J713 10/10 real deep sleeps (suspend_stats 10/0), Wi-Fi reassociates and pings gateway after each wake, wowlan stays magic-packet.
  3. J713 magic-packet s2idle wake: 2/2 wakes at +30.5/+31.5 s on brcmf_pcie_intr (RTC fallback at +120 s), link back in 0.01 s / ping 0.02 s.

Commits/DCO, PR attribution, and clean hardware-mechanism gating (wakeup-source without interrupts/interrupts-extended, not a chip/board check) all look good.

Blocking finding before approval

  • drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c:5272-5277 — wowl = NULL bypasses cfg80211_leave_all():
    Setting wowl = NULL and falling through to return 0 tells wiphy_suspend() (net/wireless/sysfs.c:105-118) that WoWLAN succeeded, so cfg80211 skips cfg80211_leave_all(rdev), event/work flushing, and the subsequent rdev_suspend(rdev, NULL). That breaks cfg80211's documented WoWLAN-refusal contract and leaves AP / P2P-GO / mesh interfaces unstopped in cfg80211 when the firmware powers down for deep sleep or hibernation.
    Match the other refusal branches in brcmf_cfg80211_suspend() (cfg80211.c:5301-5317): clear cfg->scan_status = 0; and return 1; (and update the new assertion in tools/asahi/brcmf-suspend-tests.py:122-130 to check ret == 1 with !cfg.suspended on only && deep — or test the two-call sequence suspend(&magic) == 1 followed by suspend(NULL) == 0).

Minor / still worth tracking

  • drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c:1288: defensively clear bus->wowl_s2idle_only = false; right alongside bus->wowl_wake = pci_pme_capable(...) in brcmf_pcie_request_irq().
  • Hardware rows: please also note explicit regression counts (0 AVC, 0 failed units) on the J713 deep-sleep/s2idle boot; J715, hibernation with WoWLAN on, and deep sleep with an AP/hotspot up remain untested (the return 1 fix directly addresses the AP/hotspot case).

Assisted-by: LLM (Google:Gemini 4 Neon)

On a bus whose only wake signal is the in-band MSI, a sleep deeper
than suspend-to-idle cannot be woken by the radio, so
brcmf_cfg80211_suspend() dropped the WoWLAN request by setting wowl to
NULL and suspending without it. It then returned 0, which tells
wiphy_suspend() that WoWLAN was configured: cfg80211 skips
cfg80211_leave_all(), the event and work flush and the second
suspend(NULL) call. Only station and P2P-client links were torn down
by the driver, so an AP, P2P-GO or mesh interface stayed up in cfg80211
while the firmware powered down.

Refuse WoWLAN the way the other refusal branches do: clear the scan
status and return 1. cfg80211 then leaves every interface and calls
the driver again with no WoWLAN, which runs the existing non-WoWLAN
suspend.

Also clear wowl_s2idle_only where brcmf_pcie_request_irq() resets
wowl_wake, so a stale value can never outlive the IRQ setup that
derives it.

Update the host harness: with WoWLAN supported, a deeper target on an
s2idle-only bus must return 1 with nothing configured and the scan
status cleared, and the following suspend(NULL) must succeed with
WoWLAN off on the bus. The previous wowl = NULL code fails that case.

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Review at cf3fae5 addressed in 005860b, a new commit on top (no force push).

  • Blocking, wowl = NULL bypasses cfg80211_leave_all(): the s2idle-only branch in brcmf_cfg80211_suspend() (cfg80211.c:5273-5279) now clears cfg->scan_status and returns 1, like the other refusal branches. wiphy_suspend() then runs cfg80211_leave_all(), flushes events and work, and calls suspend(NULL), which takes the existing non-WoWLAN path (WoWLAN off on the bus, links down, MPC on). AP, P2P-GO and mesh interfaces are now stopped through cfg80211 before a deep sleep. The info-once message is unchanged.
  • Test (tools/asahi/brcmf-suspend-tests.py): the stub now lets a case turn on BRCMF_FEAT_WOWL and counts brcmf_configure_wowl() calls. On an s2idle-only bus with a deeper target, suspend(&magic) must return 1 with !cfg.suspended, nothing configured and the scan status cleared, and the following suspend(NULL) must return 0 with WoWLAN off on the bus. s2idle, or a bus with a real wake line, must configure WoWLAN and return 0. The cf3fae5 driver code (wowl = NULL) fails this case.
  • Minor, pcie.c:1288: brcmf_pcie_request_irq() now clears bus->wowl_s2idle_only next to bus->wowl_wake = pci_pme_capable(...) (pcie.c:1289).

Testing on the buildbox: cfg80211.o and pcie.o build with W=1 (arm64, clang) and no warnings. run-host-tests.py --only brcmf: 46/46, with the brcmf-suspend control at 37 cases and all 8 mutations killed. checkpatch --strict: 0 errors, 0 warnings.

Hardware rows still to run on the new head (J713, 27.2, default command line), because the deep path now goes through cfg80211's refusal sequence:

  • deep sleep with WoWLAN armed, several cycles: the sleep completes, Wi-Fi comes back, iw phy phy0 wowlan show still reports magic-packet;
  • s2idle magic-packet wake on brcmf_pcie_intr (packet at +30 s, RTC fallback at +120 s);
  • deep sleep with a hotspot/AP interface up;
  • explicit regression counts on that boot: SELinux enforcing, AVCs, failed units, new kernel errors.

J715 and hibernation with WoWLAN on are still untested.

Assisted-by: LLM (Claude:Opus 5.5)

@RyanTheTide

Copy link
Copy Markdown
Contributor Author

J713 rows at 005860b (13-inch M4 Air, macOS 27.2 stub), on the new head.

The kernel is 7.3.0-aurora-fleet82: integration/aurora f5fae3c plus open heads, including this PR at 005860b. It booted as a one-shot on the default command line with the J713's configured Stage 2. WoWLAN was armed for the whole boot (iw phy phy0 wowlan show: magic packet).

  • s2idle magic-packet wake: suspended with the PMU RTC fallback at +120 s and a magic packet sent from another host at +30 s. It woke at +31.1 s on brcmf_pcie_intr (IRQ 140). The link was back 0.01 s after resume and the gateway answered at 0.02 s.
  • Deep sleep with WoWLAN armed, 3 cycles: rtcwake -d rtc1 -m mem -s 15, with PM: suspend entry (deep) each time.
    • suspend_stats +3 successes, 0 failures.
    • After every wake: Wi-Fi reassociated, the gateway answered 3/3 pings, and iw phy phy0 wowlan show still reported magic packet.
    • Bluetooth scanned 13 to 28 devices after each wake.
  • Counts on that boot:
    • SELinux Enforcing, 0 failed units.
    • Kernel error lines are the existing dwc3 genpd_prepare returns -11 refusals and DCP lines, which are the same on the previous default.
    • There was 1 AVC, from the test harness: systemd tried to execute a helper script under /var/lib directly. Nothing from the kernel or a driver.

Still to run: a deep sleep with a hotspot up, which is the case the new refusal path covers. On this Air, ssh runs over Wi-Fi, so that row needs a wired path or someone at the Mac.

Assisted-by: LLM (Claude:Opus 5.5)

@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Review at 005860b: no blockers.

The blocking item from the cf3fae5 review is fixed. When the bus is s2idle-only and the target is deeper, brcmf_cfg80211_suspend() now clears scan_status and returns 1, the same way the other refusal branches do. wiphy_suspend() therefore takes its refusal path: cfg80211_leave_all(), event/work flush, then suspend(NULL), which runs the ordinary non-WoWLAN branch (brcmf_bus_wowl_config(false), link down, MPC). The minor item is fixed too: brcmf_pcie_request_irq() clears wowl_s2idle_only next to wowl_wake. I found no new problems.

Not blocking, still open from the earlier review: a deep sleep with a hotspot/AP up (the case the return 1 change covers), hibernation with WoWLAN configured, and J715. The J715 picks up wakeup-source through the shared t8132-j713-j715.dtsi.

Full review
  • Read both of Dj's reviews (b5f37f8, cf3fae5) and our comments/rows up to the 005860b J713 row. The cf3fae5 review had one blocker (wowl = NULL skips cfg80211_leave_all()) and one minor item (pcie.c clear). Both are addressed in 005860b.
  • Caller semantics (net/wireless/sysfs.c at head): ret 1 falls through to cfg80211_leave_all() and rdev_suspend(rdev, NULL). The second call skips the new block (wowl == NULL) and reaches exit:, which sets cfg->suspended, so rdev->suspended is set and resume pairs normally. Calling sched-scan stop and abort-scan again in the second call is harmless.
  • Bus side: after suspend(NULL), devinfo->wowl_enabled is false, so brcmf_pcie_pm_enter_D3() no longer hits the -EOPNOTSUPP refusal and takes the plain D3-inform path for deep sleep. s2idle (pm_suspend_target_state == PM_SUSPEND_TO_IDLE) is unchanged.
  • Hibernation: wiphy uses SIMPLE_DEV_PM_OPS, so freeze/poweroff call wiphy_suspend() with pm_suspend_target_state == PM_SUSPEND_ON. That takes the refusal, which is the right outcome for an MSI-only wake.
  • Flag lifetime: set only in the MSI-wake branch of brcmf_pcie_request_irq(), after device_init_wakeup() succeeded. It is cleared at the top of request_irq and in brcmf_pcie_release_irq(), so a re-probe or reset cannot leave it stale. The early-return error paths in request_irq never set it.
  • Reach: the gate is the DT wake mechanism (wakeup-source without interrupts/interrupts-extended, MSI present). There is no chip, board or firmware check. Macs without the property keep wowl_s2idle_only = false and behave as before. SDIO is untouched. No module or cmdline params, no new delays.
  • Commits integration/aurora..005860b (4): only Ryan's Signed-off-by, no other trailers. PR body ends with Assisted-by:. git merge-tree onto integration/aurora 95a13cf is clean.
  • Ran on the buildbox at 005860b: run-host-tests.py --only brcmf 46/46, including the wowl-s2idle-only mutation killed. W=1 arm64 clang build of cfg80211.o and pcie.o (fleet81 config): no warnings.

Assisted-by: LLM (Claude:Opus 5.5)

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