Merge "usb: dwc3: gadget: Avoid spuriously printing NO_PULLUP in log"

This commit is contained in:
qctecmdr 2020-06-14 11:32:32 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1034f3b8dc

View file

@ -3777,15 +3777,6 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)
if (dwc->err_evt_seen)
return IRQ_HANDLED;
/* Controller is being halted, ignore the interrupts */
if (!dwc->pullups_connected) {
count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
count &= DWC3_GEVNTCOUNT_MASK;
dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), count);
dbg_event(0xFF, "NO_PULLUP", count);
return IRQ_HANDLED;
}
/*
* With PCIe legacy interrupt, test shows that top-half irq handler can
* be called again after HW interrupt deassertion. Check if bottom-half
@ -3800,6 +3791,13 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)
if (!count)
return IRQ_NONE;
/* Controller is halted; ignore new/pending events */
if (!dwc->pullups_connected) {
dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), count);
dbg_event(0xFF, "NO_PULLUP", count);
return IRQ_HANDLED;
}
evt->count = count;
evt->flags |= DWC3_EVENT_PENDING;