From patchwork Wed Feb 20 17:27:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2168571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D34113FD4E for ; Wed, 20 Feb 2013 17:31:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U8DRt-00056Z-N7; Wed, 20 Feb 2013 17:27:17 +0000 Received: from moutng.kundenserver.de ([212.227.17.8]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U8DRq-00055s-CE for linux-arm-kernel@lists.infradead.org; Wed, 20 Feb 2013 17:27:15 +0000 Received: from klappe2.localnet (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MBBkT-1Ty4QY3lUz-00A0Tw; Wed, 20 Feb 2013 18:27:08 +0100 From: Arnd Bergmann To: Barry Song Subject: Re: [PATCH v3 0/9] ARM: PRIMA2: bringup new CSR SiRFmarco SMP SoC Date: Wed, 20 Feb 2013 17:27:04 +0000 User-Agent: KMail/1.12.2 (Linux/3.8.0-6-generic; KDE/4.3.2; x86_64; ; ) References: <1358857154-9915-1-git-send-email-Barry.Song@csr.com> In-Reply-To: <1358857154-9915-1-git-send-email-Barry.Song@csr.com> MIME-Version: 1.0 Message-Id: <201302201727.04471.arnd@arndb.de> X-Provags-ID: V02:K0:3kcihuDIPB6R0AphRTmjT4F68jEXPyC17al4nS43EOu 7NreNvzfXa6g70y+IbtmPvKlukYHCAteuIoY6zpwhM2mvx6Qmm tXhJF6UzKZOg2C2wIN49UJZA6i4n0W9B0bBiam1H6L2iw696GB q9ppS9khgeMxRIB51r3vxQ1n5TJIP51xTaNbdcNAWP6W9/fOfP KYJYEGXJAysIZgWPtdkt2jpPkBEB2+kvdMhOgHfv0446cvaTZW 690UeKqHqxpu2I9T4Yh5+GJb2qyxRRWyPDOULaHiKqadwCphoT HHGp3bbWjRaTD205bURbM7i0oz7pRDe+Skzl80yEF/69tkPdu+ Xq9PJbf5Pqq8hx9lbvMA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130220_122714_670443_23286FA8 X-CRM114-Status: GOOD ( 11.34 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.8 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: olof@lixom.net, mark.rutland@arm.com, Dinh Nguyen , workgroup.linux@csr.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Tuesday 22 January 2013, Barry Song wrote: > ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures There was a conflict between this patch and another one from Dinh Nguyen. This is just to let you know that I have added this resolution to the next/soc branch. Arnd 8<------ From 9cb0d1babfcb1b4ac248c09425f7d5de1e771133 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 20 Feb 2013 18:21:58 +0100 Subject: [PATCH] ARM: prima2: remove duplicate v7_invalidate_l1 Patch c08e20d "arm: Add v7_invalidate_l1 to cache-v7.S" added a generic version of this function and removed all platform specific versions, while 4898de3 "ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures" added another one, leading to a link error. I verified that the two are identical, so we can just remove the one in mach-prima2. Signed-off-by: Arnd Bergmann diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S index ada82d0..5b8a408d 100644 --- a/arch/arm/mach-prima2/headsmp.S +++ b/arch/arm/mach-prima2/headsmp.S @@ -12,46 +12,6 @@ __CPUINIT /* - * Cold boot and hardware reset show different behaviour, - * system will be always panic if we warm-reset the board - * Here we invalidate L1 of CPU1 to make sure there isn't - * uninitialized data written into memory later - */ -ENTRY(v7_invalidate_l1) - mov r0, #0 - mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache - mcr p15, 2, r0, c0, c0, 0 - mrc p15, 1, r0, c0, c0, 0 - - ldr r1, =0x7fff - and r2, r1, r0, lsr #13 - - ldr r1, =0x3ff - - and r3, r1, r0, lsr #3 @ NumWays - 1 - add r2, r2, #1 @ NumSets - - and r0, r0, #0x7 - add r0, r0, #4 @ SetShift - - clz r1, r3 @ WayShift - add r4, r3, #1 @ NumWays -1: sub r2, r2, #1 @ NumSets-- - mov r3, r4 @ Temp = NumWays -2: subs r3, r3, #1 @ Temp-- - mov r5, r3, lsl r1 - mov r6, r2, lsl r0 - orr r5, r5, r6 @ Reg = (Temp<