From bc2eca9a682881f9da3cc7e2d75b752e549a134d Mon Sep 17 00:00:00 2001 From: Nicolas Pitre 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 Suggested-by: Robin Murphy Signed-off-by: Russell King --- arch/arm/mm/copypage-xsc3.c | 40 ++++++++++++++++++++-------------------- arch/arm/mm/copypage-xscale.c | 40 ++++++++++++++++++++-------------------- arch/arm/mm/pv-fixup-asm.S | 16 ++++++++-------- 3 files changed, 48 insertions(+), 48 deletions(-) (limited to 'arch/arm/mm') 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) diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c index b0ae8c7acb48..63b921936754 100644 --- a/arch/arm/mm/copypage-xscale.c +++ b/arch/arm/mm/copypage-xscale.c @@ -53,26 +53,26 @@ static void mc_copy_user_page(void *from, void *to) pld [%0, #96] \n\ pld [%1, #64] \n\ pld [%1, #96] \n\ -2: ldrd r2, [%0], #8 \n\ - ldrd r4, [%0], #8 \n\ +2: ldrd r2, r3, [%0], #8 \n\ + ldrd r4, r5, [%0], #8 \n\ mov ip, %1 \n\ - strd r2, [%1], #8 \n\ - ldrd r2, [%0], #8 \n\ - strd r4, [%1], #8 \n\ - ldrd r4, [%0], #8 \n\ - strd r2, [%1], #8 \n\ - strd r4, [%1], #8 \n\ + strd r2, r3, [%1], #8 \n\ + ldrd r2, r3, [%0], #8 \n\ + strd r4, r5, [%1], #8 \n\ + ldrd r4, r5, [%0], #8 \n\ + strd r2, r3, [%1], #8 \n\ + strd r4, r5, [%1], #8 \n\ mcr p15, 0, ip, c7, c10, 1 @ clean D line\n\ - ldrd r2, [%0], #8 \n\ + ldrd r2, r3, [%0], #8 \n\ mcr p15, 0, ip, c7, c6, 1 @ invalidate D line\n\ - ldrd r4, [%0], #8 \n\ + ldrd r4, r5, [%0], #8 \n\ mov ip, %1 \n\ - strd r2, [%1], #8 \n\ - ldrd r2, [%0], #8 \n\ - strd r4, [%1], #8 \n\ - ldrd r4, [%0], #8 \n\ - strd r2, [%1], #8 \n\ - strd r4, [%1], #8 \n\ + strd r2, r3, [%1], #8 \n\ + ldrd r2, r3, [%0], #8 \n\ + strd r4, r5, [%1], #8 \n\ + ldrd r4, r5, [%0], #8 \n\ + strd r2, r3, [%1], #8 \n\ + strd r4, r5, [%1], #8 \n\ mcr p15, 0, ip, c7, c10, 1 @ clean D line\n\ subs %2, %2, #1 \n\ mcr p15, 0, ip, c7, c6, 1 @ invalidate D line\n\ @@ -114,10 +114,10 @@ xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr) mov r2, #0 \n\ mov r3, #0 \n\ 1: mov ip, %0 \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\ mcr p15, 0, ip, c7, c10, 1 @ clean D line\n\ subs r1, r1, #1 \n\ mcr p15, 0, ip, c7, c6, 1 @ invalidate D line\n\ diff --git a/arch/arm/mm/pv-fixup-asm.S b/arch/arm/mm/pv-fixup-asm.S index 1867f3e43016..fd2ff9034d17 100644 --- a/arch/arm/mm/pv-fixup-asm.S +++ b/arch/arm/mm/pv-fixup-asm.S @@ -33,10 +33,10 @@ ENTRY(lpae_pgtables_remap_asm) add r7, r2, #0x1000 add r6, r7, r6, lsr #SECTION_SHIFT - L2_ORDER add r7, r7, #PAGE_OFFSET >> (SECTION_SHIFT - L2_ORDER) -1: ldrd r4, [r7] +1: ldrd r4, r5, [r7] adds r4, r4, r0 adc r5, r5, r1 - strd r4, [r7], #1 << L2_ORDER + strd r4, r5, [r7], #1 << L2_ORDER cmp r7, r6 bls 1b @@ -44,22 +44,22 @@ ENTRY(lpae_pgtables_remap_asm) add r7, r2, #0x1000 add r7, r7, r3, lsr #SECTION_SHIFT - L2_ORDER bic r7, r7, #(1 << L2_ORDER) - 1 - ldrd r4, [r7] + ldrd r4, r5, [r7] adds r4, r4, r0 adc r5, r5, r1 - strd r4, [r7], #1 << L2_ORDER - ldrd r4, [r7] + strd r4, r5, [r7], #1 << L2_ORDER + ldrd r4, r5, [r7] adds r4, r4, r0 adc r5, r5, r1 - strd r4, [r7] + strd r4, r5, [r7] /* Update level 1 entries */ mov r6, #4 mov r7, r2 -2: ldrd r4, [r7] +2: ldrd r4, r5, [r7] adds r4, r4, r0 adc r5, r5, r1 - strd r4, [r7], #1 << L1_ORDER + strd r4, r5, [r7], #1 << L1_ORDER subs r6, r6, #1 bne 2b -- cgit v1.2.3