From: pebolle@tiscali.nl (Paul Bolle)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: remove ARM710 specific assembler code
Date: Fri, 16 May 2014 11:29:58 +0200 [thread overview]
Message-ID: <1400232598.20342.16.camel@x220> (raw)
In-Reply-To: <4305975.PvMXZQ020k@wuerfel>
Support for ARM710 CPUs was removed in v3.5. But a few lines of ARM710
specific assembler code were left in the tree. Remove these too.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
This minor cleanup was suggested by Arnd. This patch is mostly
guesswork, as I already told Arnd, since I have never touched ARM
assembler before (as far as I can remember). Untested too! And this does
need testing.
arch/arm/mm/proc-arm720.S | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index d42c37f9f5bc..6699f91a6a0f 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -116,34 +116,6 @@ ENTRY(cpu_arm720_reset)
ENDPROC(cpu_arm720_reset)
.popsection
- .type __arm710_setup, #function
-__arm710_setup:
- mov r0, #0
- mcr p15, 0, r0, c7, c7, 0 @ invalidate caches
-#ifdef CONFIG_MMU
- mcr p15, 0, r0, c8, c7, 0 @ flush TLB (v4)
-#endif
- mrc p15, 0, r0, c1, c0 @ get control register
- ldr r5, arm710_cr1_clear
- bic r0, r0, r5
- ldr r5, arm710_cr1_set
- orr r0, r0, r5
- mov pc, lr @ __ret (head.S)
- .size __arm710_setup, . - __arm710_setup
-
- /*
- * R
- * .RVI ZFRS BLDP WCAM
- * .... 0001 ..11 1101
- *
- */
- .type arm710_cr1_clear, #object
- .type arm710_cr1_set, #object
-arm710_cr1_clear:
- .word 0x0f3f
-arm710_cr1_set:
- .word 0x013d
-
.type __arm720_setup, #function
__arm720_setup:
mov r0, #0
@@ -177,7 +149,6 @@ arm720_crval:
string cpu_arch_name, "armv4t"
string cpu_elf_name, "v4"
- string cpu_arm710_name, "ARM710T"
string cpu_arm720_name, "ARM720T"
.align
@@ -215,5 +186,4 @@ __\name\()_proc_info:
.size __\name\()_proc_info, . - __\name\()_proc_info
.endm
- arm720_proc_info arm710, 0x41807100, 0xffffff00, cpu_arm710_name, __arm710_setup
arm720_proc_info arm720, 0x41807200, 0xffffff00, cpu_arm720_name, __arm720_setup
--
1.9.0
WARNING: multiple messages have this Message-ID (diff)
From: Paul Bolle <pebolle@tiscali.nl>
To: Russell King <linux@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ARM: remove ARM710 specific assembler code
Date: Fri, 16 May 2014 11:29:58 +0200 [thread overview]
Message-ID: <1400232598.20342.16.camel@x220> (raw)
In-Reply-To: <4305975.PvMXZQ020k@wuerfel>
Support for ARM710 CPUs was removed in v3.5. But a few lines of ARM710
specific assembler code were left in the tree. Remove these too.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
This minor cleanup was suggested by Arnd. This patch is mostly
guesswork, as I already told Arnd, since I have never touched ARM
assembler before (as far as I can remember). Untested too! And this does
need testing.
arch/arm/mm/proc-arm720.S | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index d42c37f9f5bc..6699f91a6a0f 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -116,34 +116,6 @@ ENTRY(cpu_arm720_reset)
ENDPROC(cpu_arm720_reset)
.popsection
- .type __arm710_setup, #function
-__arm710_setup:
- mov r0, #0
- mcr p15, 0, r0, c7, c7, 0 @ invalidate caches
-#ifdef CONFIG_MMU
- mcr p15, 0, r0, c8, c7, 0 @ flush TLB (v4)
-#endif
- mrc p15, 0, r0, c1, c0 @ get control register
- ldr r5, arm710_cr1_clear
- bic r0, r0, r5
- ldr r5, arm710_cr1_set
- orr r0, r0, r5
- mov pc, lr @ __ret (head.S)
- .size __arm710_setup, . - __arm710_setup
-
- /*
- * R
- * .RVI ZFRS BLDP WCAM
- * .... 0001 ..11 1101
- *
- */
- .type arm710_cr1_clear, #object
- .type arm710_cr1_set, #object
-arm710_cr1_clear:
- .word 0x0f3f
-arm710_cr1_set:
- .word 0x013d
-
.type __arm720_setup, #function
__arm720_setup:
mov r0, #0
@@ -177,7 +149,6 @@ arm720_crval:
string cpu_arch_name, "armv4t"
string cpu_elf_name, "v4"
- string cpu_arm710_name, "ARM710T"
string cpu_arm720_name, "ARM720T"
.align
@@ -215,5 +186,4 @@ __\name\()_proc_info:
.size __\name\()_proc_info, . - __\name\()_proc_info
.endm
- arm720_proc_info arm710, 0x41807100, 0xffffff00, cpu_arm710_name, __arm710_setup
arm720_proc_info arm720, 0x41807200, 0xffffff00, cpu_arm720_name, __arm720_setup
--
1.9.0
next prev parent reply other threads:[~2014-05-16 9:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 21:46 [PATCH] ARM: remove last use of CONFIG_CPU_ARM710 Paul Bolle
2013-03-28 21:46 ` Paul Bolle
2014-05-14 8:24 ` [PATCH] [RESEND] " Paul Bolle
2014-05-14 8:24 ` Paul Bolle
2014-05-14 8:48 ` Alexander Shiyan
2014-05-14 8:48 ` Alexander Shiyan
2014-05-14 9:07 ` Paul Bolle
2014-05-14 9:07 ` Paul Bolle
2014-05-14 9:17 ` Arnd Bergmann
2014-05-14 9:17 ` Arnd Bergmann
2014-05-14 9:25 ` Paul Bolle
2014-05-14 9:25 ` Paul Bolle
2014-05-14 9:28 ` Arnd Bergmann
2014-05-14 9:28 ` Arnd Bergmann
2014-05-16 9:29 ` Paul Bolle [this message]
2014-05-16 9:29 ` [PATCH] ARM: remove ARM710 specific assembler code Paul Bolle
2014-05-16 12:55 ` Russell King - ARM Linux
2014-05-16 12:55 ` Russell King - ARM Linux
2014-05-16 14:50 ` Paul Bolle
2014-05-16 14:50 ` Paul Bolle
2014-05-17 9:23 ` Catalin Marinas
2014-05-17 9:23 ` Catalin Marinas
2014-05-17 9:46 ` Russell King - ARM Linux
2014-05-17 9:46 ` Russell King - ARM Linux
2014-05-17 9:56 ` Catalin Marinas
2014-05-17 9:56 ` Catalin Marinas
2014-05-17 10:26 ` Russell King - ARM Linux
2014-05-17 10:26 ` Russell King - ARM Linux
2014-05-19 10:18 ` Catalin Marinas
2014-05-19 10:18 ` Catalin Marinas
2014-05-19 11:26 ` Arnd Bergmann
2014-05-19 11:26 ` Arnd Bergmann
2014-05-20 16:05 ` Tony Lindgren
2014-05-20 16:05 ` Tony Lindgren
2014-05-20 20:09 ` Arnd Bergmann
2014-05-20 20:09 ` Arnd Bergmann
2014-05-22 18:40 ` Tony Lindgren
2014-05-22 18:40 ` Tony Lindgren
2014-05-22 18:42 ` Tony Lindgren
2014-05-22 18:42 ` Tony Lindgren
2014-05-20 15:48 ` One Thousand Gnomes
2014-05-20 15:48 ` One Thousand Gnomes
2014-05-20 16:14 ` Catalin Marinas
2014-05-20 16:14 ` Catalin Marinas
2014-05-23 9:07 ` [PATCH] [RESEND] ARM: remove last use of CONFIG_CPU_ARM710 Paul Bolle
2014-05-23 9:07 ` Paul Bolle
2014-05-23 9:22 ` Arnd Bergmann
2014-05-23 9:22 ` Arnd Bergmann
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=1400232598.20342.16.camel@x220 \
--to=pebolle@tiscali.nl \
--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 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.