}
}
+ list_del (&urb_priv->pending);
kfree (urb_priv);
}
for (i = ed->branch; i < NUM_INTS; i += ed->interval) {
struct ed **prev = &ohci->periodic [i];
- u32 *prev_p = &ohci->hcca->int_table [i];
+ __le32 *prev_p = &ohci->hcca->int_table [i];
struct ed *here = *prev;
/* sorting each branch by period (slow before fast)
ed->hwNextED = *prev_p;
wmb ();
*prev = ed;
- *prev_p = cpu_to_le32p (&ed->dma);
+ *prev_p = cpu_to_le32(ed->dma);
wmb();
}
ohci->load [i] += ed->load;
{
int branch;
+ if (ohci->hcd.state == USB_STATE_QUIESCING)
+ return -EAGAIN;
+
ed->state = ED_OPER;
- ed->ed_prev = 0;
- ed->ed_next = 0;
+ ed->ed_prev = NULL;
+ ed->ed_next = NULL;
ed->hwNextED = 0;
wmb ();
for (i = ed->branch; i < NUM_INTS; i += ed->interval) {
struct ed *temp;
struct ed **prev = &ohci->periodic [i];
- u32 *prev_p = &ohci->hcca->int_table [i];
+ __le32 *prev_p = &ohci->hcca->int_table [i];
while (*prev && (temp = *prev) != ed) {
prev_p = &temp->hwNextED;
if (!ed->hwNextED) {
ohci->hc_control &= ~OHCI_CTRL_CLE;
writel (ohci->hc_control, &ohci->regs->control);
- // a readl() later syncs CLE with the HC
+ // a ohci_readl() later syncs CLE with the HC
} else
writel (le32_to_cpup (&ed->hwNextED),
&ohci->regs->ed_controlhead);
if (ohci->ed_controltail == ed) {
ohci->ed_controltail = ed->ed_prev;
if (ohci->ed_controltail)
- ohci->ed_controltail->ed_next = 0;
+ ohci->ed_controltail->ed_next = NULL;
} else if (ed->ed_next) {
ed->ed_next->ed_prev = ed->ed_prev;
}
if (!ed->hwNextED) {
ohci->hc_control &= ~OHCI_CTRL_BLE;
writel (ohci->hc_control, &ohci->regs->control);
- // a readl() later syncs BLE with the HC
+ // a ohci_readl() later syncs BLE with the HC
} else
writel (le32_to_cpup (&ed->hwNextED),
&ohci->regs->ed_bulkhead);
if (ohci->ed_bulktail == ed) {
ohci->ed_bulktail = ed->ed_prev;
if (ohci->ed_bulktail)
- ohci->ed_bulktail->ed_next = 0;
+ ohci->ed_bulktail->ed_next = NULL;
} else if (ed->ed_next) {
ed->ed_next->ed_prev = ed->ed_prev;
}
if (!td) {
/* out of memory */
ed_free (ohci, ed);
- ed = 0;
+ ed = NULL;
goto done;
}
ed->dummy = td;
}
/* NOTE: only ep0 currently needs this "re"init logic, during
- * enumeration (after set_address, or if ep0 maxpacket >8).
+ * enumeration (after set_address).
*/
if (ed->state == ED_IDLE) {
u32 info;
+ __le32 hw_info;
info = usb_pipedevice (pipe);
info |= (ep >> 1) << 7;
info |= usb_maxpacket (udev, pipe, is_out) << 16;
- info = cpu_to_le32 (info);
+ hw_info = cpu_to_le32 (info);
if (udev->speed == USB_SPEED_LOW)
- info |= ED_LOWSPEED;
+ hw_info |= ED_LOWSPEED;
/* only control transfers store pids in tds */
if (type != PIPE_CONTROL) {
- info |= is_out ? ED_OUT : ED_IN;
+ hw_info |= is_out ? ED_OUT : ED_IN;
if (type != PIPE_BULK) {
/* periodic transfers... */
if (type == PIPE_ISOCHRONOUS)
- info |= ED_ISO;
+ hw_info |= ED_ISO;
else if (interval > 32) /* iso can be bigger */
interval = 32;
ed->interval = interval;
/ 1000;
}
}
- ed->hwINFO = info;
+ ed->hwINFO = hw_info;
}
done:
/* rm_list is just singly linked, for simplicity */
ed->ed_next = ohci->ed_rm_list;
- ed->ed_prev = 0;
+ ed->ed_prev = NULL;
ohci->ed_rm_list = ed;
/* enable SOF interrupt */
writel (OHCI_INTR_SF, &ohci->regs->intrstatus);
writel (OHCI_INTR_SF, &ohci->regs->intrenable);
// flush those writes, and get latest HCCA contents
- (void) readl (&ohci->regs->control);
+ (void) ohci_readl (&ohci->regs->control);
/* SF interrupt might get delayed; record the frame counter value that
* indicates when the HC isn't looking at it, so concurrent unlinks
}
urb_priv->td_cnt = 0;
+ list_add (&urb_priv->pending, &ohci->pending);
if (data_len)
data = urb->transfer_dma;
cc = TD_CC_GET (tdINFO);
- /* control endpoints only have soft stalls */
- if (type != PIPE_CONTROL && cc == TD_CC_STALL)
- usb_endpoint_halt (urb->dev,
- usb_pipeendpoint (urb->pipe),
- usb_pipeout (urb->pipe));
-
/* update packet status if needed (short is normally ok) */
if (cc == TD_DATAUNDERRUN
&& !(urb->transfer_flags & URB_SHORT_NOT_OK))
struct urb *urb = td->urb;
struct ed *ed = td->ed;
struct list_head *tmp = td->td_list.next;
- u32 toggle = ed->hwHeadP & ED_C;
+ __le32 toggle = ed->hwHeadP & ED_C;
/* clear ed halt; this is the td that caused it, but keep it inactive
* until its urb->complete() has a chance to clean up.
*/
while (tmp != &ed->td_list) {
struct td *next;
- u32 info;
+ __le32 info;
next = list_entry (tmp, struct td, td_list);
tmp = next->td_list.next;
u32 td_dma;
struct td *td_rev = NULL;
struct td *td = NULL;
- unsigned long flags;
-
- spin_lock_irqsave (&ohci->lock, flags);
td_dma = le32_to_cpup (&ohci->hcca->done_head);
ohci->hcca->done_head = 0;
td_rev = td;
td_dma = le32_to_cpup (&td->hwNextTD);
}
- spin_unlock_irqrestore (&ohci->lock, flags);
return td_rev;
}
/*-------------------------------------------------------------------------*/
-/* wrap-aware logic stolen from <linux/jiffies.h> */
-#define tick_before(t1,t2) ((((s16)(t1))-((s16)(t2))) < 0)
-
/* there are some urbs/eds to unlink; called in_irq(), with HCD locked */
static void
finish_unlinks (struct ohci_hcd *ohci, u16 tick, struct pt_regs *regs)
for (last = &ohci->ed_rm_list, ed = *last; ed != NULL; ed = *last) {
struct list_head *entry, *tmp;
int completed, modified;
- u32 *prev;
+ __le32 *prev;
/* only take off EDs that the HC isn't using, accounting for
* frame counter wraps and EDs with partially retired TDs
*/
- if (likely (HCD_IS_RUNNING(ohci->hcd.state))) {
+ if (likely (regs && HCD_IS_RUNNING(ohci->hcd.state))) {
if (tick_before (tick, ed->tick)) {
skip_ed:
last = &ed->ed_next;
td = list_entry (ed->td_list.next, struct td,
td_list);
- head = cpu_to_le32 (ed->hwHeadP) & TD_MASK;
+ head = le32_to_cpu (ed->hwHeadP) & TD_MASK;
/* INTR_WDH may need to clean up first */
if (td->td_dma != head)
* entries (which we'd ignore), but paranoia won't hurt.
*/
*last = ed->ed_next;
- ed->ed_next = 0;
+ ed->ed_next = NULL;
modified = 0;
/* unlink urbs as requested, but rescan the list after
struct td *td;
struct urb *urb;
urb_priv_t *urb_priv;
- u32 savebits;
+ __le32 savebits;
td = list_entry (entry, struct td, td_list);
urb = td->urb;
}
/* maybe reenable control and bulk lists */
- if (HCD_IS_RUNNING(ohci->hcd.state) && !ohci->ed_rm_list) {
+ if (HCD_IS_RUNNING(ohci->hcd.state)
+ && ohci->hcd.state != USB_STATE_QUIESCING
+ && !ohci->ed_rm_list) {
u32 command = 0, control = 0;
if (ohci->ed_controltail) {
* scanning the (re-reversed) donelist as this does.
*/
static void
-dl_done_list (struct ohci_hcd *ohci, struct td *td, struct pt_regs *regs)
+dl_done_list (struct ohci_hcd *ohci, struct pt_regs *regs)
{
- unsigned long flags;
+ struct td *td = dl_reverse_done_list (ohci);
- spin_lock_irqsave (&ohci->lock, flags);
while (td) {
struct td *td_next = td->next_dl_td;
struct urb *urb = td->urb;
td = td_next;
}
- spin_unlock_irqrestore (&ohci->lock, flags);
}
git://git.onelab.eu / linux-2.6.git / blobdiff