From: Nicolas Pitre <nicolas.pitre@linaro.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Tixy <tixy@yxit.co.uk>,
linux-arm-kernel@lists.infradead.org,
Russell King <rmk+kernel@arm.linux.org.uk>,
Leif Lindholm <leif.lindholm@arm.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCHv4 4/4] ARM: kprobes: make more tests conditional
Date: Thu, 23 Aug 2012 14:04:21 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.2.02.1208231403440.1754@xanadu.home> (raw)
In-Reply-To: <201208231209.26707.arnd@arndb.de>
On Thu, 23 Aug 2012, Arnd Bergmann wrote:
> On Wednesday 22 August 2012, Tixy wrote:
>
> > If you do feel so inclined for a v4 however ;-) you could also make the
> > mls part of the patch tidier by moving the added #endif to instead
> > terminate the preceding "#if __LINUX_ARM_ARCH__ >= 6", i.e.
> >
> > @@ -367,8 +367,10 @@ void kprobe_arm_test_cases(void)
> > TEST_UNSUPPORTED(".word 0xe0500090 @ undef")
> > TEST_UNSUPPORTED(".word 0xe05fff9f @ undef")
> > +#endif
> >
> > +#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")
> >
> >
> > this looks funny in patch form, but the resulting source file is more
> > consistent with other conditional tests.
>
> Ok, here we go.
>
> Arnd
>
>
> commit abfef4db8731591fbb721262bd4712662aaa6d14
> Author: Arnd Bergmann <arnd@arndb.de>
> Date: Thu Aug 16 07:49:31 2012 +0000
>
> ARM: kprobes: make more tests conditional
>
> The mls instruction is not available in ARMv6K or below, so we
> should make the test conditional on at least ARMv7. ldrexd/strexd
> are available in ARMv6K or ARMv7, which we can test by checking
> the CONFIG_CPU_32v6K symbol.
>
> /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>
Acked-by: Nicolas Pitre <nico@linaro.org>
>
> diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/kernel/kprobes-test-arm.c
> index 38c1a3b..8393129 100644
> --- a/arch/arm/kernel/kprobes-test-arm.c
> +++ b/arch/arm/kernel/kprobes-test-arm.c
> @@ -366,7 +366,9 @@ void kprobe_arm_test_cases(void)
> TEST_UNSUPPORTED(".word 0xe04f0392 @ umaal r0, pc, r2, r3")
> TEST_UNSUPPORTED(".word 0xe0500090 @ undef")
> TEST_UNSUPPORTED(".word 0xe05fff9f @ undef")
> +#endif
>
> +#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")
> @@ -456,6 +458,8 @@ void kprobe_arm_test_cases(void)
> TEST_UNSUPPORTED(".word 0xe1700090") /* Unallocated space */
> #if __LINUX_ARM_ARCH__ >= 6
> TEST_UNSUPPORTED("ldrex r2, [sp]")
> +#endif
> +#if (__LINUX_ARM_ARCH__ >= 7) || defined(CONFIG_CPU_32v6K)
> TEST_UNSUPPORTED("strexd r0, r2, r3, [sp]")
> TEST_UNSUPPORTED("ldrexd r2, r3, [sp]")
> TEST_UNSUPPORTED("strexb r0, r2, [sp]")
>
next prev parent reply other threads:[~2012-08-23 18:04 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 ` [PATCH 4/4] ARM: kprobes: make more tests conditional Arnd Bergmann
2012-08-22 14:42 ` 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 [this message]
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=alpine.LFD.2.02.1208231403440.1754@xanadu.home \
--to=nicolas.pitre@linaro.org \
--cc=arnd@arndb.de \
--cc=leif.lindholm@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.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).