Commit b77bb37a authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Revert "MIPS: LD/SD o32 macro GAS fix update" 

This reverts commit 97475f8b42e83be2966aa2d70ab9c98477701c53 (lmo) /
82b89152 (kernel.org) [MIPS: LD/SD o32
macro GAS fix update].

Turns out this patch is producing many build errors with gcc 4.2.  Based
on further testing with a test case extracted from the build errors found
further build errors and suboptimal generation even in violation of the
"R" constraint.

To make matters worse, the binutils changes also don't work quite as
intended so revert this patch for now.
parent dd5d1380

arch/mips/include/asm/io.h

+2 −10
Original line number Diff line number Diff line
@@ -329,14 +329,10 @@ static inline void pfx##write##bwlq(type val, \ 
			"dsrl32	%L0, %L0, 0"			"\n\t"	\

			"dsll32	%M0, %M0, 0"			"\n\t"	\

			"or	%L0, %L0, %M0"			"\n\t"	\

			".set	push"				"\n\t"	\

			".set	noreorder"			"\n\t"	\

			".set	nomacro"			"\n\t"	\

			"sd	%L0, %2"			"\n\t"	\

			".set	pop"				"\n\t"	\

			".set	mips0"				"\n"	\

			: "=r" (__tmp)					\

			: "0" (__val), "R" (*__mem));			\

			: "0" (__val), "m" (*__mem));			\

		if (irq)						\

			local_irq_restore(__flags);			\

	} else								\
@@ -359,16 +355,12 @@ static inline type pfx##read##bwlq(const volatile void __iomem *mem) \ 
			local_irq_save(__flags);			\

		__asm__ __volatile__(					\

			".set	mips3"		"\t\t# __readq"	"\n\t"	\

			".set	push"				"\n\t"	\

			".set	noreorder"			"\n\t"	\

			".set	nomacro"			"\n\t"	\

			"ld	%L0, %1"			"\n\t"	\

			".set	pop"				"\n\t"	\

			"dsra32	%M0, %L0, 0"			"\n\t"	\

			"sll	%L0, %L0, 0"			"\n\t"	\

			".set	mips0"				"\n"	\

			: "=r" (__val)					\

			: "R" (*__mem));				\

			: "m" (*__mem));				\

		if (irq)						\

			local_irq_restore(__flags);			\

	} else {							\

arch/mips/pmc-sierra/yosemite/py-console.c

+2 −10
Original line number Diff line number Diff line
@@ -65,15 +65,11 @@ static unsigned char readb_outer_space(unsigned long long phys) 


	__asm__ __volatile__ (

	"	.set	mips3		\n"

	"	.set	push		\n"

	"	.set	noreorder	\n"

	"	.set	nomacro		\n"

	"	ld	%0, %1		\n"

	"	.set	pop		\n"

	"	lbu	%0, (%0)	\n"

	"	.set	mips0		\n"

	: "=r" (res)

	: "R" (vaddr));

	: "m" (vaddr));



	write_c0_status(sr);

	ssnop_4();
@@ -93,15 +89,11 @@ static void writeb_outer_space(unsigned long long phys, unsigned char c) 


	__asm__ __volatile__ (

	"	.set	mips3		\n"

	"	.set	push		\n"

	"	.set	noreorder	\n"

	"	.set	nomacro		\n"

	"	ld	%0, %1		\n"

	"	.set	pop		\n"

	"	sb	%2, (%0)	\n"

	"	.set	mips0		\n"

	: "=&r" (tmp)

	: "R" (vaddr), "r" (c));

	: "m" (vaddr), "r" (c));



	write_c0_status(sr);

	ssnop_4();

CRA Git | Maintained and supported by SUSTech CRA and CCSE