* [PATCH v6 1/5] usb: musb: core: Handle Babble condition only in HOST mode
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
@ 2014-05-26 9:20 ` George Cherian
2014-06-19 10:44 ` Tony Lindgren
2014-05-26 9:20 ` [PATCH v6 2/5] usb: musb: core: Convert babble recover work to delayed work George Cherian
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: George Cherian @ 2014-05-26 9:20 UTC (permalink / raw)
To: linux-kernel, linux-usb, linux-omap
Cc: gregkh, balbi, zonque, b-liu, George Cherian
BABBLE and RESET share the same interrupt. The interrupt
is considered to be RESET if MUSB is in peripheral mode and
as a BABBLE if MUSB is in HOST mode.
Handle babble condition iff MUSB is in HOST mode.
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/usb/musb/musb_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3c6043c..0ad9551 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -849,7 +849,7 @@ b_host:
}
/* handle babble condition */
- if (int_usb & MUSB_INTR_BABBLE)
+ if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb))
schedule_work(&musb->recover_work);
#if 0
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v6 1/5] usb: musb: core: Handle Babble condition only in HOST mode
2014-05-26 9:20 ` [PATCH v6 1/5] usb: musb: core: Handle Babble condition only in HOST mode George Cherian
@ 2014-06-19 10:44 ` Tony Lindgren
2014-06-19 16:01 ` Felipe Balbi
0 siblings, 1 reply; 10+ messages in thread
From: Tony Lindgren @ 2014-06-19 10:44 UTC (permalink / raw)
To: George Cherian
Cc: linux-kernel, linux-usb, linux-omap, gregkh, balbi, zonque, b-liu
* George Cherian <george.cherian@ti.com> [140526 02:25]:
> BABBLE and RESET share the same interrupt. The interrupt
> is considered to be RESET if MUSB is in peripheral mode and
> as a BABBLE if MUSB is in HOST mode.
>
> Handle babble condition iff MUSB is in HOST mode.
Please get this into mainline kernel for v3.16-rc.
Fixes: ca88fc2ef0d7 (usb: musb: add a work_struct to recover from babble errors)
Tested-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: George Cherian <george.cherian@ti.com>
> ---
> drivers/usb/musb/musb_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 3c6043c..0ad9551 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -849,7 +849,7 @@ b_host:
> }
>
> /* handle babble condition */
> - if (int_usb & MUSB_INTR_BABBLE)
> + if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb))
> schedule_work(&musb->recover_work);
>
> #if 0
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v6 1/5] usb: musb: core: Handle Babble condition only in HOST mode
2014-06-19 10:44 ` Tony Lindgren
@ 2014-06-19 16:01 ` Felipe Balbi
0 siblings, 0 replies; 10+ messages in thread
From: Felipe Balbi @ 2014-06-19 16:01 UTC (permalink / raw)
To: Tony Lindgren
Cc: George Cherian, linux-kernel, linux-usb, linux-omap, gregkh,
balbi, zonque, b-liu
[-- Attachment #1: Type: text/plain, Size: 556 bytes --]
Hi,
On Thu, Jun 19, 2014 at 03:44:42AM -0700, Tony Lindgren wrote:
> * George Cherian <george.cherian@ti.com> [140526 02:25]:
> > BABBLE and RESET share the same interrupt. The interrupt
> > is considered to be RESET if MUSB is in peripheral mode and
> > as a BABBLE if MUSB is in HOST mode.
> >
> > Handle babble condition iff MUSB is in HOST mode.
>
> Please get this into mainline kernel for v3.16-rc.
will do. Finishing up my series of build-tests, you should receive
confirmation that the patch applied in a few hours.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v6 2/5] usb: musb: core: Convert babble recover work to delayed work
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
2014-05-26 9:20 ` [PATCH v6 1/5] usb: musb: core: Handle Babble condition only in HOST mode George Cherian
@ 2014-05-26 9:20 ` George Cherian
2014-05-26 9:20 ` [PATCH v6 3/5] usb: musb: dsps: Call usb_phy(_shutdown/_init) during musb_platform_reset() George Cherian
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: George Cherian @ 2014-05-26 9:20 UTC (permalink / raw)
To: linux-kernel, linux-usb, linux-omap
Cc: gregkh, balbi, zonque, b-liu, George Cherian
During babble condition both first disconnect of devices are
initiated. Make sure MUSB controller is reset and re-initialized
after all disconnects.
To acheive this schedule a delayed work for babble recovery.
While at that convert udelay to usleep_range.
Refer Documentation/timers/timers-howto.txt
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/usb/musb/musb_core.c | 15 ++++++++-------
drivers/usb/musb/musb_core.h | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 0ad9551..c0ce09f 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -850,7 +850,8 @@ b_host:
/* handle babble condition */
if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb))
- schedule_work(&musb->recover_work);
+ schedule_delayed_work(&musb->recover_work,
+ msecs_to_jiffies(100));
#if 0
/* REVISIT ... this would be for multiplexing periodic endpoints, or
@@ -1751,16 +1752,16 @@ static void musb_irq_work(struct work_struct *data)
/* Recover from babble interrupt conditions */
static void musb_recover_work(struct work_struct *data)
{
- struct musb *musb = container_of(data, struct musb, recover_work);
+ struct musb *musb = container_of(data, struct musb, recover_work.work);
int status;
musb_platform_reset(musb);
usb_phy_vbus_off(musb->xceiv);
- udelay(100);
+ usleep_range(100, 200);
usb_phy_vbus_on(musb->xceiv);
- udelay(100);
+ usleep_range(100, 200);
/*
* When a babble condition occurs, the musb controller removes the
@@ -1943,7 +1944,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
/* Init IRQ workqueue before request_irq */
INIT_WORK(&musb->irq_work, musb_irq_work);
- INIT_WORK(&musb->recover_work, musb_recover_work);
+ INIT_DELAYED_WORK(&musb->recover_work, musb_recover_work);
INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);
INIT_DELAYED_WORK(&musb->finish_resume_work, musb_host_finish_resume);
@@ -2039,7 +2040,7 @@ fail4:
fail3:
cancel_work_sync(&musb->irq_work);
- cancel_work_sync(&musb->recover_work);
+ cancel_delayed_work_sync(&musb->recover_work);
cancel_delayed_work_sync(&musb->finish_resume_work);
cancel_delayed_work_sync(&musb->deassert_reset_work);
if (musb->dma_controller)
@@ -2105,7 +2106,7 @@ static int musb_remove(struct platform_device *pdev)
dma_controller_destroy(musb->dma_controller);
cancel_work_sync(&musb->irq_work);
- cancel_work_sync(&musb->recover_work);
+ cancel_delayed_work_sync(&musb->recover_work);
cancel_delayed_work_sync(&musb->finish_resume_work);
cancel_delayed_work_sync(&musb->deassert_reset_work);
musb_free(musb);
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index d155a15..9241025 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -297,7 +297,7 @@ struct musb {
irqreturn_t (*isr)(int, void *);
struct work_struct irq_work;
- struct work_struct recover_work;
+ struct delayed_work recover_work;
struct delayed_work deassert_reset_work;
struct delayed_work finish_resume_work;
u16 hwvers;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v6 3/5] usb: musb: dsps: Call usb_phy(_shutdown/_init) during musb_platform_reset()
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
2014-05-26 9:20 ` [PATCH v6 1/5] usb: musb: core: Handle Babble condition only in HOST mode George Cherian
2014-05-26 9:20 ` [PATCH v6 2/5] usb: musb: core: Convert babble recover work to delayed work George Cherian
@ 2014-05-26 9:20 ` George Cherian
2014-05-26 9:20 ` [PATCH v6 4/5] usb: musb: core: Convert the musb_platform_reset to have a return value George Cherian
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: George Cherian @ 2014-05-26 9:20 UTC (permalink / raw)
To: linux-kernel, linux-usb, linux-omap
Cc: gregkh, balbi, zonque, b-liu, George Cherian
For DSPS platform usb_phy_vbus(_off/_on) are NOPs.
So during musb_platform_reset() call usb_phy(_shutdown/_init)
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/usb/musb/musb_dsps.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 51beb13..74c4193 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -543,7 +543,11 @@ static void dsps_musb_reset(struct musb *musb)
const struct dsps_musb_wrapper *wrp = glue->wrp;
dsps_writel(musb->ctrl_base, wrp->control, (1 << wrp->reset));
- udelay(100);
+ usleep_range(100, 200);
+ usb_phy_shutdown(musb->xceiv);
+ usleep_range(100, 200);
+ usb_phy_init(musb->xceiv);
+
}
static struct musb_platform_ops dsps_ops = {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v6 4/5] usb: musb: core: Convert the musb_platform_reset to have a return value.
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
` (2 preceding siblings ...)
2014-05-26 9:20 ` [PATCH v6 3/5] usb: musb: dsps: Call usb_phy(_shutdown/_init) during musb_platform_reset() George Cherian
@ 2014-05-26 9:20 ` George Cherian
2014-05-26 9:20 ` [PATCH v6 5/5] usb: musb: dsps: Add the sw_babble_control() and Enable for newer silicon George Cherian
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: George Cherian @ 2014-05-26 9:20 UTC (permalink / raw)
To: linux-kernel, linux-usb, linux-omap
Cc: gregkh, balbi, zonque, b-liu, George Cherian
Currently musb_platform_reset() is only used by dsps.
In case of BABBLE interrupt for other platforms the musb_platform_reset()
is a NOP. In such situations no need to re-initialize the endpoints.
Also in the latest silicon revision of AM335x, we do have a babble recovery
mechanism without resetting the IP block. In preperation to add that support
its better to have a rest_done return for musb_platform_reset().
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/usb/musb/musb_core.c | 10 ++++++----
drivers/usb/musb/musb_core.h | 10 ++++++----
drivers/usb/musb/musb_dsps.c | 3 ++-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index c0ce09f..b841ee0 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1753,9 +1753,11 @@ static void musb_irq_work(struct work_struct *data)
static void musb_recover_work(struct work_struct *data)
{
struct musb *musb = container_of(data, struct musb, recover_work.work);
- int status;
+ int status, ret;
- musb_platform_reset(musb);
+ ret = musb_platform_reset(musb);
+ if (ret)
+ return;
usb_phy_vbus_off(musb->xceiv);
usleep_range(100, 200);
@@ -1764,8 +1766,8 @@ static void musb_recover_work(struct work_struct *data)
usleep_range(100, 200);
/*
- * When a babble condition occurs, the musb controller removes the
- * session bit and the endpoint config is lost.
+ * When a babble condition occurs, the musb controller
+ * removes the session bit and the endpoint config is lost.
*/
if (musb->dyn_fifo)
status = ep_config_from_table(musb);
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 9241025..414e57a 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -192,7 +192,7 @@ struct musb_platform_ops {
int (*set_mode)(struct musb *musb, u8 mode);
void (*try_idle)(struct musb *musb, unsigned long timeout);
- void (*reset)(struct musb *musb);
+ int (*reset)(struct musb *musb);
int (*vbus_status)(struct musb *musb);
void (*set_vbus)(struct musb *musb, int on);
@@ -555,10 +555,12 @@ static inline void musb_platform_try_idle(struct musb *musb,
musb->ops->try_idle(musb, timeout);
}
-static inline void musb_platform_reset(struct musb *musb)
+static inline int musb_platform_reset(struct musb *musb)
{
- if (musb->ops->reset)
- musb->ops->reset(musb);
+ if (!musb->ops->reset)
+ return -EINVAL;
+
+ return musb->ops->reset(musb);
}
static inline int musb_platform_get_vbus_status(struct musb *musb)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index 74c4193..f6f3087 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -536,7 +536,7 @@ static int dsps_musb_set_mode(struct musb *musb, u8 mode)
return 0;
}
-static void dsps_musb_reset(struct musb *musb)
+static int dsps_musb_reset(struct musb *musb)
{
struct device *dev = musb->controller;
struct dsps_glue *glue = dev_get_drvdata(dev->parent);
@@ -548,6 +548,7 @@ static void dsps_musb_reset(struct musb *musb)
usleep_range(100, 200);
usb_phy_init(musb->xceiv);
+ return 0;
}
static struct musb_platform_ops dsps_ops = {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v6 5/5] usb: musb: dsps: Add the sw_babble_control() and Enable for newer silicon
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
` (3 preceding siblings ...)
2014-05-26 9:20 ` [PATCH v6 4/5] usb: musb: core: Convert the musb_platform_reset to have a return value George Cherian
@ 2014-05-26 9:20 ` George Cherian
2014-06-03 19:00 ` [PATCH v6 0/5] Add support for SW babble Control Bin Liu
2014-06-30 17:30 ` Felipe Balbi
6 siblings, 0 replies; 10+ messages in thread
From: George Cherian @ 2014-05-26 9:20 UTC (permalink / raw)
To: linux-kernel, linux-usb, linux-omap
Cc: gregkh, balbi, zonque, b-liu, George Cherian
Add sw_babble_control() logic to differentiate between transient
babble and real babble condition. Also add the SW babble control
register definitions.
Babble control register logic is implemented in the latest
revision of AM335x.
Find whether we are running on newer silicon. The babble control
register reads 0x4 by default in newer silicon as opposed to 0
in old versions of AM335x. Based on this enable the sw babble
control logic.
Signed-off-by: George Cherian <george.cherian@ti.com>
---
drivers/usb/musb/musb_dsps.c | 89 +++++++++++++++++++++++++++++++++++++++++---
drivers/usb/musb/musb_regs.h | 7 ++++
2 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index f6f3087..01543a9 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -136,6 +136,7 @@ struct dsps_glue {
const struct dsps_musb_wrapper *wrp; /* wrapper register offsets */
struct timer_list timer; /* otg_workaround timer */
unsigned long last_timer; /* last timer data for each instance */
+ bool sw_babble_enabled;
struct dsps_context context;
struct debugfs_regset32 regset;
@@ -469,6 +470,19 @@ static int dsps_musb_init(struct musb *musb)
val &= ~(1 << wrp->otg_disable);
dsps_writel(musb->ctrl_base, wrp->phy_utmi, val);
+ /*
+ * Check whether the dsps version has babble control enabled.
+ * In latest silicon revision the babble control logic is enabled.
+ * If MUSB_BABBLE_CTL returns 0x4 then we have the babble control
+ * logic enabled.
+ */
+ val = dsps_readb(musb->mregs, MUSB_BABBLE_CTL);
+ if (val == MUSB_BABBLE_RCV_DISABLE) {
+ glue->sw_babble_enabled = true;
+ val |= MUSB_BABBLE_SW_SESSION_CTRL;
+ dsps_writeb(musb->mregs, MUSB_BABBLE_CTL, val);
+ }
+
ret = dsps_musb_dbg_init(musb, glue);
if (ret)
return ret;
@@ -536,19 +550,82 @@ static int dsps_musb_set_mode(struct musb *musb, u8 mode)
return 0;
}
+static bool sw_babble_control(struct musb *musb)
+{
+ u8 babble_ctl;
+ bool session_restart = false;
+
+ babble_ctl = dsps_readb(musb->mregs, MUSB_BABBLE_CTL);
+ dev_dbg(musb->controller, "babble: MUSB_BABBLE_CTL value %x\n",
+ babble_ctl);
+ /*
+ * check line monitor flag to check whether babble is
+ * due to noise
+ */
+ dev_dbg(musb->controller, "STUCK_J is %s\n",
+ babble_ctl & MUSB_BABBLE_STUCK_J ? "set" : "reset");
+
+ if (babble_ctl & MUSB_BABBLE_STUCK_J) {
+ int timeout = 10;
+
+ /*
+ * babble is due to noise, then set transmit idle (d7 bit)
+ * to resume normal operation
+ */
+ babble_ctl = dsps_readb(musb->mregs, MUSB_BABBLE_CTL);
+ babble_ctl |= MUSB_BABBLE_FORCE_TXIDLE;
+ dsps_writeb(musb->mregs, MUSB_BABBLE_CTL, babble_ctl);
+
+ /* wait till line monitor flag cleared */
+ dev_dbg(musb->controller, "Set TXIDLE, wait J to clear\n");
+ do {
+ babble_ctl = dsps_readb(musb->mregs, MUSB_BABBLE_CTL);
+ udelay(1);
+ } while ((babble_ctl & MUSB_BABBLE_STUCK_J) && timeout--);
+
+ /* check whether stuck_at_j bit cleared */
+ if (babble_ctl & MUSB_BABBLE_STUCK_J) {
+ /*
+ * real babble condition has occurred
+ * restart the controller to start the
+ * session again
+ */
+ dev_dbg(musb->controller, "J not cleared, misc (%x)\n",
+ babble_ctl);
+ session_restart = true;
+ }
+ } else {
+ session_restart = true;
+ }
+
+ return session_restart;
+}
+
static int dsps_musb_reset(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;
+ int session_restart = 0;
- dsps_writel(musb->ctrl_base, wrp->control, (1 << wrp->reset));
- usleep_range(100, 200);
- usb_phy_shutdown(musb->xceiv);
- usleep_range(100, 200);
- usb_phy_init(musb->xceiv);
+ if (glue->sw_babble_enabled)
+ session_restart = sw_babble_control(musb);
+ /*
+ * In case of new silicon version babble condition can be recovered
+ * without resetting the MUSB. But for older silicon versions, MUSB
+ * reset is needed
+ */
+ if (session_restart || !glue->sw_babble_enabled) {
+ dev_info(musb->controller, "Restarting MUSB to recover from Babble\n");
+ dsps_writel(musb->ctrl_base, wrp->control, (1 << wrp->reset));
+ usleep_range(100, 200);
+ usb_phy_shutdown(musb->xceiv);
+ usleep_range(100, 200);
+ usb_phy_init(musb->xceiv);
+ session_restart = 1;
+ }
- return 0;
+ return !session_restart;
}
static struct musb_platform_ops dsps_ops = {
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index 03f2655..b9bcda5 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -72,6 +72,12 @@
#define MUSB_DEVCTL_HR 0x02
#define MUSB_DEVCTL_SESSION 0x01
+/* BABBLE_CTL */
+#define MUSB_BABBLE_FORCE_TXIDLE 0x80
+#define MUSB_BABBLE_SW_SESSION_CTRL 0x40
+#define MUSB_BABBLE_STUCK_J 0x20
+#define MUSB_BABBLE_RCV_DISABLE 0x04
+
/* MUSB ULPI VBUSCONTROL */
#define MUSB_ULPI_USE_EXTVBUS 0x01
#define MUSB_ULPI_USE_EXTVBUSIND 0x02
@@ -246,6 +252,7 @@
*/
#define MUSB_DEVCTL 0x60 /* 8 bit */
+#define MUSB_BABBLE_CTL 0x61 /* 8 bit */
/* These are always controlled through the INDEX register */
#define MUSB_TXFIFOSZ 0x62 /* 8-bit (see masks) */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v6 0/5] Add support for SW babble Control
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
` (4 preceding siblings ...)
2014-05-26 9:20 ` [PATCH v6 5/5] usb: musb: dsps: Add the sw_babble_control() and Enable for newer silicon George Cherian
@ 2014-06-03 19:00 ` Bin Liu
2014-06-30 17:30 ` Felipe Balbi
6 siblings, 0 replies; 10+ messages in thread
From: Bin Liu @ 2014-06-03 19:00 UTC (permalink / raw)
To: George Cherian
Cc: linux-kernel, linux-usb, linux-omap, gregkh, balbi, zonque, b-liu
George,
On Mon, May 26, 2014 at 4:20 AM, George Cherian <george.cherian@ti.com> wrote:
> Series add support for SW babble control logic found in
> new silicon versions of AM335x. Runtime differentiation of
> silicon version is done by checking the BABBLE_CTL register.
> For newer silicon the register default value read is 0x4 and
> for older versions its 0x0.
Please add 'Tested-by: Bin Liu <b-liu@ti.com>' to this series.
Thanks,
-Bin.
>
> Patch 1 -> Handle Babble only if MUSB is in HOST mode
> Patch 2 -> Convert recover work to delayed work.
> Patch 3 -> usb_phy_vbus_(off/_on) are NOPs for am335x PHY
> so use usb_phy(_shutdown/_init) in musb_platform_reset()
> Patch 4 -> Add return value for musb_platform_reset() in prepration
> to support SW babble_ctrl
> Patch 5 -> Add and Enable sw babble control for newer silicon
>
> v5 -> v6 : Squash patch 5 and 6 form v5 to avoid build warnings.
>
> v4 -> v5 : Added a debug print before resetting MUSB.
> changed a musb_readb to dsps_readb introduced in Patch#5 of v4.
>
> v3 -> v4 : Fixes an issue in gagdet mode - BUS RESET should not
> be handled as a BABBLE. Added a check for the same.(Patch #1)
> Enable sw babble control properly (Patch #6)
>
> v2 -> v3 : Modify musb_platform_reset() to return zero on success.
>
>
>
> George Cherian (5):
> usb: musb: core: Handle Babble condition only in HOST mode
> usb: musb: core: Convert babble recover work to delayed work
> usb: musb: dsps: Call usb_phy(_shutdown/_init) during
> musb_platform_reset()
> usb: musb: core: Convert the musb_platform_reset to have a return
> value.
> usb: musb: dsps: Add the sw_babble_control() and Enable for newer
> silicon
>
> drivers/usb/musb/musb_core.c | 27 ++++++++------
> drivers/usb/musb/musb_core.h | 12 +++---
> drivers/usb/musb/musb_dsps.c | 88 ++++++++++++++++++++++++++++++++++++++++++--
> drivers/usb/musb/musb_regs.h | 7 ++++
> 4 files changed, 114 insertions(+), 20 deletions(-)
>
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v6 0/5] Add support for SW babble Control
2014-05-26 9:20 [PATCH v6 0/5] Add support for SW babble Control George Cherian
` (5 preceding siblings ...)
2014-06-03 19:00 ` [PATCH v6 0/5] Add support for SW babble Control Bin Liu
@ 2014-06-30 17:30 ` Felipe Balbi
6 siblings, 0 replies; 10+ messages in thread
From: Felipe Balbi @ 2014-06-30 17:30 UTC (permalink / raw)
To: George Cherian
Cc: linux-kernel, linux-usb, linux-omap, gregkh, balbi, zonque, b-liu
[-- Attachment #1: Type: text/plain, Size: 1460 bytes --]
Hi,
On Mon, May 26, 2014 at 02:50:07PM +0530, George Cherian wrote:
> Series add support for SW babble control logic found in
> new silicon versions of AM335x. Runtime differentiation of
> silicon version is done by checking the BABBLE_CTL register.
> For newer silicon the register default value read is 0x4 and
> for older versions its 0x0.
>
> Patch 1 -> Handle Babble only if MUSB is in HOST mode
> Patch 2 -> Convert recover work to delayed work.
> Patch 3 -> usb_phy_vbus_(off/_on) are NOPs for am335x PHY
> so use usb_phy(_shutdown/_init) in musb_platform_reset()
> Patch 4 -> Add return value for musb_platform_reset() in prepration
> to support SW babble_ctrl
> Patch 5 -> Add and Enable sw babble control for newer silicon
>
> v5 -> v6 : Squash patch 5 and 6 form v5 to avoid build warnings.
>
> v4 -> v5 : Added a debug print before resetting MUSB.
> changed a musb_readb to dsps_readb introduced in Patch#5 of v4.
>
> v3 -> v4 : Fixes an issue in gagdet mode - BUS RESET should not
> be handled as a BABBLE. Added a check for the same.(Patch #1)
> Enable sw babble control properly (Patch #6)
>
> v2 -> v3 : Modify musb_platform_reset() to return zero on success.
this series doesn't apply anymore, can you please rebase on top of my
testing/next which I just pushed ?
Thank you
ps: while doing that, please also add Bin's Tested-by which he has
already given ;-)
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread