aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib/copy_32.S
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-16 21:50:32 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-16 21:50:32 -0400
commit7dffb72028bfd909ac51a1546d182de2df4d2426 (patch)
treec465c35642872973543f710f8aa06b955b84f7e5 /arch/powerpc/lib/copy_32.S
parentcf764855620aa1aa5b134687ca18b841ac9be4c7 (diff)
ppc32: use L1_CACHE_SHIFT/L1_CACHE_BYTES
instead of L1_CACHE_LINE_SIZE and LG_L1_CACHE_LINE_SIZE Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/lib/copy_32.S')
-rw-r--r--arch/powerpc/lib/copy_32.S24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/powerpc/lib/copy_32.S b/arch/powerpc/lib/copy_32.S
index 420a912198a2..bee51414812e 100644
--- a/arch/powerpc/lib/copy_32.S
+++ b/arch/powerpc/lib/copy_32.S
@@ -66,9 +66,9 @@
66 .stabs "copy32.S",N_SO,0,0,0f 66 .stabs "copy32.S",N_SO,0,0,0f
670: 670:
68 68
69CACHELINE_BYTES = L1_CACHE_LINE_SIZE 69CACHELINE_BYTES = L1_CACHE_BYTES
70LG_CACHELINE_BYTES = LG_L1_CACHE_LINE_SIZE 70LG_CACHELINE_BYTES = L1_CACHE_SHIFT
71CACHELINE_MASK = (L1_CACHE_LINE_SIZE-1) 71CACHELINE_MASK = (L1_CACHE_BYTES-1)
72 72
73/* 73/*
74 * Use dcbz on the complete cache lines in the destination 74 * Use dcbz on the complete cache lines in the destination
@@ -205,12 +205,12 @@ _GLOBAL(cacheable_memcpy)
205 dcbz r11,r6 205 dcbz r11,r6
206#endif 206#endif
207 COPY_16_BYTES 207 COPY_16_BYTES
208#if L1_CACHE_LINE_SIZE >= 32 208#if L1_CACHE_BYTES >= 32
209 COPY_16_BYTES 209 COPY_16_BYTES
210#if L1_CACHE_LINE_SIZE >= 64 210#if L1_CACHE_BYTES >= 64
211 COPY_16_BYTES 211 COPY_16_BYTES
212 COPY_16_BYTES 212 COPY_16_BYTES
213#if L1_CACHE_LINE_SIZE >= 128 213#if L1_CACHE_BYTES >= 128
214 COPY_16_BYTES 214 COPY_16_BYTES
215 COPY_16_BYTES 215 COPY_16_BYTES
216 COPY_16_BYTES 216 COPY_16_BYTES
@@ -399,12 +399,12 @@ _GLOBAL(__copy_tofrom_user)
399 .text 399 .text
400/* the main body of the cacheline loop */ 400/* the main body of the cacheline loop */
401 COPY_16_BYTES_WITHEX(0) 401 COPY_16_BYTES_WITHEX(0)
402#if L1_CACHE_LINE_SIZE >= 32 402#if L1_CACHE_BYTES >= 32
403 COPY_16_BYTES_WITHEX(1) 403 COPY_16_BYTES_WITHEX(1)
404#if L1_CACHE_LINE_SIZE >= 64 404#if L1_CACHE_BYTES >= 64
405 COPY_16_BYTES_WITHEX(2) 405 COPY_16_BYTES_WITHEX(2)
406 COPY_16_BYTES_WITHEX(3) 406 COPY_16_BYTES_WITHEX(3)
407#if L1_CACHE_LINE_SIZE >= 128 407#if L1_CACHE_BYTES >= 128
408 COPY_16_BYTES_WITHEX(4) 408 COPY_16_BYTES_WITHEX(4)
409 COPY_16_BYTES_WITHEX(5) 409 COPY_16_BYTES_WITHEX(5)
410 COPY_16_BYTES_WITHEX(6) 410 COPY_16_BYTES_WITHEX(6)
@@ -458,12 +458,12 @@ _GLOBAL(__copy_tofrom_user)
458 * 104f (if in read part) or 105f (if in write part), after updating r5 458 * 104f (if in read part) or 105f (if in write part), after updating r5
459 */ 459 */
460 COPY_16_BYTES_EXCODE(0) 460 COPY_16_BYTES_EXCODE(0)
461#if L1_CACHE_LINE_SIZE >= 32 461#if L1_CACHE_BYTES >= 32
462 COPY_16_BYTES_EXCODE(1) 462 COPY_16_BYTES_EXCODE(1)
463#if L1_CACHE_LINE_SIZE >= 64 463#if L1_CACHE_BYTES >= 64
464 COPY_16_BYTES_EXCODE(2) 464 COPY_16_BYTES_EXCODE(2)
465 COPY_16_BYTES_EXCODE(3) 465 COPY_16_BYTES_EXCODE(3)
466#if L1_CACHE_LINE_SIZE >= 128 466#if L1_CACHE_BYTES >= 128
467 COPY_16_BYTES_EXCODE(4) 467 COPY_16_BYTES_EXCODE(4)
468 COPY_16_BYTES_EXCODE(5) 468 COPY_16_BYTES_EXCODE(5)
469 COPY_16_BYTES_EXCODE(6) 469 COPY_16_BYTES_EXCODE(6)