2009-04-28 10:57:12 +08:00
|
|
|
|
/*
|
|
|
|
|
* xHCI host controller driver
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2008 Intel Corp.
|
|
|
|
|
*
|
|
|
|
|
* Author: Sarah Sharp
|
|
|
|
|
* Some code borrowed from the Linux EHCI driver.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
|
* for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
|
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
2011-07-19 02:42:00 +08:00
|
|
|
|
#include <linux/gfp.h>
|
2009-04-28 10:57:12 +08:00
|
|
|
|
#include <asm/unaligned.h>
|
|
|
|
|
|
|
|
|
|
#include "xhci.h"
|
|
|
|
|
|
2010-10-14 22:23:03 +08:00
|
|
|
|
#define PORT_WAKE_BITS (PORT_WKOC_E | PORT_WKDISC_E | PORT_WKCONN_E)
|
|
|
|
|
#define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \
|
|
|
|
|
PORT_RC | PORT_PLC | PORT_PE)
|
|
|
|
|
|
2011-10-07 02:54:23 +08:00
|
|
|
|
/* usb 1.1 root hub device descriptor */
|
|
|
|
|
static u8 usb_bos_descriptor [] = {
|
|
|
|
|
USB_DT_BOS_SIZE, /* __u8 bLength, 5 bytes */
|
|
|
|
|
USB_DT_BOS, /* __u8 bDescriptorType */
|
|
|
|
|
0x0F, 0x00, /* __le16 wTotalLength, 15 bytes */
|
|
|
|
|
0x1, /* __u8 bNumDeviceCaps */
|
|
|
|
|
/* First device capability */
|
|
|
|
|
USB_DT_USB_SS_CAP_SIZE, /* __u8 bLength, 10 bytes */
|
|
|
|
|
USB_DT_DEVICE_CAPABILITY, /* Device Capability */
|
|
|
|
|
USB_SS_CAP_TYPE, /* bDevCapabilityType, SUPERSPEED_USB */
|
|
|
|
|
0x00, /* bmAttributes, LTM off by default */
|
|
|
|
|
USB_5GBPS_OPERATION, 0x00, /* wSpeedsSupported, 5Gbps only */
|
|
|
|
|
0x03, /* bFunctionalitySupport,
|
|
|
|
|
USB 3.0 speed only */
|
|
|
|
|
0x00, /* bU1DevExitLat, set later. */
|
|
|
|
|
0x00, 0x00 /* __le16 bU2DevExitLat, set later. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2010-11-30 08:14:37 +08:00
|
|
|
|
static void xhci_common_hub_descriptor(struct xhci_hcd *xhci,
|
|
|
|
|
struct usb_hub_descriptor *desc, int ports)
|
2009-04-28 10:57:12 +08:00
|
|
|
|
{
|
|
|
|
|
u16 temp;
|
|
|
|
|
|
|
|
|
|
desc->bPwrOn2PwrGood = 10; /* xhci section 5.4.9 says 20ms max */
|
|
|
|
|
desc->bHubContrCurrent = 0;
|
|
|
|
|
|
|
|
|
|
desc->bNbrPorts = ports;
|
|
|
|
|
temp = 0;
|
2011-11-22 22:03:36 +08:00
|
|
|
|
/* Bits 1:0 - support per-port power switching, or power always on */
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if (HCC_PPC(xhci->hcc_params))
|
2011-11-22 22:03:36 +08:00
|
|
|
|
temp |= HUB_CHAR_INDV_PORT_LPSM;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
else
|
2011-11-22 22:03:36 +08:00
|
|
|
|
temp |= HUB_CHAR_NO_LPSM;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
/* Bit 2 - root hubs are not part of a compound device */
|
|
|
|
|
/* Bits 4:3 - individual port over current protection */
|
2011-11-22 22:03:36 +08:00
|
|
|
|
temp |= HUB_CHAR_INDV_PORT_OCPM;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
/* Bits 6:5 - no TTs in root ports */
|
|
|
|
|
/* Bit 7 - no port indicators */
|
2011-03-29 10:40:46 +08:00
|
|
|
|
desc->wHubCharacteristics = cpu_to_le16(temp);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
}
|
|
|
|
|
|
2010-11-30 08:14:37 +08:00
|
|
|
|
/* Fill in the USB 2.0 roothub descriptor */
|
|
|
|
|
static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
|
|
|
|
|
struct usb_hub_descriptor *desc)
|
|
|
|
|
{
|
|
|
|
|
int ports;
|
|
|
|
|
u16 temp;
|
|
|
|
|
__u8 port_removable[(USB_MAXCHILDREN + 1 + 7) / 8];
|
|
|
|
|
u32 portsc;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
ports = xhci->num_usb2_ports;
|
|
|
|
|
|
|
|
|
|
xhci_common_hub_descriptor(xhci, desc, ports);
|
2011-11-22 22:03:36 +08:00
|
|
|
|
desc->bDescriptorType = USB_DT_HUB;
|
2010-11-30 08:14:37 +08:00
|
|
|
|
temp = 1 + (ports / 8);
|
2011-11-22 22:03:36 +08:00
|
|
|
|
desc->bDescLength = USB_DT_HUB_NONVAR_SIZE + 2 * temp;
|
2010-11-30 08:14:37 +08:00
|
|
|
|
|
|
|
|
|
/* The Device Removable bits are reported on a byte granularity.
|
|
|
|
|
* If the port doesn't exist within that byte, the bit is set to 0.
|
|
|
|
|
*/
|
|
|
|
|
memset(port_removable, 0, sizeof(port_removable));
|
|
|
|
|
for (i = 0; i < ports; i++) {
|
2012-02-10 06:43:44 +08:00
|
|
|
|
portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
|
2010-11-30 08:14:37 +08:00
|
|
|
|
/* If a device is removable, PORTSC reports a 0, same as in the
|
|
|
|
|
* hub descriptor DeviceRemovable bits.
|
|
|
|
|
*/
|
|
|
|
|
if (portsc & PORT_DEV_REMOVE)
|
|
|
|
|
/* This math is hairy because bit 0 of DeviceRemovable
|
|
|
|
|
* is reserved, and bit 1 is for port 1, etc.
|
|
|
|
|
*/
|
|
|
|
|
port_removable[(i + 1) / 8] |= 1 << ((i + 1) % 8);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ch11.h defines a hub descriptor that has room for USB_MAXCHILDREN
|
|
|
|
|
* ports on it. The USB 2.0 specification says that there are two
|
|
|
|
|
* variable length fields at the end of the hub descriptor:
|
|
|
|
|
* DeviceRemovable and PortPwrCtrlMask. But since we can have less than
|
|
|
|
|
* USB_MAXCHILDREN ports, we may need to use the DeviceRemovable array
|
|
|
|
|
* to set PortPwrCtrlMask bits. PortPwrCtrlMask must always be set to
|
|
|
|
|
* 0xFF, so we initialize the both arrays (DeviceRemovable and
|
|
|
|
|
* PortPwrCtrlMask) to 0xFF. Then we set the DeviceRemovable for each
|
|
|
|
|
* set of ports that actually exist.
|
|
|
|
|
*/
|
|
|
|
|
memset(desc->u.hs.DeviceRemovable, 0xff,
|
|
|
|
|
sizeof(desc->u.hs.DeviceRemovable));
|
|
|
|
|
memset(desc->u.hs.PortPwrCtrlMask, 0xff,
|
|
|
|
|
sizeof(desc->u.hs.PortPwrCtrlMask));
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < (ports + 1 + 7) / 8; i++)
|
|
|
|
|
memset(&desc->u.hs.DeviceRemovable[i], port_removable[i],
|
|
|
|
|
sizeof(__u8));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fill in the USB 3.0 roothub descriptor */
|
|
|
|
|
static void xhci_usb3_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
|
|
|
|
|
struct usb_hub_descriptor *desc)
|
|
|
|
|
{
|
|
|
|
|
int ports;
|
|
|
|
|
u16 port_removable;
|
|
|
|
|
u32 portsc;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
|
ports = xhci->num_usb3_ports;
|
|
|
|
|
xhci_common_hub_descriptor(xhci, desc, ports);
|
2011-11-22 22:03:36 +08:00
|
|
|
|
desc->bDescriptorType = USB_DT_SS_HUB;
|
|
|
|
|
desc->bDescLength = USB_DT_SS_HUB_SIZE;
|
2010-11-30 08:14:37 +08:00
|
|
|
|
|
|
|
|
|
/* header decode latency should be zero for roothubs,
|
|
|
|
|
* see section 4.23.5.2.
|
|
|
|
|
*/
|
|
|
|
|
desc->u.ss.bHubHdrDecLat = 0;
|
|
|
|
|
desc->u.ss.wHubDelay = 0;
|
|
|
|
|
|
|
|
|
|
port_removable = 0;
|
|
|
|
|
/* bit 0 is reserved, bit 1 is for port 1, etc. */
|
|
|
|
|
for (i = 0; i < ports; i++) {
|
|
|
|
|
portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
|
|
|
|
|
if (portsc & PORT_DEV_REMOVE)
|
|
|
|
|
port_removable |= 1 << (i + 1);
|
|
|
|
|
}
|
|
|
|
|
memset(&desc->u.ss.DeviceRemovable,
|
|
|
|
|
(__force __u16) cpu_to_le16(port_removable),
|
|
|
|
|
sizeof(__u16));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void xhci_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
|
|
|
|
|
struct usb_hub_descriptor *desc)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
if (hcd->speed == HCD_USB3)
|
|
|
|
|
xhci_usb3_hub_descriptor(hcd, xhci, desc);
|
|
|
|
|
else
|
|
|
|
|
xhci_usb2_hub_descriptor(hcd, xhci, desc);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2009-04-28 10:57:12 +08:00
|
|
|
|
static unsigned int xhci_port_speed(unsigned int port_status)
|
|
|
|
|
{
|
|
|
|
|
if (DEV_LOWSPEED(port_status))
|
2010-03-05 00:32:30 +08:00
|
|
|
|
return USB_PORT_STAT_LOW_SPEED;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if (DEV_HIGHSPEED(port_status))
|
2010-03-05 00:32:30 +08:00
|
|
|
|
return USB_PORT_STAT_HIGH_SPEED;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
/*
|
|
|
|
|
* FIXME: Yes, we should check for full speed, but the core uses that as
|
|
|
|
|
* a default in portspeed() in usb/core/hub.c (which is the only place
|
2010-03-05 00:32:30 +08:00
|
|
|
|
* USB_PORT_STAT_*_SPEED is used).
|
2009-04-28 10:57:12 +08:00
|
|
|
|
*/
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* These bits are Read Only (RO) and should be saved and written to the
|
|
|
|
|
* registers: 0, 3, 10:13, 30
|
|
|
|
|
* connect status, over-current status, port speed, and device removable.
|
|
|
|
|
* connect status and port speed are also sticky - meaning they're in
|
|
|
|
|
* the AUX well and they aren't changed by a hot, warm, or cold reset.
|
|
|
|
|
*/
|
|
|
|
|
#define XHCI_PORT_RO ((1<<0) | (1<<3) | (0xf<<10) | (1<<30))
|
|
|
|
|
/*
|
|
|
|
|
* These bits are RW; writing a 0 clears the bit, writing a 1 sets the bit:
|
|
|
|
|
* bits 5:8, 9, 14:15, 25:27
|
|
|
|
|
* link state, port power, port indicator state, "wake on" enable state
|
|
|
|
|
*/
|
|
|
|
|
#define XHCI_PORT_RWS ((0xf<<5) | (1<<9) | (0x3<<14) | (0x7<<25))
|
|
|
|
|
/*
|
|
|
|
|
* These bits are RW; writing a 1 sets the bit, writing a 0 has no effect:
|
|
|
|
|
* bit 4 (port reset)
|
|
|
|
|
*/
|
|
|
|
|
#define XHCI_PORT_RW1S ((1<<4))
|
|
|
|
|
/*
|
|
|
|
|
* These bits are RW; writing a 1 clears the bit, writing a 0 has no effect:
|
|
|
|
|
* bits 1, 17, 18, 19, 20, 21, 22, 23
|
|
|
|
|
* port enable/disable, and
|
|
|
|
|
* change bits: connect, PED, warm port reset changed (reserved zero for USB 2.0 ports),
|
|
|
|
|
* over-current, reset, link state, and L1 change
|
|
|
|
|
*/
|
|
|
|
|
#define XHCI_PORT_RW1CS ((1<<1) | (0x7f<<17))
|
|
|
|
|
/*
|
|
|
|
|
* Bit 16 is RW, and writing a '1' to it causes the link state control to be
|
|
|
|
|
* latched in
|
|
|
|
|
*/
|
|
|
|
|
#define XHCI_PORT_RW ((1<<16))
|
|
|
|
|
/*
|
|
|
|
|
* These bits are Reserved Zero (RsvdZ) and zero should be written to them:
|
|
|
|
|
* bits 2, 24, 28:31
|
|
|
|
|
*/
|
|
|
|
|
#define XHCI_PORT_RZ ((1<<2) | (1<<24) | (0xf<<28))
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Given a port state, this function returns a value that would result in the
|
|
|
|
|
* port being in the same state, if the value was written to the port status
|
|
|
|
|
* control register.
|
|
|
|
|
* Save Read Only (RO) bits and save read/write bits where
|
|
|
|
|
* writing a 0 clears the bit and writing a 1 sets the bit (RWS).
|
|
|
|
|
* For all other types (RW1S, RW1CS, RW, and RZ), writing a '0' has no effect.
|
|
|
|
|
*/
|
2010-10-14 22:23:00 +08:00
|
|
|
|
u32 xhci_port_state_to_neutral(u32 state)
|
2009-04-28 10:57:12 +08:00
|
|
|
|
{
|
|
|
|
|
/* Save read-only status and port state */
|
|
|
|
|
return (state & XHCI_PORT_RO) | (state & XHCI_PORT_RWS);
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-14 22:22:57 +08:00
|
|
|
|
/*
|
|
|
|
|
* find slot id based on port number.
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
* @port: The one-based port number from one of the two split roothubs.
|
2010-10-14 22:22:57 +08:00
|
|
|
|
*/
|
2010-12-17 02:49:09 +08:00
|
|
|
|
int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
|
|
|
|
|
u16 port)
|
2010-10-14 22:22:57 +08:00
|
|
|
|
{
|
|
|
|
|
int slot_id;
|
|
|
|
|
int i;
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
enum usb_device_speed speed;
|
2010-10-14 22:22:57 +08:00
|
|
|
|
|
|
|
|
|
slot_id = 0;
|
|
|
|
|
for (i = 0; i < MAX_HC_SLOTS; i++) {
|
|
|
|
|
if (!xhci->devs[i])
|
|
|
|
|
continue;
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
speed = xhci->devs[i]->udev->speed;
|
|
|
|
|
if (((speed == USB_SPEED_SUPER) == (hcd->speed == HCD_USB3))
|
2011-09-03 02:05:41 +08:00
|
|
|
|
&& xhci->devs[i]->fake_port == port) {
|
2010-10-14 22:22:57 +08:00
|
|
|
|
slot_id = i;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return slot_id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Stop device
|
|
|
|
|
* It issues stop endpoint command for EP 0 to 30. And wait the last command
|
|
|
|
|
* to complete.
|
|
|
|
|
* suspend will set to 1, if suspend bit need to set in command.
|
|
|
|
|
*/
|
|
|
|
|
static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
|
|
|
|
|
{
|
|
|
|
|
struct xhci_virt_device *virt_dev;
|
|
|
|
|
struct xhci_command *cmd;
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
int timeleft;
|
|
|
|
|
int ret;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
virt_dev = xhci->devs[slot_id];
|
|
|
|
|
cmd = xhci_alloc_command(xhci, false, true, GFP_NOIO);
|
|
|
|
|
if (!cmd) {
|
|
|
|
|
xhci_dbg(xhci, "Couldn't allocate command structure.\n");
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
for (i = LAST_EP_INDEX; i > 0; i--) {
|
|
|
|
|
if (virt_dev->eps[i].ring && virt_dev->eps[i].ring->dequeue)
|
|
|
|
|
xhci_queue_stop_endpoint(xhci, slot_id, i, suspend);
|
|
|
|
|
}
|
|
|
|
|
cmd->command_trb = xhci->cmd_ring->enqueue;
|
|
|
|
|
list_add_tail(&cmd->cmd_list, &virt_dev->cmd_list);
|
|
|
|
|
xhci_queue_stop_endpoint(xhci, slot_id, 0, suspend);
|
|
|
|
|
xhci_ring_cmd_db(xhci);
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
|
|
|
|
|
/* Wait for last stop endpoint command to finish */
|
|
|
|
|
timeleft = wait_for_completion_interruptible_timeout(
|
|
|
|
|
cmd->completion,
|
|
|
|
|
USB_CTRL_SET_TIMEOUT);
|
|
|
|
|
if (timeleft <= 0) {
|
|
|
|
|
xhci_warn(xhci, "%s while waiting for stop endpoint command\n",
|
|
|
|
|
timeleft == 0 ? "Timeout" : "Signal");
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
/* The timeout might have raced with the event ring handler, so
|
|
|
|
|
* only delete from the list if the item isn't poisoned.
|
|
|
|
|
*/
|
|
|
|
|
if (cmd->cmd_list.next != LIST_POISON1)
|
|
|
|
|
list_del(&cmd->cmd_list);
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
ret = -ETIME;
|
|
|
|
|
goto command_cleanup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
command_cleanup:
|
|
|
|
|
xhci_free_command(xhci, cmd);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Ring device, it rings the all doorbells unconditionally.
|
|
|
|
|
*/
|
2010-10-14 22:23:00 +08:00
|
|
|
|
void xhci_ring_device(struct xhci_hcd *xhci, int slot_id)
|
2010-10-14 22:22:57 +08:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < LAST_EP_INDEX + 1; i++)
|
|
|
|
|
if (xhci->devs[slot_id]->eps[i].ring &&
|
|
|
|
|
xhci->devs[slot_id]->eps[i].ring->dequeue)
|
|
|
|
|
xhci_ring_ep_doorbell(xhci, slot_id, i, 0);
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
static void xhci_disable_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
|
2011-03-29 10:40:46 +08:00
|
|
|
|
u16 wIndex, __le32 __iomem *addr, u32 port_status)
|
2009-12-10 07:59:11 +08:00
|
|
|
|
{
|
2010-11-17 07:58:52 +08:00
|
|
|
|
/* Don't allow the USB core to disable SuperSpeed ports. */
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
if (hcd->speed == HCD_USB3) {
|
2010-11-17 07:58:52 +08:00
|
|
|
|
xhci_dbg(xhci, "Ignoring request to disable "
|
|
|
|
|
"SuperSpeed port.\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-10 07:59:11 +08:00
|
|
|
|
/* Write 1 to disable the port */
|
|
|
|
|
xhci_writel(xhci, port_status | PORT_PE, addr);
|
|
|
|
|
port_status = xhci_readl(xhci, addr);
|
|
|
|
|
xhci_dbg(xhci, "disable port, actual port %d status = 0x%x\n",
|
|
|
|
|
wIndex, port_status);
|
|
|
|
|
}
|
|
|
|
|
|
2009-12-10 07:59:08 +08:00
|
|
|
|
static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
|
2011-03-29 10:40:46 +08:00
|
|
|
|
u16 wIndex, __le32 __iomem *addr, u32 port_status)
|
2009-12-10 07:59:08 +08:00
|
|
|
|
{
|
|
|
|
|
char *port_change_bit;
|
|
|
|
|
u32 status;
|
|
|
|
|
|
|
|
|
|
switch (wValue) {
|
|
|
|
|
case USB_PORT_FEAT_C_RESET:
|
|
|
|
|
status = PORT_RC;
|
|
|
|
|
port_change_bit = "reset";
|
|
|
|
|
break;
|
2011-04-27 18:07:29 +08:00
|
|
|
|
case USB_PORT_FEAT_C_BH_PORT_RESET:
|
|
|
|
|
status = PORT_WRC;
|
|
|
|
|
port_change_bit = "warm(BH) reset";
|
|
|
|
|
break;
|
2009-12-10 07:59:08 +08:00
|
|
|
|
case USB_PORT_FEAT_C_CONNECTION:
|
|
|
|
|
status = PORT_CSC;
|
|
|
|
|
port_change_bit = "connect";
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_OVER_CURRENT:
|
|
|
|
|
status = PORT_OCC;
|
|
|
|
|
port_change_bit = "over-current";
|
|
|
|
|
break;
|
2009-12-10 07:59:11 +08:00
|
|
|
|
case USB_PORT_FEAT_C_ENABLE:
|
|
|
|
|
status = PORT_PEC;
|
|
|
|
|
port_change_bit = "enable/disable";
|
|
|
|
|
break;
|
2010-10-14 22:22:57 +08:00
|
|
|
|
case USB_PORT_FEAT_C_SUSPEND:
|
|
|
|
|
status = PORT_PLC;
|
|
|
|
|
port_change_bit = "suspend/resume";
|
|
|
|
|
break;
|
2011-04-27 18:07:35 +08:00
|
|
|
|
case USB_PORT_FEAT_C_PORT_LINK_STATE:
|
|
|
|
|
status = PORT_PLC;
|
|
|
|
|
port_change_bit = "link state";
|
|
|
|
|
break;
|
2009-12-10 07:59:08 +08:00
|
|
|
|
default:
|
|
|
|
|
/* Should never happen */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/* Change bits are all write 1 to clear */
|
|
|
|
|
xhci_writel(xhci, port_status | status, addr);
|
|
|
|
|
port_status = xhci_readl(xhci, addr);
|
|
|
|
|
xhci_dbg(xhci, "clear port %s change, actual port %d status = 0x%x\n",
|
|
|
|
|
port_change_bit, wIndex, port_status);
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-03 21:11:00 +08:00
|
|
|
|
static int xhci_get_ports(struct usb_hcd *hcd, __le32 __iomem ***port_array)
|
|
|
|
|
{
|
|
|
|
|
int max_ports;
|
|
|
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
|
|
|
|
|
|
|
|
if (hcd->speed == HCD_USB3) {
|
|
|
|
|
max_ports = xhci->num_usb3_ports;
|
|
|
|
|
*port_array = xhci->usb3_ports;
|
|
|
|
|
} else {
|
|
|
|
|
max_ports = xhci->num_usb2_ports;
|
|
|
|
|
*port_array = xhci->usb2_ports;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return max_ports;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-24 05:19:48 +08:00
|
|
|
|
void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
|
|
|
|
|
int port_id, u32 link_state)
|
|
|
|
|
{
|
|
|
|
|
u32 temp;
|
|
|
|
|
|
|
|
|
|
temp = xhci_readl(xhci, port_array[port_id]);
|
|
|
|
|
temp = xhci_port_state_to_neutral(temp);
|
|
|
|
|
temp &= ~PORT_PLS_MASK;
|
|
|
|
|
temp |= PORT_LINK_STROBE | link_state;
|
|
|
|
|
xhci_writel(xhci, temp, port_array[port_id]);
|
|
|
|
|
}
|
|
|
|
|
|
USB/xHCI: Enable USB 3.0 hub remote wakeup.
USB 3.0 hubs have a different remote wakeup policy than USB 2.0 hubs.
USB 2.0 hubs, once they have remote wakeup enabled, will always send
remote wakes when anything changes on a port.
However, USB 3.0 hubs have a per-port remote wake up policy that is off
by default. The Set Feature remote wake mask can be changed for any
port, enabling remote wakeup for a connect, disconnect, or overcurrent
event, much like EHCI and xHCI host controller "wake on" port status
bits. The bits are cleared to zero on the initial hub power on, or
after the hub has been reset.
Without this patch, when a USB 3.0 hub gets suspended, it will not send
a remote wakeup on device connect or disconnect. This would show up to
the user as "dead ports" unless they ran lsusb -v (since newer versions
of lsusb use the sysfs files, rather than sending control transfers).
Change the hub driver's suspend method to enable remote wake up for
disconnect, connect, and overcurrent for all ports on the hub. Modify
the xHCI driver's roothub code to handle that request, and set the "wake
on" bits in the port status registers accordingly.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2012-01-07 02:34:31 +08:00
|
|
|
|
void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
|
|
|
|
|
__le32 __iomem **port_array, int port_id, u16 wake_mask)
|
|
|
|
|
{
|
|
|
|
|
u32 temp;
|
|
|
|
|
|
|
|
|
|
temp = xhci_readl(xhci, port_array[port_id]);
|
|
|
|
|
temp = xhci_port_state_to_neutral(temp);
|
|
|
|
|
|
|
|
|
|
if (wake_mask & USB_PORT_FEAT_REMOTE_WAKE_CONNECT)
|
|
|
|
|
temp |= PORT_WKCONN_E;
|
|
|
|
|
else
|
|
|
|
|
temp &= ~PORT_WKCONN_E;
|
|
|
|
|
|
|
|
|
|
if (wake_mask & USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT)
|
|
|
|
|
temp |= PORT_WKDISC_E;
|
|
|
|
|
else
|
|
|
|
|
temp &= ~PORT_WKDISC_E;
|
|
|
|
|
|
|
|
|
|
if (wake_mask & USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT)
|
|
|
|
|
temp |= PORT_WKOC_E;
|
|
|
|
|
else
|
|
|
|
|
temp &= ~PORT_WKOC_E;
|
|
|
|
|
|
|
|
|
|
xhci_writel(xhci, temp, port_array[port_id]);
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-24 05:19:49 +08:00
|
|
|
|
/* Test and clear port RWC bit */
|
|
|
|
|
void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
|
|
|
|
|
int port_id, u32 port_bit)
|
|
|
|
|
{
|
|
|
|
|
u32 temp;
|
|
|
|
|
|
|
|
|
|
temp = xhci_readl(xhci, port_array[port_id]);
|
|
|
|
|
if (temp & port_bit) {
|
|
|
|
|
temp = xhci_port_state_to_neutral(temp);
|
|
|
|
|
temp |= port_bit;
|
|
|
|
|
xhci_writel(xhci, temp, port_array[port_id]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-04-28 10:57:12 +08:00
|
|
|
|
int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|
|
|
|
u16 wIndex, char *buf, u16 wLength)
|
|
|
|
|
{
|
|
|
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
2011-05-03 21:11:00 +08:00
|
|
|
|
int max_ports;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
unsigned long flags;
|
2011-09-24 05:19:48 +08:00
|
|
|
|
u32 temp, status;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
int retval = 0;
|
2011-03-29 10:40:46 +08:00
|
|
|
|
__le32 __iomem **port_array;
|
2010-10-14 22:22:57 +08:00
|
|
|
|
int slot_id;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
struct xhci_bus_state *bus_state;
|
2011-04-27 18:07:39 +08:00
|
|
|
|
u16 link_state = 0;
|
USB/xHCI: Enable USB 3.0 hub remote wakeup.
USB 3.0 hubs have a different remote wakeup policy than USB 2.0 hubs.
USB 2.0 hubs, once they have remote wakeup enabled, will always send
remote wakes when anything changes on a port.
However, USB 3.0 hubs have a per-port remote wake up policy that is off
by default. The Set Feature remote wake mask can be changed for any
port, enabling remote wakeup for a connect, disconnect, or overcurrent
event, much like EHCI and xHCI host controller "wake on" port status
bits. The bits are cleared to zero on the initial hub power on, or
after the hub has been reset.
Without this patch, when a USB 3.0 hub gets suspended, it will not send
a remote wakeup on device connect or disconnect. This would show up to
the user as "dead ports" unless they ran lsusb -v (since newer versions
of lsusb use the sysfs files, rather than sending control transfers).
Change the hub driver's suspend method to enable remote wake up for
disconnect, connect, and overcurrent for all ports on the hub. Modify
the xHCI driver's roothub code to handle that request, and set the "wake
on" bits in the port status registers accordingly.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2012-01-07 02:34:31 +08:00
|
|
|
|
u16 wake_mask = 0;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
|
2011-05-03 21:11:00 +08:00
|
|
|
|
max_ports = xhci_get_ports(hcd, &port_array);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state = &xhci->bus_state[hcd_index(hcd)];
|
2009-04-28 10:57:12 +08:00
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
switch (typeReq) {
|
|
|
|
|
case GetHubStatus:
|
|
|
|
|
/* No power source, over-current reported per port */
|
|
|
|
|
memset(buf, 0, 4);
|
|
|
|
|
break;
|
|
|
|
|
case GetHubDescriptor:
|
2010-11-30 08:14:37 +08:00
|
|
|
|
/* Check to make sure userspace is asking for the USB 3.0 hub
|
|
|
|
|
* descriptor for the USB 3.0 roothub. If not, we stall the
|
|
|
|
|
* endpoint, like external hubs do.
|
|
|
|
|
*/
|
|
|
|
|
if (hcd->speed == HCD_USB3 &&
|
|
|
|
|
(wLength < USB_DT_SS_HUB_SIZE ||
|
|
|
|
|
wValue != (USB_DT_SS_HUB << 8))) {
|
|
|
|
|
xhci_dbg(xhci, "Wrong hub descriptor type for "
|
|
|
|
|
"USB 3.0 roothub.\n");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
xhci_hub_descriptor(hcd, xhci,
|
|
|
|
|
(struct usb_hub_descriptor *) buf);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
break;
|
2011-10-07 02:54:23 +08:00
|
|
|
|
case DeviceRequest | USB_REQ_GET_DESCRIPTOR:
|
|
|
|
|
if ((wValue & 0xff00) != (USB_DT_BOS << 8))
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
if (hcd->speed != HCD_USB3)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
memcpy(buf, &usb_bos_descriptor,
|
|
|
|
|
USB_DT_BOS_SIZE + USB_DT_USB_SS_CAP_SIZE);
|
|
|
|
|
temp = xhci_readl(xhci, &xhci->cap_regs->hcs_params3);
|
|
|
|
|
buf[12] = HCS_U1_LATENCY(temp);
|
|
|
|
|
put_unaligned_le16(HCS_U2_LATENCY(temp), &buf[13]);
|
|
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
return USB_DT_BOS_SIZE + USB_DT_USB_SS_CAP_SIZE;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
case GetPortStatus:
|
2011-05-03 21:11:00 +08:00
|
|
|
|
if (!wIndex || wIndex > max_ports)
|
2009-04-28 10:57:12 +08:00
|
|
|
|
goto error;
|
|
|
|
|
wIndex--;
|
|
|
|
|
status = 0;
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2010-10-30 05:37:23 +08:00
|
|
|
|
if (temp == 0xffffffff) {
|
|
|
|
|
retval = -ENODEV;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2009-04-28 10:57:12 +08:00
|
|
|
|
xhci_dbg(xhci, "get port status, actual port %d status = 0x%x\n", wIndex, temp);
|
|
|
|
|
|
|
|
|
|
/* wPortChange bits */
|
|
|
|
|
if (temp & PORT_CSC)
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_C_CONNECTION << 16;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if (temp & PORT_PEC)
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_C_ENABLE << 16;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if ((temp & PORT_OCC))
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_C_OVERCURRENT << 16;
|
2011-04-27 18:07:43 +08:00
|
|
|
|
if ((temp & PORT_RC))
|
|
|
|
|
status |= USB_PORT_STAT_C_RESET << 16;
|
|
|
|
|
/* USB3.0 only */
|
|
|
|
|
if (hcd->speed == HCD_USB3) {
|
|
|
|
|
if ((temp & PORT_PLC))
|
|
|
|
|
status |= USB_PORT_STAT_C_LINK_STATE << 16;
|
|
|
|
|
if ((temp & PORT_WRC))
|
|
|
|
|
status |= USB_PORT_STAT_C_BH_RESET << 16;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hcd->speed != HCD_USB3) {
|
|
|
|
|
if ((temp & PORT_PLS_MASK) == XDEV_U3
|
|
|
|
|
&& (temp & PORT_POWER))
|
|
|
|
|
status |= USB_PORT_STAT_SUSPEND;
|
|
|
|
|
}
|
xHCI: report USB2 port in resuming as suspend
When a USB2 port initiate a remote wakeup, software shall ensure that
resume is signaled for at least 20ms, and then write '0' to the PLS field.
According to this, xhci driver do the following things:
1. When receive a remote wakeup event in irq_handler, set the resume_done
value as jiffies + 20ms, and modify rh_timer to poll root hub status at
that time;
2. When receive a GetPortStatus request, if the jiffies is after the
resume_done value, clear the resume signal and resume_done.
However, if usb_port_resume() is called before the rh_timer triggered, it
will indicate the port as Suspend Cleared and skip the clear resume signal
part. The device will fail the usb_get_status request in finish_port_resume(),
and usbcore will try a reset-resume instead. Device will work OK after
reset-resume, but resume_done value is not cleared in this case, and
xhci_bus_suspend() will fail because when it finds a non-zero resume_done
value, it will regard the port as resuming and return -EBUSY.
This causes issue on some platforms that the system fail to suspend
after remote wakeup from suspend by USB2 devices connected to xHCI port.
To fix this issue, report the port status as suspend if the resume is
signaling less that 20ms, and usb_port_resume() will wait 25ms and check
port status again, so xHCI driver can clear the resume signaling and
resume_done value.
This should be backported to kernels as old as 2.6.37.
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
2011-08-03 16:46:49 +08:00
|
|
|
|
if ((temp & PORT_PLS_MASK) == XDEV_RESUME &&
|
|
|
|
|
!DEV_SUPERSPEED(temp)) {
|
2010-10-14 22:23:00 +08:00
|
|
|
|
if ((temp & PORT_RESET) || !(temp & PORT_PE))
|
|
|
|
|
goto error;
|
xHCI: report USB2 port in resuming as suspend
When a USB2 port initiate a remote wakeup, software shall ensure that
resume is signaled for at least 20ms, and then write '0' to the PLS field.
According to this, xhci driver do the following things:
1. When receive a remote wakeup event in irq_handler, set the resume_done
value as jiffies + 20ms, and modify rh_timer to poll root hub status at
that time;
2. When receive a GetPortStatus request, if the jiffies is after the
resume_done value, clear the resume signal and resume_done.
However, if usb_port_resume() is called before the rh_timer triggered, it
will indicate the port as Suspend Cleared and skip the clear resume signal
part. The device will fail the usb_get_status request in finish_port_resume(),
and usbcore will try a reset-resume instead. Device will work OK after
reset-resume, but resume_done value is not cleared in this case, and
xhci_bus_suspend() will fail because when it finds a non-zero resume_done
value, it will regard the port as resuming and return -EBUSY.
This causes issue on some platforms that the system fail to suspend
after remote wakeup from suspend by USB2 devices connected to xHCI port.
To fix this issue, report the port status as suspend if the resume is
signaling less that 20ms, and usb_port_resume() will wait 25ms and check
port status again, so xHCI driver can clear the resume signaling and
resume_done value.
This should be backported to kernels as old as 2.6.37.
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
2011-08-03 16:46:49 +08:00
|
|
|
|
if (time_after_eq(jiffies,
|
|
|
|
|
bus_state->resume_done[wIndex])) {
|
2010-10-14 22:23:00 +08:00
|
|
|
|
xhci_dbg(xhci, "Resume USB2 port %d\n",
|
|
|
|
|
wIndex + 1);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->resume_done[wIndex] = 0;
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array, wIndex,
|
|
|
|
|
XDEV_U0);
|
2010-10-14 22:23:00 +08:00
|
|
|
|
xhci_dbg(xhci, "set port %d resume\n",
|
|
|
|
|
wIndex + 1);
|
2010-12-17 02:49:09 +08:00
|
|
|
|
slot_id = xhci_find_slot_id_by_port(hcd, xhci,
|
2010-10-14 22:23:00 +08:00
|
|
|
|
wIndex + 1);
|
|
|
|
|
if (!slot_id) {
|
|
|
|
|
xhci_dbg(xhci, "slot_id is zero\n");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
xhci_ring_device(xhci, slot_id);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->port_c_suspend |= 1 << wIndex;
|
|
|
|
|
bus_state->suspended_ports &= ~(1 << wIndex);
|
xHCI: report USB2 port in resuming as suspend
When a USB2 port initiate a remote wakeup, software shall ensure that
resume is signaled for at least 20ms, and then write '0' to the PLS field.
According to this, xhci driver do the following things:
1. When receive a remote wakeup event in irq_handler, set the resume_done
value as jiffies + 20ms, and modify rh_timer to poll root hub status at
that time;
2. When receive a GetPortStatus request, if the jiffies is after the
resume_done value, clear the resume signal and resume_done.
However, if usb_port_resume() is called before the rh_timer triggered, it
will indicate the port as Suspend Cleared and skip the clear resume signal
part. The device will fail the usb_get_status request in finish_port_resume(),
and usbcore will try a reset-resume instead. Device will work OK after
reset-resume, but resume_done value is not cleared in this case, and
xhci_bus_suspend() will fail because when it finds a non-zero resume_done
value, it will regard the port as resuming and return -EBUSY.
This causes issue on some platforms that the system fail to suspend
after remote wakeup from suspend by USB2 devices connected to xHCI port.
To fix this issue, report the port status as suspend if the resume is
signaling less that 20ms, and usb_port_resume() will wait 25ms and check
port status again, so xHCI driver can clear the resume signaling and
resume_done value.
This should be backported to kernels as old as 2.6.37.
Signed-off-by: Andiry Xu <andiry.xu@amd.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
2011-08-03 16:46:49 +08:00
|
|
|
|
} else {
|
|
|
|
|
/*
|
|
|
|
|
* The resume has been signaling for less than
|
|
|
|
|
* 20ms. Report the port status as SUSPEND,
|
|
|
|
|
* let the usbcore check port status again
|
|
|
|
|
* and clear resume signaling later.
|
|
|
|
|
*/
|
|
|
|
|
status |= USB_PORT_STAT_SUSPEND;
|
2010-10-14 22:23:00 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
2010-10-14 22:22:57 +08:00
|
|
|
|
if ((temp & PORT_PLS_MASK) == XDEV_U0
|
|
|
|
|
&& (temp & PORT_POWER)
|
2010-12-16 04:47:14 +08:00
|
|
|
|
&& (bus_state->suspended_ports & (1 << wIndex))) {
|
|
|
|
|
bus_state->suspended_ports &= ~(1 << wIndex);
|
2011-04-27 18:07:50 +08:00
|
|
|
|
if (hcd->speed != HCD_USB3)
|
|
|
|
|
bus_state->port_c_suspend |= 1 << wIndex;
|
2010-10-14 22:22:57 +08:00
|
|
|
|
}
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if (temp & PORT_CONNECT) {
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_CONNECTION;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
status |= xhci_port_speed(temp);
|
|
|
|
|
}
|
|
|
|
|
if (temp & PORT_PE)
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_ENABLE;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if (temp & PORT_OC)
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_OVERCURRENT;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
if (temp & PORT_RESET)
|
2010-03-05 06:05:08 +08:00
|
|
|
|
status |= USB_PORT_STAT_RESET;
|
2011-04-27 18:07:43 +08:00
|
|
|
|
if (temp & PORT_POWER) {
|
|
|
|
|
if (hcd->speed == HCD_USB3)
|
|
|
|
|
status |= USB_SS_PORT_STAT_POWER;
|
|
|
|
|
else
|
|
|
|
|
status |= USB_PORT_STAT_POWER;
|
|
|
|
|
}
|
|
|
|
|
/* Port Link State */
|
|
|
|
|
if (hcd->speed == HCD_USB3) {
|
|
|
|
|
/* resume state is a xHCI internal state.
|
|
|
|
|
* Do not report it to usb core.
|
|
|
|
|
*/
|
|
|
|
|
if ((temp & PORT_PLS_MASK) != XDEV_RESUME)
|
|
|
|
|
status |= (temp & PORT_PLS_MASK);
|
|
|
|
|
}
|
2010-12-16 04:47:14 +08:00
|
|
|
|
if (bus_state->port_c_suspend & (1 << wIndex))
|
2010-10-14 22:22:57 +08:00
|
|
|
|
status |= 1 << USB_PORT_FEAT_C_SUSPEND;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
xhci_dbg(xhci, "Get port status returned 0x%x\n", status);
|
|
|
|
|
put_unaligned(cpu_to_le32(status), (__le32 *) buf);
|
|
|
|
|
break;
|
|
|
|
|
case SetPortFeature:
|
2011-04-27 18:07:39 +08:00
|
|
|
|
if (wValue == USB_PORT_FEAT_LINK_STATE)
|
|
|
|
|
link_state = (wIndex & 0xff00) >> 3;
|
USB/xHCI: Enable USB 3.0 hub remote wakeup.
USB 3.0 hubs have a different remote wakeup policy than USB 2.0 hubs.
USB 2.0 hubs, once they have remote wakeup enabled, will always send
remote wakes when anything changes on a port.
However, USB 3.0 hubs have a per-port remote wake up policy that is off
by default. The Set Feature remote wake mask can be changed for any
port, enabling remote wakeup for a connect, disconnect, or overcurrent
event, much like EHCI and xHCI host controller "wake on" port status
bits. The bits are cleared to zero on the initial hub power on, or
after the hub has been reset.
Without this patch, when a USB 3.0 hub gets suspended, it will not send
a remote wakeup on device connect or disconnect. This would show up to
the user as "dead ports" unless they ran lsusb -v (since newer versions
of lsusb use the sysfs files, rather than sending control transfers).
Change the hub driver's suspend method to enable remote wake up for
disconnect, connect, and overcurrent for all ports on the hub. Modify
the xHCI driver's roothub code to handle that request, and set the "wake
on" bits in the port status registers accordingly.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2012-01-07 02:34:31 +08:00
|
|
|
|
if (wValue == USB_PORT_FEAT_REMOTE_WAKE_MASK)
|
|
|
|
|
wake_mask = wIndex & 0xff00;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
wIndex &= 0xff;
|
2011-05-03 21:11:00 +08:00
|
|
|
|
if (!wIndex || wIndex > max_ports)
|
2009-04-28 10:57:12 +08:00
|
|
|
|
goto error;
|
|
|
|
|
wIndex--;
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2010-10-30 05:37:23 +08:00
|
|
|
|
if (temp == 0xffffffff) {
|
|
|
|
|
retval = -ENODEV;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2009-04-28 10:57:12 +08:00
|
|
|
|
temp = xhci_port_state_to_neutral(temp);
|
2010-11-30 08:14:37 +08:00
|
|
|
|
/* FIXME: What new port features do we need to support? */
|
2009-04-28 10:57:12 +08:00
|
|
|
|
switch (wValue) {
|
2010-10-14 22:22:57 +08:00
|
|
|
|
case USB_PORT_FEAT_SUSPEND:
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2011-09-24 05:19:52 +08:00
|
|
|
|
if ((temp & PORT_PLS_MASK) != XDEV_U0) {
|
|
|
|
|
/* Resume the port to U0 first */
|
|
|
|
|
xhci_set_link_state(xhci, port_array, wIndex,
|
|
|
|
|
XDEV_U0);
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
msleep(10);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
}
|
2010-10-14 22:22:57 +08:00
|
|
|
|
/* In spec software should not attempt to suspend
|
|
|
|
|
* a port unless the port reports that it is in the
|
|
|
|
|
* enabled (PED = ‘1’,PLS < ‘3’) state.
|
|
|
|
|
*/
|
2011-09-24 05:19:52 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2010-10-14 22:22:57 +08:00
|
|
|
|
if ((temp & PORT_PE) == 0 || (temp & PORT_RESET)
|
|
|
|
|
|| (temp & PORT_PLS_MASK) >= XDEV_U3) {
|
|
|
|
|
xhci_warn(xhci, "USB core suspending device "
|
|
|
|
|
"not in U0/U1/U2.\n");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-17 02:49:09 +08:00
|
|
|
|
slot_id = xhci_find_slot_id_by_port(hcd, xhci,
|
|
|
|
|
wIndex + 1);
|
2010-10-14 22:22:57 +08:00
|
|
|
|
if (!slot_id) {
|
|
|
|
|
xhci_warn(xhci, "slot_id is zero\n");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
/* unlock to execute stop endpoint commands */
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
xhci_stop_device(xhci, slot_id, 1);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array, wIndex, XDEV_U3);
|
2010-10-14 22:22:57 +08:00
|
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
msleep(10); /* wait device to enter */
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->suspended_ports |= 1 << wIndex;
|
2010-10-14 22:22:57 +08:00
|
|
|
|
break;
|
2011-04-27 18:07:39 +08:00
|
|
|
|
case USB_PORT_FEAT_LINK_STATE:
|
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
|
|
|
|
/* Software should not attempt to set
|
|
|
|
|
* port link state above '5' (Rx.Detect) and the port
|
|
|
|
|
* must be enabled.
|
|
|
|
|
*/
|
|
|
|
|
if ((temp & PORT_PE) == 0 ||
|
|
|
|
|
(link_state > USB_SS_PORT_LS_RX_DETECT)) {
|
|
|
|
|
xhci_warn(xhci, "Cannot set link state.\n");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (link_state == USB_SS_PORT_LS_U3) {
|
|
|
|
|
slot_id = xhci_find_slot_id_by_port(hcd, xhci,
|
|
|
|
|
wIndex + 1);
|
|
|
|
|
if (slot_id) {
|
|
|
|
|
/* unlock to execute stop endpoint
|
|
|
|
|
* commands */
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock,
|
|
|
|
|
flags);
|
|
|
|
|
xhci_stop_device(xhci, slot_id, 1);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array, wIndex,
|
|
|
|
|
link_state);
|
2011-04-27 18:07:39 +08:00
|
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
msleep(20); /* wait device to enter */
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
|
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
|
|
|
|
if (link_state == USB_SS_PORT_LS_U3)
|
|
|
|
|
bus_state->suspended_ports |= 1 << wIndex;
|
|
|
|
|
break;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
case USB_PORT_FEAT_POWER:
|
|
|
|
|
/*
|
|
|
|
|
* Turn on ports, even if there isn't per-port switching.
|
|
|
|
|
* HC will report connect events even before this is set.
|
|
|
|
|
* However, khubd will ignore the roothub events until
|
|
|
|
|
* the roothub is registered.
|
|
|
|
|
*/
|
2010-12-02 03:34:59 +08:00
|
|
|
|
xhci_writel(xhci, temp | PORT_POWER,
|
|
|
|
|
port_array[wIndex]);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
xhci_dbg(xhci, "set port power, actual port %d status = 0x%x\n", wIndex, temp);
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_RESET:
|
|
|
|
|
temp = (temp | PORT_RESET);
|
2010-12-02 03:34:59 +08:00
|
|
|
|
xhci_writel(xhci, temp, port_array[wIndex]);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
xhci_dbg(xhci, "set port reset, actual port %d status = 0x%x\n", wIndex, temp);
|
|
|
|
|
break;
|
USB/xHCI: Enable USB 3.0 hub remote wakeup.
USB 3.0 hubs have a different remote wakeup policy than USB 2.0 hubs.
USB 2.0 hubs, once they have remote wakeup enabled, will always send
remote wakes when anything changes on a port.
However, USB 3.0 hubs have a per-port remote wake up policy that is off
by default. The Set Feature remote wake mask can be changed for any
port, enabling remote wakeup for a connect, disconnect, or overcurrent
event, much like EHCI and xHCI host controller "wake on" port status
bits. The bits are cleared to zero on the initial hub power on, or
after the hub has been reset.
Without this patch, when a USB 3.0 hub gets suspended, it will not send
a remote wakeup on device connect or disconnect. This would show up to
the user as "dead ports" unless they ran lsusb -v (since newer versions
of lsusb use the sysfs files, rather than sending control transfers).
Change the hub driver's suspend method to enable remote wake up for
disconnect, connect, and overcurrent for all ports on the hub. Modify
the xHCI driver's roothub code to handle that request, and set the "wake
on" bits in the port status registers accordingly.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2012-01-07 02:34:31 +08:00
|
|
|
|
case USB_PORT_FEAT_REMOTE_WAKE_MASK:
|
|
|
|
|
xhci_set_remote_wake_mask(xhci, port_array,
|
|
|
|
|
wIndex, wake_mask);
|
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
|
|
|
|
xhci_dbg(xhci, "set port remote wake mask, "
|
|
|
|
|
"actual port %d status = 0x%x\n",
|
|
|
|
|
wIndex, temp);
|
|
|
|
|
break;
|
2011-04-27 18:07:29 +08:00
|
|
|
|
case USB_PORT_FEAT_BH_PORT_RESET:
|
|
|
|
|
temp |= PORT_WR;
|
|
|
|
|
xhci_writel(xhci, temp, port_array[wIndex]);
|
|
|
|
|
|
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
|
|
|
|
break;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
default:
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
2010-12-02 03:34:59 +08:00
|
|
|
|
/* unblock any posted writes */
|
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
break;
|
|
|
|
|
case ClearPortFeature:
|
2011-05-03 21:11:00 +08:00
|
|
|
|
if (!wIndex || wIndex > max_ports)
|
2009-04-28 10:57:12 +08:00
|
|
|
|
goto error;
|
|
|
|
|
wIndex--;
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2010-10-30 05:37:23 +08:00
|
|
|
|
if (temp == 0xffffffff) {
|
|
|
|
|
retval = -ENODEV;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2010-11-30 08:14:37 +08:00
|
|
|
|
/* FIXME: What new port features do we need to support? */
|
2009-04-28 10:57:12 +08:00
|
|
|
|
temp = xhci_port_state_to_neutral(temp);
|
|
|
|
|
switch (wValue) {
|
2010-10-14 22:22:57 +08:00
|
|
|
|
case USB_PORT_FEAT_SUSPEND:
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[wIndex]);
|
2010-10-14 22:22:57 +08:00
|
|
|
|
xhci_dbg(xhci, "clear USB_PORT_FEAT_SUSPEND\n");
|
|
|
|
|
xhci_dbg(xhci, "PORTSC %04x\n", temp);
|
|
|
|
|
if (temp & PORT_RESET)
|
|
|
|
|
goto error;
|
2011-08-03 16:46:48 +08:00
|
|
|
|
if ((temp & PORT_PLS_MASK) == XDEV_U3) {
|
2010-10-14 22:22:57 +08:00
|
|
|
|
if ((temp & PORT_PE) == 0)
|
|
|
|
|
goto error;
|
|
|
|
|
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array, wIndex,
|
|
|
|
|
XDEV_RESUME);
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
2011-04-27 18:07:50 +08:00
|
|
|
|
msleep(20);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array, wIndex,
|
|
|
|
|
XDEV_U0);
|
2010-10-14 22:22:57 +08:00
|
|
|
|
}
|
2011-04-27 18:07:50 +08:00
|
|
|
|
bus_state->port_c_suspend |= 1 << wIndex;
|
2010-10-14 22:22:57 +08:00
|
|
|
|
|
2010-12-17 02:49:09 +08:00
|
|
|
|
slot_id = xhci_find_slot_id_by_port(hcd, xhci,
|
|
|
|
|
wIndex + 1);
|
2010-10-14 22:22:57 +08:00
|
|
|
|
if (!slot_id) {
|
|
|
|
|
xhci_dbg(xhci, "slot_id is zero\n");
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
xhci_ring_device(xhci, slot_id);
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_SUSPEND:
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->port_c_suspend &= ~(1 << wIndex);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
case USB_PORT_FEAT_C_RESET:
|
2011-04-27 18:07:29 +08:00
|
|
|
|
case USB_PORT_FEAT_C_BH_PORT_RESET:
|
2009-04-28 10:57:12 +08:00
|
|
|
|
case USB_PORT_FEAT_C_CONNECTION:
|
|
|
|
|
case USB_PORT_FEAT_C_OVER_CURRENT:
|
2009-12-10 07:59:11 +08:00
|
|
|
|
case USB_PORT_FEAT_C_ENABLE:
|
2011-04-27 18:07:35 +08:00
|
|
|
|
case USB_PORT_FEAT_C_PORT_LINK_STATE:
|
2009-12-10 07:59:08 +08:00
|
|
|
|
xhci_clear_port_change_bit(xhci, wValue, wIndex,
|
2010-12-02 03:34:59 +08:00
|
|
|
|
port_array[wIndex], temp);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
break;
|
2009-12-10 07:59:11 +08:00
|
|
|
|
case USB_PORT_FEAT_ENABLE:
|
xhci: Register second xHCI roothub.
This patch changes the xHCI driver to allocate two roothubs. This touches
the driver initialization and shutdown paths, roothub emulation code, and
port status change event handlers. This is a rather large patch, but it
can't be broken up, or it would break git-bisect.
Make the xHCI driver register its own PCI probe function. This will call
the USB core to create the USB 2.0 roothub, and then create the USB 3.0
roothub. This gets the code for registering a shared roothub out of the
USB core, and allows other HCDs later to decide if and how many shared
roothubs they want to allocate.
Make sure the xHCI's reset method marks the xHCI host controller's primary
roothub as the USB 2.0 roothub. This ensures that the high speed bus will
be processed first when the PCI device is resumed, and any USB 3.0 devices
that have migrated over to high speed will migrate back after being reset.
This ensures that USB persist works with these odd devices.
The reset method will also mark the xHCI USB2 roothub as having an
integrated TT. Like EHCI host controllers with a "rate matching hub" the
xHCI USB 2.0 roothub doesn't have an OHCI or UHCI companion controller.
It doesn't really have a TT, but we'll lie and say it has an integrated
TT. We need to do this because the USB core will reject LS/FS devices
under a HS hub without a TT.
Other details:
-------------
The roothub emulation code is changed to return the correct number of
ports for the two roothubs. For the USB 3.0 roothub, it only reports the
USB 3.0 ports. For the USB 2.0 roothub, it reports all the LS/FS/HS
ports. The code to disable a port now checks the speed of the roothub,
and refuses to disable SuperSpeed ports under the USB 3.0 roothub.
The code for initializing a new device context must be changed to set the
proper roothub port number. Since we've split the xHCI host into two
roothubs, we can't just use the port number in the ancestor hub. Instead,
we loop through the array of hardware port status register speeds and find
the Nth port with a similar speed.
The port status change event handler is updated to figure out whether the
port that reported the change is a USB 3.0 port, or a non-SuperSpeed port.
Once it figures out the port speed, it kicks the proper roothub.
The function to find a slot ID based on the port index is updated to take
into account that the two roothubs will have over-lapping port indexes.
It checks that the virtual device with a matching port index is the same
speed as the passed in roothub.
There's also changes to the driver initialization and shutdown paths:
1. Make sure that the xhci_hcd pointer is shared across the two
usb_hcd structures. The xhci_hcd pointer is allocated and the
registers are mapped in when xhci_pci_setup() is called with the
primary HCD. When xhci_pci_setup() is called with the non-primary
HCD, the xhci_hcd pointer is stored.
2. Make sure to set the sg_tablesize for both usb_hcd structures. Set
the PCI DMA mask for the non-primary HCD to allow for 64-bit or 32-bit
DMA. (The PCI DMA mask is set from the primary HCD further down in
the xhci_pci_setup() function.)
3. Ensure that the host controller doesn't start kicking khubd in
response to port status changes before both usb_hcd structures are
registered. xhci_run() only starts the xHC running once it has been
called with the non-primary roothub. Similarly, the xhci_stop()
function only halts the host controller when it is called with the
non-primary HCD. Then on the second call, it resets and cleans up the
MSI-X irqs.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2010-12-17 03:21:10 +08:00
|
|
|
|
xhci_disable_port(hcd, xhci, wIndex,
|
2010-12-02 03:34:59 +08:00
|
|
|
|
port_array[wIndex], temp);
|
2009-12-10 07:59:11 +08:00
|
|
|
|
break;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
default:
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
error:
|
|
|
|
|
/* "stall" on error */
|
|
|
|
|
retval = -EPIPE;
|
|
|
|
|
}
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Returns 0 if the status hasn't changed, or the number of bytes in buf.
|
|
|
|
|
* Ports are 0-indexed from the HCD point of view,
|
|
|
|
|
* and 1-indexed from the USB core pointer of view.
|
|
|
|
|
*
|
|
|
|
|
* Note that the status change bits will be cleared as soon as a port status
|
|
|
|
|
* change event is generated, so we use the saved status from that event.
|
|
|
|
|
*/
|
|
|
|
|
int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
|
|
|
|
|
{
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
u32 temp, status;
|
2010-10-14 22:23:00 +08:00
|
|
|
|
u32 mask;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
int i, retval;
|
|
|
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
2011-05-03 21:11:00 +08:00
|
|
|
|
int max_ports;
|
2011-03-29 10:40:46 +08:00
|
|
|
|
__le32 __iomem **port_array;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
struct xhci_bus_state *bus_state;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
|
2011-05-03 21:11:00 +08:00
|
|
|
|
max_ports = xhci_get_ports(hcd, &port_array);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state = &xhci->bus_state[hcd_index(hcd)];
|
2009-04-28 10:57:12 +08:00
|
|
|
|
|
|
|
|
|
/* Initial status is no changes */
|
2011-05-03 21:11:00 +08:00
|
|
|
|
retval = (max_ports + 8) / 8;
|
2010-05-13 01:20:34 +08:00
|
|
|
|
memset(buf, 0, retval);
|
2009-04-28 10:57:12 +08:00
|
|
|
|
status = 0;
|
|
|
|
|
|
USB: xhci: Set change bit when warm reset change is set.
Sometimes, when a USB 3.0 device is disconnected, the Intel Panther
Point xHCI host controller will report a link state change with the
state set to "SS.Inactive". This causes the xHCI host controller to
issue a warm port reset, which doesn't finish before the USB core times
out while waiting for it to complete.
When the warm port reset does complete, and the xHC gives back a port
status change event, the xHCI driver kicks khubd. However, it fails to
set the bit indicating there is a change event for that port because the
logic in xhci-hub.c doesn't check for the warm port reset bit.
After that, the warm port status change bit is never cleared by the USB
core, and the xHC stops reporting port status change bits. (The xHCI
spec says it shouldn't report more port events until all change bits are
cleared.) This means any port changes when a new device is connected
will never be reported, and the port will seem "dead" until the xHCI
driver is unloaded and reloaded, or the computer is rebooted. Fix this
by making the xHCI driver set the port change bit when a warm port reset
change bit is set.
A better solution would be to make the USB core handle warm port reset
in differently, merging the current code with the standard port reset
code that does an incremental backoff on the timeout, and tries to
complete the port reset two more times before giving up. That more
complicated fix will be merged next window, and this fix will be
backported to stable.
This should be backported to kernels as old as 3.0, since that was the
first kernel with commit a11496ebf375 ("xHCI: warm reset support").
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-20 07:05:11 +08:00
|
|
|
|
mask = PORT_CSC | PORT_PEC | PORT_OCC | PORT_PLC | PORT_WRC;
|
2010-10-14 22:23:00 +08:00
|
|
|
|
|
2009-04-28 10:57:12 +08:00
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
/* For each port, did anything change? If so, set that bit in buf. */
|
2011-05-03 21:11:00 +08:00
|
|
|
|
for (i = 0; i < max_ports; i++) {
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[i]);
|
2010-10-30 05:37:23 +08:00
|
|
|
|
if (temp == 0xffffffff) {
|
|
|
|
|
retval = -ENODEV;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2010-10-14 22:23:00 +08:00
|
|
|
|
if ((temp & mask) != 0 ||
|
2010-12-16 04:47:14 +08:00
|
|
|
|
(bus_state->port_c_suspend & 1 << i) ||
|
|
|
|
|
(bus_state->resume_done[i] && time_after_eq(
|
|
|
|
|
jiffies, bus_state->resume_done[i]))) {
|
2010-05-13 01:20:34 +08:00
|
|
|
|
buf[(i + 1) / 8] |= 1 << (i + 1) % 8;
|
2009-04-28 10:57:12 +08:00
|
|
|
|
status = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
return status ? retval : 0;
|
|
|
|
|
}
|
2010-10-14 22:23:03 +08:00
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
|
|
|
|
|
int xhci_bus_suspend(struct usb_hcd *hcd)
|
|
|
|
|
{
|
|
|
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
2010-12-16 03:56:29 +08:00
|
|
|
|
int max_ports, port_index;
|
2011-03-29 10:40:46 +08:00
|
|
|
|
__le32 __iomem **port_array;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
struct xhci_bus_state *bus_state;
|
2010-10-14 22:23:03 +08:00
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
2011-05-03 21:11:00 +08:00
|
|
|
|
max_ports = xhci_get_ports(hcd, &port_array);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state = &xhci->bus_state[hcd_index(hcd)];
|
2010-10-14 22:23:03 +08:00
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
|
|
|
|
|
if (hcd->self.root_hub->do_remote_wakeup) {
|
2010-12-16 03:56:29 +08:00
|
|
|
|
port_index = max_ports;
|
|
|
|
|
while (port_index--) {
|
2010-12-16 04:47:14 +08:00
|
|
|
|
if (bus_state->resume_done[port_index] != 0) {
|
2010-10-14 22:23:03 +08:00
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
xhci_dbg(xhci, "suspend failed because "
|
|
|
|
|
"port %d is resuming\n",
|
2010-12-16 03:56:29 +08:00
|
|
|
|
port_index + 1);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
return -EBUSY;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-16 03:56:29 +08:00
|
|
|
|
port_index = max_ports;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->bus_suspended = 0;
|
2010-12-16 03:56:29 +08:00
|
|
|
|
while (port_index--) {
|
2010-10-14 22:23:03 +08:00
|
|
|
|
/* suspend the port if the port is not suspended */
|
|
|
|
|
u32 t1, t2;
|
|
|
|
|
int slot_id;
|
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
t1 = xhci_readl(xhci, port_array[port_index]);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
t2 = xhci_port_state_to_neutral(t1);
|
|
|
|
|
|
|
|
|
|
if ((t1 & PORT_PE) && !(t1 & PORT_PLS_MASK)) {
|
2010-12-16 03:56:29 +08:00
|
|
|
|
xhci_dbg(xhci, "port %d not suspended\n", port_index);
|
2010-12-17 02:49:09 +08:00
|
|
|
|
slot_id = xhci_find_slot_id_by_port(hcd, xhci,
|
2010-12-16 03:56:29 +08:00
|
|
|
|
port_index + 1);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
if (slot_id) {
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
xhci_stop_device(xhci, slot_id, 1);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
}
|
|
|
|
|
t2 &= ~PORT_PLS_MASK;
|
|
|
|
|
t2 |= PORT_LINK_STROBE | XDEV_U3;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
set_bit(port_index, &bus_state->bus_suspended);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
}
|
USB/xHCI: Enable USB 3.0 hub remote wakeup.
USB 3.0 hubs have a different remote wakeup policy than USB 2.0 hubs.
USB 2.0 hubs, once they have remote wakeup enabled, will always send
remote wakes when anything changes on a port.
However, USB 3.0 hubs have a per-port remote wake up policy that is off
by default. The Set Feature remote wake mask can be changed for any
port, enabling remote wakeup for a connect, disconnect, or overcurrent
event, much like EHCI and xHCI host controller "wake on" port status
bits. The bits are cleared to zero on the initial hub power on, or
after the hub has been reset.
Without this patch, when a USB 3.0 hub gets suspended, it will not send
a remote wakeup on device connect or disconnect. This would show up to
the user as "dead ports" unless they ran lsusb -v (since newer versions
of lsusb use the sysfs files, rather than sending control transfers).
Change the hub driver's suspend method to enable remote wake up for
disconnect, connect, and overcurrent for all ports on the hub. Modify
the xHCI driver's roothub code to handle that request, and set the "wake
on" bits in the port status registers accordingly.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
2012-01-07 02:34:31 +08:00
|
|
|
|
/* USB core sets remote wake mask for USB 3.0 hubs,
|
|
|
|
|
* including the USB 3.0 roothub, but only if CONFIG_USB_SUSPEND
|
|
|
|
|
* is enabled, so also enable remote wake here.
|
|
|
|
|
*/
|
2010-10-14 22:23:03 +08:00
|
|
|
|
if (hcd->self.root_hub->do_remote_wakeup) {
|
|
|
|
|
if (t1 & PORT_CONNECT) {
|
|
|
|
|
t2 |= PORT_WKOC_E | PORT_WKDISC_E;
|
|
|
|
|
t2 &= ~PORT_WKCONN_E;
|
|
|
|
|
} else {
|
|
|
|
|
t2 |= PORT_WKOC_E | PORT_WKCONN_E;
|
|
|
|
|
t2 &= ~PORT_WKDISC_E;
|
|
|
|
|
}
|
|
|
|
|
} else
|
|
|
|
|
t2 &= ~PORT_WAKE_BITS;
|
|
|
|
|
|
|
|
|
|
t1 = xhci_port_state_to_neutral(t1);
|
|
|
|
|
if (t1 != t2)
|
2010-12-02 03:34:59 +08:00
|
|
|
|
xhci_writel(xhci, t2, port_array[port_index]);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
|
2011-04-19 17:17:39 +08:00
|
|
|
|
if (hcd->speed != HCD_USB3) {
|
2010-10-14 22:23:03 +08:00
|
|
|
|
/* enable remote wake up for USB 2.0 */
|
2011-03-29 10:40:46 +08:00
|
|
|
|
__le32 __iomem *addr;
|
2010-10-14 22:23:03 +08:00
|
|
|
|
u32 tmp;
|
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
/* Add one to the port status register address to get
|
|
|
|
|
* the port power control register address.
|
|
|
|
|
*/
|
|
|
|
|
addr = port_array[port_index] + 1;
|
2010-10-14 22:23:03 +08:00
|
|
|
|
tmp = xhci_readl(xhci, addr);
|
|
|
|
|
tmp |= PORT_RWE;
|
|
|
|
|
xhci_writel(xhci, tmp, addr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
hcd->state = HC_STATE_SUSPENDED;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int xhci_bus_resume(struct usb_hcd *hcd)
|
|
|
|
|
{
|
|
|
|
|
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
2010-12-16 03:56:29 +08:00
|
|
|
|
int max_ports, port_index;
|
2011-03-29 10:40:46 +08:00
|
|
|
|
__le32 __iomem **port_array;
|
2010-12-16 04:47:14 +08:00
|
|
|
|
struct xhci_bus_state *bus_state;
|
2010-10-14 22:23:03 +08:00
|
|
|
|
u32 temp;
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
2011-05-03 21:11:00 +08:00
|
|
|
|
max_ports = xhci_get_ports(hcd, &port_array);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state = &xhci->bus_state[hcd_index(hcd)];
|
2010-10-14 22:23:03 +08:00
|
|
|
|
|
2010-12-16 04:47:14 +08:00
|
|
|
|
if (time_before(jiffies, bus_state->next_statechange))
|
2010-10-14 22:23:03 +08:00
|
|
|
|
msleep(5);
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
if (!HCD_HW_ACCESSIBLE(hcd)) {
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
return -ESHUTDOWN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* delay the irqs */
|
|
|
|
|
temp = xhci_readl(xhci, &xhci->op_regs->command);
|
|
|
|
|
temp &= ~CMD_EIE;
|
|
|
|
|
xhci_writel(xhci, temp, &xhci->op_regs->command);
|
|
|
|
|
|
2010-12-16 03:56:29 +08:00
|
|
|
|
port_index = max_ports;
|
|
|
|
|
while (port_index--) {
|
2010-10-14 22:23:03 +08:00
|
|
|
|
/* Check whether need resume ports. If needed
|
|
|
|
|
resume port and disable remote wakeup */
|
|
|
|
|
u32 temp;
|
|
|
|
|
int slot_id;
|
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
temp = xhci_readl(xhci, port_array[port_index]);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
if (DEV_SUPERSPEED(temp))
|
|
|
|
|
temp &= ~(PORT_RWC_BITS | PORT_CEC | PORT_WAKE_BITS);
|
|
|
|
|
else
|
|
|
|
|
temp &= ~(PORT_RWC_BITS | PORT_WAKE_BITS);
|
2010-12-16 04:47:14 +08:00
|
|
|
|
if (test_bit(port_index, &bus_state->bus_suspended) &&
|
2010-10-14 22:23:03 +08:00
|
|
|
|
(temp & PORT_PLS_MASK)) {
|
|
|
|
|
if (DEV_SUPERSPEED(temp)) {
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array,
|
|
|
|
|
port_index, XDEV_U0);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
} else {
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array,
|
|
|
|
|
port_index, XDEV_RESUME);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
msleep(20);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
|
2011-09-24 05:19:48 +08:00
|
|
|
|
xhci_set_link_state(xhci, port_array,
|
|
|
|
|
port_index, XDEV_U0);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
}
|
2011-04-19 17:17:39 +08:00
|
|
|
|
/* wait for the port to enter U0 and report port link
|
|
|
|
|
* state change.
|
|
|
|
|
*/
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
msleep(20);
|
|
|
|
|
spin_lock_irqsave(&xhci->lock, flags);
|
|
|
|
|
|
|
|
|
|
/* Clear PLC */
|
2011-09-24 05:19:49 +08:00
|
|
|
|
xhci_test_and_clear_bit(xhci, port_array, port_index,
|
|
|
|
|
PORT_PLC);
|
2011-04-19 17:17:39 +08:00
|
|
|
|
|
2010-12-17 02:49:09 +08:00
|
|
|
|
slot_id = xhci_find_slot_id_by_port(hcd,
|
|
|
|
|
xhci, port_index + 1);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
if (slot_id)
|
|
|
|
|
xhci_ring_device(xhci, slot_id);
|
|
|
|
|
} else
|
2010-12-02 03:34:59 +08:00
|
|
|
|
xhci_writel(xhci, temp, port_array[port_index]);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
|
2011-04-19 17:17:39 +08:00
|
|
|
|
if (hcd->speed != HCD_USB3) {
|
2010-10-14 22:23:03 +08:00
|
|
|
|
/* disable remote wake up for USB 2.0 */
|
2011-03-29 10:40:46 +08:00
|
|
|
|
__le32 __iomem *addr;
|
2010-10-14 22:23:03 +08:00
|
|
|
|
u32 tmp;
|
|
|
|
|
|
2010-12-02 03:34:59 +08:00
|
|
|
|
/* Add one to the port status register address to get
|
|
|
|
|
* the port power control register address.
|
|
|
|
|
*/
|
|
|
|
|
addr = port_array[port_index] + 1;
|
2010-10-14 22:23:03 +08:00
|
|
|
|
tmp = xhci_readl(xhci, addr);
|
|
|
|
|
tmp &= ~PORT_RWE;
|
|
|
|
|
xhci_writel(xhci, tmp, addr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
(void) xhci_readl(xhci, &xhci->op_regs->command);
|
|
|
|
|
|
2010-12-16 04:47:14 +08:00
|
|
|
|
bus_state->next_statechange = jiffies + msecs_to_jiffies(5);
|
2010-10-14 22:23:03 +08:00
|
|
|
|
/* re-enable irqs */
|
|
|
|
|
temp = xhci_readl(xhci, &xhci->op_regs->command);
|
|
|
|
|
temp |= CMD_EIE;
|
|
|
|
|
xhci_writel(xhci, temp, &xhci->op_regs->command);
|
|
|
|
|
temp = xhci_readl(xhci, &xhci->op_regs->command);
|
|
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&xhci->lock, flags);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-16 05:59:15 +08:00
|
|
|
|
#endif /* CONFIG_PM */
|