| Message ID | 1361397978-15092-2-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 20, 2013 at 02:06:18PM -0800, Simon Horman wrote: > After discussion on the linux-sh mailing list and reference to the > hardware documentation it appears that 'TMU00', 'TMU01' and 'TMU02' > use a common clock. > > The sh_tmu.1 portion of this change resolves a regression introduced in > 58079fa7d54a0929d304054ee759187a2ccd3cdf (ARM: shmobile: r8a7779: Correct > TMU clock support) and fixes a regression introduced by that patch. That > patch is queued up for v3.9. > > ... > hub 4-0:1.0: USB hub found > hub 4-0:1.0: 2 ports detected > INFO: rcu_sched self-detected stall on CPUINFO: rcu_sched detected stalls on > +CPUs/tasks: { 1} (detected by 2, t=279640 jiffies, g=4294967052, c=4294967051, > +q=38) > Task dump for CPU 1: > swapper/0 R running 0 1 0 0x00000002 > [<c02b8f5c>] (__schedule+0x1b0/0x4c0) from [<c013c590>] (__loop_delay+0x4/0xc) > > { 1} (t=279640 jiffies g=4294967052 c=4294967052 q=37) > [<c000ef9c>] (unwind_backtrace+0x0/0xf8) from [<c0068488>] > +(rcu_check_callbacks+0x218/0x6b8) > [<c0068488>] (rcu_check_callbacks+0x218/0x6b8) from [<c0026774>] > +(update_process_times+0x38/0x4c) > [<c0026774>] (update_process_times+0x38/0x4c) from [<c00569e0>] > +(tick_nohz_handler+0xb4/0x11c) > [<c00569e0>] (tick_nohz_handler+0xb4/0x11c) from [<c000e518>] > +(twd_handler+0x34/0x44) > [<c000e518>] (twd_handler+0x34/0x44) from [<c0063484>] > +(handle_percpu_devid_irq+0x68/0x80) > [<c0063484>] (handle_percpu_devid_irq+0x68/0x80) from [<c005febc>] > +(generic_handle_irq+0x20/0x30) > [<c005febc>] (generic_handle_irq+0x20/0x30) from [<c000a5ec>] > +(handle_IRQ+0x40/0x90) > [<c000a5ec>] (handle_IRQ+0x40/0x90) from [<c000934c>] (gic_handle_irq+0x2c/0x5c) > [<c000934c>] (gic_handle_irq+0x2c/0x5c) from [<c0009a40>] (__irq_svc+0x40/0x50) > Exception stack(0xef03ddf8 to 0xef03de40) > dde0: 000001c1 ffffffff > de00: 000001d8 01bf01bf ef35ec40 ef35e800 ef35ec6c 0000002b ef35ec68 c013c560 > de20: c0392994 60000113 00000000 ef03de40 c01a5d40 c013c590 20000113 ffffffff > [<c0009a40>] (__irq_svc+0x40/0x50) from [<c013c590>] (__loop_delay+0x4/0xc) > > Cc: Denis Oliver Kropp <dok@directfb.org> > Cc: Magnus Damm <damm@opensource.se> > Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > Cc: Paul Mundt <lethal@linux-sh.org> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > (cherry picked from commit f9047306fd7332d682898dd689152bb3b45a3e73) Sorry for the delay, now applied. greg k-h
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index f3e16a8..12fb874 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -142,8 +142,8 @@ static struct clk_lookup lookups[] = { /* MSTP32 clocks */ CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP016]), /* TMU00 */ - CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP015]), /* TMU01 */ - CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP014]), /* TMU02 */ + CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP016]), /* TMU01 */ + CLKDEV_DEV_ID("sh_tmu.2", &mstp_clks[MSTP016]), /* TMU02 */ CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */ CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */ CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
After discussion on the linux-sh mailing list and reference to the hardware documentation it appears that 'TMU00', 'TMU01' and 'TMU02' use a common clock. The sh_tmu.1 portion of this change resolves a regression introduced in 58079fa7d54a0929d304054ee759187a2ccd3cdf (ARM: shmobile: r8a7779: Correct TMU clock support) and fixes a regression introduced by that patch. That patch is queued up for v3.9. ... hub 4-0:1.0: USB hub found hub 4-0:1.0: 2 ports detected INFO: rcu_sched self-detected stall on CPUINFO: rcu_sched detected stalls on +CPUs/tasks: { 1} (detected by 2, t=279640 jiffies, g=4294967052, c=4294967051, +q=38) Task dump for CPU 1: swapper/0 R running 0 1 0 0x00000002 [<c02b8f5c>] (__schedule+0x1b0/0x4c0) from [<c013c590>] (__loop_delay+0x4/0xc) { 1} (t=279640 jiffies g=4294967052 c=4294967052 q=37) [<c000ef9c>] (unwind_backtrace+0x0/0xf8) from [<c0068488>] +(rcu_check_callbacks+0x218/0x6b8) [<c0068488>] (rcu_check_callbacks+0x218/0x6b8) from [<c0026774>] +(update_process_times+0x38/0x4c) [<c0026774>] (update_process_times+0x38/0x4c) from [<c00569e0>] +(tick_nohz_handler+0xb4/0x11c) [<c00569e0>] (tick_nohz_handler+0xb4/0x11c) from [<c000e518>] +(twd_handler+0x34/0x44) [<c000e518>] (twd_handler+0x34/0x44) from [<c0063484>] +(handle_percpu_devid_irq+0x68/0x80) [<c0063484>] (handle_percpu_devid_irq+0x68/0x80) from [<c005febc>] +(generic_handle_irq+0x20/0x30) [<c005febc>] (generic_handle_irq+0x20/0x30) from [<c000a5ec>] +(handle_IRQ+0x40/0x90) [<c000a5ec>] (handle_IRQ+0x40/0x90) from [<c000934c>] (gic_handle_irq+0x2c/0x5c) [<c000934c>] (gic_handle_irq+0x2c/0x5c) from [<c0009a40>] (__irq_svc+0x40/0x50) Exception stack(0xef03ddf8 to 0xef03de40) dde0: 000001c1 ffffffff de00: 000001d8 01bf01bf ef35ec40 ef35e800 ef35ec6c 0000002b ef35ec68 c013c560 de20: c0392994 60000113 00000000 ef03de40 c01a5d40 c013c590 20000113 ffffffff [<c0009a40>] (__irq_svc+0x40/0x50) from [<c013c590>] (__loop_delay+0x4/0xc) Cc: Denis Oliver Kropp <dok@directfb.org> Cc: Magnus Damm <damm@opensource.se> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (cherry picked from commit f9047306fd7332d682898dd689152bb3b45a3e73) Conflicts: arch/arm/mach-shmobile/clock-r8a7779.c Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)