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

Commit ca5d3f14 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: clean up mmx_32.c 



checkpatch.pl --file cleanups:

  before:
    total: 74 errors, 3 warnings, 386 lines checked

  after:
    total: 0 errors, 0 warnings, 377 lines checked

no code changed:

arch/x86/lib/mmx_32.o:
   text    data     bss     dec     hex filename
   1323       0       8    1331     533 mmx_32.o.before
   1323       0       8    1331     533 mmx_32.o.after

md5:
   4cc39f1017dc40a5ebf02ce0ff7312bc  mmx_32.o.before.asm
   4cc39f1017dc40a5ebf02ce0ff7312bc  mmx_32.o.after.asm

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 04aaa7ba

arch/x86/lib/mmx_32.c

+94 −103
Original line number Diff line number Diff line 
#include <linux/types.h>

#include <linux/string.h>

#include <linux/sched.h>

#include <linux/hardirq.h>

#include <linux/module.h>



#include <asm/asm.h>

#include <asm/i387.h>





/*

 *	MMX 3DNow! library helper functions

 *
@@ -26,6 +16,14 @@ 
 *		Improved for non-egineering-sample Athlons

 *

 */

#include <linux/hardirq.h>

#include <linux/string.h>

#include <linux/module.h>

#include <linux/sched.h>

#include <linux/types.h>



#include <asm/i387.h>

#include <asm/asm.h>



void *_mmx_memcpy(void *to, const void *from, size_t len)

{
@@ -54,9 +52,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) 
			_ASM_EXTABLE(1b, 3b)

			: : "r" (from));



	

	for(; i>5; i--)

	{

	for ( ; i > 5; i--) {

		__asm__ __volatile__ (

		"1:  prefetch 320(%0)\n"

		"2:  movq (%0), %%mm0\n"
@@ -81,12 +77,12 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) 
		".previous\n"

			_ASM_EXTABLE(1b, 3b)

			: : "r" (from), "r" (to) : "memory");



		from += 64;

		to += 64;

	}



	for(; i>0; i--)

	{

	for ( ; i > 0; i--) {

		__asm__ __volatile__ (

		"  movq (%0), %%mm0\n"

		"  movq 8(%0), %%mm1\n"
@@ -105,16 +101,19 @@ void *_mmx_memcpy(void *to, const void *from, size_t len) 
		"  movq %%mm2, 48(%1)\n"

		"  movq %%mm3, 56(%1)\n"

			: : "r" (from), "r" (to) : "memory");



		from += 64;

		to += 64;

	}

	/*

	 *	Now do the tail of the block

	 * Now do the tail of the block:

	 */

	__memcpy(to, from, len & 63);

	kernel_fpu_end();



	return p;

}

EXPORT_SYMBOL(_mmx_memcpy);



#ifdef CONFIG_MK7
@@ -133,8 +132,7 @@ static void fast_clear_page(void *page) 
		"  pxor %%mm0, %%mm0\n" : :

	);



	for(i=0;i<4096/64;i++)

	{

	for (i = 0; i < 4096/64; i++) {

		__asm__ __volatile__ (

		"  movntq %%mm0, (%0)\n"

		"  movntq %%mm0, 8(%0)\n"
@@ -147,12 +145,13 @@ static void fast_clear_page(void *page) 
		: : "r" (page) : "memory");

		page += 64;

	}

	/* since movntq is weakly-ordered, a "sfence" is needed to become

	 * ordered again.



	/*

	 * Since movntq is weakly-ordered, a "sfence" is needed to become

	 * ordered again:

	 */

	__asm__ __volatile__ (

		"  sfence \n" : :

	);

	__asm__ __volatile__("sfence\n"::);



	kernel_fpu_end();

}
@@ -162,7 +161,8 @@ static void fast_copy_page(void *to, void *from) 


	kernel_fpu_begin();



	/* maybe the prefetch stuff can go before the expensive fnsave...

	/*

	 * maybe the prefetch stuff can go before the expensive fnsave...

	 * but that is for later. -AV

	 */

	__asm__ __volatile__(
@@ -176,11 +176,9 @@ static void fast_copy_page(void *to, void *from) 
		"3: movw $0x1AEB, 1b\n"	/* jmp on 26 bytes */

		"   jmp 2b\n"

		".previous\n"

		_ASM_EXTABLE(1b,3b)

		: : "r" (from) );

			_ASM_EXTABLE(1b, 3b) : : "r" (from));



	for(i=0; i<(4096-320)/64; i++)

	{

	for (i = 0; i < (4096-320)/64; i++) {

		__asm__ __volatile__ (

		"1: prefetch 320(%0)\n"

		"2: movq (%0), %%mm0\n"
@@ -203,13 +201,13 @@ static void fast_copy_page(void *to, void *from) 
		"3: movw $0x05EB, 1b\n"	/* jmp on 5 bytes */

		"   jmp 2b\n"

		".previous\n"

		_ASM_EXTABLE(1b,3b)

		: : "r" (from), "r" (to) : "memory");

		_ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");



		from += 64;

		to += 64;

	}

	for(i=(4096-320)/64; i<4096/64; i++)

	{



	for (i = (4096-320)/64; i < 4096/64; i++) {

		__asm__ __volatile__ (

		"2: movq (%0), %%mm0\n"

		"   movntq %%mm0, (%1)\n"
@@ -231,21 +229,19 @@ static void fast_copy_page(void *to, void *from) 
		from += 64;

		to += 64;

	}

	/* since movntq is weakly-ordered, a "sfence" is needed to become

	 * ordered again.

	/*

	 * Since movntq is weakly-ordered, a "sfence" is needed to become

	 * ordered again:

	 */

	__asm__ __volatile__ (

		"  sfence \n" : :

	);

	__asm__ __volatile__("sfence \n"::);

	kernel_fpu_end();

}



#else

#else /* CONFIG_MK7 */



/*

 *	Generic MMX implementation without K7 specific streaming

 */

 

static void fast_clear_page(void *page)

{

	int i;
@@ -256,8 +252,7 @@ static void fast_clear_page(void *page) 
		"  pxor %%mm0, %%mm0\n" : :

	);



	for(i=0;i<4096/128;i++)

	{

	for (i = 0; i < 4096/128; i++) {

		__asm__ __volatile__ (

		"  movq %%mm0, (%0)\n"

		"  movq %%mm0, 8(%0)\n"
@@ -286,7 +281,6 @@ static void fast_copy_page(void *to, void *from) 
{

	int i;



	

	kernel_fpu_begin();



	__asm__ __volatile__ (
@@ -300,11 +294,9 @@ static void fast_copy_page(void *to, void *from) 
		"3: movw $0x1AEB, 1b\n"	/* jmp on 26 bytes */

		"   jmp 2b\n"

		".previous\n"

		_ASM_EXTABLE(1b,3b)

		: : "r" (from) );

			_ASM_EXTABLE(1b, 3b) : : "r" (from));



	for(i=0; i<4096/64; i++)

	{

	for (i = 0; i < 4096/64; i++) {

		__asm__ __volatile__ (

		"1: prefetch 320(%0)\n"

		"2: movq (%0), %%mm0\n"
@@ -329,25 +321,26 @@ static void fast_copy_page(void *to, void *from) 
		".previous\n"

			_ASM_EXTABLE(1b, 3b)

			: : "r" (from), "r" (to) : "memory");



		from += 64;

		to += 64;

	}

	kernel_fpu_end();

}





#endif

#endif /* !CONFIG_MK7 */



/*

 *	Favour MMX for page clear and copy. 

 * Favour MMX for page clear and copy:

 */



static void slow_zero_page(void *page)

{

	int d0, d1;

	__asm__ __volatile__( \

		"cld\n\t" \

		"rep ; stosl" \



	__asm__ __volatile__(

		"cld\n\t"

		"rep ; stosl"



			: "=&c" (d0), "=&D" (d1)

			:"a" (0), "1" (page), "0" (1024)

			:"memory");
@@ -360,19 +353,20 @@ void mmx_clear_page(void * page) 
	else

		fast_clear_page(page);

}

EXPORT_SYMBOL(mmx_clear_page);



static void slow_copy_page(void *to, void *from)

{

	int d0, d1, d2;

	__asm__ __volatile__( \

		"cld\n\t" \

		"rep ; movsl" \

		: "=&c" (d0), "=&D" (d1), "=&S" (d2) \

		: "0" (1024),"1" ((long) to),"2" ((long) from) \



	__asm__ __volatile__(

		"cld\n\t"

		"rep ; movsl"

		: "=&c" (d0), "=&D" (d1), "=&S" (d2)

		: "0" (1024), "1" ((long) to), "2" ((long) from)

		: "memory");

}





void mmx_copy_page(void *to, void *from)

{

	if (unlikely(in_interrupt()))
@@ -380,7 +374,4 @@ void mmx_copy_page(void *to, void *from) 
	else

		fast_copy_page(to, from);

}



EXPORT_SYMBOL(_mmx_memcpy);

EXPORT_SYMBOL(mmx_clear_page);

EXPORT_SYMBOL(mmx_copy_page);