From b183c19f98f8afee799ee41e062810d6b1c7e123 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Wed, 12 Sep 2012 14:58:11 +0300 Subject: USB: chipidea: re-order irq handling to avoid unhandled irqs - let role driver handle irq before ID change check; this gives the role driver a chance to handle disconnect; - disable irq during switch role; no role driver to handle irq in the period. Tested-by: Michael Grzeschik Tested-by: Marc Kleine-Budde Signed-off-by: Richard Zhao Signed-off-by: Alexander Shishkin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/chipidea/core.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 19ef3242cf4..f69d029b460 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -279,6 +279,7 @@ static void ci_role_work(struct work_struct *work) ci_role_stop(ci); ci_role_start(ci, role); + enable_irq(ci->irq); } } @@ -318,18 +319,22 @@ static irqreturn_t ci_irq(int irq, void *data) { struct ci13xxx *ci = data; irqreturn_t ret = IRQ_NONE; + u32 otgsc = 0; - if (ci->is_otg) { - u32 sts = hw_read(ci, OP_OTGSC, ~0); + if (ci->is_otg) + otgsc = hw_read(ci, OP_OTGSC, ~0); + + if (ci->role != CI_ROLE_END) + ret = ci_role(ci)->irq(ci); - if (sts & OTGSC_IDIS) { - hw_write(ci, OP_OTGSC, OTGSC_IDIS, OTGSC_IDIS); - queue_work(ci->wq, &ci->work); - ret = IRQ_HANDLED; - } + if (ci->is_otg && (otgsc & OTGSC_IDIS)) { + hw_write(ci, OP_OTGSC, OTGSC_IDIS, OTGSC_IDIS); + disable_irq_nosync(ci->irq); + queue_work(ci->wq, &ci->work); + ret = IRQ_HANDLED; } - return ci->role == CI_ROLE_END ? ret : ci_role(ci)->irq(ci); + return ret; } static DEFINE_IDA(ci_ida); -- cgit v1.2.3-70-g09d2