]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: dwc3: dwc3_power_off_all_roothub_ports: Use ioremap_np when required
authorSven Peter <sven@kernel.org>
Wed, 15 Oct 2025 15:40:42 +0000 (15:40 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Dec 2025 13:03:42 +0000 (14:03 +0100)
commit 5ed9cc71432a8adf3c42223c935f714aac29901b upstream.

On Apple Silicon machines we can't use ioremap() / Device-nGnRE to map most
regions but must use ioremap_np() / Device-nGnRnE whenever
IORESOURCE_MEM_NONPOSTED is set. Make sure this is also done inside
dwc3_power_off_all_roothub_ports to prevent SErrors.

Fixes: 2d2a3349521d ("usb: dwc3: Add workaround for host mode VBUS glitch when boot")
Cc: stable@kernel.org
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Sven Peter <sven@kernel.org>
Link: https://patch.msgid.link/20251015-b4-aplpe-dwc3-v2-2-cbd65a2d511a@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/host.c

index 1c513bf8002ec9ec91b41bfd096cbd0da1dd2d2e..e77fd86d09cf0a36161c20ad3c83f10e67099775 100644 (file)
@@ -37,7 +37,10 @@ static void dwc3_power_off_all_roothub_ports(struct dwc3 *dwc)
 
        /* xhci regs are not mapped yet, do it temporarily here */
        if (dwc->xhci_resources[0].start) {
-               xhci_regs = ioremap(dwc->xhci_resources[0].start, DWC3_XHCI_REGS_END);
+               if (dwc->xhci_resources[0].flags & IORESOURCE_MEM_NONPOSTED)
+                       xhci_regs = ioremap_np(dwc->xhci_resources[0].start, DWC3_XHCI_REGS_END);
+               else
+                       xhci_regs = ioremap(dwc->xhci_resources[0].start, DWC3_XHCI_REGS_END);
                if (!xhci_regs) {
                        dev_err(dwc->dev, "Failed to ioremap xhci_regs\n");
                        return;