| Message ID | 20200728042408.180529-2-cyrozap@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] usb: xhci: define IDs for various ASMedia host controllers | expand |
Hello! On 7/28/20 7:24 AM, Forest Crossman wrote: > Not all ASMedia host controllers have a device ID that matches its part > number. #define some of these IDs to make it clearer at a glance which > chips require what quirks. > > Signed-off-by: Forest Crossman <cyrozap@gmail.com> > --- > drivers/usb/host/xhci-pci.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 9234c82e70e4..baa5af88ca67 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c [...] > @@ -260,13 +262,13 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) > xhci->quirks |= XHCI_LPM_SUPPORT; > > if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && > - pdev->device == 0x1042) > + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) You shouldn't have un-indented it, blends with the branch below. The 80-column line length limit is history now. :-) > xhci->quirks |= XHCI_BROKEN_STREAMS; > if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && > - pdev->device == 0x1142) > + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) > xhci->quirks |= XHCI_TRUST_TX_LENGTH; > if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && > - pdev->device == 0x2142) > + pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI) > xhci->quirks |= XHCI_NO_64BIT_SUPPORT; > > if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && MBR, Sergei
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 9234c82e70e4..baa5af88ca67 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -57,7 +57,9 @@ #define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba #define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb #define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc +#define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042 #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 +#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 static const char hcd_name[] = "xhci_hcd"; @@ -260,13 +262,13 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_LPM_SUPPORT; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == 0x1042) + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == 0x1142) + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) xhci->quirks |= XHCI_TRUST_TX_LENGTH; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == 0x2142) + pdev->device == PCI_DEVICE_ID_ASMEDIA_2142_XHCI) xhci->quirks |= XHCI_NO_64BIT_SUPPORT; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
Not all ASMedia host controllers have a device ID that matches its part number. #define some of these IDs to make it clearer at a glance which chips require what quirks. Signed-off-by: Forest Crossman <cyrozap@gmail.com> --- drivers/usb/host/xhci-pci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)