2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
|
* OHCI HCD (Host Controller Driver) for USB.
|
2006-12-05 11:18:31 +00:00
|
|
|
*
|
2005-04-16 22:20:36 +00:00
|
|
|
* (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
|
|
|
|
|
* (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
|
2006-12-05 11:18:31 +00:00
|
|
|
*
|
2005-04-16 22:20:36 +00:00
|
|
|
* This file is licenced under GPL
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* OHCI Root Hub ... the nonsharable stuff
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define dbg_port(hc,label,num,value) \
|
|
|
|
|
ohci_dbg (hc, \
|
|
|
|
|
"%s roothub.portstatus [%d] " \
|
|
|
|
|
"= 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n", \
|
|
|
|
|
label, num, temp, \
|
|
|
|
|
(temp & RH_PS_PRSC) ? " PRSC" : "", \
|
|
|
|
|
(temp & RH_PS_OCIC) ? " OCIC" : "", \
|
|
|
|
|
(temp & RH_PS_PSSC) ? " PSSC" : "", \
|
|
|
|
|
(temp & RH_PS_PESC) ? " PESC" : "", \
|
|
|
|
|
(temp & RH_PS_CSC) ? " CSC" : "", \
|
2006-12-05 11:18:31 +00:00
|
|
|
\
|
2005-04-16 22:20:36 +00:00
|
|
|
(temp & RH_PS_LSDA) ? " LSDA" : "", \
|
|
|
|
|
(temp & RH_PS_PPS) ? " PPS" : "", \
|
|
|
|
|
(temp & RH_PS_PRS) ? " PRS" : "", \
|
|
|
|
|
(temp & RH_PS_POCI) ? " POCI" : "", \
|
|
|
|
|
(temp & RH_PS_PSS) ? " PSS" : "", \
|
2006-12-05 11:18:31 +00:00
|
|
|
\
|
2005-04-16 22:20:36 +00:00
|
|
|
(temp & RH_PS_PES) ? " PES" : "", \
|
|
|
|
|
(temp & RH_PS_CCS) ? " CCS" : "" \
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
#define OHCI_SCHED_ENABLES \
|
|
|
|
|
(OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE)
|
|
|
|
|
|
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 13:55:46 +00:00
|
|
|
static void dl_done_list (struct ohci_hcd *);
|
|
|
|
|
static void finish_unlinks (struct ohci_hcd *, u16);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-10-24 16:02:31 +00:00
|
|
|
#ifdef CONFIG_PM
|
2006-09-26 18:46:16 +00:00
|
|
|
static int ohci_rh_suspend (struct ohci_hcd *ohci, int autostop)
|
|
|
|
|
__releases(ohci->lock)
|
|
|
|
|
__acquires(ohci->lock)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
|
int status = 0;
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 22:59:46 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
switch (ohci->hc_control & OHCI_CTRL_HCFS) {
|
|
|
|
|
case OHCI_USB_RESUME:
|
|
|
|
|
ohci_dbg (ohci, "resume/suspend?\n");
|
|
|
|
|
ohci->hc_control &= ~OHCI_CTRL_HCFS;
|
|
|
|
|
ohci->hc_control |= OHCI_USB_RESET;
|
|
|
|
|
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
|
|
|
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
/* FALL THROUGH */
|
|
|
|
|
case OHCI_USB_RESET:
|
|
|
|
|
status = -EBUSY;
|
|
|
|
|
ohci_dbg (ohci, "needs reinit!\n");
|
|
|
|
|
goto done;
|
|
|
|
|
case OHCI_USB_SUSPEND:
|
2006-09-26 18:46:16 +00:00
|
|
|
if (!ohci->autostop) {
|
|
|
|
|
ohci_dbg (ohci, "already suspended\n");
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
2006-09-26 18:46:16 +00:00
|
|
|
ohci_dbg (ohci, "%s root hub\n",
|
|
|
|
|
autostop ? "auto-stop" : "suspend");
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/* First stop any processing */
|
2006-09-26 18:46:16 +00:00
|
|
|
if (!autostop && (ohci->hc_control & OHCI_SCHED_ENABLES)) {
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control &= ~OHCI_SCHED_ENABLES;
|
|
|
|
|
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
|
|
|
|
ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
ohci_writel (ohci, OHCI_INTR_SF, &ohci->regs->intrstatus);
|
|
|
|
|
|
|
|
|
|
/* sched disables take effect on the next frame,
|
|
|
|
|
* then the last WDH could take 6+ msec
|
|
|
|
|
*/
|
|
|
|
|
ohci_dbg (ohci, "stopping schedules ...\n");
|
2006-09-26 18:46:16 +00:00
|
|
|
ohci->autostop = 0;
|
|
|
|
|
spin_unlock_irq (&ohci->lock);
|
|
|
|
|
msleep (8);
|
|
|
|
|
spin_lock_irq (&ohci->lock);
|
2005-04-16 22:20:36 +00: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 13:55:46 +00:00
|
|
|
dl_done_list (ohci);
|
|
|
|
|
finish_unlinks (ohci, ohci_frame_no(ohci));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/* maybe resume can wake root hub */
|
2008-04-14 16:17:10 +00:00
|
|
|
if (ohci_to_hcd(ohci)->self.root_hub->do_remote_wakeup || autostop) {
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control |= OHCI_CTRL_RWE;
|
2008-04-14 16:17:10 +00:00
|
|
|
} else {
|
2008-04-14 16:17:49 +00:00
|
|
|
ohci_writel(ohci, OHCI_INTR_RHSC | OHCI_INTR_RD,
|
|
|
|
|
&ohci->regs->intrdisable);
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control &= ~OHCI_CTRL_RWE;
|
2006-09-25 19:41:21 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-09-23 05:42:53 +00:00
|
|
|
/* Suspend hub ... this is the "global (to this bus) suspend" mode,
|
|
|
|
|
* which doesn't imply ports will first be individually suspended.
|
|
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control &= ~OHCI_CTRL_HCFS;
|
|
|
|
|
ohci->hc_control |= OHCI_USB_SUSPEND;
|
|
|
|
|
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
|
|
|
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
|
|
|
|
|
/* no resumes until devices finish suspending */
|
2006-09-26 18:46:16 +00:00
|
|
|
if (!autostop) {
|
|
|
|
|
ohci->next_statechange = jiffies + msecs_to_jiffies (5);
|
|
|
|
|
ohci->autostop = 0;
|
|
|
|
|
}
|
2006-08-04 18:31:55 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
done:
|
|
|
|
|
return status;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct ed *find_head (struct ed *ed)
|
|
|
|
|
{
|
|
|
|
|
/* for bulk and control lists */
|
|
|
|
|
while (ed->ed_prev)
|
|
|
|
|
ed = ed->ed_prev;
|
|
|
|
|
return ed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* caller has locked the root hub */
|
2006-09-26 18:46:16 +00:00
|
|
|
static int ohci_rh_resume (struct ohci_hcd *ohci)
|
|
|
|
|
__releases(ohci->lock)
|
|
|
|
|
__acquires(ohci->lock)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2006-09-26 18:46:16 +00:00
|
|
|
struct usb_hcd *hcd = ohci_to_hcd (ohci);
|
2005-04-16 22:20:36 +00:00
|
|
|
u32 temp, enables;
|
|
|
|
|
int status = -EINPROGRESS;
|
2006-09-26 18:46:16 +00:00
|
|
|
int autostopped = ohci->autostop;
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 22:59:46 +00:00
|
|
|
|
2006-09-26 18:46:16 +00:00
|
|
|
ohci->autostop = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
|
|
|
|
|
if (ohci->hc_control & (OHCI_CTRL_IR | OHCI_SCHED_ENABLES)) {
|
2005-09-23 05:42:53 +00:00
|
|
|
/* this can happen after resuming a swsusp snapshot */
|
2005-04-16 22:20:36 +00:00
|
|
|
if (hcd->state == HC_STATE_RESUMING) {
|
|
|
|
|
ohci_dbg (ohci, "BIOS/SMM active, control %03x\n",
|
|
|
|
|
ohci->hc_control);
|
|
|
|
|
status = -EBUSY;
|
|
|
|
|
/* this happens when pmcore resumes HC then root */
|
|
|
|
|
} else {
|
|
|
|
|
ohci_dbg (ohci, "duplicate resume\n");
|
|
|
|
|
status = 0;
|
|
|
|
|
}
|
|
|
|
|
} else switch (ohci->hc_control & OHCI_CTRL_HCFS) {
|
|
|
|
|
case OHCI_USB_SUSPEND:
|
|
|
|
|
ohci->hc_control &= ~(OHCI_CTRL_HCFS|OHCI_SCHED_ENABLES);
|
|
|
|
|
ohci->hc_control |= OHCI_USB_RESUME;
|
|
|
|
|
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
|
|
|
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
2006-09-26 18:46:16 +00:00
|
|
|
ohci_dbg (ohci, "%s root hub\n",
|
|
|
|
|
autostopped ? "auto-start" : "resume");
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
case OHCI_USB_RESUME:
|
|
|
|
|
/* HCFS changes sometime after INTR_RD */
|
2006-11-06 17:05:00 +00:00
|
|
|
ohci_dbg(ohci, "%swakeup root hub\n",
|
2006-10-24 16:04:22 +00:00
|
|
|
autostopped ? "auto-" : "");
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
case OHCI_USB_OPER:
|
2005-09-23 05:42:53 +00:00
|
|
|
/* this can happen after resuming a swsusp snapshot */
|
|
|
|
|
ohci_dbg (ohci, "snapshot resume? reinit\n");
|
|
|
|
|
status = -EBUSY;
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
default: /* RESET, we lost power */
|
2005-09-23 05:42:53 +00:00
|
|
|
ohci_dbg (ohci, "lost power\n");
|
2005-04-16 22:20:36 +00:00
|
|
|
status = -EBUSY;
|
|
|
|
|
}
|
|
|
|
|
if (status == -EBUSY) {
|
2006-09-26 18:46:16 +00:00
|
|
|
if (!autostopped) {
|
|
|
|
|
spin_unlock_irq (&ohci->lock);
|
|
|
|
|
(void) ohci_init (ohci);
|
|
|
|
|
status = ohci_restart (ohci);
|
2007-05-31 21:34:27 +00:00
|
|
|
|
|
|
|
|
usb_root_hub_lost_power(hcd->self.root_hub);
|
|
|
|
|
|
2006-09-26 18:46:16 +00:00
|
|
|
spin_lock_irq (&ohci->lock);
|
|
|
|
|
}
|
|
|
|
|
return status;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
if (status != -EINPROGRESS)
|
|
|
|
|
return status;
|
2006-09-26 18:46:16 +00:00
|
|
|
if (autostopped)
|
|
|
|
|
goto skip_resume;
|
|
|
|
|
spin_unlock_irq (&ohci->lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/* Some controllers (lucent erratum) need extra-long delays */
|
2005-09-23 05:42:53 +00:00
|
|
|
msleep (20 /* usb 11.5.1.10 */ + 12 /* 32 msec counter */ + 1);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
temp = ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
temp &= OHCI_CTRL_HCFS;
|
|
|
|
|
if (temp != OHCI_USB_RESUME) {
|
|
|
|
|
ohci_err (ohci, "controller won't resume\n");
|
2006-10-27 14:35:01 +00:00
|
|
|
spin_lock_irq(&ohci->lock);
|
2005-04-16 22:20:36 +00:00
|
|
|
return -EBUSY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* disable old schedule state, reinit from scratch */
|
|
|
|
|
ohci_writel (ohci, 0, &ohci->regs->ed_controlhead);
|
|
|
|
|
ohci_writel (ohci, 0, &ohci->regs->ed_controlcurrent);
|
|
|
|
|
ohci_writel (ohci, 0, &ohci->regs->ed_bulkhead);
|
|
|
|
|
ohci_writel (ohci, 0, &ohci->regs->ed_bulkcurrent);
|
|
|
|
|
ohci_writel (ohci, 0, &ohci->regs->ed_periodcurrent);
|
|
|
|
|
ohci_writel (ohci, (u32) ohci->hcca_dma, &ohci->regs->hcca);
|
|
|
|
|
|
|
|
|
|
/* Sometimes PCI D3 suspend trashes frame timings ... */
|
|
|
|
|
periodic_reinit (ohci);
|
|
|
|
|
|
2006-09-26 18:46:16 +00:00
|
|
|
/* the following code is executed with ohci->lock held and
|
|
|
|
|
* irqs disabled if and only if autostopped is true
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
skip_resume:
|
2005-04-16 22:20:36 +00:00
|
|
|
/* interrupts might have been disabled */
|
|
|
|
|
ohci_writel (ohci, OHCI_INTR_INIT, &ohci->regs->intrenable);
|
|
|
|
|
if (ohci->ed_rm_list)
|
|
|
|
|
ohci_writel (ohci, OHCI_INTR_SF, &ohci->regs->intrenable);
|
|
|
|
|
|
|
|
|
|
/* Then re-enable operations */
|
|
|
|
|
ohci_writel (ohci, OHCI_USB_OPER, &ohci->regs->control);
|
|
|
|
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
2006-09-26 18:46:16 +00:00
|
|
|
if (!autostopped)
|
|
|
|
|
msleep (3);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-01-23 23:28:07 +00:00
|
|
|
temp = ohci->hc_control;
|
|
|
|
|
temp &= OHCI_CTRL_RWC;
|
|
|
|
|
temp |= OHCI_CONTROL_INIT | OHCI_USB_OPER;
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci->hc_control = temp;
|
|
|
|
|
ohci_writel (ohci, temp, &ohci->regs->control);
|
|
|
|
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
|
|
|
|
|
/* TRSMRCY */
|
2006-09-26 18:46:16 +00:00
|
|
|
if (!autostopped) {
|
|
|
|
|
msleep (10);
|
|
|
|
|
spin_lock_irq (&ohci->lock);
|
|
|
|
|
}
|
|
|
|
|
/* now ohci->lock is always held and irqs are always disabled */
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-08-04 18:31:55 +00:00
|
|
|
/* keep it alive for more than ~5x suspend + resume costs */
|
|
|
|
|
ohci->next_statechange = jiffies + STATECHANGE_DELAY;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/* maybe turn schedules back on */
|
|
|
|
|
enables = 0;
|
|
|
|
|
temp = 0;
|
|
|
|
|
if (!ohci->ed_rm_list) {
|
|
|
|
|
if (ohci->ed_controltail) {
|
|
|
|
|
ohci_writel (ohci,
|
|
|
|
|
find_head (ohci->ed_controltail)->dma,
|
|
|
|
|
&ohci->regs->ed_controlhead);
|
|
|
|
|
enables |= OHCI_CTRL_CLE;
|
|
|
|
|
temp |= OHCI_CLF;
|
|
|
|
|
}
|
|
|
|
|
if (ohci->ed_bulktail) {
|
|
|
|
|
ohci_writel (ohci, find_head (ohci->ed_bulktail)->dma,
|
|
|
|
|
&ohci->regs->ed_bulkhead);
|
|
|
|
|
enables |= OHCI_CTRL_BLE;
|
|
|
|
|
temp |= OHCI_BLF;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (hcd->self.bandwidth_isoc_reqs || hcd->self.bandwidth_int_reqs)
|
|
|
|
|
enables |= OHCI_CTRL_PLE|OHCI_CTRL_IE;
|
|
|
|
|
if (enables) {
|
|
|
|
|
ohci_dbg (ohci, "restarting schedules ... %08x\n", enables);
|
|
|
|
|
ohci->hc_control |= enables;
|
|
|
|
|
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
|
|
|
|
if (temp)
|
|
|
|
|
ohci_writel (ohci, temp, &ohci->regs->cmdstatus);
|
|
|
|
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-26 18:46:16 +00:00
|
|
|
static int ohci_bus_suspend (struct usb_hcd *hcd)
|
|
|
|
|
{
|
|
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
spin_lock_irq (&ohci->lock);
|
|
|
|
|
|
|
|
|
|
if (unlikely(!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)))
|
|
|
|
|
rc = -ESHUTDOWN;
|
|
|
|
|
else
|
|
|
|
|
rc = ohci_rh_suspend (ohci, 0);
|
|
|
|
|
spin_unlock_irq (&ohci->lock);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ohci_bus_resume (struct usb_hcd *hcd)
|
|
|
|
|
{
|
|
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
|
|
if (time_before (jiffies, ohci->next_statechange))
|
|
|
|
|
msleep(5);
|
|
|
|
|
|
|
|
|
|
spin_lock_irq (&ohci->lock);
|
|
|
|
|
|
|
|
|
|
if (unlikely(!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)))
|
|
|
|
|
rc = -ESHUTDOWN;
|
|
|
|
|
else
|
|
|
|
|
rc = ohci_rh_resume (ohci);
|
|
|
|
|
spin_unlock_irq (&ohci->lock);
|
|
|
|
|
|
|
|
|
|
/* poll until we know a device is connected or we autostop */
|
|
|
|
|
if (rc == 0)
|
|
|
|
|
usb_hcd_poll_rh_status(hcd);
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-03 22:03:17 +00:00
|
|
|
/* Carry out the final steps of resuming the controller device */
|
|
|
|
|
static void ohci_finish_controller_resume(struct usb_hcd *hcd)
|
|
|
|
|
{
|
|
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
|
|
|
|
|
int port;
|
|
|
|
|
bool need_reinit = false;
|
|
|
|
|
|
|
|
|
|
/* See if the controller is already running or has been reset */
|
|
|
|
|
ohci->hc_control = ohci_readl(ohci, &ohci->regs->control);
|
|
|
|
|
if (ohci->hc_control & (OHCI_CTRL_IR | OHCI_SCHED_ENABLES)) {
|
|
|
|
|
need_reinit = true;
|
|
|
|
|
} else {
|
|
|
|
|
switch (ohci->hc_control & OHCI_CTRL_HCFS) {
|
|
|
|
|
case OHCI_USB_OPER:
|
|
|
|
|
case OHCI_USB_RESET:
|
|
|
|
|
need_reinit = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If needed, reinitialize and suspend the root hub */
|
|
|
|
|
if (need_reinit) {
|
|
|
|
|
spin_lock_irq(&ohci->lock);
|
|
|
|
|
hcd->state = HC_STATE_RESUMING;
|
|
|
|
|
ohci_rh_resume(ohci);
|
|
|
|
|
hcd->state = HC_STATE_QUIESCING;
|
|
|
|
|
ohci_rh_suspend(ohci, 0);
|
|
|
|
|
hcd->state = HC_STATE_SUSPENDED;
|
|
|
|
|
spin_unlock_irq(&ohci->lock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Normally just turn on port power and enable interrupts */
|
|
|
|
|
else {
|
|
|
|
|
ohci_dbg(ohci, "powerup ports\n");
|
|
|
|
|
for (port = 0; port < ohci->num_ports; port++)
|
|
|
|
|
ohci_writel(ohci, RH_PS_PPS,
|
|
|
|
|
&ohci->regs->roothub.portstatus[port]);
|
|
|
|
|
|
|
|
|
|
ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrenable);
|
|
|
|
|
ohci_readl(ohci, &ohci->regs->intrenable);
|
|
|
|
|
msleep(20);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-20 16:06:59 +00:00
|
|
|
/* Carry out polling-, autostop-, and autoresume-related state changes */
|
|
|
|
|
static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
|
2008-10-09 19:40:23 +00:00
|
|
|
int any_connected, int rhsc_status)
|
2006-11-20 16:06:59 +00:00
|
|
|
{
|
|
|
|
|
int poll_rh = 1;
|
2008-10-09 19:40:23 +00:00
|
|
|
int rhsc_enable;
|
2006-11-20 16:06:59 +00:00
|
|
|
|
2008-09-03 20:38:32 +00:00
|
|
|
/* Some broken controllers never turn off RHCS in the interrupt
|
|
|
|
|
* status register. For their sake we won't re-enable RHSC
|
|
|
|
|
* interrupts if the interrupt bit is already active.
|
|
|
|
|
*/
|
|
|
|
|
rhsc_enable = ohci_readl(ohci, &ohci->regs->intrenable) &
|
|
|
|
|
OHCI_INTR_RHSC;
|
2006-11-20 16:06:59 +00:00
|
|
|
|
2008-09-03 20:38:32 +00:00
|
|
|
switch (ohci->hc_control & OHCI_CTRL_HCFS) {
|
2006-11-20 16:06:59 +00:00
|
|
|
case OHCI_USB_OPER:
|
2008-09-03 20:38:32 +00:00
|
|
|
/* If no status changes are pending, enable RHSC interrupts. */
|
|
|
|
|
if (!rhsc_enable && !rhsc_status && !changed) {
|
|
|
|
|
rhsc_enable = OHCI_INTR_RHSC;
|
|
|
|
|
ohci_writel(ohci, rhsc_enable, &ohci->regs->intrenable);
|
2008-08-20 21:22:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Keep on polling until we know a device is connected
|
|
|
|
|
* and RHSC is enabled, or until we autostop.
|
|
|
|
|
*/
|
2006-11-20 16:06:59 +00:00
|
|
|
if (!ohci->autostop) {
|
|
|
|
|
if (any_connected ||
|
|
|
|
|
!device_may_wakeup(&ohci_to_hcd(ohci)
|
|
|
|
|
->self.root_hub->dev)) {
|
2008-09-03 20:38:32 +00:00
|
|
|
if (rhsc_enable)
|
2006-11-20 16:06:59 +00:00
|
|
|
poll_rh = 0;
|
|
|
|
|
} else {
|
|
|
|
|
ohci->autostop = 1;
|
|
|
|
|
ohci->next_statechange = jiffies + HZ;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* if no devices have been attached for one second, autostop */
|
|
|
|
|
} else {
|
|
|
|
|
if (changed || any_connected) {
|
|
|
|
|
ohci->autostop = 0;
|
|
|
|
|
ohci->next_statechange = jiffies +
|
|
|
|
|
STATECHANGE_DELAY;
|
2008-09-03 20:38:32 +00:00
|
|
|
} else if (time_after_eq(jiffies,
|
2006-11-20 16:06:59 +00:00
|
|
|
ohci->next_statechange)
|
|
|
|
|
&& !ohci->ed_rm_list
|
|
|
|
|
&& !(ohci->hc_control &
|
|
|
|
|
OHCI_SCHED_ENABLES)) {
|
|
|
|
|
ohci_rh_suspend(ohci, 1);
|
2008-09-03 20:38:32 +00:00
|
|
|
if (rhsc_enable)
|
|
|
|
|
poll_rh = 0;
|
2006-11-20 16:06:59 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OHCI_USB_SUSPEND:
|
|
|
|
|
case OHCI_USB_RESUME:
|
2008-09-03 20:38:32 +00:00
|
|
|
/* if there is a port change, autostart or ask to be resumed */
|
2006-11-20 16:06:59 +00:00
|
|
|
if (changed) {
|
|
|
|
|
if (ohci->autostop)
|
|
|
|
|
ohci_rh_resume(ohci);
|
|
|
|
|
else
|
|
|
|
|
usb_hcd_resume_root_hub(ohci_to_hcd(ohci));
|
2008-10-09 19:40:23 +00:00
|
|
|
|
|
|
|
|
/* If remote wakeup is disabled, stop polling */
|
|
|
|
|
} else if (!ohci->autostop &&
|
|
|
|
|
!ohci_to_hcd(ohci)->self.root_hub->
|
|
|
|
|
do_remote_wakeup) {
|
|
|
|
|
poll_rh = 0;
|
|
|
|
|
|
2006-11-20 16:06:59 +00:00
|
|
|
} else {
|
2008-10-09 19:40:23 +00:00
|
|
|
/* If no status changes are pending,
|
|
|
|
|
* enable RHSC interrupts
|
|
|
|
|
*/
|
|
|
|
|
if (!rhsc_enable && !rhsc_status) {
|
2008-09-03 20:38:32 +00:00
|
|
|
rhsc_enable = OHCI_INTR_RHSC;
|
|
|
|
|
ohci_writel(ohci, rhsc_enable,
|
2008-08-20 21:22:05 +00:00
|
|
|
&ohci->regs->intrenable);
|
2008-09-03 20:38:32 +00:00
|
|
|
}
|
2008-10-09 19:40:23 +00:00
|
|
|
/* Keep polling until RHSC is enabled */
|
2008-09-03 20:38:32 +00:00
|
|
|
if (rhsc_enable)
|
|
|
|
|
poll_rh = 0;
|
2006-11-20 16:06:59 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return poll_rh;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else /* CONFIG_PM */
|
|
|
|
|
|
|
|
|
|
static inline int ohci_rh_resume(struct ohci_hcd *ohci)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Carry out polling-related state changes.
|
|
|
|
|
* autostop isn't used when CONFIG_PM is turned off.
|
|
|
|
|
*/
|
|
|
|
|
static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
|
2008-10-09 19:40:23 +00:00
|
|
|
int any_connected, int rhsc_status)
|
2006-11-20 16:06:59 +00:00
|
|
|
{
|
2008-08-20 21:22:05 +00:00
|
|
|
/* If RHSC is enabled, don't poll */
|
2008-07-06 17:27:25 +00:00
|
|
|
if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC)
|
2008-08-20 21:22:05 +00:00
|
|
|
return 0;
|
|
|
|
|
|
2008-10-09 19:40:23 +00:00
|
|
|
/* If status changes are pending, continue polling.
|
|
|
|
|
* Conversely, if no status changes are pending but the RHSC
|
|
|
|
|
* status bit was set, then RHSC may be broken so continue polling.
|
|
|
|
|
*/
|
|
|
|
|
if (changed || rhsc_status)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* It's safe to re-enable RHSC interrupts */
|
|
|
|
|
ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable);
|
|
|
|
|
return 0;
|
2006-11-20 16:06:59 +00:00
|
|
|
}
|
|
|
|
|
|
2005-09-14 02:59:11 +00:00
|
|
|
#endif /* CONFIG_PM */
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
/* build "status change" packet (one or two bytes) from HC registers */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
ohci_hub_status_data (struct usb_hcd *hcd, char *buf)
|
|
|
|
|
{
|
|
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
2005-08-31 18:52:57 +00:00
|
|
|
int i, changed = 0, length = 1;
|
2006-10-27 14:33:11 +00:00
|
|
|
int any_connected = 0;
|
2008-10-09 19:40:23 +00:00
|
|
|
int rhsc_status;
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave (&ohci->lock, flags);
|
2007-05-04 15:57:00 +00:00
|
|
|
if (!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))
|
|
|
|
|
goto done;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2005-08-31 18:52:57 +00:00
|
|
|
/* undocumented erratum seen on at least rev D */
|
|
|
|
|
if ((ohci->flags & OHCI_QUIRK_AMD756)
|
|
|
|
|
&& (roothub_a (ohci) & RH_A_NDP) > MAX_ROOT_PORTS) {
|
|
|
|
|
ohci_warn (ohci, "bogus NDP, rereads as NDP=%d\n",
|
2005-04-16 22:20:36 +00:00
|
|
|
ohci_readl (ohci, &ohci->regs->roothub.a) & RH_A_NDP);
|
|
|
|
|
/* retry later; "should not happen" */
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* init status */
|
|
|
|
|
if (roothub_status (ohci) & (RH_HS_LPSC | RH_HS_OCIC))
|
|
|
|
|
buf [0] = changed = 1;
|
|
|
|
|
else
|
|
|
|
|
buf [0] = 0;
|
2005-08-31 18:52:57 +00:00
|
|
|
if (ohci->num_ports > 7) {
|
2005-04-16 22:20:36 +00:00
|
|
|
buf [1] = 0;
|
|
|
|
|
length++;
|
|
|
|
|
}
|
|
|
|
|
|
2008-10-09 19:40:23 +00:00
|
|
|
/* Clear the RHSC status flag before reading the port statuses */
|
|
|
|
|
ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrstatus);
|
|
|
|
|
rhsc_status = ohci_readl(ohci, &ohci->regs->intrstatus) &
|
|
|
|
|
OHCI_INTR_RHSC;
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* look at each port */
|
2005-08-31 18:52:57 +00:00
|
|
|
for (i = 0; i < ohci->num_ports; i++) {
|
2005-04-16 22:20:36 +00:00
|
|
|
u32 status = roothub_portstatus (ohci, i);
|
|
|
|
|
|
2006-09-26 18:46:16 +00:00
|
|
|
/* can't autostop if ports are connected */
|
|
|
|
|
any_connected |= (status & RH_PS_CCS);
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
if (status & (RH_PS_CSC | RH_PS_PESC | RH_PS_PSSC
|
|
|
|
|
| RH_PS_OCIC | RH_PS_PRSC)) {
|
|
|
|
|
changed = 1;
|
|
|
|
|
if (i < 7)
|
|
|
|
|
buf [0] |= 1 << (i + 1);
|
|
|
|
|
else
|
|
|
|
|
buf [1] |= 1 << (i - 7);
|
|
|
|
|
}
|
2006-08-04 18:31:55 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-11-20 16:06:59 +00:00
|
|
|
hcd->poll_rh = ohci_root_hub_state_changes(ohci, changed,
|
2008-10-09 19:40:23 +00:00
|
|
|
any_connected, rhsc_status);
|
2006-08-04 18:31:55 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
done:
|
|
|
|
|
spin_unlock_irqrestore (&ohci->lock, flags);
|
|
|
|
|
|
|
|
|
|
return changed ? length : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ohci_hub_descriptor (
|
|
|
|
|
struct ohci_hcd *ohci,
|
|
|
|
|
struct usb_hub_descriptor *desc
|
|
|
|
|
) {
|
|
|
|
|
u32 rh = roothub_a (ohci);
|
|
|
|
|
u16 temp;
|
|
|
|
|
|
|
|
|
|
desc->bDescriptorType = 0x29;
|
|
|
|
|
desc->bPwrOn2PwrGood = (rh & RH_A_POTPGT) >> 24;
|
|
|
|
|
desc->bHubContrCurrent = 0;
|
|
|
|
|
|
2005-08-31 18:52:57 +00:00
|
|
|
desc->bNbrPorts = ohci->num_ports;
|
|
|
|
|
temp = 1 + (ohci->num_ports / 8);
|
2005-04-16 22:20:36 +00:00
|
|
|
desc->bDescLength = 7 + 2 * temp;
|
|
|
|
|
|
|
|
|
|
temp = 0;
|
|
|
|
|
if (rh & RH_A_NPS) /* no power switching? */
|
|
|
|
|
temp |= 0x0002;
|
2006-12-05 11:18:31 +00:00
|
|
|
if (rh & RH_A_PSM) /* per-port power switching? */
|
2005-04-16 22:20:36 +00:00
|
|
|
temp |= 0x0001;
|
|
|
|
|
if (rh & RH_A_NOCP) /* no overcurrent reporting? */
|
|
|
|
|
temp |= 0x0010;
|
|
|
|
|
else if (rh & RH_A_OCPM) /* per-port overcurrent reporting? */
|
|
|
|
|
temp |= 0x0008;
|
|
|
|
|
desc->wHubCharacteristics = (__force __u16)cpu_to_hc16(ohci, temp);
|
|
|
|
|
|
|
|
|
|
/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
|
|
|
|
|
rh = roothub_b (ohci);
|
2005-06-25 05:20:35 +00:00
|
|
|
memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
|
2005-04-16 22:20:36 +00:00
|
|
|
desc->bitmap [0] = rh & RH_B_DR;
|
2005-08-31 18:52:57 +00:00
|
|
|
if (ohci->num_ports > 7) {
|
2005-04-16 22:20:36 +00:00
|
|
|
desc->bitmap [1] = (rh & RH_B_DR) >> 8;
|
2005-06-25 05:20:35 +00:00
|
|
|
desc->bitmap [2] = 0xff;
|
2005-04-16 22:20:36 +00:00
|
|
|
} else
|
|
|
|
|
desc->bitmap [1] = 0xff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_USB_OTG
|
|
|
|
|
|
|
|
|
|
static int ohci_start_port_reset (struct usb_hcd *hcd, unsigned port)
|
|
|
|
|
{
|
|
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
|
|
|
|
u32 status;
|
|
|
|
|
|
|
|
|
|
if (!port)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
port--;
|
|
|
|
|
|
|
|
|
|
/* start port reset before HNP protocol times out */
|
|
|
|
|
status = ohci_readl(ohci, &ohci->regs->roothub.portstatus [port]);
|
|
|
|
|
if (!(status & RH_PS_CCS))
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
|
|
/* khubd will finish the reset later */
|
|
|
|
|
ohci_writel(ohci, RH_PS_PRS, &ohci->regs->roothub.portstatus [port]);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
#define ohci_start_port_reset NULL
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* See usb 7.1.7.5: root hubs must issue at least 50 msec reset signaling,
|
|
|
|
|
* not necessarily continuous ... to guard against resume signaling.
|
|
|
|
|
* The short timeout is safe for non-root hubs, and is backward-compatible
|
|
|
|
|
* with earlier Linux hosts.
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_USB_SUSPEND
|
|
|
|
|
#define PORT_RESET_MSEC 50
|
|
|
|
|
#else
|
|
|
|
|
#define PORT_RESET_MSEC 10
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* this timer value might be vendor-specific ... */
|
|
|
|
|
#define PORT_RESET_HW_MSEC 10
|
|
|
|
|
|
|
|
|
|
/* wrap-aware logic morphed from <linux/jiffies.h> */
|
|
|
|
|
#define tick_before(t1,t2) ((s16)(((s16)(t1))-((s16)(t2))) < 0)
|
|
|
|
|
|
|
|
|
|
/* called from some task, normally khubd */
|
2006-12-07 01:04:15 +00:00
|
|
|
static inline int root_port_reset (struct ohci_hcd *ohci, unsigned port)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
|
__hc32 __iomem *portstat = &ohci->regs->roothub.portstatus [port];
|
2008-04-22 14:50:18 +00:00
|
|
|
u32 temp = 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
u16 now = ohci_readl(ohci, &ohci->regs->fmnumber);
|
|
|
|
|
u16 reset_done = now + PORT_RESET_MSEC;
|
2008-02-02 10:42:52 +00:00
|
|
|
int limit_1 = DIV_ROUND_UP(PORT_RESET_MSEC, PORT_RESET_HW_MSEC);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
/* build a "continuous enough" reset signal, with up to
|
|
|
|
|
* 3msec gap between pulses. scheduler HZ==100 must work;
|
|
|
|
|
* this might need to be deadline-scheduled.
|
|
|
|
|
*/
|
|
|
|
|
do {
|
2008-02-02 10:42:52 +00:00
|
|
|
int limit_2;
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* spin until any current reset finishes */
|
2008-02-02 10:42:52 +00:00
|
|
|
limit_2 = PORT_RESET_HW_MSEC * 2;
|
|
|
|
|
while (--limit_2 >= 0) {
|
2005-04-16 22:20:36 +00:00
|
|
|
temp = ohci_readl (ohci, portstat);
|
2006-12-07 01:04:15 +00:00
|
|
|
/* handle e.g. CardBus eject */
|
|
|
|
|
if (temp == ~(u32)0)
|
|
|
|
|
return -ESHUTDOWN;
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!(temp & RH_PS_PRS))
|
|
|
|
|
break;
|
|
|
|
|
udelay (500);
|
2006-12-05 11:18:31 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2008-02-02 10:42:52 +00:00
|
|
|
/* timeout (a hardware error) has been observed when
|
|
|
|
|
* EHCI sets CF while this driver is resetting a port;
|
|
|
|
|
* presumably other disconnect paths might do it too.
|
|
|
|
|
*/
|
|
|
|
|
if (limit_2 < 0) {
|
|
|
|
|
ohci_dbg(ohci,
|
|
|
|
|
"port[%d] reset timeout, stat %08x\n",
|
|
|
|
|
port, temp);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
if (!(temp & RH_PS_CCS))
|
|
|
|
|
break;
|
|
|
|
|
if (temp & RH_PS_PRSC)
|
|
|
|
|
ohci_writel (ohci, RH_PS_PRSC, portstat);
|
|
|
|
|
|
|
|
|
|
/* start the next reset, sleep till it's probably done */
|
|
|
|
|
ohci_writel (ohci, RH_PS_PRS, portstat);
|
|
|
|
|
msleep(PORT_RESET_HW_MSEC);
|
|
|
|
|
now = ohci_readl(ohci, &ohci->regs->fmnumber);
|
2008-02-02 10:42:52 +00:00
|
|
|
} while (tick_before(now, reset_done) && --limit_1 >= 0);
|
|
|
|
|
|
|
|
|
|
/* caller synchronizes using PRSC ... and handles PRS
|
|
|
|
|
* still being set when this returns.
|
|
|
|
|
*/
|
2006-12-07 01:04:15 +00:00
|
|
|
|
|
|
|
|
return 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int ohci_hub_control (
|
|
|
|
|
struct usb_hcd *hcd,
|
|
|
|
|
u16 typeReq,
|
|
|
|
|
u16 wValue,
|
|
|
|
|
u16 wIndex,
|
|
|
|
|
char *buf,
|
|
|
|
|
u16 wLength
|
|
|
|
|
) {
|
|
|
|
|
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
|
|
|
|
int ports = hcd_to_bus (hcd)->root_hub->maxchild;
|
|
|
|
|
u32 temp;
|
|
|
|
|
int retval = 0;
|
|
|
|
|
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-24 22:59:46 +00:00
|
|
|
if (unlikely(!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags)))
|
|
|
|
|
return -ESHUTDOWN;
|
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
switch (typeReq) {
|
|
|
|
|
case ClearHubFeature:
|
|
|
|
|
switch (wValue) {
|
|
|
|
|
case C_HUB_OVER_CURRENT:
|
|
|
|
|
ohci_writel (ohci, RH_HS_OCIC,
|
|
|
|
|
&ohci->regs->roothub.status);
|
|
|
|
|
case C_HUB_LOCAL_POWER:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case ClearPortFeature:
|
|
|
|
|
if (!wIndex || wIndex > ports)
|
|
|
|
|
goto error;
|
|
|
|
|
wIndex--;
|
|
|
|
|
|
|
|
|
|
switch (wValue) {
|
|
|
|
|
case USB_PORT_FEAT_ENABLE:
|
|
|
|
|
temp = RH_PS_CCS;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_ENABLE:
|
|
|
|
|
temp = RH_PS_PESC;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_SUSPEND:
|
|
|
|
|
temp = RH_PS_POCI;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_SUSPEND:
|
|
|
|
|
temp = RH_PS_PSSC;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_POWER:
|
|
|
|
|
temp = RH_PS_LSDA;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_CONNECTION:
|
|
|
|
|
temp = RH_PS_CSC;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_OVER_CURRENT:
|
|
|
|
|
temp = RH_PS_OCIC;
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_C_RESET:
|
|
|
|
|
temp = RH_PS_PRSC;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
ohci_writel (ohci, temp,
|
|
|
|
|
&ohci->regs->roothub.portstatus [wIndex]);
|
|
|
|
|
// ohci_readl (ohci, &ohci->regs->roothub.portstatus [wIndex]);
|
|
|
|
|
break;
|
|
|
|
|
case GetHubDescriptor:
|
|
|
|
|
ohci_hub_descriptor (ohci, (struct usb_hub_descriptor *) buf);
|
|
|
|
|
break;
|
|
|
|
|
case GetHubStatus:
|
|
|
|
|
temp = roothub_status (ohci) & ~(RH_HS_CRWE | RH_HS_DRWE);
|
2008-04-29 08:03:40 +00:00
|
|
|
put_unaligned_le32(temp, buf);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
case GetPortStatus:
|
|
|
|
|
if (!wIndex || wIndex > ports)
|
|
|
|
|
goto error;
|
|
|
|
|
wIndex--;
|
|
|
|
|
temp = roothub_portstatus (ohci, wIndex);
|
2008-04-29 08:03:40 +00:00
|
|
|
put_unaligned_le32(temp, buf);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
|
#ifndef OHCI_VERBOSE_DEBUG
|
|
|
|
|
if (*(u16*)(buf+2)) /* only if wPortChange is interesting */
|
|
|
|
|
#endif
|
|
|
|
|
dbg_port (ohci, "GetStatus", wIndex, temp);
|
|
|
|
|
break;
|
|
|
|
|
case SetHubFeature:
|
|
|
|
|
switch (wValue) {
|
|
|
|
|
case C_HUB_OVER_CURRENT:
|
|
|
|
|
// FIXME: this can be cleared, yes?
|
|
|
|
|
case C_HUB_LOCAL_POWER:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case SetPortFeature:
|
|
|
|
|
if (!wIndex || wIndex > ports)
|
|
|
|
|
goto error;
|
|
|
|
|
wIndex--;
|
|
|
|
|
switch (wValue) {
|
|
|
|
|
case USB_PORT_FEAT_SUSPEND:
|
|
|
|
|
#ifdef CONFIG_USB_OTG
|
|
|
|
|
if (hcd->self.otg_port == (wIndex + 1)
|
|
|
|
|
&& hcd->self.b_hnp_enable)
|
2008-07-06 10:26:30 +00:00
|
|
|
ohci->start_hnp(ohci);
|
2005-04-16 22:20:36 +00:00
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
ohci_writel (ohci, RH_PS_PSS,
|
|
|
|
|
&ohci->regs->roothub.portstatus [wIndex]);
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_POWER:
|
|
|
|
|
ohci_writel (ohci, RH_PS_PPS,
|
|
|
|
|
&ohci->regs->roothub.portstatus [wIndex]);
|
|
|
|
|
break;
|
|
|
|
|
case USB_PORT_FEAT_RESET:
|
2006-12-07 01:04:15 +00:00
|
|
|
retval = root_port_reset (ohci, wIndex);
|
2005-04-16 22:20:36 +00:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
error:
|
|
|
|
|
/* "protocol stall" on error */
|
|
|
|
|
retval = -EPIPE;
|
|
|
|
|
}
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|