Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ed15071 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

[ARM] Feroceon: Feroceon-specific WA-cache compatible {copy,clear}_user_page() 



This patch implements a set of Feroceon-specific
{copy,clear}_user_page() routines that perform more optimally than
the generic implementations.  This also deals with write-allocate
caches (Feroceon can run L1 D in WA mode) which otherwise prevents
Linux from booting.

[nico: optimized the code even further]

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Tested-by: default avatarSylver Bruneau <sylver.bruneau@googlemail.com>
Tested-by: default avatarMartin Michlmayr <tbm@cyrius.com>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 6b29e681

arch/arm/mm/Kconfig

+4 −1
Original line number Original line Diff line number Diff line
@@ -372,7 +372,7 @@ config CPU_FEROCEON 
	select CPU_PABRT_NOIFAR

	select CPU_PABRT_NOIFAR

	select CPU_CACHE_VIVT

	select CPU_CACHE_VIVT

	select CPU_CP15_MMU

	select CPU_CP15_MMU

	select CPU_COPY_V4WB if MMU

	select CPU_COPY_FEROCEON if MMU

	select CPU_TLB_V4WBI if MMU

	select CPU_TLB_V4WBI if MMU





config CPU_FEROCEON_OLD_ID

config CPU_FEROCEON_OLD_ID
@@ -523,6 +523,9 @@ config CPU_COPY_V4WT 
config CPU_COPY_V4WB

config CPU_COPY_V4WB

	bool

	bool





config CPU_COPY_FEROCEON

	bool



config CPU_COPY_V6

config CPU_COPY_V6

	bool

	bool

arch/arm/mm/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_CPU_CACHE_V7) += cache-v7.o 
obj-$(CONFIG_CPU_COPY_V3)	+= copypage-v3.o

obj-$(CONFIG_CPU_COPY_V3)	+= copypage-v3.o

obj-$(CONFIG_CPU_COPY_V4WT)	+= copypage-v4wt.o

obj-$(CONFIG_CPU_COPY_V4WT)	+= copypage-v4wt.o

obj-$(CONFIG_CPU_COPY_V4WB)	+= copypage-v4wb.o

obj-$(CONFIG_CPU_COPY_V4WB)	+= copypage-v4wb.o

obj-$(CONFIG_CPU_COPY_FEROCEON)	+= copypage-feroceon.o

obj-$(CONFIG_CPU_COPY_V6)	+= copypage-v6.o context.o

obj-$(CONFIG_CPU_COPY_V6)	+= copypage-v6.o context.o

obj-$(CONFIG_CPU_SA1100)	+= copypage-v4mc.o

obj-$(CONFIG_CPU_SA1100)	+= copypage-v4mc.o

obj-$(CONFIG_CPU_XSCALE)	+= copypage-xscale.o

obj-$(CONFIG_CPU_XSCALE)	+= copypage-xscale.o

arch/arm/mm/copypage-feroceon.S

0 → 100644
+95 −0
Original line number Original line Diff line number Diff line 
/*

 *  linux/arch/arm/lib/copypage-feroceon.S

 *

 *  Copyright (C) 2008 Marvell Semiconductors

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This handles copy_user_page and clear_user_page on Feroceon

 * more optimally than the generic implementations.

 */

#include <linux/linkage.h>

#include <linux/init.h>

#include <asm/asm-offsets.h>



	.text

	.align	5



ENTRY(feroceon_copy_user_page)

	stmfd	sp!, {r4-r9, lr}

	mov	ip, #PAGE_SZ

1:	mov	lr, r1

	ldmia	r1!, {r2 - r9}

	pld	[lr, #32]

	pld	[lr, #64]

	pld	[lr, #96]

	pld	[lr, #128]

	pld	[lr, #160]

	pld	[lr, #192]

	pld	[lr, #224]

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	ldmia	r1!, {r2 - r9}

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	stmia	r0, {r2 - r9}

	subs	ip, ip, #(32 * 8)

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	bne	1b

	mcr	p15, 0, ip, c7, c10, 4		@ drain WB

	ldmfd	sp!, {r4-r9, pc}



	.align	5



ENTRY(feroceon_clear_user_page)

	stmfd	sp!, {r4-r7, lr}

	mov	r1, #PAGE_SZ/32

	mov	r2, #0

	mov	r3, #0

	mov	r4, #0

	mov	r5, #0

	mov	r6, #0

	mov	r7, #0

	mov	ip, #0

	mov	lr, #0

1:	stmia	r0, {r2-r7, ip, lr}

	subs	r1, r1, #1

	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D line

	add	r0, r0, #32

	bne	1b

	mcr	p15, 0, r1, c7, c10, 4		@ drain WB

	ldmfd	sp!, {r4-r7, pc}



	__INITDATA



	.type	feroceon_user_fns, #object

ENTRY(feroceon_user_fns)

	.long	feroceon_clear_user_page

	.long	feroceon_copy_user_page

	.size	feroceon_user_fns, . - feroceon_user_fns

arch/arm/mm/proc-feroceon.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -440,7 +440,7 @@ __feroceon_old_id_proc_info: 
	.long	cpu_feroceon_name

	.long	cpu_feroceon_name

	.long	feroceon_processor_functions

	.long	feroceon_processor_functions

	.long	v4wbi_tlb_fns

	.long	v4wbi_tlb_fns

	.long	v4wb_user_fns

	.long	feroceon_user_fns

	.long	feroceon_cache_fns

	.long	feroceon_cache_fns

	.size	__feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info

	.size	__feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info

#endif

#endif
@@ -466,6 +466,6 @@ __feroceon_proc_info: 
	.long	cpu_feroceon_name

	.long	cpu_feroceon_name

	.long	feroceon_processor_functions

	.long	feroceon_processor_functions

	.long	v4wbi_tlb_fns

	.long	v4wbi_tlb_fns

	.long	v4wb_user_fns

	.long	feroceon_user_fns

	.long	feroceon_cache_fns

	.long	feroceon_cache_fns

	.size	__feroceon_proc_info, . - __feroceon_proc_info
 
	.size	__feroceon_proc_info, . - __feroceon_proc_info

include/asm-arm/page.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,14 @@ 
# endif

# endif

#endif

#endif





#ifdef CONFIG_CPU_COPY_FEROCEON

# ifdef _USER

#  define MULTI_USER 1

# else

#  define _USER feroceon

# endif

#endif



#ifdef CONFIG_CPU_SA1100

#ifdef CONFIG_CPU_SA1100

# ifdef _USER

# ifdef _USER

#  define MULTI_USER 1

#  define MULTI_USER 1