[ARM] copypage: convert assembly files to C (d73e60b7) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mm/copypage-feroceon.S

deleted100644 → 0

+0 −95

Original line number	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/copypage-feroceon.c

0 → 100644

+100 −0

Original line number	Diff line number	Diff line
		/*
		* linux/arch/arm/mm/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/init.h>

		#include <asm/page.h>

		void __attribute__((naked))
		feroceon_copy_user_page(void kto, const void kfrom, unsigned long vaddr)
		{
		asm("\
		stmfd sp!, {r4-r9, lr} \n\
		mov ip, %0 \n\
		1: mov lr, r1 \n\
		ldmia r1!, {r2 - r9} \n\
		pld [lr, #32] \n\
		pld [lr, #64] \n\
		pld [lr, #96] \n\
		pld [lr, #128] \n\
		pld [lr, #160] \n\
		pld [lr, #192] \n\
		pld [lr, #224] \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		ldmia r1!, {r2 - r9} \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		stmia r0, {r2 - r9} \n\
		subs ip, ip, #(32 * 8) \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		bne 1b \n\
		mcr p15, 0, ip, c7, c10, 4 @ drain WB\n\
		ldmfd sp!, {r4-r9, pc}"
		:
		: "I" (PAGE_SIZE));
		}

		void __attribute__((naked))
		feroceon_clear_user_page(void *kaddr, unsigned long vaddr)
		{
		asm("\
		stmfd sp!, {r4-r7, lr} \n\
		mov r1, %0 \n\
		mov r2, #0 \n\
		mov r3, #0 \n\
		mov r4, #0 \n\
		mov r5, #0 \n\
		mov r6, #0 \n\
		mov r7, #0 \n\
		mov ip, #0 \n\
		mov lr, #0 \n\
		1: stmia r0, {r2-r7, ip, lr} \n\
		subs r1, r1, #1 \n\
		mcr p15, 0, r0, c7, c14, 1 @ clean and invalidate D line\n\
		add r0, r0, #32 \n\
		bne 1b \n\
		mcr p15, 0, r1, c7, c10, 4 @ drain WB\n\
		ldmfd sp!, {r4-r7, pc}"
		:
		: "I" (PAGE_SIZE / 32));
		}

		struct cpu_user_fns feroceon_user_fns __initdata = {
		.cpu_clear_user_page = feroceon_clear_user_page,
		.cpu_copy_user_page = feroceon_copy_user_page,
		};

arch/arm/mm/copypage-v3.S

deleted100644 → 0

+0 −67

Original line number	Diff line number	Diff line
		/*
		* linux/arch/arm/lib/copypage.S
		*
		* Copyright (C) 1995-1999 Russell King
		*
		* 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.
		*
		* ASM optimised string functions
		*/
		#include <linux/linkage.h>
		#include <linux/init.h>
		#include <asm/assembler.h>
		#include <asm/asm-offsets.h>

		.text
		.align 5
		/*
		* ARMv3 optimised copy_user_page
		*
		* FIXME: do we need to handle cache stuff...
		*/
		ENTRY(v3_copy_user_page)
		stmfd sp!, {r4, lr} @ 2
		mov r2, #PAGE_SZ/64 @ 1
		ldmia r1!, {r3, r4, ip, lr} @ 4+1
		1: stmia r0!, {r3, r4, ip, lr} @ 4
		ldmia r1!, {r3, r4, ip, lr} @ 4+1
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmia r1!, {r3, r4, ip, lr} @ 4+1
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmia r1!, {r3, r4, ip, lr} @ 4
		subs r2, r2, #1 @ 1
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmneia r1!, {r3, r4, ip, lr} @ 4
		bne 1b @ 1
		ldmfd sp!, {r4, pc} @ 3

		.align 5
		/*
		* ARMv3 optimised clear_user_page
		*
		* FIXME: do we need to handle cache stuff...
		*/
		ENTRY(v3_clear_user_page)
		str lr, [sp, #-4]!
		mov r1, #PAGE_SZ/64 @ 1
		mov r2, #0 @ 1
		mov r3, #0 @ 1
		mov ip, #0 @ 1
		mov lr, #0 @ 1
		1: stmia r0!, {r2, r3, ip, lr} @ 4
		stmia r0!, {r2, r3, ip, lr} @ 4
		stmia r0!, {r2, r3, ip, lr} @ 4
		stmia r0!, {r2, r3, ip, lr} @ 4
		subs r1, r1, #1 @ 1
		bne 1b @ 1
		ldr pc, [sp], #4

		__INITDATA

		.type v3_user_fns, #object
		ENTRY(v3_user_fns)
		.long v3_clear_user_page
		.long v3_copy_user_page
		.size v3_user_fns, . - v3_user_fns

arch/arm/mm/copypage-v3.c

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/*
		* linux/arch/arm/mm/copypage-v3.c
		*
		* Copyright (C) 1995-1999 Russell King
		*
		* 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.
		*/
		#include <linux/init.h>

		#include <asm/page.h>

		/*
		* ARMv3 optimised copy_user_page
		*
		* FIXME: do we need to handle cache stuff...
		*/
		void __attribute__((naked))
		v3_copy_user_page(void kto, const void kfrom, unsigned long vaddr)
		{
		asm("\n\
		stmfd sp!, {r4, lr} @ 2\n\
		mov r2, %2 @ 1\n\
		ldmia %0!, {r3, r4, ip, lr} @ 4+1\n\
		1: stmia %1!, {r3, r4, ip, lr} @ 4\n\
		ldmia %0!, {r3, r4, ip, lr} @ 4+1\n\
		stmia %1!, {r3, r4, ip, lr} @ 4\n\
		ldmia %0!, {r3, r4, ip, lr} @ 4+1\n\
		stmia %1!, {r3, r4, ip, lr} @ 4\n\
		ldmia %0!, {r3, r4, ip, lr} @ 4\n\
		subs r2, r2, #1 @ 1\n\
		stmia %1!, {r3, r4, ip, lr} @ 4\n\
		ldmneia %0!, {r3, r4, ip, lr} @ 4\n\
		bne 1b @ 1\n\
		ldmfd sp!, {r4, pc} @ 3"
		:
		: "r" (kfrom), "r" (kto), "I" (PAGE_SIZE / 64));
		}

		/*
		* ARMv3 optimised clear_user_page
		*
		* FIXME: do we need to handle cache stuff...
		*/
		void __attribute__((naked)) v3_clear_user_page(void *kaddr, unsigned long vaddr)
		{
		asm("\n\
		str lr, [sp, #-4]!\n\
		mov r1, %1 @ 1\n\
		mov r2, #0 @ 1\n\
		mov r3, #0 @ 1\n\
		mov ip, #0 @ 1\n\
		mov lr, #0 @ 1\n\
		1: stmia %0!, {r2, r3, ip, lr} @ 4\n\
		stmia %0!, {r2, r3, ip, lr} @ 4\n\
		stmia %0!, {r2, r3, ip, lr} @ 4\n\
		stmia %0!, {r2, r3, ip, lr} @ 4\n\
		subs r1, r1, #1 @ 1\n\
		bne 1b @ 1\n\
		ldr pc, [sp], #4"
		:
		: "r" (kaddr), "I" (PAGE_SIZE / 64));
		}

		struct cpu_user_fns v3_user_fns __initdata = {
		.cpu_clear_user_page = v3_clear_user_page,
		.cpu_copy_user_page = v3_copy_user_page,
		};

arch/arm/mm/copypage-v4wb.S→arch/arm/mm/copypage-v4wb.c

+83 −0

Original line number	Diff line number	Diff line
		/*
		* linux/arch/arm/lib/copypage.S
		* linux/arch/arm/mm/copypage-v4wb.c
		*
		* Copyright (C) 1995-1999 Russell King
		*
		* 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.
		*
		* ASM optimised string functions
		*/
		#include <linux/linkage.h>
		#include <linux/init.h>
		#include <asm/asm-offsets.h>

		.text
		.align 5
		#include <asm/page.h>

		/*
		* ARMv4 optimised copy_user_page
		*
		@@ -27,53 +23,61 @@
		* instruction. If your processor does not supply this, you have to write your
		* own copy_user_page that does the right thing.
		*/
		ENTRY(v4wb_copy_user_page)
		stmfd sp!, {r4, lr} @ 2
		mov r2, #PAGE_SZ/64 @ 1
		ldmia r1!, {r3, r4, ip, lr} @ 4
		1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmia r1!, {r3, r4, ip, lr} @ 4+1
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmia r1!, {r3, r4, ip, lr} @ 4
		mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmia r1!, {r3, r4, ip, lr} @ 4
		subs r2, r2, #1 @ 1
		stmia r0!, {r3, r4, ip, lr} @ 4
		ldmneia r1!, {r3, r4, ip, lr} @ 4
		bne 1b @ 1
		mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB
		ldmfd sp!, {r4, pc} @ 3
		void __attribute__((naked))
		v4wb_copy_user_page(void kto, const void kfrom, unsigned long vaddr)
		{
		asm("\
		stmfd sp!, {r4, lr} @ 2\n\
		mov r2, %0 @ 1\n\
		ldmia r1!, {r3, r4, ip, lr} @ 4\n\
		1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\
		stmia r0!, {r3, r4, ip, lr} @ 4\n\
		ldmia r1!, {r3, r4, ip, lr} @ 4+1\n\
		stmia r0!, {r3, r4, ip, lr} @ 4\n\
		ldmia r1!, {r3, r4, ip, lr} @ 4\n\
		mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\
		stmia r0!, {r3, r4, ip, lr} @ 4\n\
		ldmia r1!, {r3, r4, ip, lr} @ 4\n\
		subs r2, r2, #1 @ 1\n\
		stmia r0!, {r3, r4, ip, lr} @ 4\n\
		ldmneia r1!, {r3, r4, ip, lr} @ 4\n\
		bne 1b @ 1\n\
		mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB\n\
		ldmfd sp!, {r4, pc} @ 3"
		:
		: "I" (PAGE_SIZE / 64));
		}

		.align 5
		/*
		* ARMv4 optimised clear_user_page
		*
		* Same story as above.
		*/
		ENTRY(v4wb_clear_user_page)
		str lr, [sp, #-4]!
		mov r1, #PAGE_SZ/64 @ 1
		mov r2, #0 @ 1
		mov r3, #0 @ 1
		mov ip, #0 @ 1
		mov lr, #0 @ 1
		1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line
		stmia r0!, {r2, r3, ip, lr} @ 4
		stmia r0!, {r2, r3, ip, lr} @ 4
		mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line
		stmia r0!, {r2, r3, ip, lr} @ 4
		stmia r0!, {r2, r3, ip, lr} @ 4
		subs r1, r1, #1 @ 1
		bne 1b @ 1
		mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB
		ldr pc, [sp], #4

		__INITDATA
		void __attribute__((naked))
		v4wb_clear_user_page(void *kaddr, unsigned long vaddr)
		{
		asm("\
		str lr, [sp, #-4]!\n\
		mov r1, %0 @ 1\n\
		mov r2, #0 @ 1\n\
		mov r3, #0 @ 1\n\
		mov ip, #0 @ 1\n\
		mov lr, #0 @ 1\n\
		1: mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\
		stmia r0!, {r2, r3, ip, lr} @ 4\n\
		stmia r0!, {r2, r3, ip, lr} @ 4\n\
		mcr p15, 0, r0, c7, c6, 1 @ 1 invalidate D line\n\
		stmia r0!, {r2, r3, ip, lr} @ 4\n\
		stmia r0!, {r2, r3, ip, lr} @ 4\n\
		subs r1, r1, #1 @ 1\n\
		bne 1b @ 1\n\
		mcr p15, 0, r1, c7, c10, 4 @ 1 drain WB\n\
		ldr pc, [sp], #4"
		:
		: "I" (PAGE_SIZE / 64));
		}

		.type v4wb_user_fns, #object
		ENTRY(v4wb_user_fns)
		.long v4wb_clear_user_page
		.long v4wb_copy_user_page
		.size v4wb_user_fns, . - v4wb_user_fns
		struct cpu_user_fns v4wb_user_fns __initdata = {
		.cpu_clear_user_page = v4wb_clear_user_page,
		.cpu_copy_user_page = v4wb_copy_user_page,
		};