Commit 92ed4dbe authored by David S. Miller's avatar David S. Miller

SPARC64: Fix obscure cheetah+ hangs.

- Execute a membar #Sync after ASI_DCACHE_INVALIDATE store
instead of just at the end of the loop.  Plain cheetah seems
to be fine with the previous code but it upsets cheetah+.
parent f3e26957
...@@ -418,9 +418,9 @@ flush_dcpage_cheetah: /* 9 insns */ ...@@ -418,9 +418,9 @@ flush_dcpage_cheetah: /* 9 insns */
sethi %hi(PAGE_SIZE), %o4 sethi %hi(PAGE_SIZE), %o4
1: subcc %o4, (1 << 5), %o4 1: subcc %o4, (1 << 5), %o4
stxa %g0, [%o0 + %o4] ASI_DCACHE_INVALIDATE stxa %g0, [%o0 + %o4] ASI_DCACHE_INVALIDATE
membar #Sync
bne,pt %icc, 1b bne,pt %icc, 1b
nop nop
membar #Sync
retl /* I-cache flush never needed on Cheetah, see callers. */ retl /* I-cache flush never needed on Cheetah, see callers. */
nop nop
...@@ -588,9 +588,9 @@ xcall_flush_dcache_page_cheetah: /* %g1 == physical page address */ ...@@ -588,9 +588,9 @@ xcall_flush_dcache_page_cheetah: /* %g1 == physical page address */
sethi %hi(PAGE_SIZE), %g3 sethi %hi(PAGE_SIZE), %g3
1: subcc %g3, (1 << 5), %g3 1: subcc %g3, (1 << 5), %g3
stxa %g0, [%g1 + %g3] ASI_DCACHE_INVALIDATE stxa %g0, [%g1 + %g3] ASI_DCACHE_INVALIDATE
membar #Sync
bne,pt %icc, 1b bne,pt %icc, 1b
nop nop
membar #Sync
retry retry
nop nop
......
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