projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 82c08c3)
ARM: 8811/1: always list both ldrd/strd registers explicitly
authorNicolas Pitre <nicolas.pitre@linaro.org>
Fri, 9 Nov 2018 03:26:39 +0000 (04:26 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 12 Nov 2018 10:51:54 +0000 (10:51 +0000)
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/kernel/head.S patch | blob | history
arch/arm/mm/copypage-xsc3.c patch | blob | history
arch/arm/mm/copypage-xscale.c patch | blob | history
arch/arm/mm/pv-fixup-asm.S patch | blob | history

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 6b1148c..4485d04 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -398,7 +398,7 @@ ENTRY(secondary_startup)
        ldmia   r4, {r5, r7, r12}               @ address to jump to after
        sub     lr, r4, r5                      @ mmu has been enabled
        add     r3, r7, lr
-       ldrd    r4, [r3, #0]                    @ get secondary_data.pgdir
+       ldrd    r4, r5, [r3, #0]                @ get secondary_data.pgdir
 ARM_BE8(eor    r4, r4, r5)                     @ Swap r5 and r4 in BE:
 ARM_BE8(eor    r5, r4, r5)                     @ it can be done in 3 steps
 ARM_BE8(eor    r4, r4, r5)                     @ without using a temp reg.
diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c
index 55cbc3a..a081582 100644 (file)
--- 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 b0ae8c7..63b9219 100644 (file)
--- 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 1867f3e..fd2ff90 100644 (file)
--- 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
 
Domain: System / Kernel;