From: Paul Walmsley <paul@pwsan.com> To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: "Benoît Cousson" <b-cousson@ti.com> Subject: [PATCHv2 06/12] ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init Date: Sun, 10 Jun 2012 18:46:11 -0600 [thread overview] Message-ID: <20120611004608.20034.55965.stgit@dusk> (raw) In-Reply-To: <20120611004502.20034.8840.stgit@dusk> Add HWMOD_EXT_OPT_MAIN_CLK flag to indicate that this IP block is dependent on an off-chip functional clock that is not guaranteed to be present during initialization. IP blocks marked with this flag are left in the INITIALIZED state during kernel init. This is a workaround for a hardware problem. It should be possible to guarantee that at least one clock source will be present and active for any IP block's main functional clock. This ensures that the hwmod code can enable and reset the IP block. Resetting the IP block during kernel init prevents any bogus bootloader, ROM code, or previous OS configuration from affecting the kernel. Hopefully a clock multiplexer can be added on future SoCs. N.B., at some point in the future, it should be possible to query the clock framework for this type of information. Then this flag should no longer be needed. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Benoît Cousson <b-cousson@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 3 +++ arch/arm/plat-omap/include/plat/omap_hwmod.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index d27bf48..e0b8131 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2140,6 +2140,9 @@ static int __init _setup_reset(struct omap_hwmod *oh) if (oh->_state != _HWMOD_STATE_INITIALIZED) return -EINVAL; + if (oh->flags & HWMOD_EXT_OPT_MAIN_CLK) + return -EPERM; + if (oh->rst_lines_cnt == 0) { r = _enable(oh); if (r) { diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 2c53648..b5f3efc 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -417,6 +417,11 @@ struct omap_hwmod_omap4_prcm { * running on the chip (e.g., the MPU is in idle). For such modules, * fine-grained PM runtime-based idle control is simply a waste of * CPU cycles. + * HWMOD_EXT_OPT_MAIN_CLK: The only main functional clock source for + * this IP block comes from an off-chip source and is not always + * enabled. This prevents the hwmod code from being able to + * enable and reset the IP block early. XXX Eventually it should + * be possible to query the clock framework for this information. */ #define HWMOD_SWSUP_SIDLE (1 << 0) #define HWMOD_SWSUP_MSTANDBY (1 << 1) @@ -428,6 +433,7 @@ struct omap_hwmod_omap4_prcm { #define HWMOD_CONTROL_OPT_CLKS_IN_RESET (1 << 7) #define HWMOD_16BIT_REG (1 << 8) #define HWMOD_ALWAYS_FORCE_SIDLE (1 << 9) +#define HWMOD_EXT_OPT_MAIN_CLK (1 << 10) /* * omap_hwmod._int_flags definitions -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: paul@pwsan.com (Paul Walmsley) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv2 06/12] ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init Date: Sun, 10 Jun 2012 18:46:11 -0600 [thread overview] Message-ID: <20120611004608.20034.55965.stgit@dusk> (raw) In-Reply-To: <20120611004502.20034.8840.stgit@dusk> Add HWMOD_EXT_OPT_MAIN_CLK flag to indicate that this IP block is dependent on an off-chip functional clock that is not guaranteed to be present during initialization. IP blocks marked with this flag are left in the INITIALIZED state during kernel init. This is a workaround for a hardware problem. It should be possible to guarantee that at least one clock source will be present and active for any IP block's main functional clock. This ensures that the hwmod code can enable and reset the IP block. Resetting the IP block during kernel init prevents any bogus bootloader, ROM code, or previous OS configuration from affecting the kernel. Hopefully a clock multiplexer can be added on future SoCs. N.B., at some point in the future, it should be possible to query the clock framework for this type of information. Then this flag should no longer be needed. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Beno?t Cousson <b-cousson@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 3 +++ arch/arm/plat-omap/include/plat/omap_hwmod.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index d27bf48..e0b8131 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2140,6 +2140,9 @@ static int __init _setup_reset(struct omap_hwmod *oh) if (oh->_state != _HWMOD_STATE_INITIALIZED) return -EINVAL; + if (oh->flags & HWMOD_EXT_OPT_MAIN_CLK) + return -EPERM; + if (oh->rst_lines_cnt == 0) { r = _enable(oh); if (r) { diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 2c53648..b5f3efc 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -417,6 +417,11 @@ struct omap_hwmod_omap4_prcm { * running on the chip (e.g., the MPU is in idle). For such modules, * fine-grained PM runtime-based idle control is simply a waste of * CPU cycles. + * HWMOD_EXT_OPT_MAIN_CLK: The only main functional clock source for + * this IP block comes from an off-chip source and is not always + * enabled. This prevents the hwmod code from being able to + * enable and reset the IP block early. XXX Eventually it should + * be possible to query the clock framework for this information. */ #define HWMOD_SWSUP_SIDLE (1 << 0) #define HWMOD_SWSUP_MSTANDBY (1 << 1) @@ -428,6 +433,7 @@ struct omap_hwmod_omap4_prcm { #define HWMOD_CONTROL_OPT_CLKS_IN_RESET (1 << 7) #define HWMOD_16BIT_REG (1 << 8) #define HWMOD_ALWAYS_FORCE_SIDLE (1 << 9) +#define HWMOD_EXT_OPT_MAIN_CLK (1 << 10) /* * omap_hwmod._int_flags definitions
next prev parent reply other threads:[~2012-06-11 0:52 UTC|newest] Thread overview: 106+ 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 ` 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 ` Paul Walmsley 2012-06-11 0:45 ` [PATCHv2 02/12] ARM: OMAP2+: hwmod code/data: fix 32K sync timer Paul Walmsley 2012-06-11 0:45 ` Paul Walmsley 2012-06-14 16:47 ` Cousson, Benoit 2012-06-14 16:47 ` Cousson, Benoit 2012-06-14 18:04 ` Paul Walmsley 2012-06-14 18:04 ` Paul Walmsley 2012-06-14 20:13 ` Cousson, Benoit 2012-06-14 20:13 ` Cousson, Benoit 2012-06-15 0:18 ` Paul Walmsley 2012-06-15 0:18 ` Paul Walmsley 2012-06-15 13:28 ` Cousson, Benoit 2012-06-15 13:28 ` Cousson, Benoit 2012-07-04 12:48 ` Paul Walmsley 2012-07-04 12:48 ` Paul Walmsley 2012-07-04 12:53 ` Paul Walmsley 2012-07-04 12:53 ` Paul Walmsley 2012-07-04 14:27 ` Kevin Hilman 2012-07-04 14:27 ` Kevin Hilman 2012-07-04 14:53 ` Paul Walmsley 2012-07-04 14:53 ` Paul Walmsley 2012-07-04 16:14 ` Benoit Cousson 2012-07-04 16:14 ` Benoit Cousson 2012-07-04 16:41 ` Tero Kristo 2012-07-04 16:41 ` Tero Kristo 2012-07-04 16:43 ` Benoit Cousson 2012-07-04 16:43 ` Benoit Cousson 2012-07-04 19:02 ` Paul Walmsley 2012-07-04 19:02 ` Paul Walmsley 2012-07-04 16:57 ` Benoit Cousson 2012-07-04 16:57 ` Benoit Cousson 2012-07-04 18:59 ` Paul Walmsley 2012-07-04 18:59 ` Paul Walmsley 2012-07-05 22:06 ` Kevin Hilman 2012-07-05 22:06 ` Kevin Hilman 2012-07-04 16:01 ` Benoit Cousson 2012-07-04 16:01 ` Benoit Cousson 2012-07-04 19:05 ` Paul Walmsley 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 ` 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 0:46 ` Paul Walmsley 2012-06-11 9:31 ` Cousson, Benoit 2012-06-11 9:31 ` Cousson, Benoit 2012-06-13 17:22 ` Paul Walmsley 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 ` Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley [this message] 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 0:46 ` Paul Walmsley 2012-06-11 6:29 ` Tony Lindgren 2012-06-11 6:29 ` Tony Lindgren 2012-06-14 9:49 ` Paul Walmsley 2012-06-14 9:49 ` Paul Walmsley 2012-06-14 9:59 ` Tony Lindgren 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-11 0:46 ` Paul Walmsley 2012-06-14 12:55 ` Cousson, Benoit 2012-06-14 12:55 ` Cousson, Benoit 2012-06-14 17:09 ` Paul Walmsley 2012-06-14 17:09 ` Paul Walmsley 2012-06-14 21:07 ` Cousson, Benoit 2012-06-14 21:07 ` Cousson, Benoit 2012-06-14 23:02 ` Paul Walmsley 2012-06-14 23:02 ` Paul Walmsley 2012-06-15 9:11 ` Cousson, Benoit 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 0:46 ` Paul Walmsley 2012-06-11 6:34 ` Tony Lindgren 2012-06-11 6:34 ` Tony Lindgren 2012-06-11 7:13 ` Felipe Balbi 2012-06-11 7:13 ` Felipe Balbi 2012-06-11 7:41 ` Tony Lindgren 2012-06-11 7:41 ` Tony Lindgren 2012-06-11 7:48 ` Felipe Balbi 2012-06-11 7:48 ` Felipe Balbi 2012-06-11 8:03 ` Tony Lindgren 2012-06-11 8:03 ` Tony Lindgren 2012-06-11 9:12 ` Felipe Balbi 2012-06-11 9:12 ` Felipe Balbi 2012-06-11 0:46 ` [PATCHv2 10/12] ARM: OMAP2+: CM: increase the module disable timeout Paul Walmsley 2012-06-11 0:46 ` Paul Walmsley 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 0:46 ` Paul Walmsley 2012-06-11 16:28 ` Cousson, Benoit 2012-06-11 16:28 ` Cousson, Benoit 2012-06-11 16:59 ` Paul Walmsley 2012-06-11 16:59 ` Paul Walmsley 2012-06-11 20:15 ` Cousson, Benoit 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 0:46 ` Paul Walmsley 2012-06-11 9:54 ` Cousson, Benoit 2012-06-11 9:54 ` Cousson, Benoit 2012-10-30 4:05 ` Paul Walmsley 2012-10-30 4:05 ` Paul Walmsley 2012-10-30 7:41 ` Péter Ujfalusi 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=20120611004608.20034.55965.stgit@dusk \ --to=paul@pwsan.com \ --cc=b-cousson@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@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: 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.