diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-04-27 15:41:44 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-04-27 15:41:44 +0000 |
| commit | d2748c80915f7c5d0ad7a2e87c8fa664dd5bc862 (patch) | |
| tree | c05cd12c858d13849f5a594e73f251d81103f819 | |
| parent | a864055badcada3890596517162b15398bd5c1c3 (diff) | |
| download | FreeBSD-src-d2748c80915f7c5d0ad7a2e87c8fa664dd5bc862.zip FreeBSD-src-d2748c80915f7c5d0ad7a2e87c8fa664dd5bc862.tar.gz | |
Setting the IMOD value below 0x3F8 can cause IRQ lockups in the Intel
LynxPoint USB 3.0 controllers found in MacBookPro 2013's.
MFC after: 2 days
Tested by: Huang Wen Hui <huanghwh@gmail.com>
| -rw-r--r-- | sys/dev/usb/controller/xhci.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/controller/xhci.h | 1 | ||||
| -rw-r--r-- | sys/dev/usb/controller/xhci_pci.c | 1 | ||||
| -rw-r--r-- | sys/dev/usb/controller/xhcireg.h | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 2764207..5092cc9 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -495,8 +495,12 @@ xhci_start_controller(struct xhci_softc *sc) XWRITE4(sc, runt, XHCI_ERSTSZ(0), XHCI_ERSTS_SET(temp)); + /* Check if we should use the default IMOD value */ + if (sc->sc_imod_default == 0) + sc->sc_imod_default = XHCI_IMOD_DEFAULT; + /* Setup interrupt rate */ - XWRITE4(sc, runt, XHCI_IMOD(0), XHCI_IMOD_DEFAULT); + XWRITE4(sc, runt, XHCI_IMOD(0), sc->sc_imod_default); usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res); diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h index c63632b..b000e4f 100644 --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -481,6 +481,7 @@ struct xhci_softc { uint16_t sc_erst_max; uint16_t sc_event_idx; uint16_t sc_command_idx; + uint16_t sc_imod_default; uint8_t sc_event_ccs; uint8_t sc_command_ccs; diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 7e03b19..dc5a6e9 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -242,6 +242,7 @@ xhci_pci_attach(device_t self) case 0x1e318086: /* Panther Point */ case 0x8c318086: /* Lynx Point */ sc->sc_port_route = &xhci_pci_port_route; + sc->sc_imod_default = XHCI_IMOD_DEFAULT_LP; break; default: break; diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h index a130f65..bd1d635 100644 --- a/sys/dev/usb/controller/xhcireg.h +++ b/sys/dev/usb/controller/xhcireg.h @@ -166,7 +166,8 @@ #define XHCI_IMOD_IVAL_SET(x) (((x) & 0xFFFF) << 0) /* 250ns unit */ #define XHCI_IMOD_ICNT_GET(x) (((x) >> 16) & 0xFFFF) /* 250ns unit */ #define XHCI_IMOD_ICNT_SET(x) (((x) & 0xFFFF) << 16) /* 250ns unit */ -#define XHCI_IMOD_DEFAULT 0x000001F4U /* 8000 IRQ/second */ +#define XHCI_IMOD_DEFAULT 0x000001F4U /* 8000 IRQs/second */ +#define XHCI_IMOD_DEFAULT_LP 0x000003F8U /* 4000 IRQs/second - LynxPoint */ #define XHCI_ERSTSZ(n) (0x0028 + (0x20 * (n))) /* XHCI event ring segment table size */ #define XHCI_ERSTS_GET(x) ((x) & 0xFFFF) #define XHCI_ERSTS_SET(x) ((x) & 0xFFFF) |
