From: Andre Eikmeyer <dev@deq.rocks>
To: Arend van Spriel <arend.vanspriel@broadcom.com>,
Jakub Kicinski <kuba@kernel.org>
Cc: Aditya Garg <gargaditya08@live.com>,
kernel test robot <lkp@intel.com>,
oe-kbuild-all@lists.linux.dev, linux-wireless@vger.kernel.org,
brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com,
linux-kernel@vger.kernel.org, Andre Eikmeyer <dev@deq.rocks>
Subject: [PATCH v2] wifi: brcmfmac: handle missing D3 ACK on BCM4377 T2 Macs
Date: Thu, 1 Oct 2026 10:53:08 +0200 [thread overview]
Message-ID: <20261001085308.1688049-1-dev@deq.rocks> (raw)
In-Reply-To: <20260918213014.1890677-1-dev@deq.rocks>
BCM4377 on the affected T2 Macs does not acknowledge HOST_D3_INFORM.
The current PCIe suspend callback treats this as fatal and aborts system
suspend.
When this happens on BCM4377, mask the mailbox interrupt, preserve the
bus-down state, and let generic PCI/ACPI suspend proceed. On resume the
existing recovery path tears down and probes the device again instead of
relying on a D0 mailbox transaction.
Tested-on: MacBookAir9,1, MacBookPro15,4, MacBookPro16,3
Signed-off-by: Andre Eikmeyer <dev@deq.rocks>
---
Changes in v2:
- Drop the redundant DMI allowlist; BCM4377 is Apple-exclusive and only
appears in the three affected MacBook models.
- Keep the device check inside CONFIG_PM, fixing the CONFIG_PM=n unused
function warning reported by the kernel test robot.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index 55f4d7b97..e2e050395 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -2652,11 +2652,18 @@ static int brcmf_pcie_pm_enter_D3(struct device *dev)
wait_event_timeout(devinfo->mbdata_resp_wait, devinfo->mbdata_completed,
BRCMF_PCIE_MBDATA_TIMEOUT);
if (!devinfo->mbdata_completed) {
+ if (devinfo->pdev->device == BRCM_PCIE_4377_DEVICE_ID) {
+ dev_info(dev, "D3 ACK missing; masking PCIe mailbox interrupt\n");
+ brcmf_pcie_intr_disable(devinfo);
+ goto done;
+ }
+
brcmf_err(bus, "Timeout on response for entering D3 substate\n");
brcmf_bus_change_state(bus, BRCMF_BUS_UP);
return -EIO;
}
+done:
devinfo->state = BRCMFMAC_PCIE_STATE_DOWN;
return 0;
base-commit: 1631d79ae57dce2c5f88ad278307028638a8b4d9
--
2.55.0
next prev parent reply other threads:[~2026-10-01 8:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-18 21:30 [PATCH] wifi: brcmfmac: handle missing D3 ACK on BCM4377 T2 Macs Andre Eikmeyer
2026-09-19 22:05 ` Aditya Garg
2026-09-23 11:41 ` kernel test robot
2026-10-01 8:53 ` Andre Eikmeyer [this message]
2026-10-04 12:28 ` [PATCH v2] " Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261001085308.1688049-1-dev@deq.rocks \
--to=dev@deq.rocks \
--cc=arend.vanspriel@broadcom.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211@lists.linux.dev \
--cc=gargaditya08@live.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lkp@intel.com \
--cc=oe-kbuild-all@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.