* OHCI HCD (Host Controller Driver) for USB.
*
* (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
- * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
+ * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
*
* This file is licenced under GPL
*/
/*
* OHCI Root Hub ... the nonsharable stuff
+ *
+ * Registers don't need cpu_to_le32, that happens transparently
*/
+/* AMD-756 (D2 rev) reports corrupt register contents in some cases.
+ * The erratum (#4) description is incorrect. AMD's workaround waits
+ * till some bits (mostly reserved) are clear; ok for all revs.
+ */
+#define read_roothub(hc, register, mask) ({ \
+ u32 temp = ohci_readl (&hc->regs->roothub.register); \
+ if (temp == -1) \
+ disable (hc); \
+ else if (hc->flags & OHCI_QUIRK_AMD756) \
+ while (temp & mask) \
+ temp = ohci_readl (&hc->regs->roothub.register); \
+ temp; })
+
+static u32 roothub_a (struct ohci_hcd *hc)
+ { return read_roothub (hc, a, 0xfc0fe000); }
+static inline u32 roothub_b (struct ohci_hcd *hc)
+ { return ohci_readl (&hc->regs->roothub.b); }
+static inline u32 roothub_status (struct ohci_hcd *hc)
+ { return ohci_readl (&hc->regs->roothub.status); }
+static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
+ { return read_roothub (hc, portstatus [i], 0xffe0fce0); }
+
+/*-------------------------------------------------------------------------*/
+
#define dbg_port(hc,label,num,value) \
ohci_dbg (hc, \
"%s roothub.portstatus [%d] " \
static void dl_done_list (struct ohci_hcd *, struct pt_regs *);
static void finish_unlinks (struct ohci_hcd *, u16 , struct pt_regs *);
-static int ohci_restart (struct ohci_hcd *ohci);
static int ohci_hub_suspend (struct usb_hcd *hcd)
{
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
+ struct usb_device *root = hcd_to_bus (&ohci->hcd)->root_hub;
int status = 0;
- unsigned long flags;
- spin_lock_irqsave (&ohci->lock, flags);
+ if (root->dev.power.power_state != 0)
+ return 0;
+ if (time_before (jiffies, ohci->next_statechange))
+ return -EAGAIN;
+
+ spin_lock_irq (&ohci->lock);
- ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
+ ohci->hc_control = ohci_readl (&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);
+ writel (ohci->hc_control, &ohci->regs->control);
+ (void) ohci_readl (&ohci->regs->control);
/* FALL THROUGH */
case OHCI_USB_RESET:
status = -EBUSY;
ohci_dbg (ohci, "needs reinit!\n");
goto done;
case OHCI_USB_SUSPEND:
- ohci_dbg (ohci, "already suspended\n");
- goto done;
+ ohci_dbg (ohci, "already suspended?\n");
+ goto succeed;
}
ohci_dbg (ohci, "suspend root hub\n");
int limit;
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);
+ writel (ohci->hc_control, &ohci->regs->control);
+ ohci->hc_control = ohci_readl (&ohci->regs->control);
+ writel (OHCI_INTR_SF, &ohci->regs->intrstatus);
/* sched disables take effect on the next frame,
* then the last WDH could take 6+ msec
while (limit > 0) {
udelay (250);
limit =- 250;
- if (ohci_readl (ohci, &ohci->regs->intrstatus)
- & OHCI_INTR_SF)
+ if (ohci_readl (&ohci->regs->intrstatus) & OHCI_INTR_SF)
break;
}
dl_done_list (ohci, NULL);
mdelay (7);
}
dl_done_list (ohci, NULL);
- finish_unlinks (ohci, ohci_frame_no(ohci), NULL);
- ohci_writel (ohci, ohci_readl (ohci, &ohci->regs->intrstatus),
- &ohci->regs->intrstatus);
+ finish_unlinks (ohci, OHCI_FRAME_NO(ohci->hcca), NULL);
+ writel (ohci_readl (&ohci->regs->intrstatus), &ohci->regs->intrstatus);
/* maybe resume can wake root hub */
if (ohci->hcd.remote_wakeup)
/* Suspend hub */
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);
+ writel (ohci->hc_control, &ohci->regs->control);
+ (void) ohci_readl (&ohci->regs->control);
/* no resumes until devices finish suspending */
ohci->next_statechange = jiffies + msecs_to_jiffies (5);
+succeed:
+ /* it's not USB_STATE_SUSPENDED unless access to this
+ * hub from the non-usb side (PCI, SOC, etc) stopped
+ */
+ root->dev.power.power_state = 3;
done:
- if (status == 0)
- ohci->hcd.state = HCD_STATE_SUSPENDED;
- spin_unlock_irqrestore (&ohci->lock, flags);
+ spin_unlock_irq (&ohci->lock);
return status;
}
return ed;
}
-/* caller has locked the root hub */
+static int hc_restart (struct ohci_hcd *ohci);
+
+/* caller owns root->serialize */
static int ohci_hub_resume (struct usb_hcd *hcd)
{
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
+ struct usb_device *root = hcd_to_bus (&ohci->hcd)->root_hub;
u32 temp, enables;
int status = -EINPROGRESS;
+ if (!root->dev.power.power_state)
+ return 0;
if (time_before (jiffies, ohci->next_statechange))
- msleep(5);
+ return -EAGAIN;
spin_lock_irq (&ohci->lock);
- ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
-
- if (ohci->hc_control & (OHCI_CTRL_IR | OHCI_SCHED_ENABLES)) {
- /* this can happen after suspend-to-disk */
- if (hcd->state == USB_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) {
+ ohci->hc_control = ohci_readl (&ohci->regs->control);
+ 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);
+ writel (ohci->hc_control, &ohci->regs->control);
+ (void) ohci_readl (&ohci->regs->control);
ohci_dbg (ohci, "resume root hub\n");
break;
case OHCI_USB_RESUME:
break;
case OHCI_USB_OPER:
ohci_dbg (ohci, "odd resume\n");
+ root->dev.power.power_state = 0;
status = 0;
break;
default: /* RESET, we lost power */
status = -EBUSY;
}
spin_unlock_irq (&ohci->lock);
- if (status == -EBUSY) {
- (void) ohci_init (ohci);
- return ohci_restart (ohci);
- }
+ if (status == -EBUSY)
+ return hc_restart (ohci);
if (status != -EINPROGRESS)
return status;
temp = roothub_a (ohci) & RH_A_NDP;
enables = 0;
while (temp--) {
- u32 stat = ohci_readl (ohci,
- &ohci->regs->roothub.portstatus [temp]);
+ u32 stat = ohci_readl (&ohci->regs->roothub.portstatus [temp]);
/* force global, not selective, resume */
if (!(stat & RH_PS_PSS))
continue;
- ohci_writel (ohci, RH_PS_POCI,
- &ohci->regs->roothub.portstatus [temp]);
+ writel (RH_PS_POCI, &ohci->regs->roothub.portstatus [temp]);
}
/* Some controllers (lucent) need extra-long delays */
ohci->hcd.state = USB_STATE_RESUMING;
mdelay (20 /* usb 11.5.1.10 */ + 15);
- temp = ohci_readl (ohci, &ohci->regs->control);
+ temp = ohci_readl (&ohci->regs->control);
temp &= OHCI_CTRL_HCFS;
if (temp != OHCI_USB_RESUME) {
ohci_err (ohci, "controller won't resume\n");
}
/* 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);
+ writel (0, &ohci->regs->ed_controlhead);
+ writel (0, &ohci->regs->ed_controlcurrent);
+ writel (0, &ohci->regs->ed_bulkhead);
+ writel (0, &ohci->regs->ed_bulkcurrent);
+ writel (0, &ohci->regs->ed_periodcurrent);
+ writel ((u32) ohci->hcca_dma, &ohci->regs->hcca);
periodic_reinit (ohci);
/* interrupts might have been disabled */
- ohci_writel (ohci, OHCI_INTR_INIT, &ohci->regs->intrenable);
+ writel (OHCI_INTR_INIT, &ohci->regs->intrenable);
if (ohci->ed_rm_list)
- ohci_writel (ohci, OHCI_INTR_SF, &ohci->regs->intrenable);
- ohci_writel (ohci, ohci_readl (ohci, &ohci->regs->intrstatus),
- &ohci->regs->intrstatus);
+ writel (OHCI_INTR_SF, &ohci->regs->intrenable);
+ writel (ohci_readl (&ohci->regs->intrstatus), &ohci->regs->intrstatus);
/* Then re-enable operations */
- ohci_writel (ohci, OHCI_USB_OPER, &ohci->regs->control);
- (void) ohci_readl (ohci, &ohci->regs->control);
+ writel (OHCI_USB_OPER, &ohci->regs->control);
+ (void) ohci_readl (&ohci->regs->control);
msleep (3);
temp = OHCI_CONTROL_INIT | OHCI_USB_OPER;
if (ohci->hcd.can_wakeup)
temp |= OHCI_CTRL_RWC;
ohci->hc_control = temp;
- ohci_writel (ohci, temp, &ohci->regs->control);
- (void) ohci_readl (ohci, &ohci->regs->control);
+ writel (temp, &ohci->regs->control);
+ (void) ohci_readl (&ohci->regs->control);
/* TRSMRCY */
msleep (10);
+ root->dev.power.power_state = 0;
/* keep it alive for ~5x suspend + resume costs */
ohci->next_statechange = jiffies + msecs_to_jiffies (250);
temp = 0;
if (!ohci->ed_rm_list) {
if (ohci->ed_controltail) {
- ohci_writel (ohci,
- find_head (ohci->ed_controltail)->dma,
- &ohci->regs->ed_controlhead);
+ writel (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,
+ writel (find_head (ohci->ed_bulktail)->dma,
&ohci->regs->ed_bulkhead);
enables |= OHCI_CTRL_BLE;
temp |= OHCI_BLF;
if (enables) {
ohci_dbg (ohci, "restarting schedules ... %08x\n", enables);
ohci->hc_control |= enables;
- ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
+ writel (ohci->hc_control, &ohci->regs->control);
if (temp)
- ohci_writel (ohci, temp, &ohci->regs->cmdstatus);
- (void) ohci_readl (ohci, &ohci->regs->control);
+ writel (status, &ohci->regs->cmdstatus);
+ (void) ohci_readl (&ohci->regs->control);
}
ohci->hcd.state = USB_STATE_RUNNING;
{
struct usb_hcd *hcd = _hcd;
- usb_lock_device (hcd->self.root_hub);
+ down (&hcd->self.root_hub->serialize);
(void) ohci_hub_resume (hcd);
- usb_unlock_device (hcd->self.root_hub);
+ up (&hcd->self.root_hub->serialize);
}
#else
{
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
int ports, i, changed = 0, length = 1;
- int can_suspend = hcd->can_wakeup;
- unsigned long flags;
-
- spin_lock_irqsave (&ohci->lock, flags);
-
- /* handle autosuspended root: finish resuming before
- * letting khubd or root hub timer see state changes.
- */
- if ((ohci->hc_control & OHCI_CTRL_HCFS) != OHCI_USB_OPER
- || !HCD_IS_RUNNING(ohci->hcd.state)) {
- can_suspend = 0;
- goto done;
- }
+ int can_suspend = 1;
ports = roothub_a (ohci) & RH_A_NDP;
if (ports > MAX_ROOT_PORTS) {
- ohci_err (ohci, "bogus NDP=%d, rereads as NDP=%d\n", ports,
- ohci_readl (ohci, &ohci->regs->roothub.a) & RH_A_NDP);
+ if (!HCD_IS_RUNNING(ohci->hcd.state))
+ return -ESHUTDOWN;
+ ohci_err (ohci, "bogus NDP=%d, rereads as NDP=%d\n",
+ ports, ohci_readl (&ohci->regs->roothub.a) & RH_A_NDP);
/* retry later; "should not happen" */
- goto done;
+ return 0;
}
/* init status */
continue;
can_suspend = 0;
}
-done:
- spin_unlock_irqrestore (&ohci->lock, flags);
#ifdef CONFIG_PM
/* save power by suspending idle root hubs;
* INTR_RD wakes us when there's work
- * NOTE: if we can do this, we don't need a root hub timer!
*/
if (can_suspend
&& !changed
&& ((OHCI_CTRL_HCFS | OHCI_SCHED_ENABLES)
& ohci->hc_control)
== OHCI_USB_OPER
- && time_after (jiffies, ohci->next_statechange)
- && usb_trylock_device (hcd->self.root_hub)
+ && down_trylock (&hcd->self.root_hub->serialize) == 0
) {
ohci_vdbg (ohci, "autosuspend\n");
(void) ohci_hub_suspend (&ohci->hcd);
ohci->hcd.state = USB_STATE_RUNNING;
- usb_unlock_device (hcd->self.root_hub);
+ up (&hcd->self.root_hub->serialize);
}
#endif
temp |= 0x0010;
else if (rh & RH_A_OCPM) /* per-port overcurrent reporting? */
temp |= 0x0008;
- desc->wHubCharacteristics = (__force __u16)cpu_to_hc16(ohci, temp);
+ desc->wHubCharacteristics = cpu_to_le16 (temp);
/* two bitmaps: ports removable, and usb 1.0 legacy PortPwrCtrlMask */
rh = roothub_b (ohci);
port--;
/* start port reset before HNP protocol times out */
- status = ohci_readl(ohci, &ohci->regs->roothub.portstatus [port]);
+ status = ohci_readl(&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]);
+ writel(RH_PS_PRS, &ohci->regs->roothub.portstatus [port]);
return 0;
}
/* 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)
+/* wrap-aware logic stolen from <linux/jiffies.h> */
+#define tick_before(t1,t2) ((((s16)(t1))-((s16)(t2))) < 0)
/* called from some task, normally khubd */
static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
{
- __hc32 __iomem *portstat = &ohci->regs->roothub.portstatus [port];
+ u32 __iomem *portstat = &ohci->regs->roothub.portstatus [port];
u32 temp;
- u16 now = ohci_readl(ohci, &ohci->regs->fmnumber);
+ u16 now = readl(&ohci->regs->fmnumber);
u16 reset_done = now + PORT_RESET_MSEC;
/* build a "continuous enough" reset signal, with up to
do {
/* spin until any current reset finishes */
for (;;) {
- temp = ohci_readl (ohci, portstat);
+ temp = ohci_readl (portstat);
if (!(temp & RH_PS_PRS))
break;
udelay (500);
if (!(temp & RH_PS_CCS))
break;
if (temp & RH_PS_PRSC)
- ohci_writel (ohci, RH_PS_PRSC, portstat);
+ writel (RH_PS_PRSC, portstat);
/* start the next reset, sleep till it's probably done */
- ohci_writel (ohci, RH_PS_PRS, portstat);
+ writel (RH_PS_PRS, portstat);
msleep(PORT_RESET_HW_MSEC);
- now = ohci_readl(ohci, &ohci->regs->fmnumber);
+ now = readl(&ohci->regs->fmnumber);
} while (tick_before(now, reset_done));
/* caller synchronizes using PRSC */
}
case ClearHubFeature:
switch (wValue) {
case C_HUB_OVER_CURRENT:
- ohci_writel (ohci, RH_HS_OCIC,
- &ohci->regs->roothub.status);
+ writel (RH_HS_OCIC, &ohci->regs->roothub.status);
case C_HUB_LOCAL_POWER:
break;
default:
default:
goto error;
}
- ohci_writel (ohci, temp,
- &ohci->regs->roothub.portstatus [wIndex]);
- // ohci_readl (ohci, &ohci->regs->roothub.portstatus [wIndex]);
+ writel (temp, &ohci->regs->roothub.portstatus [wIndex]);
+ // ohci_readl (&ohci->regs->roothub.portstatus [wIndex]);
break;
case GetHubDescriptor:
ohci_hub_descriptor (ohci, (struct usb_hub_descriptor *) buf);
start_hnp(ohci);
else
#endif
- ohci_writel (ohci, RH_PS_PSS,
+ writel (RH_PS_PSS,
&ohci->regs->roothub.portstatus [wIndex]);
break;
case USB_PORT_FEAT_POWER:
- ohci_writel (ohci, RH_PS_PPS,
+ writel (RH_PS_PPS,
&ohci->regs->roothub.portstatus [wIndex]);
break;
case USB_PORT_FEAT_RESET:
git://git.onelab.eu / linux-2.6.git / blobdiff