2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* (C) Copyright Linus Torvalds 1999
|
|
|
|
* (C) Copyright Johannes Erdfelt 1999-2001
|
|
|
|
* (C) Copyright Andreas Gal 1999
|
|
|
|
* (C) Copyright Gregory P. Smith 1999
|
|
|
|
* (C) Copyright Deti Fliegl 1999
|
|
|
|
* (C) Copyright Randy Dunlap 2000
|
|
|
|
* (C) Copyright David Brownell 2000-2002
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
|
|
* option) any later version.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/version.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/completion.h>
|
|
|
|
#include <linux/utsname.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <asm/io.h>
|
|
|
|
#include <asm/scatterlist.h>
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/dma-mapping.h>
|
2006-01-11 07:55:29 -07:00
|
|
|
#include <linux/mutex.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <asm/irq.h>
|
|
|
|
#include <asm/byteorder.h>
|
USB: Properly unregister reboot notifier in case of failure in ehci hcd
If some problem occurs during ehci startup, for instance, request_irq fails,
echi hcd driver tries it best to cleanup, but fails to unregister reboot
notifier, which in turn leads to crash on reboot/poweroff.
The following patch resolves this problem by not using reboot notifiers
anymore, but instead making ehci/ohci driver get its own shutdown method. For
PCI, it is done through pci glue, for everything else through platform driver
glue.
One downside: sa1111 does not use platform driver stuff, and does not have its
own shutdown hook, so no 'shutdown' is called for it now. I'm not sure if it
is really necessary on that platform, though.
Signed-off-by: Aleks Gorelov <dared1st@yahoo.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-08-08 18:24:08 -06:00
|
|
|
#include <linux/platform_device.h>
|
2007-03-13 14:37:30 -06:00
|
|
|
#include <linux/workqueue.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#include <linux/usb.h>
|
|
|
|
|
|
|
|
#include "usb.h"
|
|
|
|
#include "hcd.h"
|
|
|
|
#include "hub.h"
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* USB Host Controller Driver framework
|
|
|
|
*
|
|
|
|
* Plugs into usbcore (usb_bus) and lets HCDs share code, minimizing
|
|
|
|
* HCD-specific behaviors/bugs.
|
|
|
|
*
|
|
|
|
* This does error checks, tracks devices and urbs, and delegates to a
|
|
|
|
* "hc_driver" only for code (and data) that really needs to know about
|
|
|
|
* hardware differences. That includes root hub registers, i/o queues,
|
|
|
|
* and so on ... but as little else as possible.
|
|
|
|
*
|
|
|
|
* Shared code includes most of the "root hub" code (these are emulated,
|
|
|
|
* though each HC's hardware works differently) and PCI glue, plus request
|
|
|
|
* tracking overhead. The HCD code should only block on spinlocks or on
|
|
|
|
* hardware handshaking; blocking on software events (such as other kernel
|
|
|
|
* threads releasing resources, or completing actions) is all generic.
|
|
|
|
*
|
|
|
|
* Happens the USB 2.0 spec says this would be invisible inside the "USBD",
|
|
|
|
* and includes mostly a "HCDI" (HCD Interface) along with some APIs used
|
|
|
|
* only by the hub driver ... and that neither should be seen or used by
|
|
|
|
* usb client device drivers.
|
|
|
|
*
|
|
|
|
* Contributors of ideas or unattributed patches include: David Brownell,
|
|
|
|
* Roman Weissgaerber, Rory Bolt, Greg Kroah-Hartman, ...
|
|
|
|
*
|
|
|
|
* HISTORY:
|
|
|
|
* 2002-02-21 Pull in most of the usb_bus support from usb.c; some
|
|
|
|
* associated cleanup. "usb_hcd" still != "usb_bus".
|
|
|
|
* 2001-12-12 Initial patch version for Linux 2.5.1 kernel.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* host controllers we manage */
|
|
|
|
LIST_HEAD (usb_bus_list);
|
|
|
|
EXPORT_SYMBOL_GPL (usb_bus_list);
|
|
|
|
|
|
|
|
/* used when allocating bus numbers */
|
|
|
|
#define USB_MAXBUS 64
|
|
|
|
struct usb_busmap {
|
|
|
|
unsigned long busmap [USB_MAXBUS / (8*sizeof (unsigned long))];
|
|
|
|
};
|
|
|
|
static struct usb_busmap busmap;
|
|
|
|
|
|
|
|
/* used when updating list of hcds */
|
2006-01-11 07:55:29 -07:00
|
|
|
DEFINE_MUTEX(usb_bus_list_lock); /* exported only for usbfs */
|
2005-04-16 16:20:36 -06:00
|
|
|
EXPORT_SYMBOL_GPL (usb_bus_list_lock);
|
|
|
|
|
|
|
|
/* used for controlling access to virtual root hubs */
|
|
|
|
static DEFINE_SPINLOCK(hcd_root_hub_lock);
|
|
|
|
|
|
|
|
/* used when updating hcd data */
|
|
|
|
static DEFINE_SPINLOCK(hcd_data_lock);
|
|
|
|
|
|
|
|
/* wait queue for synchronous unlinks */
|
|
|
|
DECLARE_WAIT_QUEUE_HEAD(usb_kill_urb_queue);
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sharable chunks of root hub code.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
#define KERNEL_REL ((LINUX_VERSION_CODE >> 16) & 0x0ff)
|
|
|
|
#define KERNEL_VER ((LINUX_VERSION_CODE >> 8) & 0x0ff)
|
|
|
|
|
|
|
|
/* usb 2.0 root hub device descriptor */
|
|
|
|
static const u8 usb2_rh_dev_descriptor [18] = {
|
|
|
|
0x12, /* __u8 bLength; */
|
|
|
|
0x01, /* __u8 bDescriptorType; Device */
|
|
|
|
0x00, 0x02, /* __le16 bcdUSB; v2.0 */
|
|
|
|
|
|
|
|
0x09, /* __u8 bDeviceClass; HUB_CLASSCODE */
|
|
|
|
0x00, /* __u8 bDeviceSubClass; */
|
|
|
|
0x01, /* __u8 bDeviceProtocol; [ usb 2.0 single TT ]*/
|
2005-10-24 13:41:19 -06:00
|
|
|
0x40, /* __u8 bMaxPacketSize0; 64 Bytes */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
0x00, 0x00, /* __le16 idVendor; */
|
|
|
|
0x00, 0x00, /* __le16 idProduct; */
|
|
|
|
KERNEL_VER, KERNEL_REL, /* __le16 bcdDevice */
|
|
|
|
|
|
|
|
0x03, /* __u8 iManufacturer; */
|
|
|
|
0x02, /* __u8 iProduct; */
|
|
|
|
0x01, /* __u8 iSerialNumber; */
|
|
|
|
0x01 /* __u8 bNumConfigurations; */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* no usb 2.0 root hub "device qualifier" descriptor: one speed only */
|
|
|
|
|
|
|
|
/* usb 1.1 root hub device descriptor */
|
|
|
|
static const u8 usb11_rh_dev_descriptor [18] = {
|
|
|
|
0x12, /* __u8 bLength; */
|
|
|
|
0x01, /* __u8 bDescriptorType; Device */
|
|
|
|
0x10, 0x01, /* __le16 bcdUSB; v1.1 */
|
|
|
|
|
|
|
|
0x09, /* __u8 bDeviceClass; HUB_CLASSCODE */
|
|
|
|
0x00, /* __u8 bDeviceSubClass; */
|
|
|
|
0x00, /* __u8 bDeviceProtocol; [ low/full speeds only ] */
|
2005-10-24 13:41:19 -06:00
|
|
|
0x40, /* __u8 bMaxPacketSize0; 64 Bytes */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
0x00, 0x00, /* __le16 idVendor; */
|
|
|
|
0x00, 0x00, /* __le16 idProduct; */
|
|
|
|
KERNEL_VER, KERNEL_REL, /* __le16 bcdDevice */
|
|
|
|
|
|
|
|
0x03, /* __u8 iManufacturer; */
|
|
|
|
0x02, /* __u8 iProduct; */
|
|
|
|
0x01, /* __u8 iSerialNumber; */
|
|
|
|
0x01 /* __u8 bNumConfigurations; */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* Configuration descriptors for our root hubs */
|
|
|
|
|
|
|
|
static const u8 fs_rh_config_descriptor [] = {
|
|
|
|
|
|
|
|
/* one configuration */
|
|
|
|
0x09, /* __u8 bLength; */
|
|
|
|
0x02, /* __u8 bDescriptorType; Configuration */
|
|
|
|
0x19, 0x00, /* __le16 wTotalLength; */
|
|
|
|
0x01, /* __u8 bNumInterfaces; (1) */
|
|
|
|
0x01, /* __u8 bConfigurationValue; */
|
|
|
|
0x00, /* __u8 iConfiguration; */
|
|
|
|
0xc0, /* __u8 bmAttributes;
|
|
|
|
Bit 7: must be set,
|
|
|
|
6: Self-powered,
|
|
|
|
5: Remote wakeup,
|
|
|
|
4..0: resvd */
|
|
|
|
0x00, /* __u8 MaxPower; */
|
|
|
|
|
|
|
|
/* USB 1.1:
|
|
|
|
* USB 2.0, single TT organization (mandatory):
|
|
|
|
* one interface, protocol 0
|
|
|
|
*
|
|
|
|
* USB 2.0, multiple TT organization (optional):
|
|
|
|
* two interfaces, protocols 1 (like single TT)
|
|
|
|
* and 2 (multiple TT mode) ... config is
|
|
|
|
* sometimes settable
|
|
|
|
* NOT IMPLEMENTED
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* one interface */
|
|
|
|
0x09, /* __u8 if_bLength; */
|
|
|
|
0x04, /* __u8 if_bDescriptorType; Interface */
|
|
|
|
0x00, /* __u8 if_bInterfaceNumber; */
|
|
|
|
0x00, /* __u8 if_bAlternateSetting; */
|
|
|
|
0x01, /* __u8 if_bNumEndpoints; */
|
|
|
|
0x09, /* __u8 if_bInterfaceClass; HUB_CLASSCODE */
|
|
|
|
0x00, /* __u8 if_bInterfaceSubClass; */
|
|
|
|
0x00, /* __u8 if_bInterfaceProtocol; [usb1.1 or single tt] */
|
|
|
|
0x00, /* __u8 if_iInterface; */
|
|
|
|
|
|
|
|
/* one endpoint (status change endpoint) */
|
|
|
|
0x07, /* __u8 ep_bLength; */
|
|
|
|
0x05, /* __u8 ep_bDescriptorType; Endpoint */
|
|
|
|
0x81, /* __u8 ep_bEndpointAddress; IN Endpoint 1 */
|
|
|
|
0x03, /* __u8 ep_bmAttributes; Interrupt */
|
|
|
|
0x02, 0x00, /* __le16 ep_wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */
|
|
|
|
0xff /* __u8 ep_bInterval; (255ms -- usb 2.0 spec) */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const u8 hs_rh_config_descriptor [] = {
|
|
|
|
|
|
|
|
/* one configuration */
|
|
|
|
0x09, /* __u8 bLength; */
|
|
|
|
0x02, /* __u8 bDescriptorType; Configuration */
|
|
|
|
0x19, 0x00, /* __le16 wTotalLength; */
|
|
|
|
0x01, /* __u8 bNumInterfaces; (1) */
|
|
|
|
0x01, /* __u8 bConfigurationValue; */
|
|
|
|
0x00, /* __u8 iConfiguration; */
|
|
|
|
0xc0, /* __u8 bmAttributes;
|
|
|
|
Bit 7: must be set,
|
|
|
|
6: Self-powered,
|
|
|
|
5: Remote wakeup,
|
|
|
|
4..0: resvd */
|
|
|
|
0x00, /* __u8 MaxPower; */
|
|
|
|
|
|
|
|
/* USB 1.1:
|
|
|
|
* USB 2.0, single TT organization (mandatory):
|
|
|
|
* one interface, protocol 0
|
|
|
|
*
|
|
|
|
* USB 2.0, multiple TT organization (optional):
|
|
|
|
* two interfaces, protocols 1 (like single TT)
|
|
|
|
* and 2 (multiple TT mode) ... config is
|
|
|
|
* sometimes settable
|
|
|
|
* NOT IMPLEMENTED
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* one interface */
|
|
|
|
0x09, /* __u8 if_bLength; */
|
|
|
|
0x04, /* __u8 if_bDescriptorType; Interface */
|
|
|
|
0x00, /* __u8 if_bInterfaceNumber; */
|
|
|
|
0x00, /* __u8 if_bAlternateSetting; */
|
|
|
|
0x01, /* __u8 if_bNumEndpoints; */
|
|
|
|
0x09, /* __u8 if_bInterfaceClass; HUB_CLASSCODE */
|
|
|
|
0x00, /* __u8 if_bInterfaceSubClass; */
|
|
|
|
0x00, /* __u8 if_bInterfaceProtocol; [usb1.1 or single tt] */
|
|
|
|
0x00, /* __u8 if_iInterface; */
|
|
|
|
|
|
|
|
/* one endpoint (status change endpoint) */
|
|
|
|
0x07, /* __u8 ep_bLength; */
|
|
|
|
0x05, /* __u8 ep_bDescriptorType; Endpoint */
|
|
|
|
0x81, /* __u8 ep_bEndpointAddress; IN Endpoint 1 */
|
|
|
|
0x03, /* __u8 ep_bmAttributes; Interrupt */
|
2006-10-11 21:05:59 -06:00
|
|
|
/* __le16 ep_wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8)
|
|
|
|
* see hub.c:hub_configure() for details. */
|
|
|
|
(USB_MAXCHILDREN + 1 + 7) / 8, 0x00,
|
2005-04-16 16:20:36 -06:00
|
|
|
0x0c /* __u8 ep_bInterval; (256ms -- usb 2.0 spec) */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* helper routine for returning string descriptors in UTF-16LE
|
|
|
|
* input can actually be ISO-8859-1; ASCII is its 7-bit subset
|
|
|
|
*/
|
|
|
|
static int ascii2utf (char *s, u8 *utf, int utfmax)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
for (retval = 0; *s && utfmax > 1; utfmax -= 2, retval += 2) {
|
|
|
|
*utf++ = *s++;
|
|
|
|
*utf++ = 0;
|
|
|
|
}
|
|
|
|
if (utfmax > 0) {
|
|
|
|
*utf = *s;
|
|
|
|
++retval;
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* rh_string - provides manufacturer, product and serial strings for root hub
|
|
|
|
* @id: the string ID number (1: serial number, 2: product, 3: vendor)
|
|
|
|
* @hcd: the host controller for this root hub
|
|
|
|
* @type: string describing our driver
|
|
|
|
* @data: return packet in UTF-16 LE
|
|
|
|
* @len: length of the return packet
|
|
|
|
*
|
|
|
|
* Produces either a manufacturer, product or serial number string for the
|
|
|
|
* virtual root hub device.
|
|
|
|
*/
|
|
|
|
static int rh_string (
|
|
|
|
int id,
|
|
|
|
struct usb_hcd *hcd,
|
|
|
|
u8 *data,
|
|
|
|
int len
|
|
|
|
) {
|
|
|
|
char buf [100];
|
|
|
|
|
|
|
|
// language ids
|
|
|
|
if (id == 0) {
|
|
|
|
buf[0] = 4; buf[1] = 3; /* 4 bytes string data */
|
|
|
|
buf[2] = 0x09; buf[3] = 0x04; /* MSFT-speak for "en-us" */
|
|
|
|
len = min (len, 4);
|
|
|
|
memcpy (data, buf, len);
|
|
|
|
return len;
|
|
|
|
|
|
|
|
// serial number
|
|
|
|
} else if (id == 1) {
|
|
|
|
strlcpy (buf, hcd->self.bus_name, sizeof buf);
|
|
|
|
|
|
|
|
// product description
|
|
|
|
} else if (id == 2) {
|
|
|
|
strlcpy (buf, hcd->product_desc, sizeof buf);
|
|
|
|
|
|
|
|
// id 3 == vendor description
|
|
|
|
} else if (id == 3) {
|
2006-10-02 03:18:13 -06:00
|
|
|
snprintf (buf, sizeof buf, "%s %s %s", init_utsname()->sysname,
|
|
|
|
init_utsname()->release, hcd->driver->description);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
// unsupported IDs --> "protocol stall"
|
|
|
|
} else
|
|
|
|
return -EPIPE;
|
|
|
|
|
|
|
|
switch (len) { /* All cases fall through */
|
|
|
|
default:
|
|
|
|
len = 2 + ascii2utf (buf, data + 2, len - 2);
|
|
|
|
case 2:
|
|
|
|
data [1] = 3; /* type == string */
|
|
|
|
case 1:
|
|
|
|
data [0] = 2 * (strlen (buf) + 1);
|
|
|
|
case 0:
|
|
|
|
; /* Compiler wants a statement here */
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Root hub control transfers execute synchronously */
|
|
|
|
static int rh_call_control (struct usb_hcd *hcd, struct urb *urb)
|
|
|
|
{
|
|
|
|
struct usb_ctrlrequest *cmd;
|
|
|
|
u16 typeReq, wValue, wIndex, wLength;
|
|
|
|
u8 *ubuf = urb->transfer_buffer;
|
2006-09-23 18:05:31 -06:00
|
|
|
u8 tbuf [sizeof (struct usb_hub_descriptor)]
|
|
|
|
__attribute__((aligned(4)));
|
2005-04-16 16:20:36 -06:00
|
|
|
const u8 *bufp = tbuf;
|
|
|
|
int len = 0;
|
|
|
|
int patch_wakeup = 0;
|
|
|
|
unsigned long flags;
|
|
|
|
int status = 0;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
cmd = (struct usb_ctrlrequest *) urb->setup_packet;
|
|
|
|
typeReq = (cmd->bRequestType << 8) | cmd->bRequest;
|
|
|
|
wValue = le16_to_cpu (cmd->wValue);
|
|
|
|
wIndex = le16_to_cpu (cmd->wIndex);
|
|
|
|
wLength = le16_to_cpu (cmd->wLength);
|
|
|
|
|
|
|
|
if (wLength > urb->transfer_buffer_length)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
urb->actual_length = 0;
|
|
|
|
switch (typeReq) {
|
|
|
|
|
|
|
|
/* DEVICE REQUESTS */
|
|
|
|
|
2006-01-24 09:40:27 -07:00
|
|
|
/* The root hub's remote wakeup enable bit is implemented using
|
|
|
|
* driver model wakeup flags. If this system supports wakeup
|
|
|
|
* through USB, userspace may change the default "allow wakeup"
|
|
|
|
* policy through sysfs or these calls.
|
|
|
|
*
|
|
|
|
* Most root hubs support wakeup from downstream devices, for
|
|
|
|
* runtime power management (disabling USB clocks and reducing
|
|
|
|
* VBUS power usage). However, not all of them do so; silicon,
|
|
|
|
* board, and BIOS bugs here are not uncommon, so these can't
|
|
|
|
* be treated quite like external hubs.
|
|
|
|
*
|
|
|
|
* Likewise, not all root hubs will pass wakeup events upstream,
|
|
|
|
* to wake up the whole system. So don't assume root hub and
|
|
|
|
* controller capabilities are identical.
|
|
|
|
*/
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
case DeviceRequest | USB_REQ_GET_STATUS:
|
2006-01-24 09:40:27 -07:00
|
|
|
tbuf [0] = (device_may_wakeup(&hcd->self.root_hub->dev)
|
|
|
|
<< USB_DEVICE_REMOTE_WAKEUP)
|
2005-04-16 16:20:36 -06:00
|
|
|
| (1 << USB_DEVICE_SELF_POWERED);
|
|
|
|
tbuf [1] = 0;
|
|
|
|
len = 2;
|
|
|
|
break;
|
|
|
|
case DeviceOutRequest | USB_REQ_CLEAR_FEATURE:
|
|
|
|
if (wValue == USB_DEVICE_REMOTE_WAKEUP)
|
2006-01-24 09:40:27 -07:00
|
|
|
device_set_wakeup_enable(&hcd->self.root_hub->dev, 0);
|
2005-04-16 16:20:36 -06:00
|
|
|
else
|
|
|
|
goto error;
|
|
|
|
break;
|
|
|
|
case DeviceOutRequest | USB_REQ_SET_FEATURE:
|
2006-01-24 09:40:27 -07:00
|
|
|
if (device_can_wakeup(&hcd->self.root_hub->dev)
|
|
|
|
&& wValue == USB_DEVICE_REMOTE_WAKEUP)
|
|
|
|
device_set_wakeup_enable(&hcd->self.root_hub->dev, 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
else
|
|
|
|
goto error;
|
|
|
|
break;
|
|
|
|
case DeviceRequest | USB_REQ_GET_CONFIGURATION:
|
|
|
|
tbuf [0] = 1;
|
|
|
|
len = 1;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case DeviceOutRequest | USB_REQ_SET_CONFIGURATION:
|
|
|
|
break;
|
|
|
|
case DeviceRequest | USB_REQ_GET_DESCRIPTOR:
|
|
|
|
switch (wValue & 0xff00) {
|
|
|
|
case USB_DT_DEVICE << 8:
|
|
|
|
if (hcd->driver->flags & HCD_USB2)
|
|
|
|
bufp = usb2_rh_dev_descriptor;
|
|
|
|
else if (hcd->driver->flags & HCD_USB11)
|
|
|
|
bufp = usb11_rh_dev_descriptor;
|
|
|
|
else
|
|
|
|
goto error;
|
|
|
|
len = 18;
|
|
|
|
break;
|
|
|
|
case USB_DT_CONFIG << 8:
|
|
|
|
if (hcd->driver->flags & HCD_USB2) {
|
|
|
|
bufp = hs_rh_config_descriptor;
|
|
|
|
len = sizeof hs_rh_config_descriptor;
|
|
|
|
} else {
|
|
|
|
bufp = fs_rh_config_descriptor;
|
|
|
|
len = sizeof fs_rh_config_descriptor;
|
|
|
|
}
|
2006-01-24 09:40:27 -07:00
|
|
|
if (device_can_wakeup(&hcd->self.root_hub->dev))
|
2005-04-16 16:20:36 -06:00
|
|
|
patch_wakeup = 1;
|
|
|
|
break;
|
|
|
|
case USB_DT_STRING << 8:
|
|
|
|
n = rh_string (wValue & 0xff, hcd, ubuf, wLength);
|
|
|
|
if (n < 0)
|
|
|
|
goto error;
|
|
|
|
urb->actual_length = n;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DeviceRequest | USB_REQ_GET_INTERFACE:
|
|
|
|
tbuf [0] = 0;
|
|
|
|
len = 1;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case DeviceOutRequest | USB_REQ_SET_INTERFACE:
|
|
|
|
break;
|
|
|
|
case DeviceOutRequest | USB_REQ_SET_ADDRESS:
|
|
|
|
// wValue == urb->dev->devaddr
|
|
|
|
dev_dbg (hcd->self.controller, "root hub device address %d\n",
|
|
|
|
wValue);
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* INTERFACE REQUESTS (no defined feature/status flags) */
|
|
|
|
|
|
|
|
/* ENDPOINT REQUESTS */
|
|
|
|
|
|
|
|
case EndpointRequest | USB_REQ_GET_STATUS:
|
|
|
|
// ENDPOINT_HALT flag
|
|
|
|
tbuf [0] = 0;
|
|
|
|
tbuf [1] = 0;
|
|
|
|
len = 2;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case EndpointOutRequest | USB_REQ_CLEAR_FEATURE:
|
|
|
|
case EndpointOutRequest | USB_REQ_SET_FEATURE:
|
|
|
|
dev_dbg (hcd->self.controller, "no endpoint features yet\n");
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* CLASS REQUESTS (and errors) */
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* non-generic request */
|
2005-09-27 11:38:54 -06:00
|
|
|
switch (typeReq) {
|
|
|
|
case GetHubStatus:
|
|
|
|
case GetPortStatus:
|
|
|
|
len = 4;
|
|
|
|
break;
|
|
|
|
case GetHubDescriptor:
|
|
|
|
len = sizeof (struct usb_hub_descriptor);
|
|
|
|
break;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2005-09-27 11:38:54 -06:00
|
|
|
status = hcd->driver->hub_control (hcd,
|
|
|
|
typeReq, wValue, wIndex,
|
|
|
|
tbuf, wLength);
|
2005-04-16 16:20:36 -06:00
|
|
|
break;
|
|
|
|
error:
|
|
|
|
/* "protocol stall" on error */
|
|
|
|
status = -EPIPE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (status) {
|
|
|
|
len = 0;
|
|
|
|
if (status != -EPIPE) {
|
|
|
|
dev_dbg (hcd->self.controller,
|
|
|
|
"CTRL: TypeReq=0x%x val=0x%x "
|
|
|
|
"idx=0x%x len=%d ==> %d\n",
|
|
|
|
typeReq, wValue, wIndex,
|
2005-09-27 11:38:54 -06:00
|
|
|
wLength, status);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (len) {
|
|
|
|
if (urb->transfer_buffer_length < len)
|
|
|
|
len = urb->transfer_buffer_length;
|
|
|
|
urb->actual_length = len;
|
|
|
|
// always USB_DIR_IN, toward host
|
|
|
|
memcpy (ubuf, bufp, len);
|
|
|
|
|
|
|
|
/* report whether RH hardware supports remote wakeup */
|
|
|
|
if (patch_wakeup &&
|
|
|
|
len > offsetof (struct usb_config_descriptor,
|
|
|
|
bmAttributes))
|
|
|
|
((struct usb_config_descriptor *)ubuf)->bmAttributes
|
|
|
|
|= USB_CONFIG_ATT_WAKEUP;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* any errors get returned through the urb completion */
|
|
|
|
local_irq_save (flags);
|
|
|
|
spin_lock (&urb->lock);
|
|
|
|
if (urb->status == -EINPROGRESS)
|
|
|
|
urb->status = status;
|
|
|
|
spin_unlock (&urb->lock);
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
usb_hcd_giveback_urb (hcd, urb);
|
2005-04-16 16:20:36 -06:00
|
|
|
local_irq_restore (flags);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
2005-04-21 13:56:37 -06:00
|
|
|
* Root Hub interrupt transfers are polled using a timer if the
|
|
|
|
* driver requests it; otherwise the driver is responsible for
|
|
|
|
* calling usb_hcd_poll_rh_status() when an event occurs.
|
2005-04-16 16:20:36 -06:00
|
|
|
*
|
2005-04-21 13:56:37 -06:00
|
|
|
* Completions are called in_interrupt(), but they may or may not
|
|
|
|
* be in_irq().
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2005-04-21 13:56:37 -06:00
|
|
|
void usb_hcd_poll_rh_status(struct usb_hcd *hcd)
|
|
|
|
{
|
|
|
|
struct urb *urb;
|
|
|
|
int length;
|
|
|
|
unsigned long flags;
|
|
|
|
char buffer[4]; /* Any root hubs with > 31 ports? */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-03-13 09:10:52 -06:00
|
|
|
if (unlikely(!hcd->rh_registered))
|
|
|
|
return;
|
2005-04-21 13:56:37 -06:00
|
|
|
if (!hcd->uses_new_polling && !hcd->status_urb)
|
|
|
|
return;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
length = hcd->driver->hub_status_data(hcd, buffer);
|
|
|
|
if (length > 0) {
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
/* try to complete the status urb */
|
|
|
|
local_irq_save (flags);
|
|
|
|
spin_lock(&hcd_root_hub_lock);
|
|
|
|
urb = hcd->status_urb;
|
|
|
|
if (urb) {
|
|
|
|
spin_lock(&urb->lock);
|
|
|
|
if (urb->status == -EINPROGRESS) {
|
|
|
|
hcd->poll_pending = 0;
|
|
|
|
hcd->status_urb = NULL;
|
|
|
|
urb->status = 0;
|
|
|
|
urb->hcpriv = NULL;
|
|
|
|
urb->actual_length = length;
|
|
|
|
memcpy(urb->transfer_buffer, buffer, length);
|
|
|
|
} else /* urb has been unlinked */
|
|
|
|
length = 0;
|
|
|
|
spin_unlock(&urb->lock);
|
|
|
|
} else
|
|
|
|
length = 0;
|
|
|
|
spin_unlock(&hcd_root_hub_lock);
|
|
|
|
|
|
|
|
/* local irqs are always blocked in completions */
|
|
|
|
if (length > 0)
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
usb_hcd_giveback_urb (hcd, urb);
|
2005-04-21 13:56:37 -06:00
|
|
|
else
|
|
|
|
hcd->poll_pending = 1;
|
|
|
|
local_irq_restore (flags);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
/* The USB 2.0 spec says 256 ms. This is close enough and won't
|
|
|
|
* exceed that limit if HZ is 100. */
|
|
|
|
if (hcd->uses_new_polling ? hcd->poll_rh :
|
|
|
|
(length == 0 && hcd->status_urb != NULL))
|
|
|
|
mod_timer (&hcd->rh_timer, jiffies + msecs_to_jiffies(250));
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2005-04-21 13:56:37 -06:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_poll_rh_status);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* timer callback */
|
2005-04-21 13:56:37 -06:00
|
|
|
static void rh_timer_func (unsigned long _hcd)
|
|
|
|
{
|
|
|
|
usb_hcd_poll_rh_status((struct usb_hcd *) _hcd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
static int rh_queue_status (struct usb_hcd *hcd, struct urb *urb)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2005-04-21 13:56:37 -06:00
|
|
|
int retval;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long flags;
|
2005-04-21 13:56:37 -06:00
|
|
|
int len = 1 + (urb->dev->maxchild / 8);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
spin_lock_irqsave (&hcd_root_hub_lock, flags);
|
|
|
|
if (urb->status != -EINPROGRESS) /* already unlinked */
|
|
|
|
retval = urb->status;
|
|
|
|
else if (hcd->status_urb || urb->transfer_buffer_length < len) {
|
|
|
|
dev_dbg (hcd->self.controller, "not queuing rh status urb\n");
|
|
|
|
retval = -EINVAL;
|
|
|
|
} else {
|
|
|
|
hcd->status_urb = urb;
|
|
|
|
urb->hcpriv = hcd; /* indicate it's queued */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
if (!hcd->uses_new_polling)
|
|
|
|
mod_timer (&hcd->rh_timer, jiffies +
|
|
|
|
msecs_to_jiffies(250));
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
/* If a status change has already occurred, report it ASAP */
|
|
|
|
else if (hcd->poll_pending)
|
|
|
|
mod_timer (&hcd->rh_timer, jiffies);
|
|
|
|
retval = 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2005-04-21 13:56:37 -06:00
|
|
|
spin_unlock_irqrestore (&hcd_root_hub_lock, flags);
|
|
|
|
return retval;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static int rh_urb_enqueue (struct usb_hcd *hcd, struct urb *urb)
|
|
|
|
{
|
2005-04-21 13:56:37 -06:00
|
|
|
if (usb_pipeint (urb->pipe))
|
|
|
|
return rh_queue_status (hcd, urb);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (usb_pipecontrol (urb->pipe))
|
|
|
|
return rh_call_control (hcd, urb);
|
2005-04-21 13:56:37 -06:00
|
|
|
return -EINVAL;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
2006-08-11 14:01:45 -06:00
|
|
|
/* Unlinks of root-hub control URBs are legal, but they don't do anything
|
|
|
|
* since these URBs always execute synchronously.
|
2005-04-21 13:56:37 -06:00
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static int usb_rh_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
|
|
|
|
{
|
2006-08-11 14:01:45 -06:00
|
|
|
unsigned long flags;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-08-11 14:01:45 -06:00
|
|
|
if (usb_pipeendpoint(urb->pipe) == 0) { /* Control URB */
|
|
|
|
; /* Do nothing */
|
2005-04-21 13:56:37 -06:00
|
|
|
|
|
|
|
} else { /* Status URB */
|
|
|
|
if (!hcd->uses_new_polling)
|
2006-08-11 14:01:45 -06:00
|
|
|
del_timer (&hcd->rh_timer);
|
|
|
|
local_irq_save (flags);
|
2005-04-21 13:56:37 -06:00
|
|
|
spin_lock (&hcd_root_hub_lock);
|
|
|
|
if (urb == hcd->status_urb) {
|
|
|
|
hcd->status_urb = NULL;
|
|
|
|
urb->hcpriv = NULL;
|
|
|
|
} else
|
|
|
|
urb = NULL; /* wasn't fully queued */
|
|
|
|
spin_unlock (&hcd_root_hub_lock);
|
|
|
|
if (urb)
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
usb_hcd_giveback_urb (hcd, urb);
|
2006-08-11 14:01:45 -06:00
|
|
|
local_irq_restore (flags);
|
2005-04-21 13:56:37 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
2005-03-15 16:10:13 -07:00
|
|
|
static struct class *usb_host_class;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
int usb_host_init(void)
|
|
|
|
{
|
2005-03-15 16:10:13 -07:00
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
usb_host_class = class_create(THIS_MODULE, "usb_host");
|
|
|
|
if (IS_ERR(usb_host_class))
|
|
|
|
retval = PTR_ERR(usb_host_class);
|
|
|
|
return retval;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void usb_host_cleanup(void)
|
|
|
|
{
|
2005-03-15 16:10:13 -07:00
|
|
|
class_destroy(usb_host_class);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_bus_init - shared initialization code
|
|
|
|
* @bus: the bus structure being initialized
|
|
|
|
*
|
|
|
|
* This code is used to initialize a usb_bus structure, memory for which is
|
|
|
|
* separately managed.
|
|
|
|
*/
|
|
|
|
static void usb_bus_init (struct usb_bus *bus)
|
|
|
|
{
|
|
|
|
memset (&bus->devmap, 0, sizeof(struct usb_devmap));
|
|
|
|
|
|
|
|
bus->devnum_next = 1;
|
|
|
|
|
|
|
|
bus->root_hub = NULL;
|
|
|
|
bus->busnum = -1;
|
|
|
|
bus->bandwidth_allocated = 0;
|
|
|
|
bus->bandwidth_int_reqs = 0;
|
|
|
|
bus->bandwidth_isoc_reqs = 0;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD (&bus->bus_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_register_bus - registers the USB host controller with the usb core
|
|
|
|
* @bus: pointer to the bus to register
|
|
|
|
* Context: !in_interrupt()
|
|
|
|
*
|
|
|
|
* Assigns a bus number, and links the controller into usbcore data
|
|
|
|
* structures so that it can be seen by scanning the bus list.
|
|
|
|
*/
|
|
|
|
static int usb_register_bus(struct usb_bus *bus)
|
|
|
|
{
|
|
|
|
int busnum;
|
|
|
|
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_lock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
busnum = find_next_zero_bit (busmap.busmap, USB_MAXBUS, 1);
|
|
|
|
if (busnum < USB_MAXBUS) {
|
|
|
|
set_bit (busnum, busmap.busmap);
|
|
|
|
bus->busnum = busnum;
|
|
|
|
} else {
|
|
|
|
printk (KERN_ERR "%s: too many buses\n", usbcore_name);
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
return -E2BIG;
|
|
|
|
}
|
|
|
|
|
2005-10-27 23:25:43 -06:00
|
|
|
bus->class_dev = class_device_create(usb_host_class, NULL, MKDEV(0,0),
|
|
|
|
bus->controller, "usb_host%d", busnum);
|
2005-03-15 16:10:13 -07:00
|
|
|
if (IS_ERR(bus->class_dev)) {
|
2005-04-16 16:20:36 -06:00
|
|
|
clear_bit(busnum, busmap.busmap);
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-03-15 16:10:13 -07:00
|
|
|
return PTR_ERR(bus->class_dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2005-03-15 16:10:13 -07:00
|
|
|
class_set_devdata(bus->class_dev, bus);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Add it to the local list of buses */
|
|
|
|
list_add (&bus->bus_list, &usb_bus_list);
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-06-20 22:15:16 -06:00
|
|
|
usb_notify_add_bus(bus);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
dev_info (bus->controller, "new USB bus registered, assigned bus number %d\n", bus->busnum);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_deregister_bus - deregisters the USB host controller
|
|
|
|
* @bus: pointer to the bus to deregister
|
|
|
|
* Context: !in_interrupt()
|
|
|
|
*
|
|
|
|
* Recycles the bus number, and unlinks the controller from usbcore data
|
|
|
|
* structures so that it won't be seen by scanning the bus list.
|
|
|
|
*/
|
|
|
|
static void usb_deregister_bus (struct usb_bus *bus)
|
|
|
|
{
|
|
|
|
dev_info (bus->controller, "USB bus %d deregistered\n", bus->busnum);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTE: make sure that all the devices are removed by the
|
|
|
|
* controller code, as well as having it call this when cleaning
|
|
|
|
* itself up
|
|
|
|
*/
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_lock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
list_del (&bus->bus_list);
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-06-20 22:15:16 -06:00
|
|
|
usb_notify_remove_bus(bus);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
clear_bit (bus->busnum, busmap.busmap);
|
|
|
|
|
2005-03-15 16:10:13 -07:00
|
|
|
class_device_unregister(bus->class_dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2005-04-25 09:25:17 -06:00
|
|
|
* register_root_hub - called by usb_add_hcd() to register a root hub
|
2005-04-16 16:20:36 -06:00
|
|
|
* @hcd: host controller for this root hub
|
|
|
|
*
|
2005-04-25 09:25:17 -06:00
|
|
|
* This function registers the root hub with the USB subsystem. It sets up
|
2006-01-23 16:25:40 -07:00
|
|
|
* the device properly in the device tree and then calls usb_new_device()
|
|
|
|
* to register the usb device. It also assigns the root hub's USB address
|
|
|
|
* (always 1).
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2006-01-23 16:25:40 -07:00
|
|
|
static int register_root_hub(struct usb_hcd *hcd)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct device *parent_dev = hcd->self.controller;
|
2006-01-23 16:25:40 -07:00
|
|
|
struct usb_device *usb_dev = hcd->self.root_hub;
|
2005-04-16 16:20:36 -06:00
|
|
|
const int devnum = 1;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
usb_dev->devnum = devnum;
|
|
|
|
usb_dev->bus->devnum_next = devnum + 1;
|
|
|
|
memset (&usb_dev->bus->devmap.devicemap, 0,
|
|
|
|
sizeof usb_dev->bus->devmap.devicemap);
|
|
|
|
set_bit (devnum, usb_dev->bus->devmap.devicemap);
|
|
|
|
usb_set_device_state(usb_dev, USB_STATE_ADDRESS);
|
|
|
|
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_lock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
usb_dev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64);
|
|
|
|
retval = usb_get_device_descriptor(usb_dev, USB_DT_DEVICE_SIZE);
|
|
|
|
if (retval != sizeof usb_dev->descriptor) {
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
dev_dbg (parent_dev, "can't read %s device descriptor %d\n",
|
|
|
|
usb_dev->dev.bus_id, retval);
|
|
|
|
return (retval < 0) ? retval : -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
retval = usb_new_device (usb_dev);
|
|
|
|
if (retval) {
|
|
|
|
dev_err (parent_dev, "can't register root hub for %s, %d\n",
|
|
|
|
usb_dev->dev.bus_id, retval);
|
|
|
|
}
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (retval == 0) {
|
|
|
|
spin_lock_irq (&hcd_root_hub_lock);
|
|
|
|
hcd->rh_registered = 1;
|
|
|
|
spin_unlock_irq (&hcd_root_hub_lock);
|
|
|
|
|
|
|
|
/* Did the HC die before the root hub was registered? */
|
|
|
|
if (hcd->state == HC_STATE_HALT)
|
|
|
|
usb_hc_died (hcd); /* This time clean up */
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
void usb_enable_root_hub_irq (struct usb_bus *bus)
|
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
|
|
|
|
hcd = container_of (bus, struct usb_hcd, self);
|
2006-09-25 13:41:12 -06:00
|
|
|
if (hcd->driver->hub_irq_enable && hcd->state != HC_STATE_HALT)
|
2005-04-21 13:56:37 -06:00
|
|
|
hcd->driver->hub_irq_enable (hcd);
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_calc_bus_time - approximate periodic transaction time in nanoseconds
|
|
|
|
* @speed: from dev->speed; USB_SPEED_{LOW,FULL,HIGH}
|
|
|
|
* @is_input: true iff the transaction sends data to the host
|
|
|
|
* @isoc: true for isochronous transactions, false for interrupt ones
|
|
|
|
* @bytecount: how many bytes in the transaction.
|
|
|
|
*
|
|
|
|
* Returns approximate bus time in nanoseconds for a periodic transaction.
|
|
|
|
* See USB 2.0 spec section 5.11.3; only periodic transfers need to be
|
|
|
|
* scheduled in software, this function is only used for such scheduling.
|
|
|
|
*/
|
|
|
|
long usb_calc_bus_time (int speed, int is_input, int isoc, int bytecount)
|
|
|
|
{
|
|
|
|
unsigned long tmp;
|
|
|
|
|
|
|
|
switch (speed) {
|
|
|
|
case USB_SPEED_LOW: /* INTR only */
|
|
|
|
if (is_input) {
|
|
|
|
tmp = (67667L * (31L + 10L * BitTime (bytecount))) / 1000L;
|
|
|
|
return (64060L + (2 * BW_HUB_LS_SETUP) + BW_HOST_DELAY + tmp);
|
|
|
|
} else {
|
|
|
|
tmp = (66700L * (31L + 10L * BitTime (bytecount))) / 1000L;
|
|
|
|
return (64107L + (2 * BW_HUB_LS_SETUP) + BW_HOST_DELAY + tmp);
|
|
|
|
}
|
|
|
|
case USB_SPEED_FULL: /* ISOC or INTR */
|
|
|
|
if (isoc) {
|
|
|
|
tmp = (8354L * (31L + 10L * BitTime (bytecount))) / 1000L;
|
|
|
|
return (((is_input) ? 7268L : 6265L) + BW_HOST_DELAY + tmp);
|
|
|
|
} else {
|
|
|
|
tmp = (8354L * (31L + 10L * BitTime (bytecount))) / 1000L;
|
|
|
|
return (9107L + BW_HOST_DELAY + tmp);
|
|
|
|
}
|
|
|
|
case USB_SPEED_HIGH: /* ISOC or INTR */
|
|
|
|
// FIXME adjust for input vs output
|
|
|
|
if (isoc)
|
2005-07-29 13:18:28 -06:00
|
|
|
tmp = HS_NSECS_ISO (bytecount);
|
2005-04-16 16:20:36 -06:00
|
|
|
else
|
2005-07-29 13:18:28 -06:00
|
|
|
tmp = HS_NSECS (bytecount);
|
2005-04-16 16:20:36 -06:00
|
|
|
return tmp;
|
|
|
|
default:
|
|
|
|
pr_debug ("%s: bogus device speed!\n", usbcore_name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_calc_bus_time);
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Generic HC operations.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
static void urb_unlink (struct urb *urb)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
/* clear all state linking urb to this dev (and hcd) */
|
|
|
|
|
|
|
|
spin_lock_irqsave (&hcd_data_lock, flags);
|
|
|
|
list_del_init (&urb->urb_list);
|
|
|
|
spin_unlock_irqrestore (&hcd_data_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* may be called in any context with a valid urb->dev usecount
|
|
|
|
* caller surrenders "ownership" of urb
|
|
|
|
* expects usb_submit_urb() to have sanity checked and conditioned all
|
|
|
|
* inputs in the urb
|
|
|
|
*/
|
2006-08-30 09:27:36 -06:00
|
|
|
int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
int status;
|
2006-08-30 09:32:52 -06:00
|
|
|
struct usb_hcd *hcd = bus_to_hcd(urb->dev->bus);
|
2005-04-16 16:20:36 -06:00
|
|
|
struct usb_host_endpoint *ep;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
if (!hcd)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
usbmon_urb_submit(&hcd->self, urb);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Atomically queue the urb, first to our records, then to the HCD.
|
|
|
|
* Access to urb->status is controlled by urb->lock ... changes on
|
|
|
|
* i/o completion (normal or fault) or unlinking.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// FIXME: verify that quiescing hc works right (RH cleans up)
|
|
|
|
|
|
|
|
spin_lock_irqsave (&hcd_data_lock, flags);
|
|
|
|
ep = (usb_pipein(urb->pipe) ? urb->dev->ep_in : urb->dev->ep_out)
|
|
|
|
[usb_pipeendpoint(urb->pipe)];
|
|
|
|
if (unlikely (!ep))
|
|
|
|
status = -ENOENT;
|
|
|
|
else if (unlikely (urb->reject))
|
|
|
|
status = -EPERM;
|
|
|
|
else switch (hcd->state) {
|
|
|
|
case HC_STATE_RUNNING:
|
|
|
|
case HC_STATE_RESUMING:
|
2005-09-22 23:32:24 -06:00
|
|
|
doit:
|
2005-04-16 16:20:36 -06:00
|
|
|
list_add_tail (&urb->urb_list, &ep->urb_list);
|
|
|
|
status = 0;
|
|
|
|
break;
|
2005-09-22 23:32:24 -06:00
|
|
|
case HC_STATE_SUSPENDED:
|
|
|
|
/* HC upstream links (register access, wakeup signaling) can work
|
|
|
|
* even when the downstream links (and DMA etc) are quiesced; let
|
|
|
|
* usbcore talk to the root hub.
|
|
|
|
*/
|
|
|
|
if (hcd->self.controller->power.power_state.event == PM_EVENT_ON
|
|
|
|
&& urb->dev->parent == NULL)
|
|
|
|
goto doit;
|
|
|
|
/* FALL THROUGH */
|
2005-04-16 16:20:36 -06:00
|
|
|
default:
|
|
|
|
status = -ESHUTDOWN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore (&hcd_data_lock, flags);
|
|
|
|
if (status) {
|
|
|
|
INIT_LIST_HEAD (&urb->urb_list);
|
|
|
|
usbmon_urb_submit_error(&hcd->self, urb, status);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* increment urb's reference count as part of giving it to the HCD
|
|
|
|
* (which now controls it). HCD guarantees that it either returns
|
|
|
|
* an error or calls giveback(), but not both.
|
|
|
|
*/
|
|
|
|
urb = usb_get_urb (urb);
|
|
|
|
atomic_inc (&urb->use_count);
|
|
|
|
|
|
|
|
if (urb->dev == hcd->self.root_hub) {
|
|
|
|
/* NOTE: requirement on hub callers (usbfs and the hub
|
|
|
|
* driver, for now) that URBs' urb->transfer_buffer be
|
|
|
|
* valid and usb_buffer_{sync,unmap}() not be needed, since
|
|
|
|
* they could clobber root hub response data.
|
|
|
|
*/
|
|
|
|
status = rh_urb_enqueue (hcd, urb);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* lower level hcd code should use *_dma exclusively,
|
|
|
|
* unless it uses pio or talks to another transport.
|
|
|
|
*/
|
2006-08-30 09:29:56 -06:00
|
|
|
if (hcd->self.uses_dma) {
|
2005-04-16 16:20:36 -06:00
|
|
|
if (usb_pipecontrol (urb->pipe)
|
|
|
|
&& !(urb->transfer_flags & URB_NO_SETUP_DMA_MAP))
|
|
|
|
urb->setup_dma = dma_map_single (
|
|
|
|
hcd->self.controller,
|
|
|
|
urb->setup_packet,
|
|
|
|
sizeof (struct usb_ctrlrequest),
|
|
|
|
DMA_TO_DEVICE);
|
|
|
|
if (urb->transfer_buffer_length != 0
|
|
|
|
&& !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP))
|
|
|
|
urb->transfer_dma = dma_map_single (
|
|
|
|
hcd->self.controller,
|
|
|
|
urb->transfer_buffer,
|
|
|
|
urb->transfer_buffer_length,
|
|
|
|
usb_pipein (urb->pipe)
|
|
|
|
? DMA_FROM_DEVICE
|
|
|
|
: DMA_TO_DEVICE);
|
|
|
|
}
|
|
|
|
|
|
|
|
status = hcd->driver->urb_enqueue (hcd, ep, urb, mem_flags);
|
|
|
|
done:
|
|
|
|
if (unlikely (status)) {
|
|
|
|
urb_unlink (urb);
|
|
|
|
atomic_dec (&urb->use_count);
|
|
|
|
if (urb->reject)
|
|
|
|
wake_up (&usb_kill_urb_queue);
|
|
|
|
usb_put_urb (urb);
|
|
|
|
usbmon_urb_submit_error(&hcd->self, urb, status);
|
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* called in any context */
|
2006-08-30 09:27:36 -06:00
|
|
|
int usb_hcd_get_frame_number (struct usb_device *udev)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2006-08-30 09:32:52 -06:00
|
|
|
struct usb_hcd *hcd = bus_to_hcd(udev->bus);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
if (!HC_IS_RUNNING (hcd->state))
|
|
|
|
return -ESHUTDOWN;
|
|
|
|
return hcd->driver->get_frame_number (hcd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* this makes the hcd giveback() the urb more quickly, by kicking it
|
|
|
|
* off hardware queues (which may take a while) and returning it as
|
|
|
|
* soon as practical. we've already set up the urb's return status,
|
|
|
|
* but we can't know if the callback completed already.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
unlink1 (struct usb_hcd *hcd, struct urb *urb)
|
|
|
|
{
|
|
|
|
int value;
|
|
|
|
|
|
|
|
if (urb->dev == hcd->self.root_hub)
|
|
|
|
value = usb_rh_urb_dequeue (hcd, urb);
|
|
|
|
else {
|
|
|
|
|
|
|
|
/* The only reason an HCD might fail this call is if
|
|
|
|
* it has not yet fully queued the urb to begin with.
|
|
|
|
* Such failures should be harmless. */
|
|
|
|
value = hcd->driver->urb_dequeue (hcd, urb);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (value != 0)
|
|
|
|
dev_dbg (hcd->self.controller, "dequeue %p --> %d\n",
|
|
|
|
urb, value);
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* called in any context
|
|
|
|
*
|
|
|
|
* caller guarantees urb won't be recycled till both unlink()
|
|
|
|
* and the urb's completion function return
|
|
|
|
*/
|
2006-08-30 09:27:36 -06:00
|
|
|
int usb_hcd_unlink_urb (struct urb *urb, int status)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct usb_host_endpoint *ep;
|
|
|
|
struct usb_hcd *hcd = NULL;
|
|
|
|
struct device *sys = NULL;
|
|
|
|
unsigned long flags;
|
|
|
|
struct list_head *tmp;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
if (!urb)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!urb->dev || !urb->dev->bus)
|
|
|
|
return -ENODEV;
|
|
|
|
ep = (usb_pipein(urb->pipe) ? urb->dev->ep_in : urb->dev->ep_out)
|
|
|
|
[usb_pipeendpoint(urb->pipe)];
|
|
|
|
if (!ep)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we contend for urb->status with the hcd core,
|
|
|
|
* which changes it while returning the urb.
|
|
|
|
*
|
|
|
|
* Caller guaranteed that the urb pointer hasn't been freed, and
|
|
|
|
* that it was submitted. But as a rule it can't know whether or
|
|
|
|
* not it's already been unlinked ... so we respect the reversed
|
|
|
|
* lock sequence needed for the usb_hcd_giveback_urb() code paths
|
|
|
|
* (urb lock, then hcd_data_lock) in case some other CPU is now
|
|
|
|
* unlinking it.
|
|
|
|
*/
|
|
|
|
spin_lock_irqsave (&urb->lock, flags);
|
|
|
|
spin_lock (&hcd_data_lock);
|
|
|
|
|
|
|
|
sys = &urb->dev->dev;
|
2006-08-30 09:32:52 -06:00
|
|
|
hcd = bus_to_hcd(urb->dev->bus);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (hcd == NULL) {
|
|
|
|
retval = -ENODEV;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* insist the urb is still queued */
|
|
|
|
list_for_each(tmp, &ep->urb_list) {
|
|
|
|
if (tmp == &urb->urb_list)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (tmp != &urb->urb_list) {
|
|
|
|
retval = -EIDRM;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Any status except -EINPROGRESS means something already started to
|
|
|
|
* unlink this URB from the hardware. So there's no more work to do.
|
|
|
|
*/
|
|
|
|
if (urb->status != -EINPROGRESS) {
|
|
|
|
retval = -EBUSY;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* IRQ setup can easily be broken so that USB controllers
|
|
|
|
* never get completion IRQs ... maybe even the ones we need to
|
|
|
|
* finish unlinking the initial failed usb_set_address()
|
|
|
|
* or device descriptor fetch.
|
|
|
|
*/
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 15:59:46 -07:00
|
|
|
if (!test_bit(HCD_FLAG_SAW_IRQ, &hcd->flags)
|
|
|
|
&& hcd->self.root_hub != urb->dev) {
|
2005-04-16 16:20:36 -06:00
|
|
|
dev_warn (hcd->self.controller, "Unlink after no-IRQ? "
|
|
|
|
"Controller is probably using the wrong IRQ."
|
|
|
|
"\n");
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 15:59:46 -07:00
|
|
|
set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
urb->status = status;
|
|
|
|
|
|
|
|
spin_unlock (&hcd_data_lock);
|
|
|
|
spin_unlock_irqrestore (&urb->lock, flags);
|
|
|
|
|
|
|
|
retval = unlink1 (hcd, urb);
|
|
|
|
if (retval == 0)
|
|
|
|
retval = -EINPROGRESS;
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
done:
|
|
|
|
spin_unlock (&hcd_data_lock);
|
|
|
|
spin_unlock_irqrestore (&urb->lock, flags);
|
|
|
|
if (retval != -EIDRM && sys && sys->driver)
|
|
|
|
dev_dbg (sys, "hcd_unlink_urb %p fail %d\n", urb, retval);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* disables the endpoint: cancels any pending urbs, then synchronizes with
|
2006-08-11 14:01:45 -06:00
|
|
|
* the hcd to make sure all endpoint state is gone from hardware, and then
|
|
|
|
* waits until the endpoint's queue is completely drained. use for
|
2005-04-16 16:20:36 -06:00
|
|
|
* set_configuration, set_interface, driver removal, physical disconnect.
|
|
|
|
*
|
|
|
|
* example: a qh stored in ep->hcpriv, holding state related to endpoint
|
|
|
|
* type, maxpacket size, toggle, halt status, and scheduling.
|
|
|
|
*/
|
2006-08-30 09:27:36 -06:00
|
|
|
void usb_hcd_endpoint_disable (struct usb_device *udev,
|
|
|
|
struct usb_host_endpoint *ep)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
struct urb *urb;
|
|
|
|
|
2006-08-30 09:32:52 -06:00
|
|
|
hcd = bus_to_hcd(udev->bus);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
WARN_ON (!HC_IS_RUNNING (hcd->state) && hcd->state != HC_STATE_HALT &&
|
|
|
|
udev->state != USB_STATE_NOTATTACHED);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
local_irq_disable ();
|
|
|
|
|
|
|
|
/* ep is already gone from udev->ep_{in,out}[]; no more submits */
|
|
|
|
rescan:
|
|
|
|
spin_lock (&hcd_data_lock);
|
|
|
|
list_for_each_entry (urb, &ep->urb_list, urb_list) {
|
|
|
|
int tmp;
|
|
|
|
|
2006-08-11 14:01:45 -06:00
|
|
|
/* the urb may already have been unlinked */
|
2005-04-16 16:20:36 -06:00
|
|
|
if (urb->status != -EINPROGRESS)
|
|
|
|
continue;
|
|
|
|
usb_get_urb (urb);
|
|
|
|
spin_unlock (&hcd_data_lock);
|
|
|
|
|
|
|
|
spin_lock (&urb->lock);
|
|
|
|
tmp = urb->status;
|
|
|
|
if (tmp == -EINPROGRESS)
|
|
|
|
urb->status = -ESHUTDOWN;
|
|
|
|
spin_unlock (&urb->lock);
|
|
|
|
|
|
|
|
/* kick hcd unless it's already returning this */
|
|
|
|
if (tmp == -EINPROGRESS) {
|
|
|
|
tmp = urb->pipe;
|
|
|
|
unlink1 (hcd, urb);
|
|
|
|
dev_dbg (hcd->self.controller,
|
|
|
|
"shutdown urb %p pipe %08x ep%d%s%s\n",
|
|
|
|
urb, tmp, usb_pipeendpoint (tmp),
|
|
|
|
(tmp & USB_DIR_IN) ? "in" : "out",
|
|
|
|
({ char *s; \
|
|
|
|
switch (usb_pipetype (tmp)) { \
|
|
|
|
case PIPE_CONTROL: s = ""; break; \
|
|
|
|
case PIPE_BULK: s = "-bulk"; break; \
|
|
|
|
case PIPE_INTERRUPT: s = "-intr"; break; \
|
|
|
|
default: s = "-iso"; break; \
|
|
|
|
}; s;}));
|
|
|
|
}
|
|
|
|
usb_put_urb (urb);
|
|
|
|
|
|
|
|
/* list contents may have changed */
|
|
|
|
goto rescan;
|
|
|
|
}
|
|
|
|
spin_unlock (&hcd_data_lock);
|
|
|
|
local_irq_enable ();
|
|
|
|
|
|
|
|
/* synchronize with the hardware, so old configuration state
|
|
|
|
* clears out immediately (and will be freed).
|
|
|
|
*/
|
|
|
|
might_sleep ();
|
|
|
|
if (hcd->driver->endpoint_disable)
|
|
|
|
hcd->driver->endpoint_disable (hcd, ep);
|
2006-08-11 14:01:45 -06:00
|
|
|
|
|
|
|
/* Wait until the endpoint queue is completely empty. Most HCDs
|
|
|
|
* will have done this already in their endpoint_disable method,
|
|
|
|
* but some might not. And there could be root-hub control URBs
|
|
|
|
* still pending since they aren't affected by the HCDs'
|
|
|
|
* endpoint_disable methods.
|
|
|
|
*/
|
|
|
|
while (!list_empty (&ep->urb_list)) {
|
|
|
|
spin_lock_irq (&hcd_data_lock);
|
|
|
|
|
|
|
|
/* The list may have changed while we acquired the spinlock */
|
|
|
|
urb = NULL;
|
|
|
|
if (!list_empty (&ep->urb_list)) {
|
|
|
|
urb = list_entry (ep->urb_list.prev, struct urb,
|
|
|
|
urb_list);
|
|
|
|
usb_get_urb (urb);
|
|
|
|
}
|
|
|
|
spin_unlock_irq (&hcd_data_lock);
|
|
|
|
|
|
|
|
if (urb) {
|
|
|
|
usb_kill_urb (urb);
|
|
|
|
usb_put_urb (urb);
|
|
|
|
}
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
2005-09-22 23:32:11 -06:00
|
|
|
#ifdef CONFIG_PM
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-10-13 15:08:02 -06:00
|
|
|
int hcd_bus_suspend (struct usb_bus *bus)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
2005-09-22 23:32:11 -06:00
|
|
|
int status;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
hcd = container_of (bus, struct usb_hcd, self);
|
2005-10-13 15:08:02 -06:00
|
|
|
if (!hcd->driver->bus_suspend)
|
2005-09-22 23:32:11 -06:00
|
|
|
return -ENOENT;
|
|
|
|
hcd->state = HC_STATE_QUIESCING;
|
2005-10-13 15:08:02 -06:00
|
|
|
status = hcd->driver->bus_suspend (hcd);
|
2005-09-22 23:32:11 -06:00
|
|
|
if (status == 0)
|
|
|
|
hcd->state = HC_STATE_SUSPENDED;
|
|
|
|
else
|
|
|
|
dev_dbg(&bus->root_hub->dev, "%s fail, err %d\n",
|
|
|
|
"suspend", status);
|
|
|
|
return status;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2005-10-13 15:08:02 -06:00
|
|
|
int hcd_bus_resume (struct usb_bus *bus)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
2005-09-22 23:32:11 -06:00
|
|
|
int status;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
hcd = container_of (bus, struct usb_hcd, self);
|
2005-10-13 15:08:02 -06:00
|
|
|
if (!hcd->driver->bus_resume)
|
2005-09-22 23:32:11 -06:00
|
|
|
return -ENOENT;
|
2005-09-22 23:32:24 -06:00
|
|
|
if (hcd->state == HC_STATE_RUNNING)
|
|
|
|
return 0;
|
2005-09-22 23:32:11 -06:00
|
|
|
hcd->state = HC_STATE_RESUMING;
|
2005-10-13 15:08:02 -06:00
|
|
|
status = hcd->driver->bus_resume (hcd);
|
2005-09-22 23:32:11 -06:00
|
|
|
if (status == 0)
|
|
|
|
hcd->state = HC_STATE_RUNNING;
|
|
|
|
else {
|
|
|
|
dev_dbg(&bus->root_hub->dev, "%s fail, err %d\n",
|
|
|
|
"resume", status);
|
|
|
|
usb_hc_died(hcd);
|
|
|
|
}
|
|
|
|
return status;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2007-03-13 14:37:30 -06:00
|
|
|
/* Workqueue routine for root-hub remote wakeup */
|
|
|
|
static void hcd_resume_work(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct usb_hcd *hcd = container_of(work, struct usb_hcd, wakeup_work);
|
|
|
|
struct usb_device *udev = hcd->self.root_hub;
|
|
|
|
|
|
|
|
usb_lock_device(udev);
|
2007-03-27 11:33:59 -06:00
|
|
|
usb_mark_last_busy(udev);
|
2007-03-13 14:37:30 -06:00
|
|
|
usb_external_resume_device(udev);
|
|
|
|
usb_unlock_device(udev);
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/**
|
|
|
|
* usb_hcd_resume_root_hub - called by HCD to resume its root hub
|
|
|
|
* @hcd: host controller for this root hub
|
|
|
|
*
|
|
|
|
* The USB host controller calls this function when its root hub is
|
|
|
|
* suspended (with the remote wakeup feature enabled) and a remote
|
2007-03-13 14:37:30 -06:00
|
|
|
* wakeup request is received. The routine submits a workqueue request
|
|
|
|
* to resume the root hub (that is, manage its downstream ports again).
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
void usb_hcd_resume_root_hub (struct usb_hcd *hcd)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave (&hcd_root_hub_lock, flags);
|
|
|
|
if (hcd->rh_registered)
|
2007-03-13 14:37:30 -06:00
|
|
|
queue_work(ksuspend_usb_wq, &hcd->wakeup_work);
|
2005-04-16 16:20:36 -06:00
|
|
|
spin_unlock_irqrestore (&hcd_root_hub_lock, flags);
|
|
|
|
}
|
2005-09-22 23:32:11 -06:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_resume_root_hub);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
#ifdef CONFIG_USB_OTG
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_bus_start_enum - start immediate enumeration (for OTG)
|
|
|
|
* @bus: the bus (must use hcd framework)
|
|
|
|
* @port_num: 1-based number of port; usually bus->otg_port
|
|
|
|
* Context: in_interrupt()
|
|
|
|
*
|
|
|
|
* Starts enumeration, with an immediate reset followed later by
|
|
|
|
* khubd identifying and possibly configuring the device.
|
|
|
|
* This is needed by OTG controller drivers, where it helps meet
|
|
|
|
* HNP protocol timing requirements for starting a port reset.
|
|
|
|
*/
|
|
|
|
int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num)
|
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
int status = -EOPNOTSUPP;
|
|
|
|
|
|
|
|
/* NOTE: since HNP can't start by grabbing the bus's address0_sem,
|
|
|
|
* boards with root hubs hooked up to internal devices (instead of
|
|
|
|
* just the OTG port) may need more attention to resetting...
|
|
|
|
*/
|
|
|
|
hcd = container_of (bus, struct usb_hcd, self);
|
|
|
|
if (port_num && hcd->driver->start_port_reset)
|
|
|
|
status = hcd->driver->start_port_reset(hcd, port_num);
|
|
|
|
|
|
|
|
/* run khubd shortly after (first) root port reset finishes;
|
|
|
|
* it may issue others, until at least 50 msecs have passed.
|
|
|
|
*/
|
|
|
|
if (status == 0)
|
|
|
|
mod_timer(&hcd->rh_timer, jiffies + msecs_to_jiffies(10));
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_bus_start_enum);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hcd_giveback_urb - return URB from HCD to device driver
|
|
|
|
* @hcd: host controller returning the URB
|
|
|
|
* @urb: urb being returned to the USB device driver.
|
|
|
|
* Context: in_interrupt()
|
|
|
|
*
|
|
|
|
* This hands the URB from HCD to its USB device driver, using its
|
|
|
|
* completion function. The HCD has freed all per-urb resources
|
|
|
|
* (and is done using urb->hcpriv). It also released all HCD locks;
|
|
|
|
* the device driver won't cause problems if it frees, modifies,
|
|
|
|
* or resubmits this URB.
|
|
|
|
*/
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
void usb_hcd_giveback_urb (struct usb_hcd *hcd, struct urb *urb)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
int at_root_hub;
|
|
|
|
|
|
|
|
at_root_hub = (urb->dev == hcd->self.root_hub);
|
|
|
|
urb_unlink (urb);
|
|
|
|
|
2006-08-30 09:29:56 -06:00
|
|
|
/* lower level hcd code should use *_dma exclusively if the
|
|
|
|
* host controller does DMA */
|
|
|
|
if (hcd->self.uses_dma && !at_root_hub) {
|
2005-04-16 16:20:36 -06:00
|
|
|
if (usb_pipecontrol (urb->pipe)
|
|
|
|
&& !(urb->transfer_flags & URB_NO_SETUP_DMA_MAP))
|
|
|
|
dma_unmap_single (hcd->self.controller, urb->setup_dma,
|
|
|
|
sizeof (struct usb_ctrlrequest),
|
|
|
|
DMA_TO_DEVICE);
|
|
|
|
if (urb->transfer_buffer_length != 0
|
|
|
|
&& !(urb->transfer_flags & URB_NO_TRANSFER_DMA_MAP))
|
|
|
|
dma_unmap_single (hcd->self.controller,
|
|
|
|
urb->transfer_dma,
|
|
|
|
urb->transfer_buffer_length,
|
|
|
|
usb_pipein (urb->pipe)
|
|
|
|
? DMA_FROM_DEVICE
|
|
|
|
: DMA_TO_DEVICE);
|
|
|
|
}
|
|
|
|
|
|
|
|
usbmon_urb_complete (&hcd->self, urb);
|
|
|
|
/* pass ownership to the completion handler */
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
urb->complete (urb);
|
2005-04-16 16:20:36 -06:00
|
|
|
atomic_dec (&urb->use_count);
|
|
|
|
if (unlikely (urb->reject))
|
|
|
|
wake_up (&usb_kill_urb_queue);
|
|
|
|
usb_put_urb (urb);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_hcd_giveback_urb);
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hcd_irq - hook IRQs to HCD framework (bus glue)
|
|
|
|
* @irq: the IRQ being raised
|
|
|
|
* @__hcd: pointer to the HCD whose IRQ is being signaled
|
|
|
|
* @r: saved hardware registers
|
|
|
|
*
|
|
|
|
* If the controller isn't HALTed, calls the driver's irq handler.
|
|
|
|
* Checks whether the controller is now dead.
|
|
|
|
*/
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
irqreturn_t usb_hcd_irq (int irq, void *__hcd)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd = __hcd;
|
|
|
|
int start = hcd->state;
|
|
|
|
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 15:59:46 -07:00
|
|
|
if (unlikely(start == HC_STATE_HALT ||
|
|
|
|
!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)))
|
2005-04-16 16:20:36 -06:00
|
|
|
return IRQ_NONE;
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 07:55:46 -06:00
|
|
|
if (hcd->driver->irq (hcd) == IRQ_NONE)
|
2005-04-16 16:20:36 -06:00
|
|
|
return IRQ_NONE;
|
|
|
|
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 15:59:46 -07:00
|
|
|
set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
|
|
|
|
|
|
|
|
if (unlikely(hcd->state == HC_STATE_HALT))
|
2005-04-16 16:20:36 -06:00
|
|
|
usb_hc_died (hcd);
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hc_died - report abnormal shutdown of a host controller (bus glue)
|
|
|
|
* @hcd: pointer to the HCD representing the controller
|
|
|
|
*
|
|
|
|
* This is called by bus glue to report a USB host controller that died
|
|
|
|
* while operations may still have been pending. It's called automatically
|
|
|
|
* by the PCI glue, so only glue for non-PCI busses should need to call it.
|
|
|
|
*/
|
|
|
|
void usb_hc_died (struct usb_hcd *hcd)
|
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
dev_err (hcd->self.controller, "HC died; cleaning up\n");
|
|
|
|
|
|
|
|
spin_lock_irqsave (&hcd_root_hub_lock, flags);
|
|
|
|
if (hcd->rh_registered) {
|
2005-04-21 13:56:37 -06:00
|
|
|
hcd->poll_rh = 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* make khubd clean up old urbs and devices */
|
|
|
|
usb_set_device_state (hcd->self.root_hub,
|
|
|
|
USB_STATE_NOTATTACHED);
|
|
|
|
usb_kick_khubd (hcd->self.root_hub);
|
|
|
|
}
|
|
|
|
spin_unlock_irqrestore (&hcd_root_hub_lock, flags);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL (usb_hc_died);
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_create_hcd - create and initialize an HCD structure
|
|
|
|
* @driver: HC driver that will use this hcd
|
|
|
|
* @dev: device for this HC, stored in hcd->self.controller
|
|
|
|
* @bus_name: value to store in hcd->self.bus_name
|
|
|
|
* Context: !in_interrupt()
|
|
|
|
*
|
|
|
|
* Allocate a struct usb_hcd, with extra space at the end for the
|
|
|
|
* HC driver's private data. Initialize the generic members of the
|
|
|
|
* hcd structure.
|
|
|
|
*
|
|
|
|
* If memory is unavailable, returns NULL.
|
|
|
|
*/
|
|
|
|
struct usb_hcd *usb_create_hcd (const struct hc_driver *driver,
|
|
|
|
struct device *dev, char *bus_name)
|
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
|
2005-09-06 16:18:34 -06:00
|
|
|
hcd = kzalloc(sizeof(*hcd) + driver->hcd_priv_size, GFP_KERNEL);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (!hcd) {
|
|
|
|
dev_dbg (dev, "hcd alloc failed\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
dev_set_drvdata(dev, hcd);
|
2006-08-30 09:32:52 -06:00
|
|
|
kref_init(&hcd->kref);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
usb_bus_init(&hcd->self);
|
|
|
|
hcd->self.controller = dev;
|
|
|
|
hcd->self.bus_name = bus_name;
|
2006-08-30 09:29:56 -06:00
|
|
|
hcd->self.uses_dma = (dev->dma_mask != NULL);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
init_timer(&hcd->rh_timer);
|
2005-04-21 13:56:37 -06:00
|
|
|
hcd->rh_timer.function = rh_timer_func;
|
|
|
|
hcd->rh_timer.data = (unsigned long) hcd;
|
2007-03-13 14:37:30 -06:00
|
|
|
#ifdef CONFIG_PM
|
|
|
|
INIT_WORK(&hcd->wakeup_work, hcd_resume_work);
|
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
hcd->driver = driver;
|
|
|
|
hcd->product_desc = (driver->product_desc) ? driver->product_desc :
|
|
|
|
"USB Host Controller";
|
|
|
|
|
|
|
|
return hcd;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_create_hcd);
|
|
|
|
|
2006-08-30 09:32:52 -06:00
|
|
|
static void hcd_release (struct kref *kref)
|
|
|
|
{
|
|
|
|
struct usb_hcd *hcd = container_of (kref, struct usb_hcd, kref);
|
|
|
|
|
|
|
|
kfree(hcd);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct usb_hcd *usb_get_hcd (struct usb_hcd *hcd)
|
|
|
|
{
|
|
|
|
if (hcd)
|
|
|
|
kref_get (&hcd->kref);
|
|
|
|
return hcd;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_get_hcd);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
void usb_put_hcd (struct usb_hcd *hcd)
|
|
|
|
{
|
2006-08-30 09:32:52 -06:00
|
|
|
if (hcd)
|
|
|
|
kref_put (&hcd->kref, hcd_release);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_put_hcd);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_add_hcd - finish generic HCD structure initialization and register
|
|
|
|
* @hcd: the usb_hcd structure to initialize
|
|
|
|
* @irqnum: Interrupt line to allocate
|
|
|
|
* @irqflags: Interrupt type flags
|
|
|
|
*
|
|
|
|
* Finish the remaining parts of generic HCD initialization: allocate the
|
|
|
|
* buffers of consistent memory, register the bus, request the IRQ line,
|
|
|
|
* and call the driver's reset() and start() routines.
|
|
|
|
*/
|
|
|
|
int usb_add_hcd(struct usb_hcd *hcd,
|
|
|
|
unsigned int irqnum, unsigned long irqflags)
|
|
|
|
{
|
2005-04-25 09:25:17 -06:00
|
|
|
int retval;
|
|
|
|
struct usb_device *rhdev;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
dev_info(hcd->self.controller, "%s\n", hcd->product_desc);
|
|
|
|
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 15:59:46 -07:00
|
|
|
set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
|
|
|
|
2006-01-23 16:25:40 -07:00
|
|
|
/* HC is in reset state, but accessible. Now do the one-time init,
|
|
|
|
* bottom up so that hcds can customize the root hubs before khubd
|
|
|
|
* starts talking to them. (Note, bus id is assigned early too.)
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
if ((retval = hcd_buffer_create(hcd)) != 0) {
|
|
|
|
dev_dbg(hcd->self.controller, "pool alloc failed\n");
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((retval = usb_register_bus(&hcd->self)) < 0)
|
2005-04-25 09:25:17 -06:00
|
|
|
goto err_register_bus;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-01-23 16:25:40 -07:00
|
|
|
if ((rhdev = usb_alloc_dev(NULL, &hcd->self, 0)) == NULL) {
|
|
|
|
dev_err(hcd->self.controller, "unable to allocate root hub\n");
|
|
|
|
retval = -ENOMEM;
|
|
|
|
goto err_allocate_root_hub;
|
|
|
|
}
|
|
|
|
rhdev->speed = (hcd->driver->flags & HCD_USB2) ? USB_SPEED_HIGH :
|
|
|
|
USB_SPEED_FULL;
|
|
|
|
hcd->self.root_hub = rhdev;
|
|
|
|
|
2006-05-01 23:07:13 -06:00
|
|
|
/* wakeup flag init defaults to "everything works" for root hubs,
|
|
|
|
* but drivers can override it in reset() if needed, along with
|
|
|
|
* recording the overall controller's system wakeup capability.
|
|
|
|
*/
|
|
|
|
device_init_wakeup(&rhdev->dev, 1);
|
|
|
|
|
2006-01-23 16:25:40 -07:00
|
|
|
/* "reset" is misnamed; its role is now one-time init. the controller
|
|
|
|
* should already have been reset (and boot firmware kicked off etc).
|
|
|
|
*/
|
|
|
|
if (hcd->driver->reset && (retval = hcd->driver->reset(hcd)) < 0) {
|
|
|
|
dev_err(hcd->self.controller, "can't setup\n");
|
|
|
|
goto err_hcd_driver_setup;
|
|
|
|
}
|
|
|
|
|
2006-01-24 09:40:27 -07:00
|
|
|
/* NOTE: root hub and controller capabilities may not be the same */
|
|
|
|
if (device_can_wakeup(hcd->self.controller)
|
|
|
|
&& device_can_wakeup(&hcd->self.root_hub->dev))
|
2006-01-23 16:25:40 -07:00
|
|
|
dev_dbg(hcd->self.controller, "supports USB remote wakeup\n");
|
|
|
|
|
|
|
|
/* enable irqs just before we start the controller */
|
2005-04-16 16:20:36 -06:00
|
|
|
if (hcd->driver->irq) {
|
|
|
|
snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
|
|
|
|
hcd->driver->description, hcd->self.busnum);
|
|
|
|
if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags,
|
|
|
|
hcd->irq_descr, hcd)) != 0) {
|
|
|
|
dev_err(hcd->self.controller,
|
2006-06-20 02:21:29 -06:00
|
|
|
"request interrupt %d failed\n", irqnum);
|
2005-04-25 09:25:17 -06:00
|
|
|
goto err_request_irq;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
hcd->irq = irqnum;
|
2006-06-20 02:21:29 -06:00
|
|
|
dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum,
|
2005-04-16 16:20:36 -06:00
|
|
|
(hcd->driver->flags & HCD_MEMORY) ?
|
|
|
|
"io mem" : "io base",
|
|
|
|
(unsigned long long)hcd->rsrc_start);
|
|
|
|
} else {
|
|
|
|
hcd->irq = -1;
|
|
|
|
if (hcd->rsrc_start)
|
|
|
|
dev_info(hcd->self.controller, "%s 0x%08llx\n",
|
|
|
|
(hcd->driver->flags & HCD_MEMORY) ?
|
|
|
|
"io mem" : "io base",
|
|
|
|
(unsigned long long)hcd->rsrc_start);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((retval = hcd->driver->start(hcd)) < 0) {
|
|
|
|
dev_err(hcd->self.controller, "startup error %d\n", retval);
|
2005-04-25 09:25:17 -06:00
|
|
|
goto err_hcd_driver_start;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2006-01-23 16:25:40 -07:00
|
|
|
/* starting here, usbcore will pay attention to this root hub */
|
2005-11-23 10:03:12 -07:00
|
|
|
rhdev->bus_mA = min(500u, hcd->power_budget);
|
2006-01-23 16:25:40 -07:00
|
|
|
if ((retval = register_root_hub(hcd)) != 0)
|
2005-04-25 09:25:17 -06:00
|
|
|
goto err_register_root_hub;
|
|
|
|
|
2005-04-21 13:56:37 -06:00
|
|
|
if (hcd->uses_new_polling && hcd->poll_rh)
|
|
|
|
usb_hcd_poll_rh_status(hcd);
|
2005-04-16 16:20:36 -06:00
|
|
|
return retval;
|
|
|
|
|
2006-01-23 16:25:40 -07:00
|
|
|
err_register_root_hub:
|
2005-04-25 09:25:17 -06:00
|
|
|
hcd->driver->stop(hcd);
|
2006-01-23 16:25:40 -07:00
|
|
|
err_hcd_driver_start:
|
2005-04-16 16:20:36 -06:00
|
|
|
if (hcd->irq >= 0)
|
|
|
|
free_irq(irqnum, hcd);
|
2006-01-23 16:25:40 -07:00
|
|
|
err_request_irq:
|
|
|
|
err_hcd_driver_setup:
|
|
|
|
hcd->self.root_hub = NULL;
|
|
|
|
usb_put_dev(rhdev);
|
|
|
|
err_allocate_root_hub:
|
2005-04-16 16:20:36 -06:00
|
|
|
usb_deregister_bus(&hcd->self);
|
2006-01-23 16:25:40 -07:00
|
|
|
err_register_bus:
|
2005-04-16 16:20:36 -06:00
|
|
|
hcd_buffer_destroy(hcd);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_add_hcd);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_remove_hcd - shutdown processing for generic HCDs
|
|
|
|
* @hcd: the usb_hcd structure to remove
|
|
|
|
* Context: !in_interrupt()
|
|
|
|
*
|
|
|
|
* Disconnects the root hub, then reverses the effects of usb_add_hcd(),
|
|
|
|
* invoking the HCD's stop() method.
|
|
|
|
*/
|
|
|
|
void usb_remove_hcd(struct usb_hcd *hcd)
|
|
|
|
{
|
|
|
|
dev_info(hcd->self.controller, "remove, state %x\n", hcd->state);
|
|
|
|
|
|
|
|
if (HC_IS_RUNNING (hcd->state))
|
|
|
|
hcd->state = HC_STATE_QUIESCING;
|
|
|
|
|
|
|
|
dev_dbg(hcd->self.controller, "roothub graceful disconnect\n");
|
|
|
|
spin_lock_irq (&hcd_root_hub_lock);
|
|
|
|
hcd->rh_registered = 0;
|
|
|
|
spin_unlock_irq (&hcd_root_hub_lock);
|
2005-11-17 15:10:32 -07:00
|
|
|
|
2007-03-13 14:37:30 -06:00
|
|
|
#ifdef CONFIG_PM
|
|
|
|
flush_workqueue(ksuspend_usb_wq);
|
|
|
|
#endif
|
|
|
|
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_lock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
usb_disconnect(&hcd->self.root_hub);
|
2006-01-11 07:55:29 -07:00
|
|
|
mutex_unlock(&usb_bus_list_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
hcd->driver->stop(hcd);
|
|
|
|
hcd->state = HC_STATE_HALT;
|
|
|
|
|
2007-03-13 09:10:52 -06:00
|
|
|
hcd->poll_rh = 0;
|
|
|
|
del_timer_sync(&hcd->rh_timer);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
if (hcd->irq >= 0)
|
|
|
|
free_irq(hcd->irq, hcd);
|
|
|
|
usb_deregister_bus(&hcd->self);
|
|
|
|
hcd_buffer_destroy(hcd);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_remove_hcd);
|
|
|
|
|
USB: Properly unregister reboot notifier in case of failure in ehci hcd
If some problem occurs during ehci startup, for instance, request_irq fails,
echi hcd driver tries it best to cleanup, but fails to unregister reboot
notifier, which in turn leads to crash on reboot/poweroff.
The following patch resolves this problem by not using reboot notifiers
anymore, but instead making ehci/ohci driver get its own shutdown method. For
PCI, it is done through pci glue, for everything else through platform driver
glue.
One downside: sa1111 does not use platform driver stuff, and does not have its
own shutdown hook, so no 'shutdown' is called for it now. I'm not sure if it
is really necessary on that platform, though.
Signed-off-by: Aleks Gorelov <dared1st@yahoo.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-08-08 18:24:08 -06:00
|
|
|
void
|
|
|
|
usb_hcd_platform_shutdown(struct platform_device* dev)
|
|
|
|
{
|
|
|
|
struct usb_hcd *hcd = platform_get_drvdata(dev);
|
|
|
|
|
|
|
|
if (hcd->driver->shutdown)
|
|
|
|
hcd->driver->shutdown(hcd);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL (usb_hcd_platform_shutdown);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
2005-06-23 03:36:56 -06:00
|
|
|
#if defined(CONFIG_USB_MON)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
struct usb_mon_operations *mon_ops;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The registration is unlocked.
|
|
|
|
* We do it this way because we do not want to lock in hot paths.
|
|
|
|
*
|
|
|
|
* Notice that the code is minimally error-proof. Because usbmon needs
|
|
|
|
* symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int usb_mon_register (struct usb_mon_operations *ops)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (mon_ops)
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
mon_ops = ops;
|
|
|
|
mb();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL (usb_mon_register);
|
|
|
|
|
|
|
|
void usb_mon_deregister (void)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (mon_ops == NULL) {
|
|
|
|
printk(KERN_ERR "USB: monitor was not registered\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
mon_ops = NULL;
|
|
|
|
mb();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL (usb_mon_deregister);
|
|
|
|
|
|
|
|
#endif /* CONFIG_USB_MON */
|