Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25f9656c authored by Vicki Pfau's avatar Vicki Pfau Committed by Greg Kroah-Hartman
Browse files

PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device 

commit 7e6f3b6d2c352b5fde37ce3fed83bdf6172eebd4 upstream.

The AMD VanGogh SoC contains a DesignWare USB3 Dual-Role Device that can be
operated as either a USB Host or a USB Device, similar to on the AMD Nolan
platform.

be6646bf ("PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD
device") added a quirk to let the dwc3 driver claim the Nolan device since
it provides more specific support.

Extend that quirk to include the VanGogh SoC USB3 device.

Link: https://lore.kernel.org/r/20230927202212.2388216-1-vi@endrift.com


Signed-off-by: default avatarVicki Pfau <vi@endrift.com>
[bhelgaas: include be6646bf reference, add stable tag]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org	# v3.19+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af79ea9a

drivers/pci/quirks.c

+6 −3
Original line number Diff line number Diff line
@@ -429,14 +429,15 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS100, quirk_ati_ 
/*

 * In the AMD NL platform, this device ([1022:7912]) has a class code of

 * PCI_CLASS_SERIAL_USB_XHCI (0x0c0330), which means the xhci driver will

 * claim it.

 * claim it. The same applies on the VanGogh platform device ([1022:163a]).

 *

 * But the dwc3 driver is a more specific driver for this device, and we'd

 * prefer to use it instead of xhci. To prevent xhci from claiming the

 * device, change the class code to 0x0c03fe, which the PCI r3.0 spec

 * defines as "USB device (not host controller)". The dwc3 driver can then

 * claim it based on its Vendor and Device ID.

 */

static void quirk_amd_nl_class(struct pci_dev *pdev)

static void quirk_amd_dwc_class(struct pci_dev *pdev)

{

	u32 class = pdev->class;
@@ -446,7 +447,9 @@ static void quirk_amd_nl_class(struct pci_dev *pdev) 
		 class, pdev->class);

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB,

		quirk_amd_nl_class);

		quirk_amd_dwc_class);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VANGOGH_USB,

		quirk_amd_dwc_class);



/*

 * Let's make the southbridge information explicit instead

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ 
#define PCI_DEVICE_ID_AMD_16H_NB_F4	0x1534

#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583

#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584

#define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a

#define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703

#define PCI_DEVICE_ID_AMD_LANCE		0x2000

#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001