From patchwork Thu Sep 8 16:04:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 3985 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 D4B2C23F9F for ; Thu, 8 Sep 2011 16:04:27 +0000 (UTC) Received: from mail-ew0-f52.google.com (mail-ew0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id CB6C3A18033 for ; Thu, 8 Sep 2011 16:04:27 +0000 (UTC) Received: by mail-ew0-f52.google.com with SMTP id 28so556080ewy.11 for ; Thu, 08 Sep 2011 09:04:27 -0700 (PDT) Received: by 10.223.24.21 with SMTP id t21mr248297fab.24.1315497867602; Thu, 08 Sep 2011 09:04:27 -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 m8cs180666lab; Thu, 8 Sep 2011 09:04:27 -0700 (PDT) Received: by 10.227.203.213 with SMTP id fj21mr908019wbb.69.1315497867025; Thu, 08 Sep 2011 09:04:27 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id ft17si3913439wbb.110.2011.09.08.09.04.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Sep 2011 09:04:27 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-wy0-f178.google.com with SMTP id 19so843187wyg.37 for ; Thu, 08 Sep 2011 09:04:26 -0700 (PDT) Received: by 10.227.36.227 with SMTP id u35mr937749wbd.83.1315497866693; Thu, 08 Sep 2011 09:04:26 -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.24 (version=SSLv3 cipher=OTHER); Thu, 08 Sep 2011 09:04:25 -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 2/3] ARM: iwmmxt: Port problematic iwmmxt support code to v7/Thumb-2 Date: Thu, 8 Sep 2011 17:04:13 +0100 Message-Id: <1315497854-13311-3-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 for Thumb-2 kernels. Signed-off-by: Dave Martin Acked-by: Arnd Bergmann --- arch/arm/kernel/iwmmxt.S | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index a087838..7e049b0 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S @@ -319,8 +319,17 @@ ENTRY(iwmmxt_task_switch) PJ4(eor r1, r1, #0xf) PJ4(mcr p15, 0, r1, c1, c0, 2) +/* + * This should be ported to XSC()/PJ4() when everyone has new enough binutils + * to support the -march=...+iwmmxt command-line option syntax. + */ +#if __LINUX_ARM_ARCH__ < 7 || defined(IWMMXT_LEGACY_ASSEMBLER) mrc p15, 0, r1, c2, c0, 0 sub pc, lr, r1, lsr #32 @ cpwait and return +#else + isb @ ISB needed instead on ARMv7 + mov pc, lr +#endif /* * Remove Concan ownership of given task