From: Tony Lindgren <tony@atomide.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH 5/12] musb_hdrc: Fix host suspend handling, remove earlier hacks
Date: Thu, 11 Oct 2007 10:05:18 -0700 [thread overview]
Message-ID: <11921223311131-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <11921223301447-git-send-email-tony@atomide.com>
If A-cable was connected and a gadget module was reloaded, root hub
suspend would fail.
This the problem by managing musb inactive state better. The patch also adds
more debug info for cases where suspend is attempted in active state.
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 79518ae..091ae8f 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -2128,9 +2128,11 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
{
struct musb *musb = hcd_to_musb(hcd);
- if (is_host_active(musb) && musb->is_active)
+ if (is_host_active(musb) && musb->is_active) {
+ WARN("trying to suspend as %s is_active=%i\n",
+ otg_state_string(musb), musb->is_active);
return -EBUSY;
- else
+ } else
return 0;
}
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c
index b123d8e..22b1d5e 100644
--- a/drivers/usb/musb/musb_virthub.c
+++ b/drivers/usb/musb/musb_virthub.c
@@ -190,6 +190,7 @@ void musb_root_disconnect(struct musb *musb)
case OTG_STATE_A_HOST:
case OTG_STATE_A_SUSPEND:
musb->xceiv.state = OTG_STATE_A_WAIT_BCON;
+ musb->is_active = 0;
break;
case OTG_STATE_A_WAIT_VFALL:
musb->xceiv.state = OTG_STATE_B_IDLE;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 5026f2b..b3e745d 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -430,7 +430,7 @@ static void musb_do_idle(unsigned long _musb)
DBG(4, "Nothing connected %s, turning off VBUS\n",
otg_state_string(musb));
tusb_source_power(musb, 0);
- musb->xceiv.state = OTG_STATE_A_IDLE;
+ musb->xceiv.state = OTG_STATE_A_WAIT_VFALL;
musb->is_active = 0;
}
break;
@@ -551,16 +551,14 @@ static void tusb_source_power(struct musb *musb, int is_on)
if (!(otg_stat & TUSB_DEV_OTG_STAT_ID_STATUS)) {
switch (musb->xceiv.state) {
case OTG_STATE_A_WAIT_VFALL:
- musb->is_active = 1;
break;
case OTG_STATE_A_WAIT_VRISE:
- musb->is_active = 1;
musb->xceiv.state = OTG_STATE_A_WAIT_VFALL;
break;
default:
- musb->is_active = 0;
musb->xceiv.state = OTG_STATE_A_IDLE;
}
+ musb->is_active = 0;
musb->xceiv.default_a = 1;
MUSB_HST_MODE(musb);
} else {
@@ -778,11 +776,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *tbase)
break;
}
musb->xceiv.state = OTG_STATE_A_WAIT_BCON;
- /* CONNECT can wake if a_wait_bcon is set */
- if (musb->a_wait_bcon != 0)
- musb->is_active = 0;
- else
- musb->is_active = 1;
+ musb->is_active = 0;
idle_timeout = jiffies
+ msecs_to_jiffies(musb->a_wait_bcon);
} else {
--
1.5.2.5
next prev parent reply other threads:[~2007-10-11 17:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-11 17:05 [PATCH 0/12] musb_hdrc: Host and OTG updates Tony Lindgren
2007-10-11 17:05 ` [PATCH 1/12] musb_hdrc: Allow tusb3.0 and greater to use multichannel DMA Tony Lindgren
2007-10-11 17:05 ` [PATCH 2/12] musb_hdrc: Add more sysfs notify events Tony Lindgren
2007-10-11 17:05 ` [PATCH 3/12] musb_hdrc: Remove old sysfs entry cable, use mode instead Tony Lindgren
2007-10-11 17:05 ` [PATCH 4/12] musb_hdrc: Remove non-debug otg_state_string Tony Lindgren
2007-10-11 17:05 ` Tony Lindgren [this message]
2007-10-11 17:05 ` [PATCH 6/12] musb_hdrc: Improve tusb host state handling for a_idle Tony Lindgren
2007-10-11 17:05 ` [PATCH 7/12] musb_hdrc: Don't idle as host if VBUS timeout is 0 Tony Lindgren
2007-10-11 17:05 ` [PATCH 8/12] musb_hdrc: Add timer for returning to host mode from HNP Tony Lindgren
2007-10-11 17:05 ` [PATCH 9/12] musb_hdrc: Make HNP more reliable Tony Lindgren
2007-10-11 17:05 ` [PATCH 10/12] musb_hdrc: Make vbus sysfs entry report current Vbus status Tony Lindgren
2007-10-11 17:05 ` [PATCH 11/12] musb_hdrc: Allow suspend if host is already suspended Tony Lindgren
2007-10-11 17:05 ` musb_hdrc: Fix compile if CONFIG_ARCH_OMAP_OTG is not set Tony Lindgren
2007-10-11 20:07 ` [PATCH 11/12] musb_hdrc: Allow suspend if host is already suspended Felipe Balbi
2007-10-11 20:21 ` David Brownell
2007-10-11 20:38 ` Felipe Balbi
2007-10-12 0:56 ` [PATCH 3/12] musb_hdrc: Remove old sysfs entry cable, use mode instead David Brownell
2007-10-12 20:32 ` [PATCH 0/12] musb_hdrc: Host and OTG updates Tony Lindgren
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=11921223311131-git-send-email-tony@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap-open-source@linux.omap.com \
/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