From: Ravi Babu <ravibabu@ti.com>
To: <linux-usb@vger.kernel.org>
Cc: <balbi@ti.com>, <linux-kernel@vger.kernel.org>,
Ravi Babu <ravibabu@ti.com>
Subject: [PATCH v1 3/3] usb: musb: dsps: handle babble condition for dsps platform
Date: Wed, 29 May 2013 18:37:04 +0530 [thread overview]
Message-ID: <1369832824-29071-4-git-send-email-ravibabu@ti.com> (raw)
In-Reply-To: <1369832824-29071-1-git-send-email-ravibabu@ti.com>
Adding babble recovery mechanism for dsps platform and as part
of babble recovery the controller will be restarted.
Signed-off-by: Ravi Babu <ravibabu@ti.com>
---
drivers/usb/musb/musb_dsps.c | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 958c6b6..efe95e1 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -294,9 +294,17 @@ static irqreturn_t dsps_interrupt(int irq, void *hci)
* value but DEVCTL.BDEVICE is invalid without DEVCTL.SESSION set.
* Also, DRVVBUS pulses for SRP (but not at 5V) ...
*/
- if (is_host_active(musb) && usbintr & MUSB_INTR_BABBLE)
+ if (is_host_active(musb) && usbintr & MUSB_INTR_BABBLE) {
pr_info("CAUTION: musb: Babble Interrupt Occurred\n");
+ /* during babble condition the musb controller removes
+ * session (or stops) and no longer in host mode. Hence
+ * all the devices connected to root hub gets disconnected
+ */
+ musb->int_usb = MUSB_INTR_BABBLE | MUSB_INTR_DISCONNECT;
+ musb->int_tx = musb->int_rx = 0;
+ }
+
if (usbintr & ((1 << wrp->drvvbus) << wrp->usb_shift)) {
int drvvbus = dsps_readl(reg_base, wrp->status);
void __iomem *mregs = musb->mregs;
@@ -428,6 +436,29 @@ static int dsps_musb_exit(struct musb *musb)
return 0;
}
+static void dsps_musb_restart(struct musb *musb)
+{
+ struct device *dev = musb->controller;
+ struct dsps_glue *glue = dev_get_drvdata(dev->parent);
+ const struct dsps_musb_wrapper *wrp = glue->wrp;
+ void __iomem *reg_base = musb->ctrl_base;
+
+ /* Reset the musb */
+ dsps_writel(reg_base, wrp->control, (1 << wrp->reset));
+ udelay(100);
+
+ /* Stop the on-chip PHY and its PLL. */
+ usb_phy_vbus_off(musb->xceiv);
+ udelay(100);
+
+ /* Start the on-chip PHY and its PLL. */
+ usb_phy_vbus_on(musb->xceiv);
+ udelay(100);
+
+ /* reinit the endpoint fifo table and restart musb */
+ musb_restart(musb);
+}
+
static struct musb_platform_ops dsps_ops = {
.init = dsps_musb_init,
.exit = dsps_musb_exit,
@@ -436,6 +467,7 @@ static struct musb_platform_ops dsps_ops = {
.disable = dsps_musb_disable,
.try_idle = dsps_musb_try_idle,
+ .babble_recovery = dsps_musb_restart,
};
static u64 musb_dmamask = DMA_BIT_MASK(32);
--
1.7.0.4
next prev parent reply other threads:[~2013-05-29 13:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 13:07 [PATCH v1 0/3] babble error workaround for am335x platform Ravi Babu
2013-05-29 13:07 ` [PATCH v1 1/3] usb: musb: core: added musb_restart() API to handle babble condition Ravi Babu
2013-06-26 8:24 ` Felipe Balbi
2013-05-29 13:07 ` [PATCH v1 2/3] usb: musb: core: added babble recovery func-ptr to musb->ops Ravi Babu
2013-06-26 8:26 ` Felipe Balbi
2013-06-26 8:37 ` B, Ravi
2013-06-26 8:53 ` Felipe Balbi
2013-06-26 9:08 ` B, Ravi
2013-05-29 13:07 ` Ravi Babu [this message]
2013-06-26 8:29 ` [PATCH v1 3/3] usb: musb: dsps: handle babble condition for dsps platform Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369832824-29071-4-git-send-email-ravibabu@ti.com \
--to=ravibabu@ti.com \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®