From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Russell King <linux@arm.linux.org.uk>, Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, Kevin Hilman <khilman@linaro.org>, Andrew Lunn <andrew@lunn.ch>, Jason Cooper <jason@lakedaemon.net>, Gregory Clement <gregory.clement@free-electrons.com>, Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Eric Miao <eric.y.miao@gmail.com>, Haojian Zhuang <haojian.zhuang@gmail.com>, Chao Xie <xiechao.mail@gmail.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] ARM: iwmmxt: explicitly check for supported architectures Date: Tue, 15 Apr 2014 20:15:59 +0200 [thread overview] Message-ID: <1397585763-23482-2-git-send-email-sebastian.hesselbarth@gmail.com> (raw) In-Reply-To: <1397585763-23482-1-git-send-email-sebastian.hesselbarth@gmail.com> iwmmxt.S requires special treatment of coprocessor access registers for PJ4 and XScale-based CPUs. It only checks for CPU_PJ4 and drops down to XScale-based treatment on all other architectures. As some PJ4B also come with iWMMXt and also need PJ4 treatment, rework the corresponding preprocessor directives to explicitly check for supported architectures and fail on unsupported ones. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Russell King <linux@arm.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <olof@lixom.net> Cc: Kevin Hilman <khilman@linaro.org> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Chao Xie <xiechao.mail@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/kernel/iwmmxt.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index a08783823b32..2452dd1bef53 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S @@ -19,12 +19,16 @@ #include <asm/thread_info.h> #include <asm/asm-offsets.h> -#if defined(CONFIG_CPU_PJ4) +#if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B) #define PJ4(code...) code #define XSC(code...) -#else +#elif defined(CONFIG_CPU_MOHAWK) || \ + defined(CONFIG_CPU_XSC3) || \ + defined(CONFIG_CPU_XSCALE) #define PJ4(code...) #define XSC(code...) code +#else +#error "Unsupported iWMMXt architecture" #endif #define MMX_WR0 (0x00) -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] ARM: iwmmxt: explicitly check for supported architectures Date: Tue, 15 Apr 2014 20:15:59 +0200 [thread overview] Message-ID: <1397585763-23482-2-git-send-email-sebastian.hesselbarth@gmail.com> (raw) In-Reply-To: <1397585763-23482-1-git-send-email-sebastian.hesselbarth@gmail.com> iwmmxt.S requires special treatment of coprocessor access registers for PJ4 and XScale-based CPUs. It only checks for CPU_PJ4 and drops down to XScale-based treatment on all other architectures. As some PJ4B also come with iWMMXt and also need PJ4 treatment, rework the corresponding preprocessor directives to explicitly check for supported architectures and fail on unsupported ones. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- Cc: Russell King <linux@arm.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <olof@lixom.net> Cc: Kevin Hilman <khilman@linaro.org> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Chao Xie <xiechao.mail@gmail.com> Cc: linux-arm-kernel at lists.infradead.org Cc: linux-kernel at vger.kernel.org --- arch/arm/kernel/iwmmxt.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index a08783823b32..2452dd1bef53 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S @@ -19,12 +19,16 @@ #include <asm/thread_info.h> #include <asm/asm-offsets.h> -#if defined(CONFIG_CPU_PJ4) +#if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B) #define PJ4(code...) code #define XSC(code...) -#else +#elif defined(CONFIG_CPU_MOHAWK) || \ + defined(CONFIG_CPU_XSC3) || \ + defined(CONFIG_CPU_XSCALE) #define PJ4(code...) #define XSC(code...) code +#else +#error "Unsupported iWMMXt architecture" #endif #define MMX_WR0 (0x00) -- 1.9.1
next prev parent reply other threads:[~2014-04-15 18:16 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-21 7:01 [PATCH 1/2] ARM: add cpu_is_pj4() to distinguish PJ4 core Chao Xie 2014-03-21 7:01 ` [PATCH 2/2] ARM: PJ4: check cpu id for PJ4 cp0 access Chao Xie 2014-03-21 18:52 ` [PATCH 1/2] ARM: add cpu_is_pj4() to distinguish PJ4 core Stephen Warren 2014-03-24 18:58 ` Kevin Hilman 2014-03-24 19:38 ` Matt Porter 2014-04-01 20:18 ` Stephen Warren 2014-04-02 23:26 ` Kevin Hilman 2014-04-14 13:12 ` Thomas Petazzoni 2014-04-14 13:43 ` Russell King - ARM Linux 2014-04-14 15:27 ` Arnd Bergmann 2014-04-15 18:15 ` [PATCH 0/5] fixing regressions caused by Dove in MULTI_V7 Sebastian Hesselbarth 2014-04-15 18:15 ` Sebastian Hesselbarth 2014-04-15 18:15 ` Sebastian Hesselbarth [this message] 2014-04-15 18:15 ` [PATCH 1/5] ARM: iwmmxt: explicitly check for supported architectures Sebastian Hesselbarth 2014-04-15 18:16 ` [PATCH 2/5] ARM: pj4: enable iWMMXt only if CONFIG_IWMMXT is set Sebastian Hesselbarth 2014-04-15 18:16 ` Sebastian Hesselbarth 2014-04-15 18:16 ` [PATCH 3/5] ARM: pj4: properly detect existence of iWMMXt coprocessor Sebastian Hesselbarth 2014-04-15 18:16 ` Sebastian Hesselbarth 2014-04-15 18:16 ` [PATCH 4/5] ARM: pj4: fix cpu_is_pj4 check Sebastian Hesselbarth 2014-04-15 18:16 ` Sebastian Hesselbarth 2014-04-15 18:16 ` [PATCH 5/5] ARM: iwmmxt: allow to build iWMMXt on Marvell PJ4B Sebastian Hesselbarth 2014-04-15 18:16 ` Sebastian Hesselbarth 2014-04-16 8:44 ` [PATCH 0/5] fixing regressions caused by Dove in MULTI_V7 Thomas Petazzoni 2014-04-16 8:44 ` Thomas Petazzoni 2014-04-21 18:30 ` Thomas Petazzoni 2014-04-21 18:30 ` Thomas Petazzoni 2014-04-22 16:03 ` Kevin Hilman 2014-04-22 16:03 ` Kevin Hilman
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=1397585763-23482-2-git-send-email-sebastian.hesselbarth@gmail.com \ --to=sebastian.hesselbarth@gmail.com \ --cc=andrew@lunn.ch \ --cc=arnd@arndb.de \ --cc=eric.y.miao@gmail.com \ --cc=gregory.clement@free-electrons.com \ --cc=haojian.zhuang@gmail.com \ --cc=jason@lakedaemon.net \ --cc=khilman@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=olof@lixom.net \ --cc=thomas.petazzoni@free-electrons.com \ --cc=xiechao.mail@gmail.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.