Patch "MIPS: IP22: Reformat inline assembler code to modern standards." has been added to the 4.10-stable tree

Patch "MIPS: IP22: Reformat inline assembler code to modern standards." has been added to the 4.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    MIPS: IP22: Reformat inline assembler code to modern standards.

to the 4.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mips-ip22-reformat-inline-assembler-code-to-modern-standards.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From f9f1c8db1c37253805eaa32265e1e1af3ae7d0a4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 15 Dec 2016 12:27:21 +0100
Subject: MIPS: IP22: Reformat inline assembler code to modern standards.

From: Ralf Baechle <ralf@linux-mips.org>

commit f9f1c8db1c37253805eaa32265e1e1af3ae7d0a4 upstream.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/mm/sc-ip22.c |   43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

--- a/arch/mips/mm/sc-ip22.c
+++ b/arch/mips/mm/sc-ip22.c
@@ -31,26 +31,29 @@ static inline void indy_sc_wipe(unsigned
 	unsigned long tmp;
 
 	__asm__ __volatile__(
-	".set\tpush\t\t\t# indy_sc_wipe\n\t"
-	".set\tnoreorder\n\t"
-	".set\tmips3\n\t"
-	".set\tnoat\n\t"
-	"mfc0\t%2, $12\n\t"
-	"li\t$1, 0x80\t\t\t# Go 64 bit\n\t"
-	"mtc0\t$1, $12\n\t"
-
-	"dli\t$1, 0x9000000080000000\n\t"
-	"or\t%0, $1\t\t\t# first line to flush\n\t"
-	"or\t%1, $1\t\t\t# last line to flush\n\t"
-	".set\tat\n\t"
-
-	"1:\tsw\t$0, 0(%0)\n\t"
-	"bne\t%0, %1, 1b\n\t"
-	" daddu\t%0, 32\n\t"
-
-	"mtc0\t%2, $12\t\t\t# Back to 32 bit\n\t"
-	"nop; nop; nop; nop;\n\t"
-	".set\tpop"
+	"	.set	push			# indy_sc_wipe		\n"
+	"	.set	noreorder					\n"
+	"	.set	mips3						\n"
+	"	.set	noat						\n"
+	"	mfc0	%2, $12						\n"
+	"	li	$1, 0x80		# Go 64 bit		\n"
+	"	mtc0	$1, $12						\n"
+	"								\n"
+	"	dli	$1, 0x9000000080000000				\n"
+	"	or	%0, $1			# first line to flush	\n"
+	"	or	%1, $1			# last line to flush	\n"
+	"	.set	at						\n"
+	"								\n"
+	"1:	sw	$0, 0(%0)					\n"
+	"	bne	%0, %1, 1b					\n"
+	"	 daddu	%0, 32						\n"
+	"								\n"
+	"	mtc0	%2, $12			# Back to 32 bit	\n"
+	"	nop				# pipeline hazard	\n"
+	"	nop							\n"
+	"	nop							\n"
+	"	nop							\n"
+	"	.set	pop						\n"
 	: "=r" (first), "=r" (last), "=&r" (tmp)
 	: "0" (first), "1" (last));
 }


Patches currently in stable-queue which might be from ralf@linux-mips.org are

queue-4.10/mips-calculate-micromips-ra-properly-when-unwinding-the-stack.patch
queue-4.10/mips-fix-get_frame_info-handling-of-micromips-function-size.patch
queue-4.10/mips-handle-micromips-jumps-in-the-same-way-as-mips32-mips64-jumps.patch
queue-4.10/mips-fix-is_jump_ins-handling-of-16b-micromips-instructions.patch
queue-4.10/mips-clear-isa-bit-correctly-in-get_frame_info.patch
queue-4.10/mips-ip22-reformat-inline-assembler-code-to-modern-standards.patch
queue-4.10/mips-fix-special-case-in-64-bit-ip-checksumming.patch
queue-4.10/mips-pic32mzda-fix-linker-error-for-pic32_get_pbclk.patch
queue-4.10/mips-octeon-fix-copy_from_user-fault-handling-for-large-buffers.patch
queue-4.10/mips-ip22-fix-build-error-due-to-binutils-2.25-uselessnes.patch
queue-4.10/mips-prevent-unaligned-accesses-during-stack-unwinding.patch