From 9e9cd54f705a389b586484e6aab045d30fb6efcf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 5 Apr 2013 16:44:19 -0700 Subject: [PATCH] shmobile fix --- ...7779-correct-tmu-clock-support-again.patch | 140 ++++++++++++++++++ series | 1 + 2 files changed, 141 insertions(+) create mode 100644 patches.fixes/arm-shmobile-r8a7779-correct-tmu-clock-support-again.patch diff --git a/patches.fixes/arm-shmobile-r8a7779-correct-tmu-clock-support-again.patch b/patches.fixes/arm-shmobile-r8a7779-correct-tmu-clock-support-again.patch new file mode 100644 index 000000000000..a9aa3e0b5cf5 --- /dev/null +++ b/patches.fixes/arm-shmobile-r8a7779-correct-tmu-clock-support-again.patch @@ -0,0 +1,140 @@ +From ltsi-dev-bounces@lists.linuxfoundation.org Wed Feb 20 14:11:19 2013 +Return-Path: +Delivered-To: unknown +Delivered-To: gregkh@linuxfoundation.org +Received: by 10.64.18.179 with SMTP id x19csp18170ied; + Wed, 20 Feb 2013 14:11:19 -0800 (PST) +X-Received: by 10.68.194.226 with SMTP id hz2mr50991329pbc.39.1361398279080; + Wed, 20 Feb 2013 14:11:19 -0800 (PST) +Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) + by mx.google.com with ESMTP id u2si29029528paw.67.2013.02.20.14.11.18; + Wed, 20 Feb 2013 14:11:19 -0800 (PST) +Received-SPF: pass (google.com: domain of ltsi-dev-bounces@lists.linuxfoundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; +Authentication-Results: mx.google.com; + spf=pass (google.com: domain of ltsi-dev-bounces@lists.linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mail=ltsi-dev-bounces@lists.linuxfoundation.org +Received: from mail.linux-foundation.org (localhost [IPv6:::1]) + by mail.linuxfoundation.org (Postfix) with ESMTP id BA198711; + Wed, 20 Feb 2013 22:11:18 +0000 (UTC) +X-Original-To: ltsi-dev@lists.linuxfoundation.org +Delivered-To: ltsi-dev@mail.linuxfoundation.org +Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org + [172.17.192.35]) + by mail.linuxfoundation.org (Postfix) with ESMTP id ADE9A711 + for ; + Wed, 20 Feb 2013 22:11:16 +0000 (UTC) +X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 +Received: from kirsty.vergenet.net (kirsty.vergenet.net [202.4.237.240]) + by smtp1.linuxfoundation.org (Postfix) with ESMTP id 683AC20106 + for ; + Wed, 20 Feb 2013 22:11:15 +0000 (UTC) +Received: from joe.kanocho.kobe.vergenet.net (unknown [69.38.217.222]) + by kirsty.vergenet.net (Postfix) with ESMTP id D9703266CEF; + Thu, 21 Feb 2013 09:11:11 +1100 (EST) +Received: by joe.kanocho.kobe.vergenet.net (Postfix, from userid 7100) + id 5BA0028A006; Thu, 21 Feb 2013 07:06:26 +0900 (JST) +From: Simon Horman +To: ltsi-dev@lists.linuxfoundation.org +Date: Wed, 20 Feb 2013 14:06:18 -0800 +Message-Id: <1361397978-15092-2-git-send-email-horms+renesas@verge.net.au> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1361397978-15092-1-git-send-email-horms+renesas@verge.net.au> +References: <1361397978-15092-1-git-send-email-horms+renesas@verge.net.au> +X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, + RP_MATCHES_RCVD autolearn=ham version=3.3.1 +X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on + smtp1.linux-foundation.org +Cc: Denis Oliver Kropp , + Kuninori Morimoto +Subject: ARM: shmobile: r8a7779: Correct TMU clock support again +X-BeenThere: ltsi-dev@lists.linuxfoundation.org +X-Mailman-Version: 2.1.12 +Precedence: list +List-Id: "A list to discuss patches, development, + and other things related to the LTSI project" + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Sender: ltsi-dev-bounces@lists.linuxfoundation.org +Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org +Status: RO +Content-Length: 3498 +Lines: 79 + +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 +[] (__schedule+0x1b0/0x4c0) from [] (__loop_delay+0x4/0xc) + + { 1} (t=279640 jiffies g=4294967052 c=4294967052 q=37) +[] (unwind_backtrace+0x0/0xf8) from [] ++(rcu_check_callbacks+0x218/0x6b8) +[] (rcu_check_callbacks+0x218/0x6b8) from [] ++(update_process_times+0x38/0x4c) +[] (update_process_times+0x38/0x4c) from [] ++(tick_nohz_handler+0xb4/0x11c) +[] (tick_nohz_handler+0xb4/0x11c) from [] ++(twd_handler+0x34/0x44) +[] (twd_handler+0x34/0x44) from [] ++(handle_percpu_devid_irq+0x68/0x80) +[] (handle_percpu_devid_irq+0x68/0x80) from [] ++(generic_handle_irq+0x20/0x30) +[] (generic_handle_irq+0x20/0x30) from [] ++(handle_IRQ+0x40/0x90) +[] (handle_IRQ+0x40/0x90) from [] (gic_handle_irq+0x2c/0x5c) +[] (gic_handle_irq+0x2c/0x5c) from [] (__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 +[] (__irq_svc+0x40/0x50) from [] (__loop_delay+0x4/0xc) + +Cc: Denis Oliver Kropp +Cc: Magnus Damm +Cc: Kuninori Morimoto +Cc: Paul Mundt +Signed-off-by: Simon Horman +(cherry picked from commit f9047306fd7332d682898dd689152bb3b45a3e73) + +Conflicts: + arch/arm/mach-shmobile/clock-r8a7779.c + +Signed-off-by: Simon Horman +--- + arch/arm/mach-shmobile/clock-r8a7779.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- 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 */ diff --git a/series b/series index d3878129b8a0..6889b1ab41ed 100644 --- a/series +++ b/series @@ -794,3 +794,4 @@ patches.fixes/usb-gadget-acm_ms-need-to-set-max_speed.patch patches.fixes/usb-gadget-storage_common-remove-fsg_buffhd_static_buffer-support.patch patches.fixes/usb-gadget-mass_storage-fail-fsg_store_file-early-if-colud-not-open-file.patch patches.fixes/usb-gadget-mass_storage-make-file-and-ro-read-only-in-some-cases.patch +patches.fixes/arm-shmobile-r8a7779-correct-tmu-clock-support-again.patch -- 2.34.1