From patchwork Thu Sep 8 16:04:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 3986 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 5A9C523F9F for ; Thu, 8 Sep 2011 16:04:30 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 4FF2FA1881A for ; Thu, 8 Sep 2011 16:04:30 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 18so2451879fxd.11 for ; Thu, 08 Sep 2011 09:04:30 -0700 (PDT) Received: by 10.223.88.214 with SMTP id b22mr206627fam.5.1315497870214; Thu, 08 Sep 2011 09:04:30 -0700 (PDT) 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.152.11.8 with SMTP id m8cs180669lab; Thu, 8 Sep 2011 09:04:29 -0700 (PDT) Received: by 10.216.188.194 with SMTP id a44mr959988wen.4.1315497869165; Thu, 08 Sep 2011 09:04:29 -0700 (PDT) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id v7si3939442wec.34.2011.09.08.09.04.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Sep 2011 09:04:29 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-ww0-f50.google.com with SMTP id 36so38191wwi.31 for ; Thu, 08 Sep 2011 09:04:28 -0700 (PDT) Received: by 10.227.137.210 with SMTP id x18mr908646wbt.57.1315497868721; Thu, 08 Sep 2011 09:04:28 -0700 (PDT) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com [217.140.96.63]) by mx.google.com with ESMTPS id ft2sm4663505wbb.18.2011.09.08.09.04.26 (version=SSLv3 cipher=OTHER); Thu, 08 Sep 2011 09:04:27 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, Haojian Zhuang , Eric Miao , Arnd Bergmann Subject: [PATCH v2 3/3] ARM: pxa/pj4: Port problematic pj4 support code to v7/Thumb-2 Date: Thu, 8 Sep 2011 17:04:14 +0100 Message-Id: <1315497854-13311-4-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1315497854-13311-1-git-send-email-dave.martin@linaro.org> References: <1315497854-13311-1-git-send-email-dave.martin@linaro.org> The iwmmxt code contains some code to implement a pseudo-ISB, but this is not buildable for Thumb-2. This patch replaces the pseudo-ISB with a real one on v7 and above. Signed-off-by: Dave Martin --- arch/arm/kernel/pj4-cp0.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/arm/kernel/pj4-cp0.c b/arch/arm/kernel/pj4-cp0.c index a4b1b07..5117d9d 100644 --- a/arch/arm/kernel/pj4-cp0.c +++ b/arch/arm/kernel/pj4-cp0.c @@ -66,9 +66,13 @@ static void __init pj4_cp_access_write(u32 value) __asm__ __volatile__ ( "mcr p15, 0, %1, c1, c0, 2\n\t" +#ifdef __LINUX_ARM_ARCH__ >= 7 + "isb\n\t" +#else "mrc p15, 0, %0, c1, c0, 2\n\t" "mov %0, %0\n\t" "sub pc, pc, #4\n\t" +#endif : "=r" (temp) : "r" (value)); }