From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 2/3] ARM: iwmmxt: Port problematic iwmmxt support code to v7/Thumb-2
Date: Wed, 7 Sep 2011 16:59:17 +0100 [thread overview]
Message-ID: <1315411158-17479-3-git-send-email-dave.martin@linaro.org> (raw)
In-Reply-To: <1315411158-17479-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 <dave.martin@linaro.org>
---
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..bee8a74 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)
+/*
+ * When enough people have binutils which support -march=...+iwmmxt, this
+ * should change to #if __LINUX_ARM_ARCH__ < 7.
+ */
+#ifndef CONFIG_THUMB2_KERNEL
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
--
1.7.4.1
next prev parent reply other threads:[~2011-09-07 15:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-07 15:59 [RFC PATCH 0/3] ARM: iwmmxt/pj4 fixes for v7/Thumb-2 Dave Martin
2011-09-07 15:59 ` [RFC PATCH 1/3] ARM: iwmmxt: Fix Makefile rules for building iwmmxt for Thumb-2 Dave Martin
2011-09-07 16:10 ` Eric Miao
2011-09-07 17:18 ` Nicolas Pitre
2011-09-07 20:32 ` Arnd Bergmann
2011-09-08 8:53 ` Dave Martin
2011-09-07 15:59 ` Dave Martin [this message]
2011-09-07 16:13 ` [RFC PATCH 2/3] ARM: iwmmxt: Port problematic iwmmxt support code to v7/Thumb-2 Eric Miao
2011-09-07 20:35 ` Arnd Bergmann
2011-09-08 8:58 ` Dave Martin
2011-09-08 9:01 ` Russell King - ARM Linux
2011-09-08 11:33 ` Dave Martin
2011-09-08 14:40 ` Arnd Bergmann
2011-09-07 15:59 ` [RFC PATCH 3/3] ARM: pxa/pj4: Port problematic pj4 " Dave Martin
2011-09-07 16:18 ` Eric Miao
2011-09-07 20:27 ` Arnd Bergmann
2011-09-08 8:58 ` Haojian Zhuang
2011-09-08 11:10 ` Sergei Shtylyov
2011-09-08 11:35 ` Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315411158-17479-3-git-send-email-dave.martin@linaro.org \
--to=dave.martin@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).