From: Paul Walmsley <paul@pwsan.com> To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Tero Kristo <t-kristo@ti.com> Subject: [PATCH 08/11] ARM: OMAP2+: CM: increase the module disable timeout Date: Thu, 07 Jun 2012 00:13:13 -0600 [thread overview] Message-ID: <20120607061312.25532.68396.stgit@dusk> (raw) In-Reply-To: <20120607060901.25532.68354.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 99978c7..cf67617 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h @@ -28,4 +28,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 02daacc..20e45a6 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -30,6 +30,7 @@ #include <plat/mmc.h> #include <plat/dmtimer.h> #include <plat/common.h> +#include <plat/usb.h> #include "omap_hwmod_common_data.h"
WARNING: multiple messages have this Message-ID (diff)
From: paul@pwsan.com (Paul Walmsley) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/11] ARM: OMAP2+: CM: increase the module disable timeout Date: Thu, 07 Jun 2012 00:13:13 -0600 [thread overview] Message-ID: <20120607061312.25532.68396.stgit@dusk> (raw) In-Reply-To: <20120607060901.25532.68354.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 99978c7..cf67617 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h @@ -28,4 +28,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 02daacc..20e45a6 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -30,6 +30,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-07 6:21 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-07 6:13 [PATCH 00/11] ARM: OMAP: core/hwmod: first set of fixes for 3.5-rc Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 01/11] ARM: OMAP2+: hwmod: add setup_preprogram hook Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 02/11] ARM: OMAP4+: AESS: enable internal auto-gating during initial setup Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 7:19 ` Tony Lindgren 2012-06-07 7:19 ` Tony Lindgren 2012-06-07 7:31 ` Paul Walmsley 2012-06-07 7:31 ` Paul Walmsley 2012-06-07 7:48 ` Tony Lindgren 2012-06-07 7:48 ` Tony Lindgren 2012-06-07 10:45 ` Paul Walmsley 2012-06-07 10:45 ` Paul Walmsley 2012-06-07 11:08 ` Tony Lindgren 2012-06-07 11:08 ` Tony Lindgren 2012-06-07 6:13 ` [PATCH 03/11] ARM: OMAP4: hwmod data: add SL2IF hardreset line Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 04/11] ARM: OMAP2+: usb_host_fs: add custom reset for usb_host_fs (fsusb) Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 7:31 ` Tony Lindgren 2012-06-07 7:31 ` Tony Lindgren 2012-06-07 7:33 ` Felipe Balbi 2012-06-07 7:33 ` Felipe Balbi 2012-06-07 8:00 ` Tony Lindgren 2012-06-07 8:00 ` Tony Lindgren 2012-06-07 7:40 ` Paul Walmsley 2012-06-07 7:40 ` Paul Walmsley 2012-06-07 7:51 ` Tony Lindgren 2012-06-07 7:51 ` Tony Lindgren 2012-06-07 7:55 ` Felipe Balbi 2012-06-07 7:55 ` Felipe Balbi 2012-06-07 8:02 ` Cousson, Benoit 2012-06-07 8:02 ` Cousson, Benoit 2012-06-07 8:10 ` Tony Lindgren 2012-06-07 8:10 ` Tony Lindgren 2012-06-07 8:14 ` Felipe Balbi 2012-06-07 8:14 ` Felipe Balbi 2012-06-07 10:52 ` Paul Walmsley 2012-06-07 10:52 ` Paul Walmsley 2012-06-07 12:30 ` Cousson, Benoit 2012-06-07 12:30 ` Cousson, Benoit 2012-06-08 1:11 ` Paul Walmsley 2012-06-08 1:11 ` Paul Walmsley 2012-06-08 13:13 ` Cousson, Benoit 2012-06-08 13:13 ` Cousson, Benoit 2012-06-08 13:28 ` Paul Walmsley 2012-06-08 13:28 ` Paul Walmsley 2012-06-08 19:32 ` Hiremath, Vaibhav 2012-06-08 19:32 ` Hiremath, Vaibhav 2012-06-08 23:10 ` AM335x CPSW reset (was "RE: [PATCH 04/11] ARM: OMAP2+: usb_host_fs: add custom reset for usb_host_fs (fsusb)") Paul Walmsley 2012-06-08 23:10 ` Paul Walmsley 2012-06-09 8:39 ` Hiremath, Vaibhav 2012-06-09 8:39 ` Hiremath, Vaibhav 2012-06-09 16:05 ` Paul Walmsley 2012-06-09 16:05 ` Paul Walmsley 2012-06-11 6:15 ` [PATCH 04/11] ARM: OMAP2+: usb_host_fs: add custom reset for usb_host_fs (fsusb) Tony Lindgren 2012-06-11 6:15 ` Tony Lindgren 2012-06-11 8:04 ` Paul Walmsley 2012-06-11 8:04 ` Paul Walmsley 2012-06-11 9:24 ` Cousson, Benoit 2012-06-11 9:24 ` Cousson, Benoit 2012-06-11 16:20 ` Paul Walmsley 2012-06-11 16:20 ` Paul Walmsley 2012-06-07 10:20 ` Paul Walmsley 2012-06-07 10:20 ` Paul Walmsley 2012-06-07 10:52 ` Tony Lindgren 2012-06-07 10:52 ` Tony Lindgren 2012-06-07 22:05 ` Paul Walmsley 2012-06-07 22:05 ` Paul Walmsley 2012-06-08 6:38 ` Tony Lindgren 2012-06-08 6:38 ` Tony Lindgren 2012-06-09 1:31 ` Paul Walmsley 2012-06-09 1:31 ` Paul Walmsley 2012-06-11 6:21 ` Tony Lindgren 2012-06-11 6:21 ` Tony Lindgren 2012-06-07 6:13 ` [PATCH 05/11] ARM: OMAP2+: hwmod code/data: fix 32K sync timer Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:59 ` Hiremath, Vaibhav 2012-06-07 6:59 ` Hiremath, Vaibhav 2012-06-07 7:08 ` Paul Walmsley 2012-06-07 7:08 ` Paul Walmsley 2012-06-07 18:09 ` Hiremath, Vaibhav 2012-06-07 18:09 ` Hiremath, Vaibhav 2012-06-07 20:03 ` Paul Walmsley 2012-06-07 20:03 ` Paul Walmsley 2012-06-08 19:10 ` Hiremath, Vaibhav 2012-06-08 19:10 ` Hiremath, Vaibhav 2012-06-11 9:12 ` Cousson, Benoit 2012-06-11 9:12 ` Cousson, Benoit 2012-06-08 13:22 ` Tero Kristo 2012-06-08 13:22 ` Tero Kristo 2012-06-08 23:18 ` Paul Walmsley 2012-06-08 23:18 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 06/11] ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 07/11] ARM: OMAP: PM: Lock clocks list while generating summary Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley [this message] 2012-06-07 6:13 ` [PATCH 08/11] ARM: OMAP2+: CM: increase the module disable timeout Paul Walmsley 2012-06-07 6:13 ` [PATCH 10/11] ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 09/11] ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:39 ` Rajendra Nayak 2012-06-07 6:39 ` Rajendra Nayak 2012-06-18 17:41 ` Paul Walmsley 2012-06-18 17:41 ` Paul Walmsley 2012-06-19 5:15 ` Rajendra Nayak 2012-06-19 5:15 ` Rajendra Nayak 2012-06-07 6:13 ` [PATCH 11/11] ARM: OMAP4: hwmod data: do not enable or reset the McPDM during kernel init Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-08 13:30 ` [PATCH 00/11] ARM: OMAP: core/hwmod: first set of fixes for 3.5-rc Tero Kristo 2012-06-08 13:30 ` Tero Kristo 2012-06-09 1:15 ` Paul Walmsley 2012-06-09 1:15 ` Paul Walmsley 2012-06-13 23:55 ` Paul Walmsley 2012-06-13 23:55 ` Paul Walmsley 2012-06-14 7:36 ` Tero Kristo 2012-06-14 7:36 ` Tero Kristo
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=20120607061312.25532.68396.stgit@dusk \ --to=paul@pwsan.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=t-kristo@ti.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.