Commit 7b78f48a authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Bjorn Helgaas

PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition

PCI-SIG has defined Interface FEh for Base Class 0Ch, Sub-Class 03h as "USB
Device (not host controller)".  It is already being used in various USB
device controller drivers for matching, so add PCI_CLASS_SERIAL_USB_DEVICE
and use it.
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent caf02abf
...@@ -438,7 +438,7 @@ static void quirk_amd_nl_class(struct pci_dev *pdev) ...@@ -438,7 +438,7 @@ static void quirk_amd_nl_class(struct pci_dev *pdev)
u32 class = pdev->class; u32 class = pdev->class;
/* Use "USB Device (not host controller)" class */ /* Use "USB Device (not host controller)" class */
pdev->class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe; pdev->class = PCI_CLASS_SERIAL_USB_DEVICE;
dev_info(&pdev->dev, "PCI class overridden (%#08x -> %#08x) so dwc3 driver can claim this instead of xhci\n", dev_info(&pdev->dev, "PCI class overridden (%#08x -> %#08x) so dwc3 driver can claim this instead of xhci\n",
class, pdev->class); class, pdev->class);
} }
......
...@@ -3397,7 +3397,7 @@ static int udc_pci_probe( ...@@ -3397,7 +3397,7 @@ static int udc_pci_probe(
static const struct pci_device_id pci_id[] = { static const struct pci_device_id pci_id[] = {
{ {
PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x2096), PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x2096),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe, .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = 0xffffffff, .class_mask = 0xffffffff,
}, },
{}, {},
......
...@@ -1846,7 +1846,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1846,7 +1846,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static const struct pci_device_id pci_ids[] = { { static const struct pci_device_id pci_ids[] = { {
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe), .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = ~0, .class_mask = ~0,
.vendor = 0x102f, /* Toshiba */ .vendor = 0x102f, /* Toshiba */
.device = 0x0107, /* this UDC */ .device = 0x0107, /* this UDC */
......
...@@ -3735,7 +3735,7 @@ static void net2280_shutdown(struct pci_dev *pdev) ...@@ -3735,7 +3735,7 @@ static void net2280_shutdown(struct pci_dev *pdev)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static const struct pci_device_id pci_ids[] = { { static const struct pci_device_id pci_ids[] = { {
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe), .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = ~0, .class_mask = ~0,
.vendor = PCI_VENDOR_ID_PLX_LEGACY, .vendor = PCI_VENDOR_ID_PLX_LEGACY,
.device = 0x2280, .device = 0x2280,
...@@ -3743,7 +3743,7 @@ static const struct pci_device_id pci_ids[] = { { ...@@ -3743,7 +3743,7 @@ static const struct pci_device_id pci_ids[] = { {
.subdevice = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
.driver_data = PLX_LEGACY | PLX_2280, .driver_data = PLX_LEGACY | PLX_2280,
}, { }, {
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe), .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = ~0, .class_mask = ~0,
.vendor = PCI_VENDOR_ID_PLX_LEGACY, .vendor = PCI_VENDOR_ID_PLX_LEGACY,
.device = 0x2282, .device = 0x2282,
...@@ -3752,7 +3752,7 @@ static const struct pci_device_id pci_ids[] = { { ...@@ -3752,7 +3752,7 @@ static const struct pci_device_id pci_ids[] = { {
.driver_data = PLX_LEGACY, .driver_data = PLX_LEGACY,
}, },
{ {
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe), .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = ~0, .class_mask = ~0,
.vendor = PCI_VENDOR_ID_PLX, .vendor = PCI_VENDOR_ID_PLX,
.device = 0x3380, .device = 0x3380,
...@@ -3761,7 +3761,7 @@ static const struct pci_device_id pci_ids[] = { { ...@@ -3761,7 +3761,7 @@ static const struct pci_device_id pci_ids[] = { {
.driver_data = PLX_SUPERSPEED, .driver_data = PLX_SUPERSPEED,
}, },
{ {
.class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe), .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = ~0, .class_mask = ~0,
.vendor = PCI_VENDOR_ID_PLX, .vendor = PCI_VENDOR_ID_PLX,
.device = 0x3382, .device = 0x3382,
......
...@@ -3234,22 +3234,22 @@ static const struct pci_device_id pch_udc_pcidev_id[] = { ...@@ -3234,22 +3234,22 @@ static const struct pci_device_id pch_udc_pcidev_id[] = {
{ {
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC), PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe, .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = 0xffffffff, .class_mask = 0xffffffff,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC), PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe, .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = 0xffffffff, .class_mask = 0xffffffff,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7213_IOH_UDC), PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7213_IOH_UDC),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe, .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = 0xffffffff, .class_mask = 0xffffffff,
}, },
{ {
PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7831_IOH_UDC), PCI_DEVICE(PCI_VENDOR_ID_ROHM, PCI_DEVICE_ID_ML7831_IOH_UDC),
.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe, .class = PCI_CLASS_SERIAL_USB_DEVICE,
.class_mask = 0xffffffff, .class_mask = 0xffffffff,
}, },
{ 0 }, { 0 },
......
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
#define PCI_CLASS_SERIAL_USB_OHCI 0x0c0310 #define PCI_CLASS_SERIAL_USB_OHCI 0x0c0310
#define PCI_CLASS_SERIAL_USB_EHCI 0x0c0320 #define PCI_CLASS_SERIAL_USB_EHCI 0x0c0320
#define PCI_CLASS_SERIAL_USB_XHCI 0x0c0330 #define PCI_CLASS_SERIAL_USB_XHCI 0x0c0330
#define PCI_CLASS_SERIAL_USB_DEVICE 0x0c03fe
#define PCI_CLASS_SERIAL_FIBER 0x0c04 #define PCI_CLASS_SERIAL_FIBER 0x0c04
#define PCI_CLASS_SERIAL_SMBUS 0x0c05 #define PCI_CLASS_SERIAL_SMBUS 0x0c05
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment