From 0c31a8b000ec36aed9f9c92cb0c478fb00226c8c Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Tue, 3 Mar 2015 10:21:54 +0000 Subject: [PATCH] Add quirk for USB 3.0 controllers which don't support 64-bit DMA. MFC after: 3 days Submitted by: Gary Jennejohn --- sys/dev/usb/controller/xhci_pci.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 98218143119e..c2367f4c4a45 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -180,6 +180,7 @@ xhci_pci_attach(device_t self) { struct xhci_softc *sc = device_get_softc(self); int count, err, rid; + uint8_t usedma32; rid = PCI_XHCI_CBMEM; sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, @@ -192,7 +193,17 @@ xhci_pci_attach(device_t self) sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); sc->sc_io_size = rman_get_size(sc->sc_io_res); - if (xhci_init(sc, self, 0)) { + /* check for USB 3.0 controllers which don't support 64-bit DMA */ + switch (pci_get_devid(self)) { + case 0x01941033: /* NEC uPD720200 USB 3.0 controller */ + usedma32 = 1; + break; + default: + usedma32 = 0; + break; + } + + if (xhci_init(sc, self, usedma32)) { device_printf(self, "Could not initialize softc\n"); bus_release_resource(self, SYS_RES_MEMORY, PCI_XHCI_CBMEM, sc->sc_io_res);