Commit 1a569433 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/gregkh/linux/linus-2.5

into penguin.transmeta.com:/home/torvalds/v2.5/linux
parents 47e4079c 85b55d6f
...@@ -672,6 +672,7 @@ void usb_set_maxpacket(struct usb_device *dev) ...@@ -672,6 +672,7 @@ void usb_set_maxpacket(struct usb_device *dev)
{ {
int i, b; int i, b;
/* NOTE: affects all endpoints _except_ ep0 */
for (i=0; i<dev->actconfig->desc.bNumInterfaces; i++) { for (i=0; i<dev->actconfig->desc.bNumInterfaces; i++) {
struct usb_interface *ifp = dev->actconfig->interface + i; struct usb_interface *ifp = dev->actconfig->interface + i;
struct usb_host_interface *as = ifp->altsetting + ifp->act_altsetting; struct usb_host_interface *as = ifp->altsetting + ifp->act_altsetting;
...@@ -862,6 +863,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) ...@@ -862,6 +863,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
usb_settoggle (dev, ep, out, 0); usb_settoggle (dev, ep, out, 0);
(out ? dev->epmaxpacketout : dev->epmaxpacketin) [ep] (out ? dev->epmaxpacketout : dev->epmaxpacketin) [ep]
= iface_as->endpoint [i].desc.wMaxPacketSize; = iface_as->endpoint [i].desc.wMaxPacketSize;
usb_endpoint_running (dev, ep, out);
} }
return 0; return 0;
...@@ -916,7 +918,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) ...@@ -916,7 +918,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
/* if it's already configured, clear out old state first. */ /* if it's already configured, clear out old state first. */
if (dev->state != USB_STATE_ADDRESS && disable) { if (dev->state != USB_STATE_ADDRESS && disable) {
for (i = 0; i < 15; i++) { for (i = 1 /* skip ep0 */; i < 15; i++) {
disable (dev, i); disable (dev, i);
disable (dev, USB_DIR_IN | i); disable (dev, USB_DIR_IN | i);
} }
......
...@@ -1107,7 +1107,7 @@ eth_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) ...@@ -1107,7 +1107,7 @@ eth_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
} }
/* respond with data transfer before status phase? */ /* respond with data transfer before status phase? */
if (value > 0) { if (value >= 0) {
req->length = value; req->length = value;
value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC); value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
if (value < 0) { if (value < 0) {
......
...@@ -393,7 +393,7 @@ net2280_free_request (struct usb_ep *_ep, struct usb_request *_req) ...@@ -393,7 +393,7 @@ net2280_free_request (struct usb_ep *_ep, struct usb_request *_req)
struct net2280_request *req; struct net2280_request *req;
ep = container_of (_ep, struct net2280_ep, ep); ep = container_of (_ep, struct net2280_ep, ep);
if (!ep || !_req) if (!_ep || !_req)
return; return;
req = container_of (_req, struct net2280_request, req); req = container_of (_req, struct net2280_request, req);
...@@ -442,7 +442,7 @@ net2280_alloc_buffer ( ...@@ -442,7 +442,7 @@ net2280_alloc_buffer (
struct net2280_ep *ep; struct net2280_ep *ep;
ep = container_of (_ep, struct net2280_ep, ep); ep = container_of (_ep, struct net2280_ep, ep);
if (!ep || (!ep->desc && ep->num != 0)) if (!_ep || (!ep->desc && ep->num != 0))
return 0; return 0;
*dma = DMA_ADDR_INVALID; *dma = DMA_ADDR_INVALID;
...@@ -561,15 +561,11 @@ static void out_flush (struct net2280_ep *ep) ...@@ -561,15 +561,11 @@ static void out_flush (struct net2280_ep *ep)
writel ((1 << FIFO_FLUSH), statp); writel ((1 << FIFO_FLUSH), statp);
mb (); mb ();
tmp = readl (statp); tmp = readl (statp);
if (tmp & (1 << DATA_OUT_PING_TOKEN_INTERRUPT)) { if (tmp & (1 << DATA_OUT_PING_TOKEN_INTERRUPT)
/* high speed did bulk NYET; fifo isn't filling */
&& ep->dev->gadget.speed == USB_SPEED_FULL) {
unsigned usec; unsigned usec;
if (ep->dev->gadget.speed == USB_SPEED_HIGH) {
if (ep->ep.maxpacket <= 512)
usec = 10; /* 512 byte bulk */
else
usec = 21; /* 1024 byte interrupt */
} else
usec = 50; /* 64 byte bulk/interrupt */ usec = 50; /* 64 byte bulk/interrupt */
handshake (statp, (1 << USB_OUT_PING_NAK_SENT), handshake (statp, (1 << USB_OUT_PING_NAK_SENT),
(1 << USB_OUT_PING_NAK_SENT), usec); (1 << USB_OUT_PING_NAK_SENT), usec);
...@@ -614,15 +610,13 @@ read_fifo (struct net2280_ep *ep, struct net2280_request *req) ...@@ -614,15 +610,13 @@ read_fifo (struct net2280_ep *ep, struct net2280_request *req)
count = readl (&regs->ep_avail); count = readl (&regs->ep_avail);
tmp = req->req.length - req->req.actual; tmp = req->req.length - req->req.actual;
if (count > tmp) { if (count > tmp) {
unsigned over = tmp % ep->ep.maxpacket; /* as with DMA, data overflow gets flushed */
if ((tmp % ep->ep.maxpacket) != 0) {
/* FIXME handle this consistently between PIO and DMA */
if (over) {
ERROR (ep->dev, ERROR (ep->dev,
"%s out fifo %d bytes, over %d extra %d\n", "%s out fifo %d bytes, expected %d\n",
ep->ep.name, count, over, count - tmp); ep->ep.name, count, tmp);
req->req.status = -EOVERFLOW; req->req.status = -EOVERFLOW;
tmp -= over; cleanup = 1;
} }
count = tmp; count = tmp;
} }
...@@ -670,10 +664,12 @@ fill_dma_desc (struct net2280_ep *ep, struct net2280_request *req, int valid) ...@@ -670,10 +664,12 @@ fill_dma_desc (struct net2280_ep *ep, struct net2280_request *req, int valid)
/* don't let DMA continue after a short OUT packet, /* don't let DMA continue after a short OUT packet,
* so overruns can't affect the next transfer. * so overruns can't affect the next transfer.
* in case of overruns on max-size packets, we can't
* stop the fifo from filling but we can flush it.
*/ */
if (ep->is_in) if (ep->is_in)
dmacount |= (1 << DMA_DIRECTION); dmacount |= (1 << DMA_DIRECTION);
else if ((dmacount % ep->ep.maxpacket) != 0) else
dmacount |= (1 << END_OF_CHAIN); dmacount |= (1 << END_OF_CHAIN);
req->valid = valid; req->valid = valid;
...@@ -897,8 +893,12 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, int gfp_flags) ...@@ -897,8 +893,12 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, int gfp_flags)
start_dma (ep, req); start_dma (ep, req);
else { else {
/* maybe there's no control data, just status ack */ /* maybe there's no control data, just status ack */
if (ep->num == 0 && _req->length == 0) if (ep->num == 0 && _req->length == 0) {
allow_status (ep);
done (ep, req, 0);
VDEBUG (dev, "%s status ack\n", ep->ep.name);
goto done; goto done;
}
/* PIO ... stuff the fifo, or unblock it. */ /* PIO ... stuff the fifo, or unblock it. */
if (ep->is_in) if (ep->is_in)
...@@ -948,10 +948,9 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, int gfp_flags) ...@@ -948,10 +948,9 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, int gfp_flags)
} /* else the irq handler advances the queue. */ } /* else the irq handler advances the queue. */
if (req) { if (req)
done:
list_add_tail (&req->queue, &ep->queue); list_add_tail (&req->queue, &ep->queue);
} done:
spin_unlock_irqrestore (&dev->lock, flags); spin_unlock_irqrestore (&dev->lock, flags);
/* pci writes may still be posted */ /* pci writes may still be posted */
...@@ -992,6 +991,8 @@ static void scan_dma_completions (struct net2280_ep *ep) ...@@ -992,6 +991,8 @@ static void scan_dma_completions (struct net2280_ep *ep)
/* SHORT_PACKET_TRANSFERRED_INTERRUPT handles "usb-short" /* SHORT_PACKET_TRANSFERRED_INTERRUPT handles "usb-short"
* packets, including overruns, even when the transfer was * packets, including overruns, even when the transfer was
* exactly the length requested (dmacount now zero). * exactly the length requested (dmacount now zero).
* FIXME there's an overrun case here too, where we expect
* a short packet but receive a max length one (won't NAK).
*/ */
if (!ep->is_in && (req->req.length % ep->ep.maxpacket) != 0) { if (!ep->is_in && (req->req.length % ep->ep.maxpacket) != 0) {
req->dma_done = 1; req->dma_done = 1;
...@@ -1186,7 +1187,8 @@ net2280_set_halt (struct usb_ep *_ep, int value) ...@@ -1186,7 +1187,8 @@ net2280_set_halt (struct usb_ep *_ep, int value)
return -EINVAL; return -EINVAL;
if (!ep->dev->driver || ep->dev->gadget.speed == USB_SPEED_UNKNOWN) if (!ep->dev->driver || ep->dev->gadget.speed == USB_SPEED_UNKNOWN)
return -ESHUTDOWN; return -ESHUTDOWN;
if ((ep->desc->bmAttributes & 0x03) == USB_ENDPOINT_XFER_ISOC) if (ep->desc /* not ep0 */ && (ep->desc->bmAttributes & 0x03)
== USB_ENDPOINT_XFER_ISOC)
return -EINVAL; return -EINVAL;
VDEBUG (ep->dev, "%s %s halt\n", _ep->name, value ? "set" : "clear"); VDEBUG (ep->dev, "%s %s halt\n", _ep->name, value ? "set" : "clear");
...@@ -1712,7 +1714,7 @@ static void usb_reinit (struct net2280 *dev) ...@@ -1712,7 +1714,7 @@ static void usb_reinit (struct net2280 *dev)
static void ep0_start (struct net2280 *dev) static void ep0_start (struct net2280 *dev)
{ {
writel ( (1 << SET_EP_HIDE_STATUS_PHASE) writel ( (1 << CLEAR_EP_HIDE_STATUS_PHASE)
| (1 << CLEAR_NAK_OUT_PACKETS) | (1 << CLEAR_NAK_OUT_PACKETS)
| (1 << CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE) | (1 << CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE)
, &dev->epregs [0].ep_rsp); , &dev->epregs [0].ep_rsp);
...@@ -1916,22 +1918,27 @@ static void handle_ep_small (struct net2280_ep *ep) ...@@ -1916,22 +1918,27 @@ static void handle_ep_small (struct net2280_ep *ep)
if (ep->is_in) { if (ep->is_in) {
/* status; stop NAKing */ /* status; stop NAKing */
if (t & (1 << DATA_OUT_PING_TOKEN_INTERRUPT)) { if (t & (1 << DATA_OUT_PING_TOKEN_INTERRUPT)) {
if (ep->dev->protocol_stall) if (ep->dev->protocol_stall) {
ep->stopped = 1;
set_halt (ep); set_halt (ep);
}
mode = 2; mode = 2;
/* reply to extra IN tokens with a zlp */ /* reply to extra IN data tokens with a zlp */
} else if (t & (1 << DATA_IN_TOKEN_INTERRUPT)) { } else if (t & (1 << DATA_IN_TOKEN_INTERRUPT)) {
if (ep->dev->protocol_stall) { if (ep->dev->protocol_stall) {
ep->stopped = 1;
set_halt (ep); set_halt (ep);
mode = 2; mode = 2;
} else if (!req) } else if (!req && ep->stopped)
write_fifo (ep, 0); write_fifo (ep, 0);
} }
} else { } else {
/* status; stop NAKing */ /* status; stop NAKing */
if (t & (1 << DATA_IN_TOKEN_INTERRUPT)) { if (t & (1 << DATA_IN_TOKEN_INTERRUPT)) {
if (ep->dev->protocol_stall) if (ep->dev->protocol_stall) {
ep->stopped = 1;
set_halt (ep); set_halt (ep);
}
mode = 2; mode = 2;
/* an extra OUT token is an error */ /* an extra OUT token is an error */
} else if (((t & (1 << DATA_OUT_PING_TOKEN_INTERRUPT)) } else if (((t & (1 << DATA_OUT_PING_TOKEN_INTERRUPT))
...@@ -2031,6 +2038,10 @@ static void handle_ep_small (struct net2280_ep *ep) ...@@ -2031,6 +2038,10 @@ static void handle_ep_small (struct net2280_ep *ep)
/* maybe advance queue to next request */ /* maybe advance queue to next request */
if (ep->num == 0) { if (ep->num == 0) {
/* FIXME need mechanism (request flag?) so control OUT
* can decide to stall ep0 after that done() returns,
* from non-irq context
*/
allow_status (ep); allow_status (ep);
req = 0; req = 0;
} else { } else {
...@@ -2171,6 +2182,7 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat) ...@@ -2171,6 +2182,7 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
struct net2280_ep *e; struct net2280_ep *e;
u16 status; u16 status;
/* hw handles device and interface status */
if (u.r.bRequestType != (USB_DIR_IN|USB_RECIP_ENDPOINT)) if (u.r.bRequestType != (USB_DIR_IN|USB_RECIP_ENDPOINT))
goto delegate; goto delegate;
if ((e = get_ep_by_addr (dev, u.r.wIndex)) == 0 if ((e = get_ep_by_addr (dev, u.r.wIndex)) == 0
...@@ -2188,12 +2200,14 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat) ...@@ -2188,12 +2200,14 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
set_fifo_bytecount (ep, u.r.wLength); set_fifo_bytecount (ep, u.r.wLength);
writel (status, &dev->epregs [0].ep_data); writel (status, &dev->epregs [0].ep_data);
allow_status (ep); allow_status (ep);
VDEBUG (dev, "%s stat %02x\n", ep->ep.name, status);
goto next_endpoints; goto next_endpoints;
} }
break; break;
case USB_REQ_CLEAR_FEATURE: { case USB_REQ_CLEAR_FEATURE: {
struct net2280_ep *e; struct net2280_ep *e;
/* hw handles device features */
if (u.r.bRequestType != USB_RECIP_ENDPOINT) if (u.r.bRequestType != USB_RECIP_ENDPOINT)
goto delegate; goto delegate;
if (u.r.wIndex != 0 /* HALT feature */ if (u.r.wIndex != 0 /* HALT feature */
...@@ -2202,11 +2216,15 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat) ...@@ -2202,11 +2216,15 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
if ((e = get_ep_by_addr (dev, u.r.wIndex)) == 0) if ((e = get_ep_by_addr (dev, u.r.wIndex)) == 0)
goto do_stall; goto do_stall;
clear_halt (e); clear_halt (e);
allow_status (ep);
VDEBUG (dev, "%s clear halt\n", ep->ep.name);
goto next_endpoints;
} }
break; break;
case USB_REQ_SET_FEATURE: { case USB_REQ_SET_FEATURE: {
struct net2280_ep *e; struct net2280_ep *e;
/* hw handles device features */
if (u.r.bRequestType != USB_RECIP_ENDPOINT) if (u.r.bRequestType != USB_RECIP_ENDPOINT)
goto delegate; goto delegate;
if (u.r.wIndex != 0 /* HALT feature */ if (u.r.wIndex != 0 /* HALT feature */
...@@ -2215,6 +2233,9 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat) ...@@ -2215,6 +2233,9 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
if ((e = get_ep_by_addr (dev, u.r.wIndex)) == 0) if ((e = get_ep_by_addr (dev, u.r.wIndex)) == 0)
goto do_stall; goto do_stall;
set_halt (e); set_halt (e);
allow_status (ep);
VDEBUG (dev, "%s set halt\n", ep->ep.name);
goto next_endpoints;
} }
break; break;
default: default:
...@@ -2235,23 +2256,12 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat) ...@@ -2235,23 +2256,12 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
VDEBUG (dev, "req %02x.%02x protocol STALL; stat %d\n", VDEBUG (dev, "req %02x.%02x protocol STALL; stat %d\n",
u.r.bRequestType, u.r.bRequest, tmp); u.r.bRequestType, u.r.bRequest, tmp);
dev->protocol_stall = 1; dev->protocol_stall = 1;
/* when there's no data, queueing a response is optional */
} else if (list_empty (&ep->queue)) {
if (u.r.wLength == 0) {
/* done() not possible/requested */
allow_status (ep);
} else {
DEBUG (dev, "req %02x.%02x v%04x "
"gadget error, len %d, stat %d\n",
u.r.bRequestType, u.r.bRequest,
le16_to_cpu (u.r.wValue),
u.r.wLength, tmp);
dev->protocol_stall = 1;
}
} }
/* some in/out token irq should follow; maybe stall then. */ /* some in/out token irq should follow; maybe stall then.
* driver must queue a request (even zlp) or halt ep0
* before the host times out.
*/
} }
next_endpoints: next_endpoints:
......
...@@ -437,6 +437,8 @@ struct net2280_ep_regs { /* [11.9] */ ...@@ -437,6 +437,8 @@ struct net2280_ep_regs { /* [11.9] */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#ifdef __KERNEL__
/* indexed registers [11.10] are accessed indirectly /* indexed registers [11.10] are accessed indirectly
* caller must own the device lock. * caller must own the device lock.
*/ */
...@@ -457,6 +459,9 @@ set_idx_reg (struct net2280_regs *regs, u32 index, u32 value) ...@@ -457,6 +459,9 @@ set_idx_reg (struct net2280_regs *regs, u32 index, u32 value)
/* posted, may not be visible yet */ /* posted, may not be visible yet */
} }
#endif /* __KERNEL__ */
#define REG_DIAG 0x0 #define REG_DIAG 0x0
#define RETRY_COUNTER 16 #define RETRY_COUNTER 16
#define FORCE_PCI_SERR 11 #define FORCE_PCI_SERR 11
...@@ -471,6 +476,8 @@ set_idx_reg (struct net2280_regs *regs, u32 index, u32 value) ...@@ -471,6 +476,8 @@ set_idx_reg (struct net2280_regs *regs, u32 index, u32 value)
#define REG_CHIPREV 0x03 /* in bcd */ #define REG_CHIPREV 0x03 /* in bcd */
#define REG_HS_NAK_RATE 0x0a /* NAK per N uframes */ #define REG_HS_NAK_RATE 0x0a /* NAK per N uframes */
#ifdef __KERNEL__
/* ep a-f highspeed and fullspeed maxpacket, addresses /* ep a-f highspeed and fullspeed maxpacket, addresses
* computed from ep->num * computed from ep->num
*/ */
...@@ -519,6 +526,7 @@ static inline void allow_status (struct net2280_ep *ep) ...@@ -519,6 +526,7 @@ static inline void allow_status (struct net2280_ep *ep)
writel ( (1 << CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE) writel ( (1 << CLEAR_CONTROL_STATUS_PHASE_HANDSHAKE)
| (1 << CLEAR_NAK_OUT_PACKETS_MODE) | (1 << CLEAR_NAK_OUT_PACKETS_MODE)
, &ep->regs->ep_rsp); , &ep->regs->ep_rsp);
ep->stopped = 1;
} }
static inline void set_halt (struct net2280_ep *ep) static inline void set_halt (struct net2280_ep *ep)
...@@ -707,3 +715,4 @@ static inline void stop_out_naking (struct net2280_ep *ep) ...@@ -707,3 +715,4 @@ static inline void stop_out_naking (struct net2280_ep *ep)
writel ((1 << CLEAR_NAK_OUT_PACKETS), &ep->regs->ep_rsp); writel ((1 << CLEAR_NAK_OUT_PACKETS), &ep->regs->ep_rsp);
} }
#endif /* __KERNEL__ */
...@@ -653,7 +653,7 @@ static void source_sink_complete (struct usb_ep *ep, struct usb_request *req) ...@@ -653,7 +653,7 @@ static void source_sink_complete (struct usb_ep *ep, struct usb_request *req)
/* this endpoint is normally active while we're configured */ /* this endpoint is normally active while we're configured */
case -ECONNRESET: /* request dequeued */ case -ECONNRESET: /* request dequeued */
case -ESHUTDOWN: /* disconnect from host */ case -ESHUTDOWN: /* disconnect from host */
DEBUG (dev, "%s gone (%d), %d/%d\n", ep->name, status, VDEBUG (dev, "%s gone (%d), %d/%d\n", ep->name, status,
req->actual, req->length); req->actual, req->length);
free_ep_req (ep, req); free_ep_req (ep, req);
return; return;
...@@ -1035,9 +1035,6 @@ zero_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) ...@@ -1035,9 +1035,6 @@ zero_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
if (ctrl->bRequestType != 0) if (ctrl->bRequestType != 0)
break; break;
spin_lock (&dev->lock); spin_lock (&dev->lock);
/* change hardware configuration!
* no response queued, just zero status == success
*/
value = zero_set_config (dev, ctrl->wValue, GFP_ATOMIC); value = zero_set_config (dev, ctrl->wValue, GFP_ATOMIC);
spin_unlock (&dev->lock); spin_unlock (&dev->lock);
break; break;
...@@ -1092,7 +1089,7 @@ zero_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) ...@@ -1092,7 +1089,7 @@ zero_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
} }
/* respond with data transfer before status phase? */ /* respond with data transfer before status phase? */
if (value > 0) { if (value >= 0) {
req->length = value; req->length = value;
value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC); value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
if (value < 0) { if (value < 0) {
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
/* /*
* Version Information * Version Information
*/ */
#define DRIVER_VERSION "v2.0" #define DRIVER_VERSION "v2.1"
#define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber" #define DRIVER_AUTHOR "Linus 'Frodo Rabbit' Torvalds, Johannes Erdfelt, Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber"
#define DRIVER_DESC "USB Universal Host Controller Interface driver" #define DRIVER_DESC "USB Universal Host Controller Interface driver"
...@@ -91,9 +91,7 @@ static int uhci_get_current_frame_number(struct uhci_hcd *uhci); ...@@ -91,9 +91,7 @@ static int uhci_get_current_frame_number(struct uhci_hcd *uhci);
static int uhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb); static int uhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb);
static void uhci_unlink_generic(struct uhci_hcd *uhci, struct urb *urb); static void uhci_unlink_generic(struct uhci_hcd *uhci, struct urb *urb);
static int ports_active(struct uhci_hcd *uhci); static void hc_state_transitions(struct uhci_hcd *uhci);
static void suspend_hc(struct uhci_hcd *uhci);
static void wakeup_hc(struct uhci_hcd *uhci);
/* If a transfer is still active after this much time, turn off FSBR */ /* If a transfer is still active after this much time, turn off FSBR */
#define IDLE_TIMEOUT (HZ / 20) /* 50 ms */ #define IDLE_TIMEOUT (HZ / 20) /* 50 ms */
...@@ -1757,9 +1755,8 @@ static void stall_callback(unsigned long ptr) ...@@ -1757,9 +1755,8 @@ static void stall_callback(unsigned long ptr)
uhci->skel_term_qh->link = UHCI_PTR_TERM; uhci->skel_term_qh->link = UHCI_PTR_TERM;
} }
/* enter global suspend if nothing connected */ /* Poll for and perform state transitions */
if (!uhci->is_suspended && !ports_active(uhci)) hc_state_transitions(uhci);
suspend_hc(uhci);
init_stall_timer(hcd); init_stall_timer(hcd);
} }
...@@ -1884,14 +1881,14 @@ static void uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs) ...@@ -1884,14 +1881,14 @@ static void uhci_irq(struct usb_hcd *hcd, struct pt_regs *regs)
err("%x: host system error, PCI problems?", io_addr); err("%x: host system error, PCI problems?", io_addr);
if (status & USBSTS_HCPE) if (status & USBSTS_HCPE)
err("%x: host controller process error. something bad happened", io_addr); err("%x: host controller process error. something bad happened", io_addr);
if ((status & USBSTS_HCH) && !uhci->is_suspended) { if ((status & USBSTS_HCH) && uhci->state > 0) {
err("%x: host controller halted. very bad", io_addr); err("%x: host controller halted. very bad", io_addr);
/* FIXME: Reset the controller, fix the offending TD */ /* FIXME: Reset the controller, fix the offending TD */
} }
} }
if (status & USBSTS_RD) if (status & USBSTS_RD)
wakeup_hc(uhci); uhci->resume_detect = 1;
uhci_free_pending_qhs(uhci); uhci_free_pending_qhs(uhci);
...@@ -1922,10 +1919,18 @@ static void reset_hc(struct uhci_hcd *uhci) ...@@ -1922,10 +1919,18 @@ static void reset_hc(struct uhci_hcd *uhci)
unsigned int io_addr = uhci->io_addr; unsigned int io_addr = uhci->io_addr;
/* Global reset for 50ms */ /* Global reset for 50ms */
uhci->state = UHCI_RESET;
outw(USBCMD_GRESET, io_addr + USBCMD); outw(USBCMD_GRESET, io_addr + USBCMD);
wait_ms(50); set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout((HZ*50+999) / 1000);
set_current_state(TASK_RUNNING);
outw(0, io_addr + USBCMD); outw(0, io_addr + USBCMD);
wait_ms(10);
/* Another 10ms delay */
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout((HZ*10+999) / 1000);
set_current_state(TASK_RUNNING);
uhci->resume_detect = 0;
} }
static void suspend_hc(struct uhci_hcd *uhci) static void suspend_hc(struct uhci_hcd *uhci)
...@@ -1933,34 +1938,49 @@ static void suspend_hc(struct uhci_hcd *uhci) ...@@ -1933,34 +1938,49 @@ static void suspend_hc(struct uhci_hcd *uhci)
unsigned int io_addr = uhci->io_addr; unsigned int io_addr = uhci->io_addr;
dbg("%x: suspend_hc", io_addr); dbg("%x: suspend_hc", io_addr);
uhci->state = UHCI_SUSPENDED;
uhci->is_suspended = 1; uhci->resume_detect = 0;
smp_wmb();
outw(USBCMD_EGSM, io_addr + USBCMD); outw(USBCMD_EGSM, io_addr + USBCMD);
} }
static void wakeup_hc(struct uhci_hcd *uhci) static void wakeup_hc(struct uhci_hcd *uhci)
{ {
unsigned int io_addr = uhci->io_addr; unsigned int io_addr = uhci->io_addr;
unsigned int status;
switch (uhci->state) {
case UHCI_SUSPENDED: /* Start the resume */
dbg("%x: wakeup_hc", io_addr); dbg("%x: wakeup_hc", io_addr);
/* Global resume for 20ms */ /* Global resume for >= 20ms */
outw(USBCMD_FGR | USBCMD_EGSM, io_addr + USBCMD); outw(USBCMD_FGR | USBCMD_EGSM, io_addr + USBCMD);
wait_ms(20); uhci->state = UHCI_RESUMING_1;
uhci->state_end = jiffies + (20*HZ+999) / 1000;
break;
case UHCI_RESUMING_1: /* End global resume */
uhci->state = UHCI_RESUMING_2;
outw(0, io_addr + USBCMD); outw(0, io_addr + USBCMD);
/* Falls through */
/* wait for EOP to be sent */ case UHCI_RESUMING_2: /* Wait for EOP to be sent */
status = inw(io_addr + USBCMD); if (inw(io_addr + USBCMD) & USBCMD_FGR)
while (status & USBCMD_FGR) break;
status = inw(io_addr + USBCMD);
uhci->is_suspended = 0; /* Run for at least 1 second, and
* mark it configured with a 64-byte max packet */
uhci->state = UHCI_RUNNING_GRACE;
uhci->state_end = jiffies + HZ;
outw(USBCMD_RS | USBCMD_CF | USBCMD_MAXP,
io_addr + USBCMD);
break;
/* Run and mark it configured with a 64-byte max packet */ case UHCI_RUNNING_GRACE: /* Now allowed to suspend */
outw(USBCMD_RS | USBCMD_CF | USBCMD_MAXP, io_addr + USBCMD); uhci->state = UHCI_RUNNING;
break;
default:
break;
}
} }
static int ports_active(struct uhci_hcd *uhci) static int ports_active(struct uhci_hcd *uhci)
...@@ -1975,6 +1995,73 @@ static int ports_active(struct uhci_hcd *uhci) ...@@ -1975,6 +1995,73 @@ static int ports_active(struct uhci_hcd *uhci)
return connection; return connection;
} }
static int suspend_allowed(struct uhci_hcd *uhci)
{
unsigned int io_addr = uhci->io_addr;
int i;
if (!uhci->hcd.pdev ||
uhci->hcd.pdev->vendor != PCI_VENDOR_ID_INTEL ||
uhci->hcd.pdev->device != PCI_DEVICE_ID_INTEL_82371AB_2)
return 1;
/* This is a 82371AB/EB/MB USB controller which has a bug that
* causes false resume indications if any port has an
* over current condition. To prevent problems, we will not
* allow a global suspend if any ports are OC.
*
* Some motherboards using the 82371AB/EB/MB (but not the USB portion)
* appear to hardwire the over current inputs active to disable
* the USB ports.
*/
/* check for over current condition on any port */
for (i = 0; i < uhci->rh_numports; i++) {
if (inw(io_addr + USBPORTSC1 + i * 2) & USBPORTSC_OC)
return 0;
}
return 1;
}
static void hc_state_transitions(struct uhci_hcd *uhci)
{
switch (uhci->state) {
case UHCI_RUNNING:
/* global suspend if nothing connected for 1 second */
if (!ports_active(uhci) && suspend_allowed(uhci)) {
uhci->state = UHCI_SUSPENDING_GRACE;
uhci->state_end = jiffies + HZ;
}
break;
case UHCI_SUSPENDING_GRACE:
if (ports_active(uhci))
uhci->state = UHCI_RUNNING;
else if (time_after_eq(jiffies, uhci->state_end))
suspend_hc(uhci);
break;
case UHCI_SUSPENDED:
/* wakeup if requested by a device */
if (uhci->resume_detect)
wakeup_hc(uhci);
break;
case UHCI_RESUMING_1:
case UHCI_RESUMING_2:
case UHCI_RUNNING_GRACE:
if (time_after_eq(jiffies, uhci->state_end))
wakeup_hc(uhci);
break;
default:
break;
}
}
static void start_hc(struct uhci_hcd *uhci) static void start_hc(struct uhci_hcd *uhci)
{ {
unsigned int io_addr = uhci->io_addr; unsigned int io_addr = uhci->io_addr;
...@@ -2003,6 +2090,8 @@ static void start_hc(struct uhci_hcd *uhci) ...@@ -2003,6 +2090,8 @@ static void start_hc(struct uhci_hcd *uhci)
outl(uhci->fl->dma_handle, io_addr + USBFLBASEADD); outl(uhci->fl->dma_handle, io_addr + USBFLBASEADD);
/* Run and mark it configured with a 64-byte max packet */ /* Run and mark it configured with a 64-byte max packet */
uhci->state = UHCI_RUNNING_GRACE;
uhci->state_end = jiffies + HZ;
outw(USBCMD_RS | USBCMD_CF | USBCMD_MAXP, io_addr + USBCMD); outw(USBCMD_RS | USBCMD_CF | USBCMD_MAXP, io_addr + USBCMD);
uhci->hcd.state = USB_STATE_READY; uhci->hcd.state = USB_STATE_READY;
...@@ -2101,8 +2190,6 @@ static int __devinit uhci_start(struct usb_hcd *hcd) ...@@ -2101,8 +2190,6 @@ static int __devinit uhci_start(struct usb_hcd *hcd)
uhci->fsbr = 0; uhci->fsbr = 0;
uhci->fsbrtimeout = 0; uhci->fsbrtimeout = 0;
uhci->is_suspended = 0;
spin_lock_init(&uhci->qh_remove_list_lock); spin_lock_init(&uhci->qh_remove_list_lock);
INIT_LIST_HEAD(&uhci->qh_remove_list); INIT_LIST_HEAD(&uhci->qh_remove_list);
...@@ -2335,7 +2422,11 @@ static int uhci_suspend(struct usb_hcd *hcd, u32 state) ...@@ -2335,7 +2422,11 @@ static int uhci_suspend(struct usb_hcd *hcd, u32 state)
{ {
struct uhci_hcd *uhci = hcd_to_uhci(hcd); struct uhci_hcd *uhci = hcd_to_uhci(hcd);
/* Don't try to suspend broken motherboards, reset instead */
if (suspend_allowed(uhci))
suspend_hc(uhci); suspend_hc(uhci);
else
reset_hc(uhci);
return 0; return 0;
} }
...@@ -2345,8 +2436,13 @@ static int uhci_resume(struct usb_hcd *hcd) ...@@ -2345,8 +2436,13 @@ static int uhci_resume(struct usb_hcd *hcd)
pci_set_master(uhci->hcd.pdev); pci_set_master(uhci->hcd.pdev);
if (uhci->state == UHCI_SUSPENDED)
uhci->resume_detect = 1;
else {
reset_hc(uhci); reset_hc(uhci);
start_hc(uhci); start_hc(uhci);
}
uhci->hcd.state = USB_STATE_READY;
return 0; return 0;
} }
#endif #endif
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#define USBPORTSC_RD 0x0040 /* Resume Detect */ #define USBPORTSC_RD 0x0040 /* Resume Detect */
#define USBPORTSC_LSDA 0x0100 /* Low Speed Device Attached */ #define USBPORTSC_LSDA 0x0100 /* Low Speed Device Attached */
#define USBPORTSC_PR 0x0200 /* Port Reset */ #define USBPORTSC_PR 0x0200 /* Port Reset */
#define USBPORTSC_OC 0x0400 /* Over Current condition */
#define USBPORTSC_SUSP 0x1000 /* Suspend */ #define USBPORTSC_SUSP 0x1000 /* Suspend */
/* Legacy support register */ /* Legacy support register */
...@@ -282,6 +283,29 @@ static inline int __interval_to_skel(int interval) ...@@ -282,6 +283,29 @@ static inline int __interval_to_skel(int interval)
return 0; /* int128 for 128-255 ms (Max.) */ return 0; /* int128 for 128-255 ms (Max.) */
} }
/*
* Device states for the host controller.
*
* To prevent "bouncing" in the presence of electrical noise,
* we insist on a 1-second "grace" period, before switching to
* the RUNNING or SUSPENDED states, during which the state is
* not allowed to change.
*
* The resume process is divided into substates in order to avoid
* potentially length delays during the timer handler.
*
* States in which the host controller is halted must have values <= 0.
*/
enum uhci_state {
UHCI_RESET,
UHCI_RUNNING_GRACE, /* Before RUNNING */
UHCI_RUNNING, /* The normal state */
UHCI_SUSPENDING_GRACE, /* Before SUSPENDED */
UHCI_SUSPENDED = -10, /* When no devices are attached */
UHCI_RESUMING_1,
UHCI_RESUMING_2
};
#define hcd_to_uhci(hcd_ptr) container_of(hcd_ptr, struct uhci_hcd, hcd) #define hcd_to_uhci(hcd_ptr) container_of(hcd_ptr, struct uhci_hcd, hcd)
/* /*
...@@ -313,7 +337,10 @@ struct uhci_hcd { ...@@ -313,7 +337,10 @@ struct uhci_hcd {
struct uhci_frame_list *fl; /* P: uhci->frame_list_lock */ struct uhci_frame_list *fl; /* P: uhci->frame_list_lock */
int fsbr; /* Full speed bandwidth reclamation */ int fsbr; /* Full speed bandwidth reclamation */
unsigned long fsbrtimeout; /* FSBR delay */ unsigned long fsbrtimeout; /* FSBR delay */
int is_suspended;
enum uhci_state state; /* FIXME: needs a spinlock */
unsigned long state_end; /* Time of next transition */
int resume_detect; /* Need a Global Resume */
/* Main list of URB's currently controlled by this HC */ /* Main list of URB's currently controlled by this HC */
spinlock_t urb_list_lock; spinlock_t urb_list_lock;
......
This diff is collapsed.
...@@ -988,7 +988,7 @@ int usb_stor_Bulk_transport(Scsi_Cmnd *srb, struct us_data *us) ...@@ -988,7 +988,7 @@ int usb_stor_Bulk_transport(Scsi_Cmnd *srb, struct us_data *us)
US_DEBUGP("Bulk status Sig 0x%x T 0x%x R %d Stat 0x%x\n", US_DEBUGP("Bulk status Sig 0x%x T 0x%x R %d Stat 0x%x\n",
le32_to_cpu(bcs.Signature), bcs.Tag, le32_to_cpu(bcs.Signature), bcs.Tag,
bcs.Residue, bcs.Status); bcs.Residue, bcs.Status);
if (bcs.Signature != cpu_to_le32(US_BULK_CS_SIGN) || if ((bcs.Signature != cpu_to_le32(US_BULK_CS_SIGN) && bcs.Signature != cpu_to_le32(US_BULK_CS_OLYMPUS_SIGN)) ||
bcs.Tag != bcb.Tag || bcs.Tag != bcb.Tag ||
bcs.Status > US_BULK_STAT_PHASE) { bcs.Status > US_BULK_STAT_PHASE) {
US_DEBUGP("Bulk logical error\n"); US_DEBUGP("Bulk logical error\n");
......
...@@ -105,6 +105,8 @@ struct bulk_cs_wrap { ...@@ -105,6 +105,8 @@ struct bulk_cs_wrap {
#define US_BULK_CS_WRAP_LEN 13 #define US_BULK_CS_WRAP_LEN 13
#define US_BULK_CS_SIGN 0x53425355 /* spells out 'USBS' */ #define US_BULK_CS_SIGN 0x53425355 /* spells out 'USBS' */
/* This is for Olympus Camedia digital cameras */
#define US_BULK_CS_OLYMPUS_SIGN 0x55425355 /* spells out 'USBU' */
#define US_BULK_STAT_OK 0 #define US_BULK_STAT_OK 0
#define US_BULK_STAT_FAIL 1 #define US_BULK_STAT_FAIL 1
#define US_BULK_STAT_PHASE 2 #define US_BULK_STAT_PHASE 2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment