From bc2eca9a682881f9da3cc7e2d75b752e549a134d Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Fri, 9 Nov 2018 04:26:39 +0100
Subject: ARM: 8811/1: always list both ldrd/strd registers explicitly

The ldrd and strd instructions work on a pair of consecutive registers.
It is possible to specify either the first register in the pair, or both
registers explicitly. Let's always do the later to make things clearer.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 arch/arm/mm/copypage-xsc3.c | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'arch/arm/mm/copypage-xsc3.c')

diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c
index 55cbc3a89d85..a08158241ad1 100644
--- a/arch/arm/mm/copypage-xsc3.c
+++ b/arch/arm/mm/copypage-xsc3.c
@@ -37,25 +37,25 @@ static void xsc3_mc_copy_user_page(void *kto, const void *kfrom)
 1:	pld	[%1, #64]			\n\
 	pld	[%1, #96]			\n\
 						\n\
-2:	ldrd	r2, [%1], #8			\n\
-	ldrd	r4, [%1], #8			\n\
+2:	ldrd	r2, r3, [%1], #8		\n\
+	ldrd	r4, r5, [%1], #8		\n\
 	mcr	p15, 0, %0, c7, c6, 1		@ invalidate\n\
-	strd	r2, [%0], #8			\n\
-	ldrd	r2, [%1], #8			\n\
-	strd	r4, [%0], #8			\n\
-	ldrd	r4, [%1], #8			\n\
-	strd	r2, [%0], #8			\n\
-	strd	r4, [%0], #8			\n\
-	ldrd	r2, [%1], #8			\n\
-	ldrd	r4, [%1], #8			\n\
+	strd	r2, r3, [%0], #8		\n\
+	ldrd	r2, r3, [%1], #8		\n\
+	strd	r4, r5, [%0], #8		\n\
+	ldrd	r4, r5, [%1], #8		\n\
+	strd	r2, r3, [%0], #8		\n\
+	strd	r4, r5, [%0], #8		\n\
+	ldrd	r2, r3, [%1], #8		\n\
+	ldrd	r4, r5, [%1], #8		\n\
 	mcr	p15, 0, %0, c7, c6, 1		@ invalidate\n\
-	strd	r2, [%0], #8			\n\
-	ldrd	r2, [%1], #8			\n\
+	strd	r2, r3, [%0], #8		\n\
+	ldrd	r2, r3, [%1], #8		\n\
 	subs	%2, %2, #1			\n\
-	strd	r4, [%0], #8			\n\
-	ldrd	r4, [%1], #8			\n\
-	strd	r2, [%0], #8			\n\
-	strd	r4, [%0], #8			\n\
+	strd	r4, r5, [%0], #8		\n\
+	ldrd	r4, r5, [%1], #8		\n\
+	strd	r2, r3, [%0], #8		\n\
+	strd	r4, r5, [%0], #8		\n\
 	bgt	1b				\n\
 	beq	2b				"
 	: "+&r" (kto), "+&r" (kfrom), "=&r" (tmp)
@@ -87,10 +87,10 @@ void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 	mov	r2, #0				\n\
 	mov	r3, #0				\n\
 1:	mcr	p15, 0, %0, c7, c6, 1		@ invalidate line\n\
-	strd	r2, [%0], #8			\n\
-	strd	r2, [%0], #8			\n\
-	strd	r2, [%0], #8			\n\
-	strd	r2, [%0], #8			\n\
+	strd	r2, r3, [%0], #8		\n\
+	strd	r2, r3, [%0], #8		\n\
+	strd	r2, r3, [%0], #8		\n\
+	strd	r2, r3, [%0], #8		\n\
 	subs	r1, r1, #1			\n\
 	bne	1b"
 	: "=r" (ptr)
-- 
cgit