From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/21] ARM: Fix MULTI_TLB for feroceon
Date: Fri, 7 Feb 2014 00:42:08 +0100 [thread overview]
Message-ID: <1391730137-14814-13-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1391730137-14814-1-git-send-email-andrew@lunn.ch>
Feroceon has the same flush operations as v4wbi, but has an additional
flag, TLB_L2CLEAN_FR. When building with MULTI_TLB this flag is placed
into cpu_tlb.tlb_flags, so there needs to be a cpu_tlb specifically
for feroceon, rather than sharing the v4wbi.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/mm/proc-feroceon.S | 2 +-
arch/arm/mm/tlb-v4wbi.S | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index db79b62c92fb..b76c2706cb02 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -607,7 +607,7 @@ __\name\()_proc_info:
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
.long \cpu_name
.long feroceon_processor_functions
- .long v4wbi_tlb_fns
+ .long fr_tlb_fns
.long feroceon_user_fns
.long \cache
.size __\name\()_proc_info, . - __\name\()_proc_info
diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S
index 1f6062b6c1c1..4e053fef3487 100644
--- a/arch/arm/mm/tlb-v4wbi.S
+++ b/arch/arm/mm/tlb-v4wbi.S
@@ -28,6 +28,7 @@
* - mm - mm_struct describing address space
*/
.align 5
+ENTRY(fr_flush_user_tlb_range)
ENTRY(v4wbi_flush_user_tlb_range)
vma_vm_mm ip, r2
act_mm r3 @ get current->active_mm
@@ -46,6 +47,7 @@ ENTRY(v4wbi_flush_user_tlb_range)
blo 1b
mov pc, lr
+ENTRY(fr_flush_kern_tlb_range)
ENTRY(v4wbi_flush_kern_tlb_range)
mov r3, #0
mcr p15, 0, r3, c7, c10, 4 @ drain WB
@@ -62,3 +64,4 @@ ENTRY(v4wbi_flush_kern_tlb_range)
/* define struct cpu_tlb_fns (see <asm/tlbflush.h> and proc-macros.S) */
define_tlb_functions v4wbi, v4wbi_tlb_flags
+ define_tlb_functions fr, fr_tlb_flags
--
1.8.5.3
next prev parent reply other threads:[~2014-02-06 23:42 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-06 23:41 [PATCH 00/21] Move DT kirkwood into mach-mvebu Andrew Lunn
2014-02-06 23:41 ` [PATCH 01/21] ARM: Kirkwood: Give pm.c its own header file Andrew Lunn
2014-02-06 23:41 ` [PATCH 02/21] IRQ: Orion: Fix getting generic chip pointer Andrew Lunn
2014-02-07 2:38 ` Jason Cooper
2014-02-07 22:32 ` Sebastian Hesselbarth
2014-02-08 15:45 ` Jason Cooper
2014-02-06 23:41 ` [PATCH 03/21] ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT Andrew Lunn
2014-02-07 8:25 ` Thomas Petazzoni
2014-02-07 9:02 ` Andrew Lunn
2014-02-06 23:42 ` [PATCH 04/21] ARM: Kirkwood: Drop printing the SoC type and revision Andrew Lunn
2014-02-06 23:42 ` [PATCH 05/21] ARM: Kirkwood: Seperate board-dt from common and pcie code Andrew Lunn
2014-02-06 23:42 ` [PATCH 06/21] ARM: Kirkwood: ioremap the cpu_config register before using it Andrew Lunn
2014-02-06 23:42 ` [PATCH 07/21] ARM: Kirkwood: ioremap memory control register Andrew Lunn
2014-02-06 23:42 ` [PATCH 08/21] ARM: MVEBU: Add ARCH_MULTI_V7 to SoCs Andrew Lunn
2014-02-06 23:42 ` [PATCH 09/21] ARM: Orion: Move cache-feroceon-l2.h out of plat-orion Andrew Lunn
2014-02-06 23:42 ` [PATCH 10/21] ARM: MM: Add DT binding for Feroceon L2 cache Andrew Lunn
2014-02-07 0:51 ` Jason Gunthorpe
2014-02-07 1:27 ` Jason Cooper
2014-02-07 9:32 ` Andrew Lunn
2014-02-07 14:31 ` Jason Cooper
2014-02-07 18:13 ` Jason Gunthorpe
2014-02-07 14:48 ` Sudeep Holla
2014-02-07 18:21 ` Jason Gunthorpe
2014-02-07 19:12 ` Sudeep Holla
2014-02-06 23:42 ` [PATCH 11/21] ARM: Fix default CPU selection for ARCH_MULTI_V5 Andrew Lunn
2014-02-06 23:42 ` Andrew Lunn [this message]
2014-02-06 23:42 ` [PATCH 13/21] ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU Andrew Lunn
2014-02-06 23:42 ` [PATCH 14/21] ARM: Move kirkwood DT boards into mach-mvebu Andrew Lunn
2014-02-06 23:42 ` [PATCH 15/21] ARM: MVEBU: Let kirkwood use the system controller for restart Andrew Lunn
2014-02-07 1:37 ` Jason Cooper
2014-02-06 23:42 ` [PATCH 16/21] drivers: Enable building of Kirkwood drivers for mach-mvebu Andrew Lunn
2014-02-07 1:59 ` Jason Cooper
2014-02-07 9:13 ` Andrew Lunn
2014-02-07 14:35 ` Jason Cooper
2014-02-06 23:42 ` [PATCH 17/21] ARM: MVEBU: Enable mvebu-soc-id on Kirkwood Andrew Lunn
2014-02-06 23:42 ` [PATCH 18/21] ARM: config: Add a multi_v5_defconfig Andrew Lunn
2014-02-06 23:42 ` [PATCH 19/21] ARM: MVEBU: Simplifiy headers and make local Andrew Lunn
2014-02-07 8:31 ` Thomas Petazzoni
2014-02-07 9:20 ` Andrew Lunn
2014-02-07 9:36 ` Thomas Petazzoni
2014-02-07 9:45 ` Andrew Lunn
2014-02-07 18:27 ` Jason Gunthorpe
2014-02-06 23:42 ` [PATCH 20/21] ARM: MVEBU: Remove unneeded headers Andrew Lunn
2014-02-07 2:02 ` Jason Cooper
2014-02-06 23:42 ` [PATCH 21/21] ARM: Kirkwood: Remove DT support Andrew Lunn
2014-02-07 8:33 ` Thomas Petazzoni
2014-02-07 9:12 ` Andrew Lunn
2014-02-07 15:03 ` Jason Cooper
2014-02-07 15:09 ` Thomas Petazzoni
2014-02-07 15:15 ` Jason Cooper
2014-02-07 17:31 ` Sebastian Hesselbarth
2014-02-10 18:09 ` Andrew Lunn
2014-02-07 17:34 ` Sebastian Hesselbarth
2014-02-07 18:48 ` Jason Cooper
2014-02-20 10:30 ` Ian Campbell
2014-02-20 10:58 ` Andrew Lunn
2014-02-20 11:19 ` Russell King - ARM Linux
2014-02-20 11:28 ` Andrew Lunn
2014-02-20 11:39 ` Ian Campbell
2014-02-20 23:26 ` Jason Cooper
2014-02-24 16:00 ` Ian Campbell
2014-02-24 16:24 ` Andrew Lunn
2014-02-24 16:26 ` Ian Campbell
2014-02-24 16:34 ` Jason Cooper
2014-05-03 13:19 ` Automatically detecting when to use kirkwood-tsXXX-6281.dtb vs -6282.dtb (Was: Re: [PATCH 21/21] ARM: Kirkwood: Remove DT support) Ian Campbell
2014-05-03 14:40 ` Andrew Lunn
2014-05-05 8:44 ` Ian Campbell
2014-02-20 11:34 ` [PATCH 21/21] ARM: Kirkwood: Remove DT support Ian Campbell
2014-02-20 12:18 ` Andrew Lunn
2014-02-20 12:51 ` Ian Campbell
2014-02-20 13:23 ` Andrew Lunn
2014-02-20 14:24 ` Ian Campbell
2014-02-21 2:00 ` Ben Hutchings
2014-02-21 13:16 ` Arnd Bergmann
2014-02-24 16:03 ` Ian Campbell
2014-02-24 20:09 ` Ben Hutchings
2014-02-20 13:53 ` Arnd Bergmann
2014-02-20 14:21 ` Ian Campbell
2014-02-20 15:19 ` Arnd Bergmann
2014-02-21 1:47 ` Ben Hutchings
2014-02-21 13:07 ` Arnd Bergmann
2014-02-21 15:58 ` Jason Cooper
2014-02-21 19:51 ` Ben Hutchings
2014-02-20 13:04 ` Arnd Bergmann
2014-02-20 14:22 ` Ian Campbell
2014-02-20 12:09 ` Arnd Bergmann
2014-02-20 23:24 ` Jason Cooper
2014-02-21 15:52 ` Thomas Petazzoni
2014-02-21 16:36 ` Arnd Bergmann
2014-02-21 16:41 ` Andrew Lunn
2014-02-21 16:42 ` Jason Cooper
2014-02-23 21:44 ` Simon Guinot
2014-02-25 12:44 ` Arnd Bergmann
2014-02-25 13:05 ` Simon Guinot
2014-02-25 15:36 ` Arnd Bergmann
2014-02-25 15:09 ` Simon Guinot
2014-02-25 15:59 ` Arnd Bergmann
2014-02-07 1:14 ` [PATCH 00/21] Move DT kirkwood into mach-mvebu Jason Cooper
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=1391730137-14814-13-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--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).