* [PATCH] usb: xhci-pci: Add Power handling for Card readers on Apple systems
@ 2026-11-16 23:19 Atharva Tiwari
2026-11-16 23:34 ` sashiko-bot
0 siblings, 1 reply; 2+ messages in thread
From: Atharva Tiwari @ 2026-11-16 23:19 UTC (permalink / raw)
Cc: Atharva Tiwari, Mathias Nyman, Greg Kroah-Hartman,
open list:USB XHCI DRIVER, open list
Add Power handling for Card readers on Apple systems using SPWR
ACPI method, SPWR(1) turns on the card reader, SPWR(0) turns off
the card reader, on newer systems SPWR just write a variable in EC.
On previous systems it writes to GPIO pins.
It also used by the macOS driver with the function
AppleUSB30XHCICardReaderPort::setDevicePower in AppleUSBXHCIPCI.kext.
(This should fix https://bugzilla.kernel.org/show_bug.cgi?id=111201
But thats not confirmed)
(Tested on iMac20,1)
Signed-off-by: Atharva Tiwari <atharvatiwarilinuxdev@gmail.com>
---
drivers/usb/host/xhci-pci.c | 17 +++++++++++++++++
drivers/usb/host/xhci.h | 1 +
2 files changed, 18 insertions(+)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index e278db940..0cbecbbbb 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -15,6 +15,7 @@
#include <linux/reset.h>
#include <linux/suspend.h>
#include <linux/bitfield.h>
+#include <linux/platform_data/x86/apple.h>
#include "xhci.h"
#include "xhci-trace.h"
@@ -517,6 +518,16 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
if (xhci->hci_version >= 0x120)
xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
+ /* On Apple Machine with Card readers, we have to use SPWR(0/1) to turn
+ * off/on the card reader, And on boot the card reader is off, so we turn
+ * it on.
+ */
+ if (x86_apple_machine && ACPI_HANDLE(&pdev->dev) &&
+ acpi_has_method(ACPI_HANDLE(&pdev->dev), "SPWR")) {
+ acpi_execute_simple_method(ACPI_HANDLE(&pdev->dev), "SPWR", 1);
+ xhci->quirks |= XHCI_APPLE_CARD_READER_POWER;
+ }
+
if (xhci->quirks & XHCI_RESET_ON_RESUME)
xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
"QUIRK: Resetting on resume");
@@ -853,6 +864,9 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
/* synchronize irq when using MSI-X */
xhci_msix_sync_irqs(xhci);
+ if (xhci->quirks & XHCI_APPLE_CARD_READER_POWER)
+ acpi_execute_simple_method(ACPI_HANDLE(&pdev->dev), "SPWR", 0);
+
if (ret && (xhci->quirks & XHCI_SSIC_PORT_UNUSED))
xhci_ssic_port_unused_quirk(hcd, false);
@@ -895,6 +909,9 @@ static int xhci_pci_resume(struct usb_hcd *hcd, pm_message_t msg)
if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
xhci_pme_quirk(hcd);
+ if (xhci->quirks & XHCI_APPLE_CARD_READER_POWER)
+ acpi_execute_simple_method(ACPI_HANDLE(&pdev->dev), "SPWR", 1);
+
return xhci_resume(xhci, power_lost, is_auto_resume);
}
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index ec4bfeb48..579ddea52 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1652,6 +1652,7 @@ struct xhci_hcd {
#define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48)
#define XHCI_ETRON_HOST BIT_ULL(49)
#define XHCI_LIMIT_ENDPOINT_INTERVAL_9 BIT_ULL(50)
+#define XHCI_APPLE_CARD_READER_POWER BIT_ULL(51)
unsigned int num_active_eps;
unsigned int limit_active_eps;
--
2.55.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] usb: xhci-pci: Add Power handling for Card readers on Apple systems
2026-11-16 23:19 [PATCH] usb: xhci-pci: Add Power handling for Card readers on Apple systems Atharva Tiwari
@ 2026-11-16 23:34 ` sashiko-bot
0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-16 23:34 UTC (permalink / raw)
To: Atharva Tiwari; +Cc: open list:USB XHCI DRIVER
Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] usb: xhci-pci: build failure when CONFIG_ACPI is disabled
- [Medium] usb: xhci-pci: xhci_pci_suspend() powers off card reader when
suspend fails
--
commit 6b73237773664917a89fc903fc5b335cb19cc8a0
Author: Atharva Tiwari <atharvatiwarilinuxdev@gmail.com>
usb: xhci-pci: Add Power handling for Card readers on Apple systems
This commit adds power handling for card readers on x86 Apple systems by
evaluating the SPWR ACPI method during xhci-pci probe, suspend, and
resume.
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index e278db940a583..0cbecbbbb21b2 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
[ ... ]
> @@ -517,6 +518,16 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
> if (xhci->hci_version >= 0x120)
> xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
>
> + /* On Apple Machine with Card readers, we have to use SPWR(0/1) to turn
> + * off/on the card reader, And on boot the card reader is off, so we turn
> + * it on.
> + */
> + if (x86_apple_machine && ACPI_HANDLE(&pdev->dev) &&
> + acpi_has_method(ACPI_HANDLE(&pdev->dev), "SPWR")) {
> + acpi_execute_simple_method(ACPI_HANDLE(&pdev->dev), "SPWR", 1);
> + xhci->quirks |= XHCI_APPLE_CARD_READER_POWER;
> + }
[Severity: High]
Does calling acpi_execute_simple_method() here and in xhci_pci_suspend()
and xhci_pci_resume() break the build when CONFIG_ACPI is disabled?
include/acpi/acpi_bus.h declares acpi_execute_simple_method() only inside
#ifdef CONFIG_ACPI and provides no stub for !CONFIG_ACPI, whereas
CONFIG_USB_XHCI_PCI does not depend on CONFIG_ACPI.
> @@ -853,6 +864,9 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
> /* synchronize irq when using MSI-X */
> xhci_msix_sync_irqs(xhci);
>
> + if (xhci->quirks & XHCI_APPLE_CARD_READER_POWER)
> + acpi_execute_simple_method(ACPI_HANDLE(&pdev->dev), "SPWR", 0);
> +
> if (ret && (xhci->quirks & XHCI_SSIC_PORT_UNUSED))
> xhci_ssic_port_unused_quirk(hcd, false);
[Severity: Medium]
Should SPWR(0) be skipped when xhci_suspend() returns an error in ret?
If xhci_suspend() fails, suspend_common() aborts the suspend without
calling xhci_pci_resume(), leaving the card reader powered off while the
host controller remains active.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261116231926.5891-1-atharvatiwarilinuxdev@gmail.com?part=1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-16 23:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 23:19 [PATCH] usb: xhci-pci: Add Power handling for Card readers on Apple systems Atharva Tiwari
2026-11-16 23:34 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox