2005-04-17 06:20:36 +08:00
|
|
|
/*
|
2005-05-08 04:21:50 +08:00
|
|
|
* Copyright (C) 2001-2004 by David Brownell
|
2006-08-31 05:50:06 +08:00
|
|
|
*
|
2005-04-17 06:20:36 +08:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* this file is part of ehci-hcd.c */
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* EHCI hardware queue manipulation ... the core. QH/QTD manipulation.
|
|
|
|
*
|
|
|
|
* Control, bulk, and interrupt traffic all use "qh" lists. They list "qtd"
|
|
|
|
* entries describing USB transactions, max 16-20kB/entry (with 4kB-aligned
|
|
|
|
* buffers needed for the larger number). We use one QH per endpoint, queue
|
|
|
|
* multiple urbs (all three types) per endpoint. URBs may need several qtds.
|
|
|
|
*
|
|
|
|
* ISO traffic uses "ISO TD" (itd, and sitd) records, and (along with
|
|
|
|
* interrupts) needs careful scheduling. Performance improvements can be
|
|
|
|
* an ongoing challenge. That's in "ehci-sched.c".
|
2006-08-31 05:50:06 +08:00
|
|
|
*
|
2005-04-17 06:20:36 +08:00
|
|
|
* USB 1.1 devices are handled (a) by "companion" OHCI or UHCI root hubs,
|
|
|
|
* or otherwise through transaction translators (TTs) in USB 2.0 hubs using
|
|
|
|
* (b) special fields in qh entries or (c) split iso entries. TTs will
|
|
|
|
* buffer low/full speed data so the host collects it at high speed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* fill a qtd, returning how much of the buffer we were able to queue up */
|
|
|
|
|
|
|
|
static int
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd_fill(struct ehci_hcd *ehci, struct ehci_qtd *qtd, dma_addr_t buf,
|
|
|
|
size_t len, int token, int maxpacket)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int i, count;
|
|
|
|
u64 addr = buf;
|
|
|
|
|
|
|
|
/* one buffer entry per 4K ... first might be short or unaligned */
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_buf[0] = cpu_to_hc32(ehci, (u32)addr);
|
|
|
|
qtd->hw_buf_hi[0] = cpu_to_hc32(ehci, (u32)(addr >> 32));
|
2005-04-17 06:20:36 +08:00
|
|
|
count = 0x1000 - (buf & 0x0fff); /* rest of that page */
|
|
|
|
if (likely (len < count)) /* ... iff needed */
|
|
|
|
count = len;
|
|
|
|
else {
|
|
|
|
buf += 0x1000;
|
|
|
|
buf &= ~0x0fff;
|
|
|
|
|
|
|
|
/* per-qtd limit: from 16K to 20K (best alignment) */
|
|
|
|
for (i = 1; count < len && i < 5; i++) {
|
|
|
|
addr = buf;
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_buf[i] = cpu_to_hc32(ehci, (u32)addr);
|
|
|
|
qtd->hw_buf_hi[i] = cpu_to_hc32(ehci,
|
|
|
|
(u32)(addr >> 32));
|
2005-04-17 06:20:36 +08:00
|
|
|
buf += 0x1000;
|
|
|
|
if ((count + 0x1000) < len)
|
|
|
|
count += 0x1000;
|
|
|
|
else
|
|
|
|
count = len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* short packets may only terminate transfers */
|
|
|
|
if (count != len)
|
|
|
|
count -= (count % maxpacket);
|
|
|
|
}
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_token = cpu_to_hc32(ehci, (count << 16) | token);
|
2005-04-17 06:20:36 +08:00
|
|
|
qtd->length = count;
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
qh_update (struct ehci_hcd *ehci, struct ehci_qh *qh, struct ehci_qtd *qtd)
|
|
|
|
{
|
|
|
|
/* writes to an active overlay are unsafe */
|
|
|
|
BUG_ON(qh->qh_state != QH_STATE_IDLE);
|
|
|
|
|
2007-05-02 00:29:37 +08:00
|
|
|
qh->hw_qtd_next = QTD_NEXT(ehci, qtd->qtd_dma);
|
|
|
|
qh->hw_alt_next = EHCI_LIST_END(ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-06-12 02:56:22 +08:00
|
|
|
/* Except for control endpoints, we make hardware maintain data
|
|
|
|
* toggle (like OHCI) ... here (re)initialize the toggle in the QH,
|
|
|
|
* and set the pseudo-toggle in udev. Only usb_clear_halt() will
|
|
|
|
* ever clear it.
|
|
|
|
*/
|
|
|
|
if (!(qh->hw_info1 & cpu_to_hc32(ehci, 1 << 14))) {
|
|
|
|
unsigned is_out, epnum;
|
|
|
|
|
|
|
|
is_out = !(qtd->hw_token & cpu_to_hc32(ehci, 1 << 8));
|
|
|
|
epnum = (hc32_to_cpup(ehci, &qh->hw_info1) >> 8) & 0x0f;
|
|
|
|
if (unlikely (!usb_gettoggle (qh->dev, epnum, is_out))) {
|
|
|
|
qh->hw_token &= ~cpu_to_hc32(ehci, QTD_TOGGLE);
|
|
|
|
usb_settoggle (qh->dev, epnum, is_out, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* HC must see latest qtd and qh data before we clear ACTIVE+HALT */
|
|
|
|
wmb ();
|
2007-05-02 00:29:37 +08:00
|
|
|
qh->hw_token &= cpu_to_hc32(ehci, QTD_TOGGLE | QTD_STS_PING);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if it weren't for a common silicon quirk (writing the dummy into the qh
|
|
|
|
* overlay, so qh->hw_token wrongly becomes inactive/halted), only fault
|
|
|
|
* recovery (including urb dequeue) would need software changes to a QH...
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
qh_refresh (struct ehci_hcd *ehci, struct ehci_qh *qh)
|
|
|
|
{
|
|
|
|
struct ehci_qtd *qtd;
|
|
|
|
|
|
|
|
if (list_empty (&qh->qtd_list))
|
|
|
|
qtd = qh->dummy;
|
|
|
|
else {
|
|
|
|
qtd = list_entry (qh->qtd_list.next,
|
|
|
|
struct ehci_qtd, qtd_list);
|
|
|
|
/* first qtd may already be partially processed */
|
2007-05-02 00:29:37 +08:00
|
|
|
if (cpu_to_hc32(ehci, qtd->qtd_dma) == qh->hw_current)
|
2005-04-17 06:20:36 +08:00
|
|
|
qtd = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (qtd)
|
|
|
|
qh_update (ehci, qh, qtd);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
2009-06-29 22:47:30 +08:00
|
|
|
static void qh_link_async(struct ehci_hcd *ehci, struct ehci_qh *qh);
|
|
|
|
|
|
|
|
static void ehci_clear_tt_buffer_complete(struct usb_hcd *hcd,
|
|
|
|
struct usb_host_endpoint *ep)
|
|
|
|
{
|
|
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
|
|
struct ehci_qh *qh = ep->hcpriv;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&ehci->lock, flags);
|
|
|
|
qh->clearing_tt = 0;
|
|
|
|
if (qh->qh_state == QH_STATE_IDLE && !list_empty(&qh->qtd_list)
|
|
|
|
&& HC_IS_RUNNING(hcd->state))
|
|
|
|
qh_link_async(ehci, qh);
|
|
|
|
spin_unlock_irqrestore(&ehci->lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ehci_clear_tt_buffer(struct ehci_hcd *ehci, struct ehci_qh *qh,
|
|
|
|
struct urb *urb, u32 token)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* If an async split transaction gets an error or is unlinked,
|
|
|
|
* the TT buffer may be left in an indeterminate state. We
|
|
|
|
* have to clear the TT buffer.
|
|
|
|
*
|
|
|
|
* Note: this routine is never called for Isochronous transfers.
|
|
|
|
*/
|
|
|
|
if (urb->dev->tt && !usb_pipeint(urb->pipe) && !qh->clearing_tt) {
|
|
|
|
#ifdef DEBUG
|
|
|
|
struct usb_device *tt = urb->dev->tt->hub;
|
|
|
|
dev_dbg(&tt->dev,
|
|
|
|
"clear tt buffer port %d, a%d ep%d t%08x\n",
|
|
|
|
urb->dev->ttport, urb->dev->devnum,
|
|
|
|
usb_pipeendpoint(urb->pipe), token);
|
|
|
|
#endif /* DEBUG */
|
|
|
|
if (!ehci_is_TDI(ehci)
|
|
|
|
|| urb->dev->tt->hub !=
|
|
|
|
ehci_to_hcd(ehci)->self.root_hub) {
|
|
|
|
if (usb_hub_clear_tt_buffer(urb) == 0)
|
|
|
|
qh->clearing_tt = 1;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
/* REVISIT ARC-derived cores don't clear the root
|
|
|
|
* hub TT buffer in this way...
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-25 03:40:19 +08:00
|
|
|
static int qtd_copy_status (
|
2005-04-17 06:20:36 +08:00
|
|
|
struct ehci_hcd *ehci,
|
|
|
|
struct urb *urb,
|
|
|
|
size_t length,
|
|
|
|
u32 token
|
|
|
|
)
|
|
|
|
{
|
2007-08-25 03:40:19 +08:00
|
|
|
int status = -EINPROGRESS;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* count IN/OUT bytes, not SETUP (even short packets) */
|
|
|
|
if (likely (QTD_PID (token) != 2))
|
|
|
|
urb->actual_length += length - QTD_LENGTH (token);
|
|
|
|
|
|
|
|
/* don't modify error codes */
|
2007-08-22 03:40:36 +08:00
|
|
|
if (unlikely(urb->unlinked))
|
2007-08-25 03:40:19 +08:00
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* force cleanup after short read; not always an error */
|
|
|
|
if (unlikely (IS_SHORT_READ (token)))
|
2007-08-25 03:40:19 +08:00
|
|
|
status = -EREMOTEIO;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* serious "can't proceed" faults reported by the hardware */
|
|
|
|
if (token & QTD_STS_HALT) {
|
|
|
|
if (token & QTD_STS_BABBLE) {
|
|
|
|
/* FIXME "must" disable babbling device's port too */
|
2007-08-25 03:40:19 +08:00
|
|
|
status = -EOVERFLOW;
|
2009-06-30 05:36:14 +08:00
|
|
|
/* CERR nonzero + halt --> stall */
|
|
|
|
} else if (QTD_CERR(token)) {
|
|
|
|
status = -EPIPE;
|
|
|
|
|
|
|
|
/* In theory, more than one of the following bits can be set
|
|
|
|
* since they are sticky and the transaction is retried.
|
|
|
|
* Which to test first is rather arbitrary.
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
} else if (token & QTD_STS_MMF) {
|
|
|
|
/* fs/ls interrupt xfer missed the complete-split */
|
2007-08-25 03:40:19 +08:00
|
|
|
status = -EPROTO;
|
2005-04-17 06:20:36 +08:00
|
|
|
} else if (token & QTD_STS_DBE) {
|
2007-08-25 03:40:19 +08:00
|
|
|
status = (QTD_PID (token) == 1) /* IN ? */
|
2005-04-17 06:20:36 +08:00
|
|
|
? -ENOSR /* hc couldn't read data */
|
|
|
|
: -ECOMM; /* hc couldn't write data */
|
|
|
|
} else if (token & QTD_STS_XACT) {
|
2009-06-30 05:36:14 +08:00
|
|
|
/* timeout, bad CRC, wrong PID, etc */
|
|
|
|
ehci_dbg(ehci, "devpath %s ep%d%s 3strikes\n",
|
|
|
|
urb->dev->devpath,
|
|
|
|
usb_pipeendpoint(urb->pipe),
|
|
|
|
usb_pipein(urb->pipe) ? "in" : "out");
|
2007-08-25 03:40:19 +08:00
|
|
|
status = -EPROTO;
|
2009-06-30 05:36:14 +08:00
|
|
|
} else { /* unknown */
|
|
|
|
status = -EPROTO;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
ehci_vdbg (ehci,
|
|
|
|
"dev%d ep%d%s qtd token %08x --> status %d\n",
|
|
|
|
usb_pipedevice (urb->pipe),
|
|
|
|
usb_pipeendpoint (urb->pipe),
|
|
|
|
usb_pipein (urb->pipe) ? "in" : "out",
|
2007-08-25 03:40:19 +08:00
|
|
|
token, status);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2007-08-25 03:40:19 +08:00
|
|
|
|
|
|
|
return status;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-08-25 03:40:19 +08:00
|
|
|
ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
|
2005-04-17 06:20:36 +08:00
|
|
|
__releases(ehci->lock)
|
|
|
|
__acquires(ehci->lock)
|
|
|
|
{
|
|
|
|
if (likely (urb->hcpriv != NULL)) {
|
|
|
|
struct ehci_qh *qh = (struct ehci_qh *) urb->hcpriv;
|
|
|
|
|
|
|
|
/* S-mask in a QH means it's an interrupt urb */
|
2007-05-02 00:29:37 +08:00
|
|
|
if ((qh->hw_info2 & cpu_to_hc32(ehci, QH_SMASK)) != 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* ... update hc-wide periodic stats (for usbfs) */
|
|
|
|
ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
|
|
|
|
}
|
|
|
|
qh_put (qh);
|
|
|
|
}
|
|
|
|
|
2007-08-22 03:40:36 +08:00
|
|
|
if (unlikely(urb->unlinked)) {
|
|
|
|
COUNT(ehci->stats.unlink);
|
|
|
|
} else {
|
USB: ehci: qh_completions cleanup and bugfix
Simplify processing of completed qtds, and correct handling of short
reads, by removing two state variables:
- "qtd_status" wasn't needed. The current URB's status is either
OK (-EINPROGRESS) or some fault status. Once a fault appears,
the queue halts and any later QTDs are immediately removed, so
no temporary status is needed. (Or for typical short reads,
it's not treated as a fault, so no queue halt is needed.)
- "do_status" was erroneous. Because of how the queue is set up,
short control reads can (and should!) be treated like full size
reads, and cleaned up the usual way. The status stage will be
executed transparently, and usbcore handles the choice of whether
to report this status as unexected.
The "do_status" problem caused a rather perplexing timing-dependent
problem with usbtest case 10. Sometimes it would make the controller
skip a dozen transactions while (wrongly) trying to clean up after a
short transfer. Fortunately, removing a dcache contention issue made
this become trivial to reproduce (on one test rig), so enough clues
finally presented themselves ... I think this has been around for a
very long time, but was worsened by recent urb->status changes.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-12 23:32:05 +08:00
|
|
|
/* report non-error and short read status as zero */
|
|
|
|
if (status == -EINPROGRESS || status == -EREMOTEIO)
|
2007-08-25 03:40:19 +08:00
|
|
|
status = 0;
|
2007-08-22 03:40:36 +08:00
|
|
|
COUNT(ehci->stats.complete);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef EHCI_URB_TRACE
|
|
|
|
ehci_dbg (ehci,
|
|
|
|
"%s %s urb %p ep%d%s status %d len %d/%d\n",
|
2008-03-04 08:08:34 +08:00
|
|
|
__func__, urb->dev->devpath, urb,
|
2005-04-17 06:20:36 +08:00
|
|
|
usb_pipeendpoint (urb->pipe),
|
|
|
|
usb_pipein (urb->pipe) ? "in" : "out",
|
2007-08-25 03:40:19 +08:00
|
|
|
status,
|
2005-04-17 06:20:36 +08:00
|
|
|
urb->actual_length, urb->transfer_buffer_length);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* complete() can reenter this HCD */
|
2007-08-08 23:48:02 +08:00
|
|
|
usb_hcd_unlink_urb_from_ep(ehci_to_hcd(ehci), urb);
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_unlock (&ehci->lock);
|
2007-08-25 03:42:24 +08:00
|
|
|
usb_hcd_giveback_urb(ehci_to_hcd(ehci), urb, status);
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_lock (&ehci->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh);
|
|
|
|
static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh);
|
|
|
|
|
|
|
|
static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh);
|
|
|
|
static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Process and free completed qtds for a qh, returning URBs to drivers.
|
|
|
|
* Chases up to qh->hw_current. Returns number of completions called,
|
|
|
|
* indicating how much "real" work we did.
|
|
|
|
*/
|
|
|
|
static unsigned
|
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 21:55:46 +08:00
|
|
|
qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct ehci_qtd *last = NULL, *end = qh->dummy;
|
|
|
|
struct list_head *entry, *tmp;
|
2007-08-25 03:40:19 +08:00
|
|
|
int last_status = -EINPROGRESS;
|
2005-04-17 06:20:36 +08:00
|
|
|
int stopped;
|
|
|
|
unsigned count = 0;
|
|
|
|
u8 state;
|
2008-04-28 14:00:16 +08:00
|
|
|
__le32 halt = HALT_BIT(ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (unlikely (list_empty (&qh->qtd_list)))
|
|
|
|
return count;
|
|
|
|
|
|
|
|
/* completions (or tasks on other cpus) must never clobber HALT
|
|
|
|
* till we've gone through and cleaned everything up, even when
|
|
|
|
* they add urbs to this qh's queue or mark them for unlinking.
|
|
|
|
*
|
|
|
|
* NOTE: unlinking expects to be done in queue order.
|
|
|
|
*/
|
|
|
|
state = qh->qh_state;
|
|
|
|
qh->qh_state = QH_STATE_COMPLETING;
|
|
|
|
stopped = (state == QH_STATE_IDLE);
|
|
|
|
|
|
|
|
/* remove de-activated QTDs from front of queue.
|
|
|
|
* after faults (including short reads), cleanup this urb
|
|
|
|
* then let the queue advance.
|
|
|
|
* if queue is stopped, handles unlinks.
|
|
|
|
*/
|
|
|
|
list_for_each_safe (entry, tmp, &qh->qtd_list) {
|
|
|
|
struct ehci_qtd *qtd;
|
|
|
|
struct urb *urb;
|
|
|
|
u32 token = 0;
|
|
|
|
|
|
|
|
qtd = list_entry (entry, struct ehci_qtd, qtd_list);
|
|
|
|
urb = qtd->urb;
|
|
|
|
|
|
|
|
/* clean up any state from previous QTD ...*/
|
|
|
|
if (last) {
|
|
|
|
if (likely (last->urb != urb)) {
|
2007-08-25 03:40:19 +08:00
|
|
|
ehci_urb_done(ehci, last->urb, last_status);
|
2005-04-17 06:20:36 +08:00
|
|
|
count++;
|
2008-02-28 10:05:24 +08:00
|
|
|
last_status = -EINPROGRESS;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
ehci_qtd_free (ehci, last);
|
|
|
|
last = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ignore urbs submitted during completions we reported */
|
|
|
|
if (qtd == end)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* hardware copies qtd out of qh overlay */
|
|
|
|
rmb ();
|
2007-05-02 00:29:37 +08:00
|
|
|
token = hc32_to_cpu(ehci, qtd->hw_token);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* always clean up qtds the hc de-activated */
|
2009-02-10 23:16:58 +08:00
|
|
|
retry_xacterr:
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((token & QTD_STS_ACTIVE) == 0) {
|
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/* on STALL, error, and short reads this urb must
|
|
|
|
* complete and all its qtds must be recycled.
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if ((token & QTD_STS_HALT) != 0) {
|
2009-02-10 23:16:58 +08:00
|
|
|
|
|
|
|
/* retry transaction errors until we
|
|
|
|
* reach the software xacterr limit
|
|
|
|
*/
|
|
|
|
if ((token & QTD_STS_XACT) &&
|
|
|
|
QTD_CERR(token) == 0 &&
|
2009-07-31 22:41:40 +08:00
|
|
|
++qh->xacterrs < QH_XACTERR_MAX &&
|
2009-02-10 23:16:58 +08:00
|
|
|
!urb->unlinked) {
|
|
|
|
ehci_dbg(ehci,
|
2009-02-14 03:22:06 +08:00
|
|
|
"detected XactErr len %zu/%zu retry %d\n",
|
2009-07-31 22:41:40 +08:00
|
|
|
qtd->length - QTD_LENGTH(token), qtd->length, qh->xacterrs);
|
2009-02-10 23:16:58 +08:00
|
|
|
|
|
|
|
/* reset the token in the qtd and the
|
|
|
|
* qh overlay (which still contains
|
|
|
|
* the qtd) so that we pick up from
|
|
|
|
* where we left off
|
|
|
|
*/
|
|
|
|
token &= ~QTD_STS_HALT;
|
|
|
|
token |= QTD_STS_ACTIVE |
|
|
|
|
(EHCI_TUNE_CERR << 10);
|
|
|
|
qtd->hw_token = cpu_to_hc32(ehci,
|
|
|
|
token);
|
|
|
|
wmb();
|
|
|
|
qh->hw_token = cpu_to_hc32(ehci, token);
|
|
|
|
goto retry_xacterr;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
stopped = 1;
|
|
|
|
|
|
|
|
/* magic dummy for some short reads; qh won't advance.
|
|
|
|
* that silicon quirk can kick in with this dummy too.
|
2008-04-11 05:21:06 +08:00
|
|
|
*
|
|
|
|
* other short reads won't stop the queue, including
|
|
|
|
* control transfers (status stage handles that) or
|
|
|
|
* most other single-qtd reads ... the queue stops if
|
|
|
|
* URB_SHORT_NOT_OK was set so the driver submitting
|
|
|
|
* the urbs could clean it up.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
} else if (IS_SHORT_READ (token)
|
2007-05-02 00:29:37 +08:00
|
|
|
&& !(qtd->hw_alt_next
|
|
|
|
& EHCI_LIST_END(ehci))) {
|
2005-04-17 06:20:36 +08:00
|
|
|
stopped = 1;
|
|
|
|
goto halt;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* stop scanning when we reach qtds the hc is using */
|
|
|
|
} else if (likely (!stopped
|
|
|
|
&& HC_IS_RUNNING (ehci_to_hcd(ehci)->state))) {
|
|
|
|
break;
|
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/* scan the whole queue for unlinks whenever it stops */
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
stopped = 1;
|
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/* cancel everything if we halt, suspend, etc */
|
|
|
|
if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))
|
2007-08-25 03:40:19 +08:00
|
|
|
last_status = -ESHUTDOWN;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/* this qtd is active; skip it unless a previous qtd
|
|
|
|
* for its urb faulted, or its urb was canceled.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2008-04-11 05:21:06 +08:00
|
|
|
else if (last_status == -EINPROGRESS && !urb->unlinked)
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
2006-08-31 05:50:06 +08:00
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/* qh unlinked; token in overlay may be most current */
|
2005-04-17 06:20:36 +08:00
|
|
|
if (state == QH_STATE_IDLE
|
2007-05-02 00:29:37 +08:00
|
|
|
&& cpu_to_hc32(ehci, qtd->qtd_dma)
|
2009-06-29 22:47:30 +08:00
|
|
|
== qh->hw_current) {
|
2007-05-02 00:29:37 +08:00
|
|
|
token = hc32_to_cpu(ehci, qh->hw_token);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-06-29 22:47:30 +08:00
|
|
|
/* An unlink may leave an incomplete
|
|
|
|
* async transaction in the TT buffer.
|
|
|
|
* We have to clear it.
|
|
|
|
*/
|
|
|
|
ehci_clear_tt_buffer(ehci, qh, urb, token);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* force halt for unlinked or blocked qh, so we'll
|
|
|
|
* patch the qh later and so that completions can't
|
|
|
|
* activate it while we "know" it's stopped.
|
|
|
|
*/
|
2007-05-02 00:29:37 +08:00
|
|
|
if ((halt & qh->hw_token) == 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
halt:
|
2007-05-02 00:29:37 +08:00
|
|
|
qh->hw_token |= halt;
|
2005-04-17 06:20:36 +08:00
|
|
|
wmb ();
|
|
|
|
}
|
|
|
|
}
|
2006-08-31 05:50:06 +08:00
|
|
|
|
USB: ehci: qh_completions cleanup and bugfix
Simplify processing of completed qtds, and correct handling of short
reads, by removing two state variables:
- "qtd_status" wasn't needed. The current URB's status is either
OK (-EINPROGRESS) or some fault status. Once a fault appears,
the queue halts and any later QTDs are immediately removed, so
no temporary status is needed. (Or for typical short reads,
it's not treated as a fault, so no queue halt is needed.)
- "do_status" was erroneous. Because of how the queue is set up,
short control reads can (and should!) be treated like full size
reads, and cleaned up the usual way. The status stage will be
executed transparently, and usbcore handles the choice of whether
to report this status as unexected.
The "do_status" problem caused a rather perplexing timing-dependent
problem with usbtest case 10. Sometimes it would make the controller
skip a dozen transactions while (wrongly) trying to clean up after a
short transfer. Fortunately, removing a dcache contention issue made
this become trivial to reproduce (on one test rig), so enough clues
finally presented themselves ... I think this has been around for a
very long time, but was worsened by recent urb->status changes.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-12 23:32:05 +08:00
|
|
|
/* unless we already know the urb's status, collect qtd status
|
|
|
|
* and update count of bytes transferred. in common short read
|
|
|
|
* cases with only one data qtd (including control transfers),
|
|
|
|
* queue processing won't halt. but with two or more qtds (for
|
|
|
|
* example, with a 32 KB transfer), when the first qtd gets a
|
|
|
|
* short read the second must be removed by hand.
|
|
|
|
*/
|
|
|
|
if (last_status == -EINPROGRESS) {
|
|
|
|
last_status = qtd_copy_status(ehci, urb,
|
|
|
|
qtd->length, token);
|
|
|
|
if (last_status == -EREMOTEIO
|
|
|
|
&& (qtd->hw_alt_next
|
|
|
|
& EHCI_LIST_END(ehci)))
|
|
|
|
last_status = -EINPROGRESS;
|
2009-06-29 22:47:30 +08:00
|
|
|
|
|
|
|
/* As part of low/full-speed endpoint-halt processing
|
|
|
|
* we must clear the TT buffer (11.17.5).
|
|
|
|
*/
|
|
|
|
if (unlikely(last_status != -EINPROGRESS &&
|
|
|
|
last_status != -EREMOTEIO))
|
|
|
|
ehci_clear_tt_buffer(ehci, qh, urb, token);
|
2007-08-22 03:39:21 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/* if we're removing something not at the queue head,
|
|
|
|
* patch the hardware queue pointer.
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if (stopped && qtd->qtd_list.prev != &qh->qtd_list) {
|
|
|
|
last = list_entry (qtd->qtd_list.prev,
|
|
|
|
struct ehci_qtd, qtd_list);
|
|
|
|
last->hw_next = qtd->hw_next;
|
|
|
|
}
|
2008-04-11 05:21:06 +08:00
|
|
|
|
|
|
|
/* remove qtd; it's recycled after possible urb completion */
|
2005-04-17 06:20:36 +08:00
|
|
|
list_del (&qtd->qtd_list);
|
|
|
|
last = qtd;
|
2009-02-10 23:16:58 +08:00
|
|
|
|
|
|
|
/* reinit the xacterr counter for the next qtd */
|
2009-07-31 22:41:40 +08:00
|
|
|
qh->xacterrs = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* last urb's completion might still need calling */
|
|
|
|
if (likely (last != NULL)) {
|
2007-08-25 03:40:19 +08:00
|
|
|
ehci_urb_done(ehci, last->urb, last_status);
|
2005-04-17 06:20:36 +08:00
|
|
|
count++;
|
|
|
|
ehci_qtd_free (ehci, last);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* restore original state; caller must unlink or relink */
|
|
|
|
qh->qh_state = state;
|
|
|
|
|
|
|
|
/* be sure the hardware's done with the qh before refreshing
|
|
|
|
* it after fault cleanup, or recovering from silicon wrongly
|
|
|
|
* overlaying the dummy qtd (which reduces DMA chatter).
|
|
|
|
*/
|
2007-05-02 00:29:37 +08:00
|
|
|
if (stopped != 0 || qh->hw_qtd_next == EHCI_LIST_END(ehci)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
switch (state) {
|
|
|
|
case QH_STATE_IDLE:
|
|
|
|
qh_refresh(ehci, qh);
|
|
|
|
break;
|
|
|
|
case QH_STATE_LINKED:
|
2008-04-11 05:21:06 +08:00
|
|
|
/* We won't refresh a QH that's linked (after the HC
|
|
|
|
* stopped the queue). That avoids a race:
|
|
|
|
* - HC reads first part of QH;
|
|
|
|
* - CPU updates that first part and the token;
|
|
|
|
* - HC reads rest of that QH, including token
|
|
|
|
* Result: HC gets an inconsistent image, and then
|
|
|
|
* DMAs to/from the wrong memory (corrupting it).
|
|
|
|
*
|
|
|
|
* That should be rare for interrupt transfers,
|
2005-04-17 06:20:36 +08:00
|
|
|
* except maybe high bandwidth ...
|
|
|
|
*/
|
2007-05-02 00:29:37 +08:00
|
|
|
if ((cpu_to_hc32(ehci, QH_SMASK)
|
2005-08-05 09:06:41 +08:00
|
|
|
& qh->hw_info2) != 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
intr_deschedule (ehci, qh);
|
|
|
|
(void) qh_schedule (ehci, qh);
|
|
|
|
} else
|
|
|
|
unlink_async (ehci, qh);
|
|
|
|
break;
|
|
|
|
/* otherwise, unlink already started */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
// high bandwidth multiplier, as encoded in highspeed endpoint descriptors
|
|
|
|
#define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
|
|
|
|
// ... and packet size, for any kind of endpoint descriptor
|
|
|
|
#define max_packet(wMaxPacketSize) ((wMaxPacketSize) & 0x07ff)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* reverse of qh_urb_transaction: free a list of TDs.
|
|
|
|
* used for cleanup after errors, before HC sees an URB's TDs.
|
|
|
|
*/
|
|
|
|
static void qtd_list_free (
|
|
|
|
struct ehci_hcd *ehci,
|
|
|
|
struct urb *urb,
|
|
|
|
struct list_head *qtd_list
|
|
|
|
) {
|
|
|
|
struct list_head *entry, *temp;
|
|
|
|
|
|
|
|
list_for_each_safe (entry, temp, qtd_list) {
|
|
|
|
struct ehci_qtd *qtd;
|
|
|
|
|
|
|
|
qtd = list_entry (entry, struct ehci_qtd, qtd_list);
|
|
|
|
list_del (&qtd->qtd_list);
|
|
|
|
ehci_qtd_free (ehci, qtd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* create a list of filled qtds for this URB; won't link into qh.
|
|
|
|
*/
|
|
|
|
static struct list_head *
|
|
|
|
qh_urb_transaction (
|
|
|
|
struct ehci_hcd *ehci,
|
|
|
|
struct urb *urb,
|
|
|
|
struct list_head *head,
|
2005-10-21 15:21:58 +08:00
|
|
|
gfp_t flags
|
2005-04-17 06:20:36 +08:00
|
|
|
) {
|
|
|
|
struct ehci_qtd *qtd, *qtd_prev;
|
|
|
|
dma_addr_t buf;
|
|
|
|
int len, maxpacket;
|
|
|
|
int is_input;
|
|
|
|
u32 token;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* URBs map to sequences of QTDs: one logical transaction
|
|
|
|
*/
|
|
|
|
qtd = ehci_qtd_alloc (ehci, flags);
|
|
|
|
if (unlikely (!qtd))
|
|
|
|
return NULL;
|
|
|
|
list_add_tail (&qtd->qtd_list, head);
|
|
|
|
qtd->urb = urb;
|
|
|
|
|
|
|
|
token = QTD_STS_ACTIVE;
|
|
|
|
token |= (EHCI_TUNE_CERR << 10);
|
|
|
|
/* for split transactions, SplitXState initialized to zero */
|
|
|
|
|
|
|
|
len = urb->transfer_buffer_length;
|
|
|
|
is_input = usb_pipein (urb->pipe);
|
|
|
|
if (usb_pipecontrol (urb->pipe)) {
|
|
|
|
/* SETUP pid */
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd_fill(ehci, qtd, urb->setup_dma,
|
|
|
|
sizeof (struct usb_ctrlrequest),
|
|
|
|
token | (2 /* "setup" */ << 8), 8);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* ... and always at least one more pid */
|
|
|
|
token ^= QTD_TOGGLE;
|
|
|
|
qtd_prev = qtd;
|
|
|
|
qtd = ehci_qtd_alloc (ehci, flags);
|
|
|
|
if (unlikely (!qtd))
|
|
|
|
goto cleanup;
|
|
|
|
qtd->urb = urb;
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd_prev->hw_next = QTD_NEXT(ehci, qtd->qtd_dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
list_add_tail (&qtd->qtd_list, head);
|
2005-11-04 00:44:49 +08:00
|
|
|
|
|
|
|
/* for zero length DATA stages, STATUS is always IN */
|
|
|
|
if (len == 0)
|
|
|
|
token |= (1 /* "in" */ << 8);
|
2006-08-31 05:50:06 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* data transfer stage: buffer setup
|
|
|
|
*/
|
2005-11-04 00:44:49 +08:00
|
|
|
buf = urb->transfer_dma;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-11-04 00:44:49 +08:00
|
|
|
if (is_input)
|
2005-04-17 06:20:36 +08:00
|
|
|
token |= (1 /* "in" */ << 8);
|
|
|
|
/* else it's already initted to "out" pid (0 << 8) */
|
|
|
|
|
|
|
|
maxpacket = max_packet(usb_maxpacket(urb->dev, urb->pipe, !is_input));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* buffer gets wrapped in one or more qtds;
|
|
|
|
* last one may be "short" (including zero len)
|
|
|
|
* and may serve as a control status ack
|
|
|
|
*/
|
|
|
|
for (;;) {
|
|
|
|
int this_qtd_len;
|
|
|
|
|
2007-05-02 00:29:37 +08:00
|
|
|
this_qtd_len = qtd_fill(ehci, qtd, buf, len, token, maxpacket);
|
2005-04-17 06:20:36 +08:00
|
|
|
len -= this_qtd_len;
|
|
|
|
buf += this_qtd_len;
|
2008-04-11 05:21:06 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* short reads advance to a "magic" dummy instead of the next
|
|
|
|
* qtd ... that forces the queue to stop, for manual cleanup.
|
|
|
|
* (this will usually be overridden later.)
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
if (is_input)
|
|
|
|
qtd->hw_alt_next = ehci->async->hw_alt_next;
|
|
|
|
|
|
|
|
/* qh makes control packets use qtd toggle; maybe switch it */
|
|
|
|
if ((maxpacket & (this_qtd_len + (maxpacket - 1))) == 0)
|
|
|
|
token ^= QTD_TOGGLE;
|
|
|
|
|
|
|
|
if (likely (len <= 0))
|
|
|
|
break;
|
|
|
|
|
|
|
|
qtd_prev = qtd;
|
|
|
|
qtd = ehci_qtd_alloc (ehci, flags);
|
|
|
|
if (unlikely (!qtd))
|
|
|
|
goto cleanup;
|
|
|
|
qtd->urb = urb;
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd_prev->hw_next = QTD_NEXT(ehci, qtd->qtd_dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
list_add_tail (&qtd->qtd_list, head);
|
|
|
|
}
|
|
|
|
|
2008-04-11 05:21:06 +08:00
|
|
|
/*
|
|
|
|
* unless the caller requires manual cleanup after short reads,
|
|
|
|
* have the alt_next mechanism keep the queue running after the
|
|
|
|
* last data qtd (the only one, for control and most other cases).
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
if (likely ((urb->transfer_flags & URB_SHORT_NOT_OK) == 0
|
|
|
|
|| usb_pipecontrol (urb->pipe)))
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_alt_next = EHCI_LIST_END(ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* control requests may need a terminating data "status" ack;
|
|
|
|
* bulk ones may need a terminating short packet (zero length).
|
|
|
|
*/
|
2005-11-04 00:44:49 +08:00
|
|
|
if (likely (urb->transfer_buffer_length != 0)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
int one_more = 0;
|
|
|
|
|
|
|
|
if (usb_pipecontrol (urb->pipe)) {
|
|
|
|
one_more = 1;
|
|
|
|
token ^= 0x0100; /* "in" <--> "out" */
|
|
|
|
token |= QTD_TOGGLE; /* force DATA1 */
|
|
|
|
} else if (usb_pipebulk (urb->pipe)
|
|
|
|
&& (urb->transfer_flags & URB_ZERO_PACKET)
|
|
|
|
&& !(urb->transfer_buffer_length % maxpacket)) {
|
|
|
|
one_more = 1;
|
|
|
|
}
|
|
|
|
if (one_more) {
|
|
|
|
qtd_prev = qtd;
|
|
|
|
qtd = ehci_qtd_alloc (ehci, flags);
|
|
|
|
if (unlikely (!qtd))
|
|
|
|
goto cleanup;
|
|
|
|
qtd->urb = urb;
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd_prev->hw_next = QTD_NEXT(ehci, qtd->qtd_dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
list_add_tail (&qtd->qtd_list, head);
|
|
|
|
|
|
|
|
/* never any data in such packets */
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd_fill(ehci, qtd, 0, 0, token, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* by default, enable interrupt on urb completion */
|
|
|
|
if (likely (!(urb->transfer_flags & URB_NO_INTERRUPT)))
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_token |= cpu_to_hc32(ehci, QTD_IOC);
|
2005-04-17 06:20:36 +08:00
|
|
|
return head;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
qtd_list_free (ehci, urb, head);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
// Would be best to create all qh's from config descriptors,
|
|
|
|
// when each interface/altsetting is established. Unlink
|
|
|
|
// any previous qh and cancel its urbs first; endpoints are
|
|
|
|
// implicitly reset then (data toggle too).
|
|
|
|
// That'd mean updating how usbcore talks to HCDs. (2.7?)
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Each QH holds a qtd list; a QH is used for everything except iso.
|
|
|
|
*
|
|
|
|
* For interrupt urbs, the scheduler must set the microframe scheduling
|
|
|
|
* mask(s) each time the QH gets scheduled. For highspeed, that's
|
|
|
|
* just one microframe in the s-mask. For split interrupt transactions
|
|
|
|
* there are additional complications: c-mask, maybe FSTNs.
|
|
|
|
*/
|
|
|
|
static struct ehci_qh *
|
|
|
|
qh_make (
|
|
|
|
struct ehci_hcd *ehci,
|
|
|
|
struct urb *urb,
|
2005-10-21 15:21:58 +08:00
|
|
|
gfp_t flags
|
2005-04-17 06:20:36 +08:00
|
|
|
) {
|
|
|
|
struct ehci_qh *qh = ehci_qh_alloc (ehci, flags);
|
|
|
|
u32 info1 = 0, info2 = 0;
|
|
|
|
int is_input, type;
|
|
|
|
int maxp = 0;
|
2007-12-20 03:30:39 +08:00
|
|
|
struct usb_tt *tt = urb->dev->tt;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!qh)
|
|
|
|
return qh;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* init endpoint/device data for this QH
|
|
|
|
*/
|
|
|
|
info1 |= usb_pipeendpoint (urb->pipe) << 8;
|
|
|
|
info1 |= usb_pipedevice (urb->pipe) << 0;
|
|
|
|
|
|
|
|
is_input = usb_pipein (urb->pipe);
|
|
|
|
type = usb_pipetype (urb->pipe);
|
|
|
|
maxp = usb_maxpacket (urb->dev, urb->pipe, !is_input);
|
|
|
|
|
2008-02-09 07:08:44 +08:00
|
|
|
/* 1024 byte maxpacket is a hardware ceiling. High bandwidth
|
|
|
|
* acts like up to 3KB, but is built from smaller packets.
|
|
|
|
*/
|
|
|
|
if (max_packet(maxp) > 1024) {
|
|
|
|
ehci_dbg(ehci, "bogus qh maxpacket %d\n", max_packet(maxp));
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Compute interrupt scheduling parameters just once, and save.
|
|
|
|
* - allowing for high bandwidth, how many nsec/uframe are used?
|
|
|
|
* - split transactions need a second CSPLIT uframe; same question
|
|
|
|
* - splits also need a schedule gap (for full/low speed I/O)
|
|
|
|
* - qh has a polling interval
|
|
|
|
*
|
|
|
|
* For control/bulk requests, the HC or TT handles these.
|
|
|
|
*/
|
|
|
|
if (type == PIPE_INTERRUPT) {
|
2007-12-20 03:30:39 +08:00
|
|
|
qh->usecs = NS_TO_US(usb_calc_bus_time(USB_SPEED_HIGH,
|
|
|
|
is_input, 0,
|
|
|
|
hb_mult(maxp) * max_packet(maxp)));
|
2005-04-17 06:20:36 +08:00
|
|
|
qh->start = NO_FRAME;
|
|
|
|
|
|
|
|
if (urb->dev->speed == USB_SPEED_HIGH) {
|
|
|
|
qh->c_usecs = 0;
|
|
|
|
qh->gap_uf = 0;
|
|
|
|
|
|
|
|
qh->period = urb->interval >> 3;
|
|
|
|
if (qh->period == 0 && urb->interval != 1) {
|
|
|
|
/* NOTE interval 2 or 4 uframes could work.
|
|
|
|
* But interval 1 scheduling is simpler, and
|
|
|
|
* includes high bandwidth.
|
|
|
|
*/
|
|
|
|
dbg ("intr period %d uframes, NYET!",
|
|
|
|
urb->interval);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
} else {
|
2005-08-14 09:44:58 +08:00
|
|
|
int think_time;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* gap is f(FS/LS transfer times) */
|
|
|
|
qh->gap_uf = 1 + usb_calc_bus_time (urb->dev->speed,
|
|
|
|
is_input, 0, maxp) / (125 * 1000);
|
|
|
|
|
|
|
|
/* FIXME this just approximates SPLIT/CSPLIT times */
|
|
|
|
if (is_input) { // SPLIT, gap, CSPLIT+DATA
|
|
|
|
qh->c_usecs = qh->usecs + HS_USECS (0);
|
|
|
|
qh->usecs = HS_USECS (1);
|
|
|
|
} else { // SPLIT+DATA, gap, CSPLIT
|
|
|
|
qh->usecs += HS_USECS (1);
|
|
|
|
qh->c_usecs = HS_USECS (0);
|
|
|
|
}
|
|
|
|
|
2005-08-14 09:44:58 +08:00
|
|
|
think_time = tt ? tt->think_time : 0;
|
|
|
|
qh->tt_usecs = NS_TO_US (think_time +
|
|
|
|
usb_calc_bus_time (urb->dev->speed,
|
|
|
|
is_input, 0, max_packet (maxp)));
|
2005-04-17 06:20:36 +08:00
|
|
|
qh->period = urb->interval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* support for tt scheduling, and access to toggles */
|
2006-01-19 23:46:27 +08:00
|
|
|
qh->dev = urb->dev;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* using TT? */
|
|
|
|
switch (urb->dev->speed) {
|
|
|
|
case USB_SPEED_LOW:
|
|
|
|
info1 |= (1 << 12); /* EPS "low" */
|
|
|
|
/* FALL THROUGH */
|
|
|
|
|
|
|
|
case USB_SPEED_FULL:
|
|
|
|
/* EPS 0 means "full" */
|
|
|
|
if (type != PIPE_INTERRUPT)
|
|
|
|
info1 |= (EHCI_TUNE_RL_TT << 28);
|
|
|
|
if (type == PIPE_CONTROL) {
|
|
|
|
info1 |= (1 << 27); /* for TT */
|
|
|
|
info1 |= 1 << 14; /* toggle from qtd */
|
|
|
|
}
|
|
|
|
info1 |= maxp << 16;
|
|
|
|
|
|
|
|
info2 |= (EHCI_TUNE_MULT_TT << 30);
|
2006-01-21 05:57:52 +08:00
|
|
|
|
|
|
|
/* Some Freescale processors have an erratum in which the
|
|
|
|
* port number in the queue head was 0..N-1 instead of 1..N.
|
|
|
|
*/
|
|
|
|
if (ehci_has_fsl_portno_bug(ehci))
|
|
|
|
info2 |= (urb->dev->ttport-1) << 23;
|
|
|
|
else
|
|
|
|
info2 |= urb->dev->ttport << 23;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* set the address of the TT; for TDI's integrated
|
|
|
|
* root hub tt, leave it zeroed.
|
|
|
|
*/
|
2007-12-20 03:30:39 +08:00
|
|
|
if (tt && tt->hub != ehci_to_hcd(ehci)->self.root_hub)
|
|
|
|
info2 |= tt->hub->devnum << 16;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* NOTE: if (PIPE_INTERRUPT) { scheduler sets c-mask } */
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case USB_SPEED_HIGH: /* no TT involved */
|
|
|
|
info1 |= (2 << 12); /* EPS "high" */
|
|
|
|
if (type == PIPE_CONTROL) {
|
|
|
|
info1 |= (EHCI_TUNE_RL_HS << 28);
|
|
|
|
info1 |= 64 << 16; /* usb2 fixed maxpacket */
|
|
|
|
info1 |= 1 << 14; /* toggle from qtd */
|
|
|
|
info2 |= (EHCI_TUNE_MULT_HS << 30);
|
|
|
|
} else if (type == PIPE_BULK) {
|
|
|
|
info1 |= (EHCI_TUNE_RL_HS << 28);
|
2008-02-09 07:08:44 +08:00
|
|
|
/* The USB spec says that high speed bulk endpoints
|
|
|
|
* always use 512 byte maxpacket. But some device
|
|
|
|
* vendors decided to ignore that, and MSFT is happy
|
|
|
|
* to help them do so. So now people expect to use
|
|
|
|
* such nonconformant devices with Linux too; sigh.
|
|
|
|
*/
|
|
|
|
info1 |= max_packet(maxp) << 16;
|
2005-04-17 06:20:36 +08:00
|
|
|
info2 |= (EHCI_TUNE_MULT_HS << 30);
|
|
|
|
} else { /* PIPE_INTERRUPT */
|
|
|
|
info1 |= max_packet (maxp) << 16;
|
|
|
|
info2 |= hb_mult (maxp) << 30;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2006-08-31 05:50:06 +08:00
|
|
|
dbg ("bogus dev %p speed %d", urb->dev, urb->dev->speed);
|
2005-04-17 06:20:36 +08:00
|
|
|
done:
|
|
|
|
qh_put (qh);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE: if (PIPE_INTERRUPT) { scheduler sets s-mask } */
|
|
|
|
|
|
|
|
/* init as live, toggle clear, advance to dummy */
|
|
|
|
qh->qh_state = QH_STATE_IDLE;
|
2007-05-02 00:29:37 +08:00
|
|
|
qh->hw_info1 = cpu_to_hc32(ehci, info1);
|
|
|
|
qh->hw_info2 = cpu_to_hc32(ehci, info2);
|
2009-06-12 02:56:22 +08:00
|
|
|
usb_settoggle (urb->dev, usb_pipeendpoint (urb->pipe), !is_input, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
qh_refresh (ehci, qh);
|
|
|
|
return qh;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* move qh (and its qtds) onto async queue; maybe enable queue. */
|
|
|
|
|
|
|
|
static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
|
|
|
|
{
|
2007-05-02 00:29:37 +08:00
|
|
|
__hc32 dma = QH_NEXT(ehci, qh->qh_dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct ehci_qh *head;
|
|
|
|
|
2009-06-29 22:47:30 +08:00
|
|
|
/* Don't link a QH if there's a Clear-TT-Buffer pending */
|
|
|
|
if (unlikely(qh->clearing_tt))
|
|
|
|
return;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* (re)start the async schedule? */
|
|
|
|
head = ehci->async;
|
|
|
|
timer_action_done (ehci, TIMER_ASYNC_OFF);
|
|
|
|
if (!head->qh_next.qh) {
|
2006-12-15 03:54:08 +08:00
|
|
|
u32 cmd = ehci_readl(ehci, &ehci->regs->command);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!(cmd & CMD_ASE)) {
|
|
|
|
/* in case a clear of CMD_ASE didn't take yet */
|
2006-12-15 03:54:08 +08:00
|
|
|
(void)handshake(ehci, &ehci->regs->status,
|
|
|
|
STS_ASS, 0, 150);
|
2005-04-17 06:20:36 +08:00
|
|
|
cmd |= CMD_ASE | CMD_RUN;
|
2006-12-15 03:54:08 +08:00
|
|
|
ehci_writel(ehci, cmd, &ehci->regs->command);
|
2005-04-17 06:20:36 +08:00
|
|
|
ehci_to_hcd(ehci)->state = HC_STATE_RUNNING;
|
|
|
|
/* posted write need not be known to HC yet ... */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-06-12 02:56:22 +08:00
|
|
|
/* clear halt and/or toggle; and maybe recover from silicon quirk */
|
2005-04-17 06:20:36 +08:00
|
|
|
if (qh->qh_state == QH_STATE_IDLE)
|
|
|
|
qh_refresh (ehci, qh);
|
|
|
|
|
|
|
|
/* splice right after start */
|
|
|
|
qh->qh_next = head->qh_next;
|
|
|
|
qh->hw_next = head->hw_next;
|
|
|
|
wmb ();
|
|
|
|
|
|
|
|
head->qh_next.qh = qh;
|
|
|
|
head->hw_next = dma;
|
|
|
|
|
2009-07-31 22:40:22 +08:00
|
|
|
qh_get(qh);
|
2009-07-31 22:41:40 +08:00
|
|
|
qh->xacterrs = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
qh->qh_state = QH_STATE_LINKED;
|
|
|
|
/* qtd completions reported later by interrupt */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For control/bulk/interrupt, return QH with these TDs appended.
|
|
|
|
* Allocates and initializes the QH if necessary.
|
|
|
|
* Returns null if it can't allocate a QH it needs to.
|
|
|
|
* If the QH has TDs (urbs) already, that's great.
|
|
|
|
*/
|
|
|
|
static struct ehci_qh *qh_append_tds (
|
|
|
|
struct ehci_hcd *ehci,
|
|
|
|
struct urb *urb,
|
|
|
|
struct list_head *qtd_list,
|
|
|
|
int epnum,
|
|
|
|
void **ptr
|
|
|
|
)
|
|
|
|
{
|
|
|
|
struct ehci_qh *qh = NULL;
|
2008-04-28 14:00:16 +08:00
|
|
|
__hc32 qh_addr_mask = cpu_to_hc32(ehci, 0x7f);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
qh = (struct ehci_qh *) *ptr;
|
|
|
|
if (unlikely (qh == NULL)) {
|
|
|
|
/* can't sleep here, we have ehci->lock... */
|
|
|
|
qh = qh_make (ehci, urb, GFP_ATOMIC);
|
|
|
|
*ptr = qh;
|
|
|
|
}
|
|
|
|
if (likely (qh != NULL)) {
|
|
|
|
struct ehci_qtd *qtd;
|
|
|
|
|
|
|
|
if (unlikely (list_empty (qtd_list)))
|
|
|
|
qtd = NULL;
|
|
|
|
else
|
|
|
|
qtd = list_entry (qtd_list->next, struct ehci_qtd,
|
|
|
|
qtd_list);
|
|
|
|
|
|
|
|
/* control qh may need patching ... */
|
|
|
|
if (unlikely (epnum == 0)) {
|
|
|
|
|
|
|
|
/* usb_reset_device() briefly reverts to address 0 */
|
|
|
|
if (usb_pipedevice (urb->pipe) == 0)
|
2007-05-02 00:29:37 +08:00
|
|
|
qh->hw_info1 &= ~qh_addr_mask;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* just one way to queue requests: swap with the dummy qtd.
|
|
|
|
* only hc or qh_refresh() ever modify the overlay.
|
|
|
|
*/
|
|
|
|
if (likely (qtd != NULL)) {
|
|
|
|
struct ehci_qtd *dummy;
|
|
|
|
dma_addr_t dma;
|
2007-05-02 00:29:37 +08:00
|
|
|
__hc32 token;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* to avoid racing the HC, use the dummy td instead of
|
|
|
|
* the first td of our list (becomes new dummy). both
|
|
|
|
* tds stay deactivated until we're done, when the
|
|
|
|
* HC is allowed to fetch the old dummy (4.10.2).
|
|
|
|
*/
|
|
|
|
token = qtd->hw_token;
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_token = HALT_BIT(ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
wmb ();
|
|
|
|
dummy = qh->dummy;
|
|
|
|
|
|
|
|
dma = dummy->qtd_dma;
|
|
|
|
*dummy = *qtd;
|
|
|
|
dummy->qtd_dma = dma;
|
|
|
|
|
|
|
|
list_del (&qtd->qtd_list);
|
|
|
|
list_add (&dummy->qtd_list, qtd_list);
|
2008-08-07 06:21:26 +08:00
|
|
|
list_splice_tail(qtd_list, &qh->qtd_list);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-05-02 00:29:37 +08:00
|
|
|
ehci_qtd_init(ehci, qtd, qtd->qtd_dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
qh->dummy = qtd;
|
|
|
|
|
|
|
|
/* hc must see the new dummy at list end */
|
|
|
|
dma = qtd->qtd_dma;
|
|
|
|
qtd = list_entry (qh->qtd_list.prev,
|
|
|
|
struct ehci_qtd, qtd_list);
|
2007-05-02 00:29:37 +08:00
|
|
|
qtd->hw_next = QTD_NEXT(ehci, dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* let the hc process these next qtds */
|
|
|
|
wmb ();
|
|
|
|
dummy->hw_token = token;
|
|
|
|
|
|
|
|
urb->hcpriv = qh_get (qh);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return qh;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
static int
|
|
|
|
submit_async (
|
|
|
|
struct ehci_hcd *ehci,
|
|
|
|
struct urb *urb,
|
|
|
|
struct list_head *qtd_list,
|
2005-10-21 15:21:58 +08:00
|
|
|
gfp_t mem_flags
|
2005-04-17 06:20:36 +08:00
|
|
|
) {
|
|
|
|
struct ehci_qtd *qtd;
|
|
|
|
int epnum;
|
|
|
|
unsigned long flags;
|
|
|
|
struct ehci_qh *qh = NULL;
|
2007-08-08 23:48:02 +08:00
|
|
|
int rc;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
qtd = list_entry (qtd_list->next, struct ehci_qtd, qtd_list);
|
2007-08-08 23:48:02 +08:00
|
|
|
epnum = urb->ep->desc.bEndpointAddress;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#ifdef EHCI_URB_TRACE
|
|
|
|
ehci_dbg (ehci,
|
|
|
|
"%s %s urb %p ep%d%s len %d, qtd %p [qh %p]\n",
|
2008-03-04 08:08:34 +08:00
|
|
|
__func__, urb->dev->devpath, urb,
|
2005-04-17 06:20:36 +08:00
|
|
|
epnum & 0x0f, (epnum & USB_DIR_IN) ? "in" : "out",
|
|
|
|
urb->transfer_buffer_length,
|
2007-08-08 23:48:02 +08:00
|
|
|
qtd, urb->ep->hcpriv);
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
spin_lock_irqsave (&ehci->lock, flags);
|
[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-25 06:59:46 +08:00
|
|
|
if (unlikely(!test_bit(HCD_FLAG_HW_ACCESSIBLE,
|
|
|
|
&ehci_to_hcd(ehci)->flags))) {
|
|
|
|
rc = -ESHUTDOWN;
|
|
|
|
goto done;
|
|
|
|
}
|
2007-08-08 23:48:02 +08:00
|
|
|
rc = usb_hcd_link_urb_to_ep(ehci_to_hcd(ehci), urb);
|
|
|
|
if (unlikely(rc))
|
|
|
|
goto done;
|
[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-25 06:59:46 +08:00
|
|
|
|
2007-08-08 23:48:02 +08:00
|
|
|
qh = qh_append_tds(ehci, urb, qtd_list, epnum, &urb->ep->hcpriv);
|
[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-25 06:59:46 +08:00
|
|
|
if (unlikely(qh == NULL)) {
|
2007-08-08 23:48:02 +08:00
|
|
|
usb_hcd_unlink_urb_from_ep(ehci_to_hcd(ehci), urb);
|
[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-25 06:59:46 +08:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto done;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Control/bulk operations through TTs don't need scheduling,
|
|
|
|
* the HC and TT handle it when the TT has a buffer ready.
|
|
|
|
*/
|
[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-25 06:59:46 +08:00
|
|
|
if (likely (qh->qh_state == QH_STATE_IDLE))
|
2009-07-31 22:40:22 +08:00
|
|
|
qh_link_async(ehci, qh);
|
[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-25 06:59:46 +08:00
|
|
|
done:
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_unlock_irqrestore (&ehci->lock, flags);
|
[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-25 06:59:46 +08:00
|
|
|
if (unlikely (qh == NULL))
|
2005-04-17 06:20:36 +08:00
|
|
|
qtd_list_free (ehci, urb, qtd_list);
|
[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-25 06:59:46 +08:00
|
|
|
return rc;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* the async qh for the qtds being reclaimed are now unlinked from the HC */
|
|
|
|
|
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 21:55:46 +08:00
|
|
|
static void end_unlink_async (struct ehci_hcd *ehci)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct ehci_qh *qh = ehci->reclaim;
|
|
|
|
struct ehci_qh *next;
|
|
|
|
|
2007-12-12 05:05:30 +08:00
|
|
|
iaa_watchdog_done(ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-05-02 00:29:37 +08:00
|
|
|
// qh->hw_next = cpu_to_hc32(qh->qh_dma);
|
2005-04-17 06:20:36 +08:00
|
|
|
qh->qh_state = QH_STATE_IDLE;
|
|
|
|
qh->qh_next.qh = NULL;
|
2006-08-31 05:50:06 +08:00
|
|
|
qh_put (qh); // refcount from reclaim
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* other unlink(s) may be pending (in QH_STATE_UNLINK_WAIT) */
|
|
|
|
next = qh->reclaim;
|
|
|
|
ehci->reclaim = next;
|
|
|
|
qh->reclaim = NULL;
|
|
|
|
|
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 21:55:46 +08:00
|
|
|
qh_completions (ehci, qh);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (!list_empty (&qh->qtd_list)
|
|
|
|
&& HC_IS_RUNNING (ehci_to_hcd(ehci)->state))
|
|
|
|
qh_link_async (ehci, qh);
|
|
|
|
else {
|
|
|
|
/* it's not free to turn the async schedule on/off; leave it
|
|
|
|
* active but idle for a while once it empties.
|
|
|
|
*/
|
|
|
|
if (HC_IS_RUNNING (ehci_to_hcd(ehci)->state)
|
|
|
|
&& ehci->async->qh_next.qh == NULL)
|
|
|
|
timer_action (ehci, TIMER_ASYNC_OFF);
|
|
|
|
}
|
2009-07-31 22:40:22 +08:00
|
|
|
qh_put(qh); /* refcount from async list */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (next) {
|
|
|
|
ehci->reclaim = NULL;
|
|
|
|
start_unlink_async (ehci, next);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* makes sure the async qh will become idle */
|
|
|
|
/* caller must own ehci->lock */
|
|
|
|
|
|
|
|
static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
|
|
|
|
{
|
2006-12-15 03:54:08 +08:00
|
|
|
int cmd = ehci_readl(ehci, &ehci->regs->command);
|
2005-04-17 06:20:36 +08:00
|
|
|
struct ehci_qh *prev;
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
assert_spin_locked(&ehci->lock);
|
|
|
|
if (ehci->reclaim
|
|
|
|
|| (qh->qh_state != QH_STATE_LINKED
|
|
|
|
&& qh->qh_state != QH_STATE_UNLINK_WAIT)
|
|
|
|
)
|
|
|
|
BUG ();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* stop async schedule right now? */
|
|
|
|
if (unlikely (qh == ehci->async)) {
|
|
|
|
/* can't get here without STS_ASS set */
|
2006-01-21 06:35:55 +08:00
|
|
|
if (ehci_to_hcd(ehci)->state != HC_STATE_HALT
|
|
|
|
&& !ehci->reclaim) {
|
|
|
|
/* ... and CMD_IAAD clear */
|
2006-12-15 03:54:08 +08:00
|
|
|
ehci_writel(ehci, cmd & ~CMD_ASE,
|
|
|
|
&ehci->regs->command);
|
2005-04-17 06:20:36 +08:00
|
|
|
wmb ();
|
|
|
|
// handshake later, if we need to
|
2006-01-21 06:35:55 +08:00
|
|
|
timer_action_done (ehci, TIMER_ASYNC_OFF);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return;
|
2006-08-31 05:50:06 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
qh->qh_state = QH_STATE_UNLINK;
|
|
|
|
ehci->reclaim = qh = qh_get (qh);
|
|
|
|
|
|
|
|
prev = ehci->async;
|
|
|
|
while (prev->qh_next.qh != qh)
|
|
|
|
prev = prev->qh_next.qh;
|
|
|
|
|
|
|
|
prev->hw_next = qh->hw_next;
|
|
|
|
prev->qh_next = qh->qh_next;
|
|
|
|
wmb ();
|
|
|
|
|
2009-03-17 02:21:56 +08:00
|
|
|
/* If the controller isn't running, we don't have to wait for it */
|
|
|
|
if (unlikely(!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))) {
|
2005-04-17 06:20:36 +08:00
|
|
|
/* if (unlikely (qh->reclaim != 0))
|
2006-08-31 05:50:06 +08:00
|
|
|
* this will recurse, probably not much
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
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 21:55:46 +08:00
|
|
|
end_unlink_async (ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cmd |= CMD_IAAD;
|
2006-12-15 03:54:08 +08:00
|
|
|
ehci_writel(ehci, cmd, &ehci->regs->command);
|
|
|
|
(void)ehci_readl(ehci, &ehci->regs->command);
|
2007-12-12 05:05:30 +08:00
|
|
|
iaa_watchdog_start(ehci);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
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 21:55:46 +08:00
|
|
|
static void scan_async (struct ehci_hcd *ehci)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct ehci_qh *qh;
|
|
|
|
enum ehci_timer_action action = TIMER_IO_WATCHDOG;
|
|
|
|
|
2008-06-04 13:21:55 +08:00
|
|
|
ehci->stamp = ehci_readl(ehci, &ehci->regs->frame_index);
|
2005-04-17 06:20:36 +08:00
|
|
|
timer_action_done (ehci, TIMER_ASYNC_SHRINK);
|
|
|
|
rescan:
|
|
|
|
qh = ehci->async->qh_next.qh;
|
|
|
|
if (likely (qh != NULL)) {
|
|
|
|
do {
|
|
|
|
/* clean any finished work for this qh */
|
|
|
|
if (!list_empty (&qh->qtd_list)
|
|
|
|
&& qh->stamp != ehci->stamp) {
|
|
|
|
int temp;
|
|
|
|
|
|
|
|
/* unlinks could happen here; completion
|
|
|
|
* reporting drops the lock. rescan using
|
|
|
|
* the latest schedule, but don't rescan
|
|
|
|
* qhs we already finished (no looping).
|
|
|
|
*/
|
|
|
|
qh = qh_get (qh);
|
|
|
|
qh->stamp = ehci->stamp;
|
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 21:55:46 +08:00
|
|
|
temp = qh_completions (ehci, qh);
|
2005-04-17 06:20:36 +08:00
|
|
|
qh_put (qh);
|
|
|
|
if (temp != 0) {
|
|
|
|
goto rescan;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-04 13:21:55 +08:00
|
|
|
/* unlink idle entries, reducing DMA usage as well
|
2005-04-17 06:20:36 +08:00
|
|
|
* as HCD schedule-scanning costs. delay for any qh
|
|
|
|
* we just scanned, there's a not-unusual case that it
|
|
|
|
* doesn't stay idle for long.
|
|
|
|
* (plus, avoids some kind of re-activation race.)
|
|
|
|
*/
|
2008-06-04 13:21:55 +08:00
|
|
|
if (list_empty(&qh->qtd_list)
|
|
|
|
&& qh->qh_state == QH_STATE_LINKED) {
|
|
|
|
if (!ehci->reclaim
|
|
|
|
&& ((ehci->stamp - qh->stamp) & 0x1fff)
|
|
|
|
>= (EHCI_SHRINK_FRAMES * 8))
|
|
|
|
start_unlink_async(ehci, qh);
|
|
|
|
else
|
2005-04-17 06:20:36 +08:00
|
|
|
action = TIMER_ASYNC_SHRINK;
|
|
|
|
}
|
|
|
|
|
|
|
|
qh = qh->qh_next.qh;
|
|
|
|
} while (qh);
|
|
|
|
}
|
|
|
|
if (action == TIMER_ASYNC_SHRINK)
|
|
|
|
timer_action (ehci, TIMER_ASYNC_SHRINK);
|
|
|
|
}
|