stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: balbi@ti.com, bigeasy@linutronix.de, gregkh@linuxfoundation.org,
	nsekhar@ti.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "usb: musb: host: rely on port_mode to call musb_start()" has been added to the 4.1-stable tree
Date: Wed, 29 Jul 2015 18:49:58 -0700	[thread overview]
Message-ID: <143822099876200@kroah.com> (raw)


This is a note to let you know that I've just added the patch titled

    usb: musb: host: rely on port_mode to call musb_start()

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-musb-host-rely-on-port_mode-to-call-musb_start.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From be9d39881fc4fa39a64b6eed6bab5d9ee5125344 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Tue, 2 Jun 2015 13:03:36 -0500
Subject: usb: musb: host: rely on port_mode to call musb_start()

From: Felipe Balbi <balbi@ti.com>

commit be9d39881fc4fa39a64b6eed6bab5d9ee5125344 upstream.

Currently, we're calling musb_start() twice for DRD ports
in some situations. This has been observed to cause enumeration
issues after suspend/resume cycles with AM335x.

In order to fix the problem, we just have to fix the check
on musb_has_gadget() so that it only returns true if
current mode is Host and ignore the fact that we have or
not a gadget driver loaded.

Fixes: ae44df2e21b5 (usb: musb: call musb_start() only once in OTG mode)
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/musb/musb_virthub.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -273,9 +273,7 @@ static int musb_has_gadget(struct musb *
 #ifdef CONFIG_USB_MUSB_HOST
 	return 1;
 #else
-	if (musb->port_mode == MUSB_PORT_MODE_HOST)
-		return 1;
-	return musb->g.dev.driver != NULL;
+	return musb->port_mode == MUSB_PORT_MODE_HOST;
 #endif
 }
 


Patches currently in stable-queue which might be from balbi@ti.com are

queue-4.1/usb-f_mass_storage-limit-number-of-reported-luns.patch
queue-4.1/usb-dwc3-reset-the-transfer-resource-index-on-set_interface.patch
queue-4.1/usb-musb-host-rely-on-port_mode-to-call-musb_start.patch
queue-4.1/usb-gadget-mv_udc_core-fix-phy_regs-i-o-memory-leak.patch
queue-4.1/usb-dwc3-gadget-don-t-clear-ep_busy-too-early.patch
queue-4.1/usb-gadget-composite-fix-null-pointer-dereference.patch
queue-4.1/usb-dwc3-gadget-return-error-if-command-sent-to-depcmd-register-fails.patch
queue-4.1/usb-phy-mxs-suspend-to-ram-causes-null-pointer-dereference.patch
queue-4.1/usb-gadget-f_fs-do-not-set-cancel-function-on-synchronous-read-write.patch
queue-4.1/usb-dwc3-gadget-return-error-if-command-sent-to-dgcmd-register-fails.patch

                 reply	other threads:[~2015-07-30  1:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=143822099876200@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=balbi@ti.com \
    --cc=bigeasy@linutronix.de \
    --cc=nsekhar@ti.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@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;
as well as URLs for NNTP newsgroup(s).