diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-07-16 06:14:41 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-07-16 06:14:41 +0000 |
| commit | 674e4050044671e2b5921d1e342a8dd1de672216 (patch) | |
| tree | 04509544a0f8b9d217362f88cffbe2dc10f7f75d /sys/dev/usb/controller/xhci_pci.c | |
| parent | 7a4991b9439dc80184ccaa530425275469eb9fdb (diff) | |
| download | FreeBSD-src-674e4050044671e2b5921d1e342a8dd1de672216.zip FreeBSD-src-674e4050044671e2b5921d1e342a8dd1de672216.tar.gz | |
Improve support for Intel Lynx Point USB 3.0 controllers by using the
USB 2.0 port mask in addition to the USB 3.0 port mask. The hardware
does not always accept when writing -1U to the port switching
registers.
MFC after: 3 days
Tested by: Huang Wen Hui <huanghwh@gmail.com>
Diffstat (limited to 'sys/dev/usb/controller/xhci_pci.c')
| -rw-r--r-- | sys/dev/usb/controller/xhci_pci.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 3d18d34..f0b789a 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -150,6 +150,8 @@ static int xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear) { uint32_t temp; + uint32_t usb3_mask; + uint32_t usb2_mask; temp = pci_read_config(self, PCI_XHCI_INTEL_USB3_PSSEN, 4) | pci_read_config(self, PCI_XHCI_INTEL_XUSB2PR, 4); @@ -158,10 +160,11 @@ xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear) temp &= ~clear; /* Don't set bits which the hardware doesn't support */ - temp &= pci_read_config(self, PCI_XHCI_INTEL_USB3PRM, 4); + usb3_mask = pci_read_config(self, PCI_XHCI_INTEL_USB3PRM, 4); + usb2_mask = pci_read_config(self, PCI_XHCI_INTEL_USB2PRM, 4); - pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4); - pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4); + pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp & usb3_mask, 4); + pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp & usb2_mask, 4); device_printf(self, "Port routing mask set to 0x%08x\n", temp); |
