Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89368d3d authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: musb: silence "suspend as a_wait_vrise is_active" msgs 



Get rid of some obnoxious and inappropriate messaging, mostly on
DaVinci, when usbcore tries to autosuspend a root hub if just a
mini/micro-A connector is connected.  Symptom: endless stream of
messages reading like:

 musb_bus_suspend 2221: trying to suspend as a_wait_vrise is_active=1

Improve that musb bus suspend primitive a bit.  Take advantage of
this call to update the OTG state machine if appropriate, moving
the device out of the A_WAIT_VRISE state.  There's basically no
timer for that state transition just now, except with tusb6010;
that can make trouble.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6d84599b

drivers/usb/musb/davinci.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -330,7 +330,6 @@ static irqreturn_t davinci_interrupt(int irq, void *__hci) 
			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);

			WARNING("VBUS error workaround (delay coming)\n");

			WARNING("VBUS error workaround (delay coming)\n");

		} else if (is_host_enabled(musb) && drvvbus) {

		} else if (is_host_enabled(musb) && drvvbus) {

			musb->is_active = 1;

			MUSB_HST_MODE(musb);

			MUSB_HST_MODE(musb);

			musb->xceiv->default_a = 1;

			musb->xceiv->default_a = 1;

			musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;

			musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
@@ -344,7 +343,9 @@ static irqreturn_t davinci_interrupt(int irq, void *__hci) 
			portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);

			portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);

		}

		}





		/* NOTE:  this must complete poweron within 100 msec */

		/* NOTE:  this must complete poweron within 100 msec

		 * (OTG_TIME_A_WAIT_VRISE) but we don't check for that.

		 */

		davinci_source_power(musb, drvvbus, 0);

		davinci_source_power(musb, drvvbus, 0);

		DBG(2, "VBUS %s (%s)%s, devctl %02x\n",

		DBG(2, "VBUS %s (%s)%s, devctl %02x\n",

				drvvbus ? "on" : "off",

				drvvbus ? "on" : "off",

drivers/usb/musb/musb_host.c

+21 −4
Original line number Original line Diff line number Diff line
@@ -2235,13 +2235,30 @@ static void musb_h_stop(struct usb_hcd *hcd) 
static int musb_bus_suspend(struct usb_hcd *hcd)

static int musb_bus_suspend(struct usb_hcd *hcd)

{

{

	struct musb	*musb = hcd_to_musb(hcd);

	struct musb	*musb = hcd_to_musb(hcd);

	u8		devctl;





	if (musb->xceiv->state == OTG_STATE_A_SUSPEND)

	if (!is_host_active(musb))

		return 0;

		return 0;





	if (is_host_active(musb) && musb->is_active) {

	switch (musb->xceiv->state) {

		WARNING("trying to suspend as %s is_active=%i\n",

	case OTG_STATE_A_SUSPEND:

			otg_state_string(musb), musb->is_active);

		return 0;

	case OTG_STATE_A_WAIT_VRISE:

		/* ID could be grounded even if there's no device

		 * on the other end of the cable.  NOTE that the

		 * A_WAIT_VRISE timers are messy with MUSB...

		 */

		devctl = musb_readb(musb->mregs, MUSB_DEVCTL);

		if ((devctl & MUSB_DEVCTL_VBUS) == MUSB_DEVCTL_VBUS)

			musb->xceiv->state = OTG_STATE_A_WAIT_BCON;

		break;

	default:

		break;

	}



	if (musb->is_active) {

		WARNING("trying to suspend as %s while active\n",

				otg_state_string(musb));

		return -EBUSY;

		return -EBUSY;

	} else

	} else

		return 0;

		return 0;