From: paul@pwsan.com (Paul Walmsley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 10/12] ARM: OMAP2+: CM: increase the module disable timeout
Date: Sun, 10 Jun 2012 18:46:23 -0600 [thread overview]
Message-ID: <20120611004620.20034.4341.stgit@dusk> (raw)
In-Reply-To: <20120611004502.20034.8840.stgit@dusk>
Increase the timeout for disabling an IP block to five milliseconds.
This is to handle the usb_host_fs idle latency, which takes almost
four milliseconds after a host controller reset.
This is the second of two patches needed to resolve the following
boot warning:
omap_hwmod: usb_host_fs: _wait_target_disable failed
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
---
arch/arm/mach-omap2/cm.h | 11 +++++++++++
arch/arm/mach-omap2/cminst44xx.c | 4 ++--
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 +
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index a7bc096..f24e3f7 100644
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -22,4 +22,15 @@
*/
#define MAX_MODULE_READY_TIME 2000
+/*
+ * MAX_MODULE_DISABLE_TIME: max duration in microseconds to wait for
+ * the PRCM to request that a module enter the inactive state in the
+ * case of OMAP2 & 3. In the case of OMAP4 this is the max duration
+ * in microseconds for the module to reach the inactive state from
+ * a functional state.
+ * XXX FSUSB on OMAP4430 takes ~4ms to idle after reset during
+ * kernel init.
+ */
+#define MAX_MODULE_DISABLE_TIME 5000
+
#endif
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c
index 8c86d29..1a39945 100644
--- a/arch/arm/mach-omap2/cminst44xx.c
+++ b/arch/arm/mach-omap2/cminst44xx.c
@@ -313,9 +313,9 @@ int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_off
omap_test_timeout((_clkctrl_idlest(part, inst, cdoffs, clkctrl_offs) ==
CLKCTRL_IDLEST_DISABLED),
- MAX_MODULE_READY_TIME, i);
+ MAX_MODULE_DISABLE_TIME, i);
- return (i < MAX_MODULE_READY_TIME) ? 0 : -EBUSY;
+ return (i < MAX_MODULE_DISABLE_TIME) ? 0 : -EBUSY;
}
/**
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index b8b28be..3613054 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -33,6 +33,7 @@
#include <plat/mmc.h>
#include <plat/dmtimer.h>
#include <plat/common.h>
+#include <plat/usb.h>
#include "omap_hwmod_common_data.h"
next prev parent reply other threads:[~2012-06-11 0:46 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-11 0:45 [PATCHv2 00/12] ARM: OMAP: core/hwmod: first set of fixes for 3.5-rc Paul Walmsley
2012-06-11 0:45 ` [PATCHv2 01/12] ARM: OMAP: PM: Lock clocks list while generating summary Paul Walmsley
2012-06-11 0:45 ` [PATCHv2 02/12] ARM: OMAP2+: hwmod code/data: fix 32K sync timer Paul Walmsley
2012-06-14 16:47 ` Cousson, Benoit
2012-06-14 18:04 ` Paul Walmsley
2012-06-14 20:13 ` Cousson, Benoit
2012-06-15 0:18 ` Paul Walmsley
2012-06-15 13:28 ` Cousson, Benoit
2012-07-04 12:48 ` Paul Walmsley
2012-07-04 12:53 ` Paul Walmsley
2012-07-04 14:27 ` Kevin Hilman
2012-07-04 14:53 ` Paul Walmsley
2012-07-04 16:14 ` Benoit Cousson
2012-07-04 16:41 ` Tero Kristo
2012-07-04 16:43 ` Benoit Cousson
2012-07-04 19:02 ` Paul Walmsley
2012-07-04 16:57 ` Benoit Cousson
2012-07-04 18:59 ` Paul Walmsley
2012-07-05 22:06 ` Kevin Hilman
2012-07-04 16:01 ` Benoit Cousson
2012-07-04 19:05 ` Paul Walmsley
2012-06-11 0:46 ` [PATCHv2 03/12] ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby Paul Walmsley
2012-06-11 0:46 ` [PATCHv2 04/12] ARM: OMAP4: hwmod data: fix 32k sync timer idle modes Paul Walmsley
2012-06-11 9:31 ` Cousson, Benoit
2012-06-13 17:22 ` Paul Walmsley
2012-06-11 0:46 ` [PATCHv2 05/12] ARM: OMAP2+: hwmod: add setup_preprogram hook Paul Walmsley
2012-06-11 0:46 ` [PATCHv2 06/12] ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init Paul Walmsley
2012-06-11 0:46 ` [PATCHv2 07/12] ARM: OMAP4+: AESS: enable internal auto-gating during initial setup Paul Walmsley
2012-06-11 6:29 ` Tony Lindgren
2012-06-14 9:49 ` Paul Walmsley
2012-06-14 9:59 ` Tony Lindgren
2012-06-11 0:46 ` [PATCHv2 08/12] ARM: OMAP4: hwmod data: add SL2IF hardreset line Paul Walmsley
2012-06-14 12:55 ` Cousson, Benoit
2012-06-14 17:09 ` Paul Walmsley
2012-06-14 21:07 ` Cousson, Benoit
2012-06-14 23:02 ` Paul Walmsley
2012-06-15 9:11 ` Cousson, Benoit
2012-06-11 0:46 ` [PATCHv2 09/12] ARM: OMAP2+: usb_host_fs: add custom setup_preprogram for usb_host_fs (fsusb) Paul Walmsley
2012-06-11 6:34 ` Tony Lindgren
2012-06-11 7:13 ` Felipe Balbi
2012-06-11 7:41 ` Tony Lindgren
2012-06-11 7:48 ` Felipe Balbi
2012-06-11 8:03 ` Tony Lindgren
2012-06-11 9:12 ` Felipe Balbi
2012-06-11 0:46 ` Paul Walmsley [this message]
2012-06-11 0:46 ` [PATCHv2 11/12] ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks Paul Walmsley
2012-06-11 16:28 ` Cousson, Benoit
2012-06-11 16:59 ` Paul Walmsley
2012-06-11 20:15 ` Cousson, Benoit
2012-06-11 0:46 ` [PATCHv2 12/12] ARM: OMAP4: hwmod data: do not enable or reset the McPDM during kernel init Paul Walmsley
2012-06-11 9:54 ` Cousson, Benoit
2012-10-30 4:05 ` Paul Walmsley
2012-10-30 7:41 ` Péter Ujfalusi
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=20120611004620.20034.4341.stgit@dusk \
--to=paul@pwsan.com \
--cc=linux-arm-kernel@lists.infradead.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).