]> git.ipfire.org Git - thirdparty/kernel/stable.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>
Sat, 6 Dec 2025 21:27:36 +0000 (06:27 +0900)
commit 40f8d17eed7533ed2bbb5e3cc680049b19411b2e upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/core.c

index 8002c23a5a02acb8f3e87b2662a53998a4cf4f5c..839514d7f3c7fd54baefb2f872166d1993fcaaa6 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>
@@ -2240,7 +2241,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)