Commit 40f8d17e authored by Jamie Iles's avatar Jamie Iles Committed by Greg Kroah-Hartman
Browse files

drivers/usb/dwc3: fix PCI parent check 



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: 47ce4590 ("usb: dwc3: leave default DMA for PCI devices")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarJamie Iles <jamie.iles@oss.qualcomm.com>
Signed-off-by: default avatarPunit Agrawal <punit.agrawal@oss.qualcomm.com>
Acked-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://patch.msgid.link/20251107104437.1602509-1-punit.agrawal@oss.qualcomm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41e99fe2

drivers/usb/dwc3/core.c

+2 −1
Original line number Diff line number Diff line
@@ -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)