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

Commit 12863939 authored by Joshua Kinard's avatar Joshua Kinard Committed by Ralf Baechle
Browse files

MIPS: Adjust set_pte() SMP fix to handle R10000_LLSC_WAR 



Update the recent changes to set_pte() that were added in 46011e6e
to handle R10000_LLSC_WAR, and format the assembly to match other areas
of the MIPS tree using the same WAR.

This also incorporates a patch recently sent in my Markos Chandras,
"Remove local LL/SC preprocessor variants", so that patch doesn't need
to be applied if this one is accepted.

Signed-off-by: default avatarJoshua Kinard <kumba@gentoo.org>
Fixes: 46011e6e ("MIPS: Make set_pte() SMP safe.)
Cc: David Daney <david.daney@cavium.com>
Cc: Linux/MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/11103/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 05490626

arch/mips/include/asm/pgtable.h

+32 −13
Original line number Diff line number Diff line
@@ -190,20 +190,39 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) 
		unsigned long page_global = _PAGE_GLOBAL;

		unsigned long tmp;



		if (kernel_uses_llsc && R10000_LLSC_WAR) {

			__asm__ __volatile__ (

			"	.set	arch=r4000			\n"

			"	.set	push				\n"

			"	.set	noreorder			\n"

			"1:"	__LL	"%[tmp], %[buddy]		\n"

			"	bnez	%[tmp], 2f			\n"

			"	 or	%[tmp], %[tmp], %[global]	\n"

			"	" __SC "	%[tmp], %[buddy]\n"

				__SC	"%[tmp], %[buddy]		\n"

			"	beqzl	%[tmp], 1b			\n"

			"	nop					\n"

			"2:						\n"

			"	.set	pop				\n"

			"	.set	mips0				\n"

			: [buddy] "+m" (buddy->pte), [tmp] "=&r" (tmp)

			: [global] "r" (page_global));

		} else if (kernel_uses_llsc) {

			__asm__ __volatile__ (

			"	.set	"MIPS_ISA_ARCH_LEVEL"		\n"

			"	.set	push				\n"

			"	.set	noreorder			\n"

			"1:"	__LL	"%[tmp], %[buddy]		\n"

			"	bnez	%[tmp], 2f			\n"

			"	 or	%[tmp], %[tmp], %[global]	\n"

				__SC	"%[tmp], %[buddy]		\n"

			"	beqz	%[tmp], 1b			\n"

			"	nop					\n"

			"2:						\n"

			"	.set pop"

			: [buddy] "+m" (buddy->pte),

			  [tmp] "=&r" (tmp)

			"	.set	pop				\n"

			"	.set	mips0				\n"

			: [buddy] "+m" (buddy->pte), [tmp] "=&r" (tmp)

			: [global] "r" (page_global));

		}

#else /* !CONFIG_SMP */

		if (pte_none(*buddy))

			pte_val(*buddy) = pte_val(*buddy) | _PAGE_GLOBAL;