From: Arnd Bergmann <arnd@arndb.de>
To: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Jon Medhurst <tixy@yxit.co.uk>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Leif Lindholm <leif.lindholm@arm.com>
Subject: [PATCH 4/4] ARM: kprobes: make more tests conditional
Date: Wed, 22 Aug 2012 16:29:40 +0200 [thread overview]
Message-ID: <1345645780-2749-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1345645780-2749-1-git-send-email-arnd@arndb.de>
The mls instruction is not available in ARMv6K or below, so we
should make the test conditional on at least ARMv7. ldrex/strex
are available in ARMv6K or ARMv7, which we can test by checking
the CONFIG_CPU_32v6K symbol. Just testing for ARMv6 is not enough.
/tmp/ccuMTZ8D.s: Assembler messages:
/tmp/ccuMTZ8D.s:22188: Error: selected processor does not support ARM mode `mls r0,r1,r2,r3'
/tmp/ccuMTZ8D.s:22222: Error: selected processor does not support ARM mode `mlshi r7,r8,r9,r10'
/tmp/ccuMTZ8D.s:22252: Error: selected processor does not support ARM mode `mls lr,r1,r2,r13'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jon Medhurst <tixy@yxit.co.uk>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Leif Lindholm <leif.lindholm@arm.com>
---
arch/arm/kernel/kprobes-test-arm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/kernel/kprobes-test-arm.c
index 38c1a3b..3e87ff7 100644
--- a/arch/arm/kernel/kprobes-test-arm.c
+++ b/arch/arm/kernel/kprobes-test-arm.c
@@ -367,9 +367,11 @@ void kprobe_arm_test_cases(void)
TEST_UNSUPPORTED(".word 0xe0500090 @ undef")
TEST_UNSUPPORTED(".word 0xe05fff9f @ undef")
+#if __LINUX_ARM_ARCH__ >= 7
TEST_RRR( "mls r0, r",1, VAL1,", r",2, VAL2,", r",3, VAL3,"")
TEST_RRR( "mlshi r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
TEST_RR( "mls lr, r",1, VAL2,", r",2, VAL3,", r13")
+#endif
TEST_UNSUPPORTED(".word 0xe06f3291 @ mls pc, r1, r2, r3")
TEST_UNSUPPORTED(".word 0xe060329f @ mls r0, pc, r2, r3")
TEST_UNSUPPORTED(".word 0xe0603f91 @ mls r0, r1, pc, r3")
@@ -454,7 +456,7 @@ void kprobe_arm_test_cases(void)
TEST_UNSUPPORTED(".word 0xe1500090") /* Unallocated space */
TEST_UNSUPPORTED(".word 0xe1600090") /* Unallocated space */
TEST_UNSUPPORTED(".word 0xe1700090") /* Unallocated space */
-#if __LINUX_ARM_ARCH__ >= 6
+#ifdef CONFIG_CPU_32v6K
TEST_UNSUPPORTED("ldrex r2, [sp]")
TEST_UNSUPPORTED("strexd r0, r2, r3, [sp]")
TEST_UNSUPPORTED("ldrexd r2, r3, [sp]")
--
1.7.10
next prev parent reply other threads:[~2012-08-22 14:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 14:29 [PATCH 0/4] ARM: patches for randconfig build errors Arnd Bergmann
2012-08-22 14:29 ` [PATCH 1/4] ARM: export read_current_timer Arnd Bergmann
2012-08-22 17:15 ` Stephen Boyd
2012-08-22 17:49 ` Will Deacon
2012-08-22 17:57 ` Stephen Boyd
2012-08-22 17:58 ` Will Deacon
2012-08-23 4:23 ` Shinya Kuribayashi
2012-08-23 3:56 ` Shinya Kuribayashi
2012-08-22 14:29 ` [PATCH 2/4] ARM: allow PID_IN_CONTEXTIDR only for ARMv7 Arnd Bergmann
2012-08-22 14:39 ` Will Deacon
2012-08-22 14:44 ` Arnd Bergmann
2012-08-22 14:29 ` [PATCH 3/4] ARM: export set_irq_flags/irq_set_chip_and_handler Arnd Bergmann
2012-08-22 14:29 ` Arnd Bergmann [this message]
2012-08-22 14:42 ` [PATCH 4/4] ARM: kprobes: make more tests conditional Nicolas Pitre
2012-08-22 15:19 ` Arnd Bergmann
2012-08-22 15:38 ` Nicolas Pitre
2012-08-22 18:41 ` [PATCHv3 " Arnd Bergmann
2012-08-22 19:43 ` Nicolas Pitre
2012-08-22 23:51 ` Tixy
2012-08-23 12:09 ` [PATCHv4 " Arnd Bergmann
2012-08-23 17:28 ` Tixy
2012-08-23 18:04 ` Nicolas Pitre
2012-08-23 12:25 ` [PATCHv3 " Will Deacon
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=1345645780-2749-5-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=leif.lindholm@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=tixy@yxit.co.uk \
/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).