Skip to contentSkip to conversation

ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

PATCH Superseded Vaibhav Hiremath 3 participants 6 messages Mar 27, 2013 – May 20, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

It is required to enable respective clock-domain before enabling any clock/module inside that clock-domain.

During common-clock migration, .clkdm_name field got missed for "clkdiv32k_ick" clock, which leaves "clk_24mhz_clkdm" unused; so it will be disabled even if childs of this clock-domain is enabled, which keeps child modules in idle mode.

This fixes the kernel crash observed on AM335xEVM-SK platform, where clkdiv32_ick clock is being used as a gpio debounce clock and since clkdiv32k_ick is in idle mode it leads to below crash -

Crash Log:
==========

[    2.598347] Unhandled fault: external abort on non-linefetch (0x1028) at
0xfa1ac150
[    2.606434] Internal error: : 1028 [#1] SMP ARM
[    2.611207] Modules linked in:
[    2.614449] CPU: 0    Not tainted  (3.8.4-01382-g1f449cd-dirty #4)
[    2.620973] PC is at _set_gpio_debounce+0x60/0x104
[    2.626025] LR is at clk_enable+0x30/0x3c
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Rajendra Nayak <[email protected]>

---
Change from V1 (no code change):
- Commit description updated as per Rajendra and Paul's comment.

 arch/arm/mach-omap2/cclock33xx_data.c |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/cclock33xx_data.c +23 -3
index 476b820..8327721 100644
@@ -446,9 +446,29 @@ DEFINE_CLK_GATE(cefuse_fck, "sys_clkin_ck", &sys_clkin_ck, 0x0,
  */
 DEFINE_CLK_FIXED_FACTOR(clkdiv32k_ck, "clk_24mhz", &clk_24mhz, 0x0, 1, 732);
 
-DEFINE_CLK_GATE(clkdiv32k_ick, "clkdiv32k_ck", &clkdiv32k_ck, 0x0,
-		AM33XX_CM_PER_CLKDIV32K_CLKCTRL, AM33XX_MODULEMODE_SWCTRL_SHIFT,
-		0x0, NULL);
+static struct clk clkdiv32k_ick;
+
+static const char *clkdiv32k_ick_parent_names[] = {
+	"clkdiv32k_ck",
+};
+
+static const struct clk_ops clkdiv32k_ick_ops = {
+	.enable         = &omap2_dflt_clk_enable,
+	.disable        = &omap2_dflt_clk_disable,
+	.is_enabled     = &omap2_dflt_clk_is_enabled,
+	.init           = &omap2_init_clk_clkdm,
+};
+
+static struct clk_hw_omap clkdiv32k_ick_hw = {
+	.hw	= {
+		.clk	= &clkdiv32k_ick,
+	},
+	.enable_reg	= AM33XX_CM_PER_CLKDIV32K_CLKCTRL,
+	.enable_bit	= AM33XX_MODULEMODE_SWCTRL_SHIFT,
+	.clkdm_name	= "clk_24mhz_clkdm",
+};
+
+DEFINE_STRUCT_CLK(clkdiv32k_ick, clkdiv32k_ick_parent_names, clkdiv32k_ick_ops);
 
 /* "usbotg_fck" is an additional clock and not really a modulemode */
 DEFINE_CLK_GATE(usbotg_fck, "dpll_per_ck", &dpll_per_ck, 0x0,

--
1.7.0.4

maintainer
#1 lore raw

PATCH v2 1/1 ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 22 lines · Vaibhav Hiremath

It is required to enable respective clock-domain before enabling any clock/module inside that clock-domain.

During common-clock migration, .clkdm_name field got missed for "clkdiv32k_ick" clock, which leaves "clk_24mhz_clkdm" unused; so it will be disabled even if childs of this clock-domain is enabled, which keeps child modules in idle mode.

This fixes the kernel crash observed on AM335xEVM-SK platform, where clkdiv32_ick clock is being used as a gpio debounce clock and since clkdiv32k_ick is in idle mode it leads to below crash -

Crash Log:
==========

[    2.598347] Unhandled fault: external abort on non-linefetch (0x1028) at
0xfa1ac150
[    2.606434] Internal error: : 1028 [#1] SMP ARM
[    2.611207] Modules linked in:
[    2.614449] CPU: 0    Not tainted  (3.8.4-01382-g1f449cd-dirty #4)
[    2.620973] PC is at _set_gpio_debounce+0x60/0x104
[    2.626025] LR is at clk_enable+0x30/0x3c
Quoted 4 lines
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Rajendra Nayak <[email protected]>

Tony, if it isn't too late, could this one be added to your 3.9-rc fixes series?

- Paul

maintainer
#2 lore raw

PATCH v2 1/1 ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 29 lines · Paul Walmsley
Quoted 22 lines · Vaibhav Hiremath

It is required to enable respective clock-domain before enabling any clock/module inside that clock-domain.

During common-clock migration, .clkdm_name field got missed for "clkdiv32k_ick" clock, which leaves "clk_24mhz_clkdm" unused; so it will be disabled even if childs of this clock-domain is enabled, which keeps child modules in idle mode.

This fixes the kernel crash observed on AM335xEVM-SK platform, where clkdiv32_ick clock is being used as a gpio debounce clock and since clkdiv32k_ick is in idle mode it leads to below crash -

Crash Log:
==========

[    2.598347] Unhandled fault: external abort on non-linefetch (0x1028) at
0xfa1ac150
[    2.606434] Internal error: : 1028 [#1] SMP ARM
[    2.611207] Modules linked in:
[    2.614449] CPU: 0    Not tainted  (3.8.4-01382-g1f449cd-dirty #4)
[    2.620973] PC is at _set_gpio_debounce+0x60/0x104
[    2.626025] LR is at clk_enable+0x30/0x3c
Quoted 4 lines
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Rajendra Nayak <[email protected]>
Quoted 4 lines

Tony, if it isn't too late, could this one be added to your 3.9-rc fixes series?

Just sent the previous ones, I'll add this into omap-for-v3.9-rc4/fixes.

Regards,

Tony

#3 lore raw

PATCH v2 1/1 ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

In reply to Paul Walmsley
Quoted 40 lines

-----Original Message-----
From: Paul Walmsley [mailto:paul at pwsan.com]
Sent: Wednesday, March 27, 2013 11:15 PM
To: Tony Lindgren; Hiremath, Vaibhav
Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Nayak, Rajendra
Subject: Re: [PATCH-V2] ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 8 lines · Vaibhav Hiremath

It is required to enable respective clock-domain before enabling any clock/module inside that clock-domain.

During common-clock migration, .clkdm_name field got missed for "clkdiv32k_ick" clock, which leaves "clk_24mhz_clkdm" unused; so it will be disabled even if childs of this clock-domain is enabled, which keeps child modules in idle mode.

Quoted 7 lines

This fixes the kernel crash observed on AM335xEVM-SK platform, where clkdiv32_ick clock is being used as a gpio debounce clock and since clkdiv32k_ick is in idle mode it leads to below crash -

Crash Log:
==========

[    2.598347] Unhandled fault: external abort on non-linefetch

(0x1028) at

Quoted 11 lines

0xfa1ac150

[    2.606434] Internal error: : 1028 [#1] SMP ARM
[    2.611207] Modules linked in:
[    2.614449] CPU: 0    Not tainted  (3.8.4-01382-g1f449cd-dirty #4)
[    2.620973] PC is at _set_gpio_debounce+0x60/0x104
[    2.626025] LR is at clk_enable+0x30/0x3c
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Rajendra Nayak <[email protected]>
Quoted 7 lines

Tony, if it isn't too late, could this one be added to your 3.9-rc fixes
series?

Looks like we missed this so far.

Tony, can you merge this patch for v3.10-rc ?

Thanks,
Vaibhav

maintainer
#4 lore raw

PATCH v2 1/1 ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 48 lines · Hiremath, Vaibhav
Quoted 40 lines

-----Original Message-----
From: Paul Walmsley [mailto:paul at pwsan.com]
Sent: Wednesday, March 27, 2013 11:15 PM
To: Tony Lindgren; Hiremath, Vaibhav
Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org; Nayak, Rajendra
Subject: Re: [PATCH-V2] ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 8 lines · Vaibhav Hiremath

It is required to enable respective clock-domain before enabling any clock/module inside that clock-domain.

During common-clock migration, .clkdm_name field got missed for "clkdiv32k_ick" clock, which leaves "clk_24mhz_clkdm" unused; so it will be disabled even if childs of this clock-domain is enabled, which keeps child modules in idle mode.

Quoted 7 lines

This fixes the kernel crash observed on AM335xEVM-SK platform, where clkdiv32_ick clock is being used as a gpio debounce clock and since clkdiv32k_ick is in idle mode it leads to below crash -

Crash Log:
==========

[    2.598347] Unhandled fault: external abort on non-linefetch

(0x1028) at

Quoted 11 lines

0xfa1ac150

[    2.606434] Internal error: : 1028 [#1] SMP ARM
[    2.611207] Modules linked in:
[    2.614449] CPU: 0    Not tainted  (3.8.4-01382-g1f449cd-dirty #4)
[    2.620973] PC is at _set_gpio_debounce+0x60/0x104
[    2.626025] LR is at clk_enable+0x30/0x3c
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Rajendra Nayak <[email protected]>
Quoted 7 lines

Tony, if it isn't too late, could this one be added to your 3.9-rc fixes
series?

Quoted 3 lines

Looks like we missed this so far.

Tony, can you merge this patch for v3.10-rc ?

Oops, sorry somehow this did not make it. I'll apply it to omap-for-v3.10/fixes with cc: stable flag.

Regards,

Tony

#5 lore raw

PATCH v2 1/1 ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 62 lines

-----Original Message-----
From: Tony Lindgren [mailto:tony at atomide.com]
Sent: Friday, May 17, 2013 10:40 PM
To: Hiremath, Vaibhav
Cc: Paul Walmsley; linux-omap at vger.kernel.org; linux-arm- kernel at lists.infradead.org; Nayak, Rajendra
Subject: Re: [PATCH-V2] ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 6 lines · Hiremath, Vaibhav
Quoted 6 lines

-----Original Message-----
From: Paul Walmsley [mailto:paul at pwsan.com]
Sent: Wednesday, March 27, 2013 11:15 PM
To: Tony Lindgren; Hiremath, Vaibhav
Cc: linux-omap at vger.kernel.org; linux-arm-

kernel at lists.infradead.org;

Quoted 4 lines
Quoted 4 lines

Nayak, Rajendra
Subject: Re: [PATCH-V2] ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock

Quoted 8 lines
Quoted 8 lines · Vaibhav Hiremath
Quoted 7 lines

It is required to enable respective clock-domain before enabling any clock/module inside that clock-domain.

During common-clock migration, .clkdm_name field got missed for "clkdiv32k_ick" clock, which leaves "clk_24mhz_clkdm" unused; so it will be disabled even if childs of this clock-

domain

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

is enabled, which keeps child modules in idle mode.

This fixes the kernel crash observed on AM335xEVM-SK platform, where clkdiv32_ick clock is being used as a gpio debounce clock and since clkdiv32k_ick is in idle mode it leads to below crash -

Quoted 8 lines
Quoted 8 lines
Quoted 3 lines

Crash Log:
==========

[    2.598347] Unhandled fault: external abort on non-linefetch

(0x1028) at

Quoted 4 lines

0xfa1ac150

[    2.606434] Internal error: : 1028 [#1] SMP ARM
[    2.611207] Modules linked in:
[    2.614449] CPU: 0    Not tainted  (3.8.4-01382-g1f449cd-dirty

#4)

Quoted 16 lines
Quoted 15 lines
Quoted 7 lines
[    2.620973] PC is at _set_gpio_debounce+0x60/0x104
[    2.626025] LR is at clk_enable+0x30/0x3c
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Rajendra Nayak <[email protected]>

Tony, if it isn't too late, could this one be added to your 3.9-rc fixes
series?

Quoted 8 lines
Quoted 3 lines

Looks like we missed this so far.

Tony, can you merge this patch for v3.10-rc ?

Oops, sorry somehow this did not make it. I'll apply it to omap-for- v3.10/fixes
with cc: stable flag.

Thanks Tony, I saw it in your yesterday's pull request.

Thanks,
Vaibhav