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: 13759 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D42BE23EDB for ; Tue, 1 Jan 2013 13:16:24 +0000 (UTC) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by fiordland.canonical.com (Postfix) with ESMTP id 6C447A193BE for ; Tue, 1 Jan 2013 13:16:24 +0000 (UTC) Received: by mail-vb0-f41.google.com with SMTP id l22so13331227vbn.14 for ; Tue, 01 Jan 2013 05:16:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=iTt5mMUgR6N410ZDfH0n1+NFmBWL7A9d46gA+lpdfJ8=; b=p31I2/W15nzc6d6oJquIrHYkj/Xr5vhuI7ZB7yCXswx2AwSC0v2saAsmfovGPov1Sg 87uYHOMpDvyGtlqge/mhdzaBGvHl7dgRYMD1z6IAk5OY864Hycu//bh8BIOSq5gp531D lU3FA+cICGvHp+hsIh2TChebR5Qo/qiP4PgIHxTeBKA3npkQhlLUVxVeItQBVvIjRqlh kPsau1H9hXSHIHKObrXFesMhA4Ywv8rGS2jqi32oPVzrP0gwkX14VM2dy1+r9rrONbR0 xkdXrUzNJLdkg4NYe9gE2Fv9L2i2sN0ESnWIADxH4RmSVOwGJlaLSOXaIBVz1Vk4ZarI trhg== X-Received: by 10.220.8.18 with SMTP id f18mr66149870vcf.14.1357046183876; Tue, 01 Jan 2013 05:16:23 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp9170veb; Tue, 1 Jan 2013 05:16:23 -0800 (PST) X-Received: by 10.68.203.132 with SMTP id kq4mr134619773pbc.3.1357046182556; Tue, 01 Jan 2013 05:16:22 -0800 (PST) Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41]) by mx.google.com with ESMTPS id qc4si41742892pbb.266.2013.01.01.05.16.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Jan 2013 05:16:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.41 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=209.85.160.41; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.41 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-pb0-f41.google.com with SMTP id xa7so7405487pbc.14 for ; Tue, 01 Jan 2013 05:16:21 -0800 (PST) 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 Cc: Haojian Zhuang 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: ALoCoQkZ/uKklS/Usuiabze605h1JX/9kIm3C6yKSTNR7jiGeJsxVdS2XW4bmEBa1Ej/0yzyzKuM 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