Commit 5035b230 authored by John David Anglin's avatar John David Anglin Committed by Helge Deller
Browse files

parisc: Also flush data TLB in flush_icache_page_asm



This is the second issue I noticed in reviewing the parisc TLB code.

The fic instruction may use either the instruction or data TLB in
flushing the instruction cache.  Thus, on machines with a split TLB, we
should also flush the data TLB after setting up the temporary alias
registers.

Although this has no functional impact, I changed the pdtlb and pitlb
instructions to consistently use the index register %r0.  These
instructions do not support integer displacements.

Tested on rp3440 and c8000.
Signed-off-by: default avatarJohn David Anglin  <dave.anglin@bell.net>
Cc: <stable@vger.kernel.org> # v3.16+
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent c0452fb9
...@@ -96,7 +96,7 @@ fitmanyloop: /* Loop if LOOP >= 2 */ ...@@ -96,7 +96,7 @@ fitmanyloop: /* Loop if LOOP >= 2 */
fitmanymiddle: /* Loop if LOOP >= 2 */ fitmanymiddle: /* Loop if LOOP >= 2 */
addib,COND(>) -1, %r31, fitmanymiddle /* Adjusted inner loop decr */ addib,COND(>) -1, %r31, fitmanymiddle /* Adjusted inner loop decr */
pitlbe 0(%sr1, %r28) pitlbe %r0(%sr1, %r28)
pitlbe,m %arg1(%sr1, %r28) /* Last pitlbe and addr adjust */ pitlbe,m %arg1(%sr1, %r28) /* Last pitlbe and addr adjust */
addib,COND(>) -1, %r29, fitmanymiddle /* Middle loop decr */ addib,COND(>) -1, %r29, fitmanymiddle /* Middle loop decr */
copy %arg3, %r31 /* Re-init inner loop count */ copy %arg3, %r31 /* Re-init inner loop count */
...@@ -139,7 +139,7 @@ fdtmanyloop: /* Loop if LOOP >= 2 */ ...@@ -139,7 +139,7 @@ fdtmanyloop: /* Loop if LOOP >= 2 */
fdtmanymiddle: /* Loop if LOOP >= 2 */ fdtmanymiddle: /* Loop if LOOP >= 2 */
addib,COND(>) -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */ addib,COND(>) -1, %r31, fdtmanymiddle /* Adjusted inner loop decr */
pdtlbe 0(%sr1, %r28) pdtlbe %r0(%sr1, %r28)
pdtlbe,m %arg1(%sr1, %r28) /* Last pdtlbe and addr adjust */ pdtlbe,m %arg1(%sr1, %r28) /* Last pdtlbe and addr adjust */
addib,COND(>) -1, %r29, fdtmanymiddle /* Middle loop decr */ addib,COND(>) -1, %r29, fdtmanymiddle /* Middle loop decr */
copy %arg3, %r31 /* Re-init inner loop count */ copy %arg3, %r31 /* Re-init inner loop count */
...@@ -626,12 +626,12 @@ ENTRY_CFI(copy_user_page_asm) ...@@ -626,12 +626,12 @@ ENTRY_CFI(copy_user_page_asm)
/* Purge any old translations */ /* Purge any old translations */
#ifdef CONFIG_PA20 #ifdef CONFIG_PA20
pdtlb,l 0(%r28) pdtlb,l %r0(%r28)
pdtlb,l 0(%r29) pdtlb,l %r0(%r29)
#else #else
tlb_lock %r20,%r21,%r22 tlb_lock %r20,%r21,%r22
pdtlb 0(%r28) pdtlb %r0(%r28)
pdtlb 0(%r29) pdtlb %r0(%r29)
tlb_unlock %r20,%r21,%r22 tlb_unlock %r20,%r21,%r22
#endif #endif
...@@ -774,10 +774,10 @@ ENTRY_CFI(clear_user_page_asm) ...@@ -774,10 +774,10 @@ ENTRY_CFI(clear_user_page_asm)
/* Purge any old translation */ /* Purge any old translation */
#ifdef CONFIG_PA20 #ifdef CONFIG_PA20
pdtlb,l 0(%r28) pdtlb,l %r0(%r28)
#else #else
tlb_lock %r20,%r21,%r22 tlb_lock %r20,%r21,%r22
pdtlb 0(%r28) pdtlb %r0(%r28)
tlb_unlock %r20,%r21,%r22 tlb_unlock %r20,%r21,%r22
#endif #endif
...@@ -858,10 +858,10 @@ ENTRY_CFI(flush_dcache_page_asm) ...@@ -858,10 +858,10 @@ ENTRY_CFI(flush_dcache_page_asm)
/* Purge any old translation */ /* Purge any old translation */
#ifdef CONFIG_PA20 #ifdef CONFIG_PA20
pdtlb,l 0(%r28) pdtlb,l %r0(%r28)
#else #else
tlb_lock %r20,%r21,%r22 tlb_lock %r20,%r21,%r22
pdtlb 0(%r28) pdtlb %r0(%r28)
tlb_unlock %r20,%r21,%r22 tlb_unlock %r20,%r21,%r22
#endif #endif
...@@ -898,10 +898,10 @@ ENTRY_CFI(flush_dcache_page_asm) ...@@ -898,10 +898,10 @@ ENTRY_CFI(flush_dcache_page_asm)
sync sync
#ifdef CONFIG_PA20 #ifdef CONFIG_PA20
pdtlb,l 0(%r25) pdtlb,l %r0(%r25)
#else #else
tlb_lock %r20,%r21,%r22 tlb_lock %r20,%r21,%r22
pdtlb 0(%r25) pdtlb %r0(%r25)
tlb_unlock %r20,%r21,%r22 tlb_unlock %r20,%r21,%r22
#endif #endif
...@@ -931,13 +931,18 @@ ENTRY_CFI(flush_icache_page_asm) ...@@ -931,13 +931,18 @@ ENTRY_CFI(flush_icache_page_asm)
depwi 0, 31,PAGE_SHIFT, %r28 /* Clear any offset bits */ depwi 0, 31,PAGE_SHIFT, %r28 /* Clear any offset bits */
#endif #endif
/* Purge any old translation */ /* Purge any old translation. Note that the FIC instruction
* may use either the instruction or data TLB. Given that we
* have a flat address space, it's not clear which TLB will be
* used. So, we purge both entries. */
#ifdef CONFIG_PA20 #ifdef CONFIG_PA20
pdtlb,l %r0(%r28)
pitlb,l %r0(%sr4,%r28) pitlb,l %r0(%sr4,%r28)
#else #else
tlb_lock %r20,%r21,%r22 tlb_lock %r20,%r21,%r22
pitlb (%sr4,%r28) pdtlb %r0(%r28)
pitlb %r0(%sr4,%r28)
tlb_unlock %r20,%r21,%r22 tlb_unlock %r20,%r21,%r22
#endif #endif
...@@ -976,10 +981,12 @@ ENTRY_CFI(flush_icache_page_asm) ...@@ -976,10 +981,12 @@ ENTRY_CFI(flush_icache_page_asm)
sync sync
#ifdef CONFIG_PA20 #ifdef CONFIG_PA20
pdtlb,l %r0(%r28)
pitlb,l %r0(%sr4,%r25) pitlb,l %r0(%sr4,%r25)
#else #else
tlb_lock %r20,%r21,%r22 tlb_lock %r20,%r21,%r22
pitlb (%sr4,%r25) pdtlb %r0(%r28)
pitlb %r0(%sr4,%r25)
tlb_unlock %r20,%r21,%r22 tlb_unlock %r20,%r21,%r22
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment