From: "Derek J. Clark" <derekjohn.clark@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: "Pierre-Loup A . Griffais" <pgriffais@valvesoftware.com>,
"Derek J . Clark" <derekjohn.clark@gmail.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] pci: quirks: Disable native PCIe hotplug on MSI Claw A8 root bridge
Date: Thu, 6 Aug 2026 12:04:39 -0700 [thread overview]
Message-ID: <20260806190439.12022-1-derekjohn.clark@gmail.com> (raw)
The MSI Claw A8 (MS-1T8K) hard-locks on resume from s2idle whenever an
SD/MMC card is present in the onboard Realtek RTS525A card reader
(10ec:525a), which sits behind root port 0000:00:02.2. The reader's
PCIe endpoint is fixed/soldered and not user-hotpluggable.
Firmware advertises this root port as PCIe hotplug-capable, and _OSC
grants the OS native hotplug control. When native hotplug is OS-owned,
resuming from s2idle races the port's hotplug/PME resume handling
against the RTS525A's own resume sequence when a card is present,
hard-locking the system.
Two kernel command line parameters were confirmed to prevent the hang:
pcie_aspm=off and pcie_ports=compat. Both stop the OS from running
its own hotplug/PME resume path against this port. The former does
so by dropping _OSC negotiation during boot, skipping the path that
enables PCIeHotPlug. The latter prevents the PME service resume
handling by aborting registration of the ports native services. Testing
different kernel boot commands, including pciehp=off and pcie_pme=off
did not resolve the issue. AER, DPC, SHPC, and LTR flags were not tested
because the hardware reports that the platform doesn't support those
features.
This quirk implements as narrow a fix as possible, clearing
native_pcie_hotplug on the host bridge, scoped by DMI board name
and this root port's bus/device/function, so the port driver never
registers a native hotplug service against it. As native_pcie_hotplug
is a struct pci_host_bridge field shared by every port under this root's
domain I also verified this to be the only slot under this root bridge
reporting HotPlug+.
SD card insertion is handled entirely by rtsx_pci's own card-detect logic,
so is unaffected by this quirk.
Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
---
drivers/pci/quirks.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 6501c949c5b7..8218f423fd2a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -6420,3 +6420,29 @@ static void pci_mask_replay_timer_timeout(struct pci_dev *pdev)
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9750, pci_mask_replay_timer_timeout);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_GLI, 0x9755, pci_mask_replay_timer_timeout);
#endif
+
+/*
+ * The MSI Claw A8 firmware advertises native PCIe hotplug support for
+ * this root bridge, but native hotplug handling causes resume failures.
+ * Prevent the PCIe port driver from claiming native hotplug ownership.
+ */
+static void quirk_claw_a8_no_native_hotplug(struct pci_dev *pdev)
+{
+ struct pci_host_bridge *bridge;
+
+ if (!dmi_match(DMI_BOARD_NAME, "MS-1T8K"))
+ return;
+
+ if (pdev->bus->number != 0 ||
+ PCI_SLOT(pdev->devfn) != 2 ||
+ PCI_FUNC(pdev->devfn) != 2)
+ return;
+
+ bridge = pci_find_host_bridge(pdev->bus);
+ if (!bridge)
+ return;
+ dev_info(&pdev->dev, "disabling native PCIe hotplug\n");
+ bridge->native_pcie_hotplug = false;
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x150b,
+ quirk_claw_a8_no_native_hotplug);
--
2.55.0
next reply other threads:[~2026-08-06 19:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 19:04 Derek J. Clark [this message]
2026-08-06 19:19 ` [PATCH] pci: quirks: Disable native PCIe hotplug on MSI Claw A8 root bridge sashiko-bot
2026-08-06 19:38 ` Derek John Clark
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=20260806190439.12022-1-derekjohn.clark@gmail.com \
--to=derekjohn.clark@gmail.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=pgriffais@valvesoftware.com \
/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.