Felipe,
On Thu, Feb 26, 2015 at 9:07 AM, Felipe Balbi <[email protected]> wrote:
> There was already a proper place where we were
> checking for babble interrupts, move babble
> recovery there.
>
> Signed-off-by: Felipe Balbi <[email protected]>
> ---
> drivers/usb/musb/musb_core.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index 2767ce1bf016..0569b24719e6 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -892,6 +892,12 @@ b_host:
> } else {
> ERR("Stopping host session -- babble\n");
> musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
> +
> + if (is_host_active(musb)) {
> + musb_generic_disable(musb);
> +
> schedule_delayed_work(&musb->recover_work,
> +
> msecs_to_jiffies(100));
> + }
This change breaks babble recovery, because the following lines above here
873 if (devctl & (MUSB_DEVCTL_FSDEV |
MUSB_DEVCTL_LSDEV)) {
874 dev_dbg(musb->controller, "BABBLE
devctl: %02x\n", devctl);
have a bug - DEVCTL_FSDEV bit will be set for high-speed too, so this
'if' traps babble handling for all cases, never hit on 'else'.
> }
> } else {
> dev_dbg(musb->controller, "BUS RESET as %s\n",
> @@ -931,13 +937,6 @@ b_host:
> }
> }
>
> - /* handle babble condition */
> - if (int_usb & MUSB_INTR_BABBLE && is_host_active(musb)) {
> - musb_generic_disable(musb);
> - schedule_delayed_work(&musb->recover_work,
> - msecs_to_jiffies(100));
> - }
> -
> #if 0
> /* REVISIT ... this would be for multiplexing periodic endpoints, or
> * supporting transfer phasing to prevent exceeding ISO bandwidth
> --
> 2.3.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
