From patchwork Tue May 19 21:55:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6440701 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 73EF6C0432 for ; Tue, 19 May 2015 21:56:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6152D2013D for ; Tue, 19 May 2015 21:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 716952012D for ; Tue, 19 May 2015 21:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751170AbbESV4g (ORCPT ); Tue, 19 May 2015 17:56:36 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:64702 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103AbbESV4f (ORCPT ); Tue, 19 May 2015 17:56:35 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0M2v1a-1ZCurX0qSk-00saoX; Tue, 19 May 2015 23:55:22 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Heiko Stuebner , Russell King , Andrew Lunn , linux-sh@vger.kernel.org, Gregory Clement , Thierry Reding , Alexandre Courbot , Florian Fainelli , Magnus Damm , Michal Simek , Wei Xu , linux-rockchip@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, =?ISO-8859-1?Q?S=C3=B6ren?= Brinkmann , Michael =?ISO-8859-1?Q?Niew=F6hner?= , Sebastian Hesselbarth , Jason Cooper , Stephen Warren , Marc Carino , Simon Horman , Gregory Fong , linux-tegra@vger.kernel.org, Barry Song , Brian Norris , Christian Daudt , Sascha Hauer , Dinh Nguyen , Shawn Guo Subject: Re: [PATCH] ARM: v7 setup function should invalidate L1 cache Date: Tue, 19 May 2015 23:55:12 +0200 Message-ID: <2080993.BUNZpO9uLL@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <6452458.LAJUB33YSi@phil> References: <6452458.LAJUB33YSi@phil> MIME-Version: 1.0 X-Provags-ID: V03:K0:q+ClVW6b2ECHqDKn4DjDKxbF4hbR8uapO4r5gizSTFwtgcp6Bv2 0mqb7W0r9ERJpZgdLrWnaliYZAzqhz9gzyyR/gp2mi9RF7he8c5jfaZFzTX7IVCbwwhrB9K ZaCEYOiMTsHgqncVEdK76PxmxJSL2bNZfTA4DJlYGFEc3cwYd7kwUBXbb3rtbs5RgwsoZWm GX0DmrlXUot1xhsQG2S8g== X-UI-Out-Filterresults: notjunk:1; Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tuesday 19 May 2015 23:44:58 Heiko Stuebner wrote: > > Michael Niewoehner tested this on a rk3188 (Cortex-A9) and wrote in [0] > > Tested-by: Michael Niewoehner > > > > Tested on Radxa Rock Pro with RK3188. > > The kernel panics on reboot I had before and also a kernel BUG when running > > "memtester 1900M" went away and the rock seems to run stable now. > We should probably create a separate fix for that and add it to the stable kernels then. I would suggest something like the untested patch below, which takes advantage of the fact that we already have separate assignments for the start_secondary function pointer for A9 and A17. Arnd --- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-rockchip/headsmp.S b/arch/arm/mach-rockchip/headsmp.S index 46c22dedf632..ae0077e8fe98 100644 --- a/arch/arm/mach-rockchip/headsmp.S +++ b/arch/arm/mach-rockchip/headsmp.S @@ -16,9 +16,6 @@ #include ENTRY(rockchip_secondary_startup) - mrc p15, 0, r0, c0, c0, 0 @ read main ID register - ldr r1, =0x00000c09 @ Cortex-A9 primary part number - teq r0, r1 beq v7_invalidate_l1 b secondary_startup ENDPROC(rockchip_secondary_startup) diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 5b4ca3c3c879..5f46724cca2f 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -149,8 +149,7 @@ static int __cpuinit rockchip_boot_secondary(unsigned int cpu, * sram_base_addr + 8: start address for pc * */ udelay(10); - writel(virt_to_phys(rockchip_secondary_startup), - sram_base_addr + 8); + writel(virt_to_phys(secondary_startup), sram_base_addr + 8); writel(0xDEADBEAF, sram_base_addr + 4); dsb_sev(); }