From patchwork Tue Jan 1 13:16:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1922011 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 B56603FF0F for ; Tue, 1 Jan 2013 13:20:09 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tq1hl-0002Dn-1D; Tue, 01 Jan 2013 13:16:29 +0000 Received: from mail-pb0-f43.google.com ([209.85.160.43]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tq1hh-0002DW-9e for linux-arm-kernel@lists.infradead.org; Tue, 01 Jan 2013 13:16:25 +0000 Received: by mail-pb0-f43.google.com with SMTP id um15so7469376pbc.30 for ; Tue, 01 Jan 2013 05:16:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=iTt5mMUgR6N410ZDfH0n1+NFmBWL7A9d46gA+lpdfJ8=; b=Or/eNZE7T9TmWoeAHadpwW2JMWA/TD/kpTeBE/Dm/0TZ96WJFjndUJ1j97tJ+nq+l8 kjSXadx0sB4/4LkkGg4SKpWbnZJYQgHqALmNPhbM1Z9RXmHYr6jvRFoziXYzR0zeL80k ScjU467qdU8RqTYuY5r7oeDk+xazrDL/4xR+g0aJ43ByNR62pxXMax+x8nPC2vJ8LuhH zLMW5J4rz4F5q+oH7l6GYemIW2MRpL43yK6lrHeGmBhMvpqV/+UQiSfU5VrQiBjS1A0z MDLy18aW6PI0iCzxcaxuz+GbIcX2mFX1PlWvPG9P6BTaSgnNmfGxsNDJoFCiTX/4nwe6 WbDQ== X-Received: by 10.68.253.102 with SMTP id zz6mr135171498pbc.99.1357046181724; Tue, 01 Jan 2013 05:16:21 -0800 (PST) Received: from localhost.localdomain ([58.39.216.101]) by mx.google.com with ESMTPS id bi8sm23748067pab.15.2013.01.01.05.16.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Jan 2013 05:16:20 -0800 (PST) From: Haojian Zhuang To: linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, will.deacon@arm.com, patches@linaro.org Subject: [PATCH] ARM: mm: fix wrong branch from a9 to pj4b Date: Tue, 1 Jan 2013 21:16:07 +0800 Message-Id: <1357046167-32495-1-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkLi3aHpQinry6j5xqRt7CxqMGUPnLqvPCkALG3h6ot3PEYjibdausLl+4NqiVoqFz4hOAo X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130101_081625_445916_72A9C682 X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.43 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Haojian Zhuang 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If CONFIG_ARCH_MULTIPLATFORM & CONFIG_ARCH_MVEBU are both enabled, __v7_pj4b_setup is added between __v7_ca9mp_setup and __v7_setup. But there's no jump instruction added. If the chip is Cortex A5/A9, it goes through __v7_pj4b_setup also. It results in system hang. Signed-off-by: Haojian Zhuang --- arch/arm/mm/proc-v7.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 350f6a7..863de63 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -169,6 +169,7 @@ __v7_ca15mp_setup: orreq r0, r0, r10 @ Enable CPU-specific SMP bits mcreq p15, 0, r0, c1, c0, 1 #endif + b __v7_setup __v7_pj4b_setup: #ifdef CONFIG_CPU_PJ4B