svn commit: r289030 - head/sys/dev/usb/controller

[Kevin Lo]

Author: kevlo
Date: Thu Oct  8 15:13:57 2015
New Revision: 289030
URL: https://svnweb.freebsd.org/changeset/base/289030

Log:
  Add support for Fresco Logic USB 3.0 host controller.
  
  Fresco Logic hosts advertise MSI, but fail to actually generate MSI
  interrupts.  We have to disable MSI use.
  
  Reviewed by:	hselasky

Modified:
  head/sys/dev/usb/controller/xhci_pci.c

Modified: head/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci_pci.c	Thu Oct  8 13:39:27 2015	(r289029)
+++ head/sys/dev/usb/controller/xhci_pci.c	Thu Oct  8 15:13:57 2015	(r289030)
@@ -98,13 +98,16 @@ xhci_pci_match(device_t self)
 	case 0x01941033:
 		return ("NEC uPD720200 USB 3.0 controller");
 
+	case 0x10001b73:
+		return ("Fresco Logic FL1000G USB 3.0 controller");
+
 	case 0x10421b21:
 		return ("ASMedia ASM1042 USB 3.0 controller");
 	case 0x11421b21:
 		return ("ASMedia ASM1042A USB 3.0 controller");
 
 	case 0x0f358086:
-		return ("Intel Intel BayTrail USB 3.0 controller");
+		return ("Intel BayTrail USB 3.0 controller");
 	case 0x9c318086:
 	case 0x1e318086:
 		return ("Intel Panther Point USB 3.0 controller");
@@ -184,7 +187,8 @@ xhci_pci_attach(device_t self)
 {
 	struct xhci_softc *sc = device_get_softc(self);
 	int count, err, rid;
-	uint8_t usedma32;
+	uint8_t usemsi = 1;
+	uint8_t usedma32 = 0;
 
 	rid = PCI_XHCI_CBMEM;
 	sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid,
@@ -203,6 +207,10 @@ xhci_pci_attach(device_t self)
 		/* Don't use 64-bit DMA on these controllers. */
 		usedma32 = 1;
 		break;
+	case 0x10001b73:	/* FL1000G */
+		/* Fresco Logic host doesn't support MSI. */
+		usemsi = 0;
+		break;
 	case 0x0f358086:	/* BayTrail */
 	case 0x9c318086:	/* Panther Point */
 	case 0x1e318086:	/* Panther Point */
@@ -214,9 +222,6 @@ xhci_pci_attach(device_t self)
 		 */
 		sc->sc_port_route = &xhci_pci_port_route;
 		sc->sc_imod_default = XHCI_IMOD_DEFAULT_LP;
-		/* FALLTHROUGH */
-	default:
-		usedma32 = 0;
 		break;
 	}
 
@@ -232,7 +237,7 @@ xhci_pci_attach(device_t self)
 	usb_callout_init_mtx(&sc->sc_callout, &sc->sc_bus.bus_mtx, 0);
 
 	rid = 0;
-	if (xhci_use_msi) {
+	if (xhci_use_msi && usemsi) {
 		count = 1;
 		if (pci_alloc_msi(self, &count) == 0) {
 			if (bootverbose)