Commit f42f2447 authored by Felipe Balbi's avatar Felipe Balbi

usb: dwc3: gadget: introduce dwc3_process_event_buf

in order to make our IRQ handler thread easier
to read, we re-factor the inner loop to a separate
function.
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 7f97aa98
...@@ -2442,57 +2442,64 @@ static void dwc3_process_event_entry(struct dwc3 *dwc, ...@@ -2442,57 +2442,64 @@ static void dwc3_process_event_entry(struct dwc3 *dwc,
} }
} }
static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc) static irqreturn_t dwc3_process_event_buf(struct dwc3 *dwc, u32 buf)
{ {
struct dwc3 *dwc = _dwc; struct dwc3_event_buffer *evt;
unsigned long flags;
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
int left;
u32 reg; u32 reg;
int i;
spin_lock_irqsave(&dwc->lock, flags); evt = dwc->ev_buffs[buf];
left = evt->count;
for (i = 0; i < dwc->num_event_buffers; i++) { if (!(evt->flags & DWC3_EVENT_PENDING))
struct dwc3_event_buffer *evt; return IRQ_NONE;
int left;
evt = dwc->ev_buffs[i]; while (left > 0) {
left = evt->count; union dwc3_event event;
if (!(evt->flags & DWC3_EVENT_PENDING)) event.raw = *(u32 *) (evt->buf + evt->lpos);
continue;
while (left > 0) { dwc3_process_event_entry(dwc, &event);
union dwc3_event event;
event.raw = *(u32 *) (evt->buf + evt->lpos); /*
* FIXME we wrap around correctly to the next entry as
* almost all entries are 4 bytes in size. There is one
* entry which has 12 bytes which is a regular entry
* followed by 8 bytes data. ATM I don't know how
* things are organized if we get next to the a
* boundary so I worry about that once we try to handle
* that.
*/
evt->lpos = (evt->lpos + 4) % DWC3_EVENT_BUFFERS_SIZE;
left -= 4;
dwc3_process_event_entry(dwc, &event); dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(buf), 4);
}
/* evt->count = 0;
* FIXME we wrap around correctly to the next entry as evt->flags &= ~DWC3_EVENT_PENDING;
* almost all entries are 4 bytes in size. There is one ret = IRQ_HANDLED;
* entry which has 12 bytes which is a regular entry
* followed by 8 bytes data. ATM I don't know how
* things are organized if we get next to the a
* boundary so I worry about that once we try to handle
* that.
*/
evt->lpos = (evt->lpos + 4) % DWC3_EVENT_BUFFERS_SIZE;
left -= 4;
dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(i), 4); /* Unmask interrupt */
} reg = dwc3_readl(dwc->regs, DWC3_GEVNTSIZ(buf));
reg &= ~DWC3_GEVNTSIZ_INTMASK;
dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(buf), reg);
evt->count = 0; return ret;
evt->flags &= ~DWC3_EVENT_PENDING; }
ret = IRQ_HANDLED;
/* Unmask interrupt */ static irqreturn_t dwc3_thread_interrupt(int irq, void *_dwc)
reg = dwc3_readl(dwc->regs, DWC3_GEVNTSIZ(i)); {
reg &= ~DWC3_GEVNTSIZ_INTMASK; struct dwc3 *dwc = _dwc;
dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(i), reg); unsigned long flags;
} irqreturn_t ret = IRQ_NONE;
int i;
spin_lock_irqsave(&dwc->lock, flags);
for (i = 0; i < dwc->num_event_buffers; i++)
ret |= dwc3_process_event_buf(dwc, i);
spin_unlock_irqrestore(&dwc->lock, flags); spin_unlock_irqrestore(&dwc->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment