]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drivers/usb/dwc3: fix PCI parent check
authorJamie Iles <jamie.iles@oss.qualcomm.com>
Fri, 7 Nov 2025 10:44:37 +0000 (10:44 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Nov 2025 01:56:25 +0000 (10:56 +0900)
The sysdev_is_parent check was being used to infer PCI devices that have
the DMA mask set from the PCI capabilities, but sysdev_is_parent is also
used for non-PCI ACPI devices in which case the DMA mask would be the
bus default or as set by the _DMA method.

Without this fix the DMA mask would default to 32-bits and so allocation
would fail if there was no DRAM below 4GB.

Fixes: 47ce45906ca9 ("usb: dwc3: leave default DMA for PCI devices")
Cc: stable <stable@kernel.org>
Signed-off-by: Jamie Iles <jamie.iles@oss.qualcomm.com>
Signed-off-by: Punit Agrawal <punit.agrawal@oss.qualcomm.com>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://patch.msgid.link/20251107104437.1602509-1-punit.agrawal@oss.qualcomm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/core.c

index ae140c356295c03df3982ff4fa95f8638296e52d..c2ce2f5e60a19ce207551ef7681737fd9e91a70a 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/of.h>
 #include <linux/of_graph.h>
 #include <linux/acpi.h>
+#include <linux/pci.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pinctrl/devinfo.h>
 #include <linux/reset.h>
@@ -2241,7 +2242,7 @@ int dwc3_core_probe(const struct dwc3_probe_data *data)
        dev_set_drvdata(dev, dwc);
        dwc3_cache_hwparams(dwc);
 
-       if (!dwc->sysdev_is_parent &&
+       if (!dev_is_pci(dwc->sysdev) &&
            DWC3_GHWPARAMS0_AWIDTH(dwc->hwparams.hwparams0) == 64) {
                ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));
                if (ret)