Skip to content

Fix USB IRQ storm on R4 Pro when the CN15 M.2 slot is empty#204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frank-w merged 1 commit into from
Jul 30, 2026
Merged

Fix USB IRQ storm on R4 Pro when the CN15 M.2 slot is empty #204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion drivers/clk/mediatek/clk-mt7988-infracfg.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,7 +229,17 @@ static const struct mtk_gate infra_clks[] = {
CLK_IS_CRITICAL),
GATE_INFRA3_FLAGS(CLK_INFRA_USB_FRMCNT_CK_P1, "infra_usb_frmcnt_ck_p1", "usb_frmcnt_p1_sel",
9, CLK_IS_CRITICAL),
GATE_INFRA3(CLK_INFRA_USB_PIPE, "infra_usb_pipe", "sspxtp_sel", 10),
/*
* Reference clock of the U3/PCIe combo serdes (xphyu3port0). The lane
* is shared between ssusb0 and pcie2, but only the PHY consumer that
* claims it holds this gate. On boards where pcie2 owns the lane, a
* failed pcie2 probe (e.g. empty M.2 slot) calls phy_exit() and gates
* this clock while ssusb0 still has a live SuperSpeed root hub on the
* same PHY, which wedges the shared SSUSB interrupt. CCF cannot model
* the cross-IP sharing, so keep the gate on.
*/
GATE_INFRA3_FLAGS(CLK_INFRA_USB_PIPE, "infra_usb_pipe", "sspxtp_sel", 10,
CLK_IS_CRITICAL),
GATE_INFRA3(CLK_INFRA_USB_PIPE_CK_P1, "infra_usb_pipe_ck_p1", "usb_phy_sel", 11),
GATE_INFRA3(CLK_INFRA_USB_UTMI, "infra_usb_utmi", "top_xtal", 12),
GATE_INFRA3(CLK_INFRA_USB_UTMI_CK_P1, "infra_usb_utmi_ck_p1", "top_xtal", 13),
Expand Down