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

Commit 43f2a6e8 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Remove "cache" optimized copy_page function 



Current implementation doesn't handle dcache_line_length
correctly that's why is better to use generic memcpy.

Cache optimized function could be good way howto improve
performance but must be based on benchmarking not blind
function like this.

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 21e1c936

arch/microblaze/include/asm/page.h

+1 −3
Original line number Diff line number Diff line
@@ -71,13 +71,11 @@ typedef unsigned long pte_basic_t; 
#endif /* CONFIG_MMU */



#  ifndef CONFIG_MMU

#  define copy_page(to, from)			memcpy((to), (from), PAGE_SIZE)

#  define get_user_page(vaddr)			__get_free_page(GFP_KERNEL)

#  define free_user_page(page, addr)		free_page(addr)

#  else /* CONFIG_MMU */

extern void copy_page(void *to, void *from);

#  endif /* CONFIG_MMU */



# define copy_page(to, from)			memcpy((to), (from), PAGE_SIZE)

# define clear_page(pgaddr)			memset((pgaddr), 0, PAGE_SIZE)



# define clear_user_page(pgaddr, vaddr, page)	memset((pgaddr), 0, PAGE_SIZE)

arch/microblaze/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/hardirq.h>

#include <linux/thread_info.h>

#include <linux/kbuild.h>

#include <asm/cpuinfo.h>



int main(int argc, char *argv[])

{

arch/microblaze/kernel/misc.S

+0 −36
Original line number Diff line number Diff line
@@ -93,39 +93,3 @@ early_console_reg_tlb_alloc: 
	nop



	.size  early_console_reg_tlb_alloc, . - early_console_reg_tlb_alloc
 


/*

 * Copy a whole page (4096 bytes).

 */

#define COPY_16_BYTES		\

	lwi	r7, r6, 0;	\

	lwi	r8, r6, 4;	\

	lwi	r9, r6, 8;	\

	lwi	r10, r6, 12;	\

	swi	r7, r5, 0;	\

	swi	r8, r5, 4;	\

	swi	r9, r5, 8;	\

	swi	r10, r5, 12





/* FIXME DCACHE_LINE_BYTES (CONFIG_XILINX_MICROBLAZE0_DCACHE_LINE_LEN * 4)*/

#define DCACHE_LINE_BYTES (4 * 4)



.globl copy_page;

.type  copy_page, @function

.align 4;

copy_page:

	ori	r11, r0, (PAGE_SIZE/DCACHE_LINE_BYTES) - 1

_copy_page_loop:

	COPY_16_BYTES

#if DCACHE_LINE_BYTES >= 32

	COPY_16_BYTES

#endif

	addik	r6, r6, DCACHE_LINE_BYTES

	addik	r5, r5, DCACHE_LINE_BYTES

	bneid	r11, _copy_page_loop

	addik	r11, r11, -1

	rtsd	r15, 8

	nop



	.size  copy_page, . - copy_page