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>

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 108e78ef3878a9e5929a7066c9bd5a3d90d1a9e5..d9b063f567e01db15ba17f1cffc4c1231ed56a7e 100644 (file)
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -837,7 +837,7 @@ relocate_kernel:
 copy_and_flush:
        addi    r5,r5,-4
        addi    r6,r6,-4
 copy_and_flush:
        addi    r5,r5,-4
        addi    r6,r6,-4

-4:     li      r0,L1_CACHE_LINE_SIZE/4
+4:     li      r0,L1_CACHE_BYTES/4

        mtctr   r0
 3:     addi    r6,r6,4                 /* copy a cache line */
        lwzx    r0,r6,r4
        mtctr   r0
 3:     addi    r6,r6,4                 /* copy a cache line */
        lwzx    r0,r6,r4

diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 27274108116f670acdcbda37ce5c6683ae630d1a..0b0e908b50652bee6a9471349e49953f9d4ff771 100644 (file)
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -496,21 +496,21 @@ _GLOBAL(flush_icache_range)
 BEGIN_FTR_SECTION
        blr                             /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
 BEGIN_FTR_SECTION
        blr                             /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
        mr      r6,r3
 1:     dcbst   0,r3
        beqlr
        mtctr   r4
        mr      r6,r3
 1:     dcbst   0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        mtctr   r4
 2:     icbi    0,r6
        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        mtctr   r4
 2:     icbi    0,r6

-       addi    r6,r6,L1_CACHE_LINE_SIZE
+       addi    r6,r6,L1_CACHE_BYTES

        bdnz    2b
        sync                            /* additional sync needed on g4 */
        isync
        bdnz    2b
        sync                            /* additional sync needed on g4 */
        isync


@@ -523,16 +523,16 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
  * clean_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(clean_dcache_range)
  * clean_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(clean_dcache_range)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
 
 1:     dcbst   0,r3
        beqlr
        mtctr   r4
 
 1:     dcbst   0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr
        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr


@@ -544,16 +544,16 @@ _GLOBAL(clean_dcache_range)
  * flush_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(flush_dcache_range)
  * flush_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(flush_dcache_range)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
 
 1:     dcbf    0,r3
        beqlr
        mtctr   r4
 
 1:     dcbf    0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr
        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr


@@ -566,16 +566,16 @@ _GLOBAL(flush_dcache_range)
  * invalidate_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(invalidate_dcache_range)
  * invalidate_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(invalidate_dcache_range)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
 
 1:     dcbi    0,r3
        beqlr
        mtctr   r4
 
 1:     dcbi    0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbi's to get to ram */
        blr
        bdnz    1b
        sync                            /* wait for dcbi's to get to ram */
        blr


@@ -596,7 +596,7 @@ _GLOBAL(flush_dcache_all)
        mtctr   r4
        lis     r5, KERNELBASE@h
 1:     lwz     r3, 0(r5)               /* Load one word from every line */
        mtctr   r4
        lis     r5, KERNELBASE@h
 1:     lwz     r3, 0(r5)               /* Load one word from every line */

-       addi    r5, r5, L1_CACHE_LINE_SIZE
+       addi    r5, r5, L1_CACHE_BYTES

        bdnz    1b
        blr
 #endif /* CONFIG_NOT_COHERENT_CACHE */
        bdnz    1b
        blr
 #endif /* CONFIG_NOT_COHERENT_CACHE */


@@ -614,16 +614,16 @@ BEGIN_FTR_SECTION
        blr                                     /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
        rlwinm  r3,r3,0,0,19                    /* Get page base address */
        blr                                     /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
        rlwinm  r3,r3,0,0,19                    /* Get page base address */

-       li      r4,4096/L1_CACHE_LINE_SIZE      /* Number of lines in a page */
+       li      r4,4096/L1_CACHE_BYTES  /* Number of lines in a page */

        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */
        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6
        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6

-       addi    r6,r6,L1_CACHE_LINE_SIZE
+       addi    r6,r6,L1_CACHE_BYTES

        bdnz    1b
        sync
        isync
        bdnz    1b
        sync
        isync


@@ -646,16 +646,16 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
        mtmsr   r0
        isync
        rlwinm  r3,r3,0,0,19                    /* Get page base address */
        mtmsr   r0
        isync
        rlwinm  r3,r3,0,0,19                    /* Get page base address */

-       li      r4,4096/L1_CACHE_LINE_SIZE      /* Number of lines in a page */
+       li      r4,4096/L1_CACHE_BYTES  /* Number of lines in a page */

        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */
        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6
        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6

-       addi    r6,r6,L1_CACHE_LINE_SIZE
+       addi    r6,r6,L1_CACHE_BYTES

        bdnz    1b
        sync
        mtmsr   r10                             /* restore DR */
        bdnz    1b
        sync
        mtmsr   r10                             /* restore DR */


@@ -670,7 +670,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
  * void clear_pages(void *page, int order) ;
  */
 _GLOBAL(clear_pages)
  * void clear_pages(void *page, int order) ;
  */
 _GLOBAL(clear_pages)

-       li      r0,4096/L1_CACHE_LINE_SIZE
+       li      r0,4096/L1_CACHE_BYTES

        slw     r0,r0,r4
        mtctr   r0
 #ifdef CONFIG_8xx
        slw     r0,r0,r4
        mtctr   r0
 #ifdef CONFIG_8xx


@@ -682,7 +682,7 @@ _GLOBAL(clear_pages)
 #else
 1:     dcbz    0,r3
 #endif
 #else
 1:     dcbz    0,r3
 #endif

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        blr
 
        bdnz    1b
        blr
 


@@ -708,7 +708,7 @@ _GLOBAL(copy_page)
 
 #ifdef CONFIG_8xx
        /* don't use prefetch on 8xx */
 
 #ifdef CONFIG_8xx
        /* don't use prefetch on 8xx */

-       li      r0,4096/L1_CACHE_LINE_SIZE
+       li      r0,4096/L1_CACHE_BYTES

        mtctr   r0
 1:     COPY_16_BYTES
        bdnz    1b
        mtctr   r0
 1:     COPY_16_BYTES
        bdnz    1b


@@ -722,13 +722,13 @@ _GLOBAL(copy_page)
        li      r11,4
        mtctr   r0
 11:    dcbt    r11,r4
        li      r11,4
        mtctr   r0
 11:    dcbt    r11,r4

-       addi    r11,r11,L1_CACHE_LINE_SIZE
+       addi    r11,r11,L1_CACHE_BYTES

        bdnz    11b
 #else /* MAX_COPY_PREFETCH == 1 */
        dcbt    r5,r4
        bdnz    11b
 #else /* MAX_COPY_PREFETCH == 1 */
        dcbt    r5,r4

-       li      r11,L1_CACHE_LINE_SIZE+4
+       li      r11,L1_CACHE_BYTES+4

 #endif /* MAX_COPY_PREFETCH */
 #endif /* MAX_COPY_PREFETCH */

-       li      r0,4096/L1_CACHE_LINE_SIZE - MAX_COPY_PREFETCH
+       li      r0,4096/L1_CACHE_BYTES - MAX_COPY_PREFETCH

        crclr   4*cr0+eq
 2:
        mtctr   r0
        crclr   4*cr0+eq
 2:
        mtctr   r0


@@ -736,12 +736,12 @@ _GLOBAL(copy_page)
        dcbt    r11,r4
        dcbz    r5,r3
        COPY_16_BYTES
        dcbt    r11,r4
        dcbz    r5,r3
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES

diff --git a/arch/powerpc/lib/copy_32.S b/arch/powerpc/lib/copy_32.S
index 420a912198a234df56738e3a7fb8b781ea7390b4..bee51414812ebda0241f99983a454709e3326e8d 100644 (file)
--- a/arch/powerpc/lib/copy_32.S
+++ b/arch/powerpc/lib/copy_32.S
@@ -66,9 +66,9 @@
        .stabs  "copy32.S",N_SO,0,0,0f
 0:
 
        .stabs  "copy32.S",N_SO,0,0,0f
 0:
 

-CACHELINE_BYTES = L1_CACHE_LINE_SIZE
-LG_CACHELINE_BYTES = LG_L1_CACHE_LINE_SIZE
-CACHELINE_MASK = (L1_CACHE_LINE_SIZE-1)
+CACHELINE_BYTES = L1_CACHE_BYTES
+LG_CACHELINE_BYTES = L1_CACHE_SHIFT
+CACHELINE_MASK = (L1_CACHE_BYTES-1)

 
 /*
  * Use dcbz on the complete cache lines in the destination
 
 /*
  * Use dcbz on the complete cache lines in the destination


@@ -205,12 +205,12 @@ _GLOBAL(cacheable_memcpy)
        dcbz    r11,r6
 #endif
        COPY_16_BYTES
        dcbz    r11,r6
 #endif
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES


@@ -399,12 +399,12 @@ _GLOBAL(__copy_tofrom_user)
        .text
 /* the main body of the cacheline loop */
        COPY_16_BYTES_WITHEX(0)
        .text
 /* the main body of the cacheline loop */
        COPY_16_BYTES_WITHEX(0)

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES_WITHEX(1)
        COPY_16_BYTES_WITHEX(1)

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES_WITHEX(2)
        COPY_16_BYTES_WITHEX(3)
        COPY_16_BYTES_WITHEX(2)
        COPY_16_BYTES_WITHEX(3)

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES_WITHEX(4)
        COPY_16_BYTES_WITHEX(5)
        COPY_16_BYTES_WITHEX(6)
        COPY_16_BYTES_WITHEX(4)
        COPY_16_BYTES_WITHEX(5)
        COPY_16_BYTES_WITHEX(6)


@@ -458,12 +458,12 @@ _GLOBAL(__copy_tofrom_user)
  * 104f (if in read part) or 105f (if in write part), after updating r5
  */
        COPY_16_BYTES_EXCODE(0)
  * 104f (if in read part) or 105f (if in write part), after updating r5
  */
        COPY_16_BYTES_EXCODE(0)

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES_EXCODE(1)
        COPY_16_BYTES_EXCODE(1)

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES_EXCODE(2)
        COPY_16_BYTES_EXCODE(3)
        COPY_16_BYTES_EXCODE(2)
        COPY_16_BYTES_EXCODE(3)

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES_EXCODE(4)
        COPY_16_BYTES_EXCODE(5)
        COPY_16_BYTES_EXCODE(6)
        COPY_16_BYTES_EXCODE(4)
        COPY_16_BYTES_EXCODE(5)
        COPY_16_BYTES_EXCODE(6)

diff --git a/arch/powerpc/platforms/powermac/sleep.S b/arch/powerpc/platforms/powermac/sleep.S
index 88419c77ac439cd72b341c59dab10201efee9240..22b113d19b2442089726f7901a5e2e07a3a3b491 100644 (file)
--- a/arch/powerpc/platforms/powermac/sleep.S
+++ b/arch/powerpc/platforms/powermac/sleep.S
@@ -387,10 +387,10 @@ turn_on_mmu:
 #endif /* defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ) */
 
        .section .data
 #endif /* defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ) */
 
        .section .data

-       .balign L1_CACHE_LINE_SIZE
+       .balign L1_CACHE_BYTES

 sleep_storage:
        .long 0
 sleep_storage:
        .long 0

-       .balign L1_CACHE_LINE_SIZE, 0
+       .balign L1_CACHE_BYTES, 0

 
 #endif /* CONFIG_6xx */
        .section .text
 
 #endif /* CONFIG_6xx */
        .section .text

diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S
index a5333c07fc3c13ff611c8d52b4b2d4426034d8d3..55ed7716636f45d02135f46728a2fab8beb07c97 100644 (file)
--- a/arch/ppc/kernel/cpu_setup_6xx.S
+++ b/arch/ppc/kernel/cpu_setup_6xx.S
@@ -290,10 +290,10 @@ _GLOBAL(__init_fpu_registers)
 #define CS_SIZE                32
 
        .data
 #define CS_SIZE                32
 
        .data

-       .balign L1_CACHE_LINE_SIZE
+       .balign L1_CACHE_BYTES

 cpu_state_storage:
        .space  CS_SIZE
 cpu_state_storage:
        .space  CS_SIZE

-       .balign L1_CACHE_LINE_SIZE,0
+       .balign L1_CACHE_BYTES,0

        .text
 
 /* Called in normal context to backup CPU 0 state. This
        .text
 
 /* Called in normal context to backup CPU 0 state. This

diff --git a/arch/ppc/kernel/cpu_setup_power4.S b/arch/ppc/kernel/cpu_setup_power4.S
index 0abb5f25b2ca5201535787487fe56e16c36eb6b8..d7bfd60e21fc2e0cc8660bd44e5e7cb4f75706c0 100644 (file)
--- a/arch/ppc/kernel/cpu_setup_power4.S
+++ b/arch/ppc/kernel/cpu_setup_power4.S
@@ -86,10 +86,10 @@ _GLOBAL(__setup_cpu_ppc970)
 #define CS_SIZE                32
 
        .data
 #define CS_SIZE                32
 
        .data

-       .balign L1_CACHE_LINE_SIZE
+       .balign L1_CACHE_BYTES

 cpu_state_storage:     
        .space  CS_SIZE
 cpu_state_storage:     
        .space  CS_SIZE

-       .balign L1_CACHE_LINE_SIZE,0
+       .balign L1_CACHE_BYTES,0

        .text
        
 /* Called in normal context to backup CPU 0 state. This
        .text
        
 /* Called in normal context to backup CPU 0 state. This

diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index 5b43987a943bce1342e15ca5c91daed1de2b2fe2..c5a890dca9cf20405eacb7a4985f5b4eeab314aa 100644 (file)
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -916,7 +916,7 @@ relocate_kernel:
 copy_and_flush:
        addi    r5,r5,-4
        addi    r6,r6,-4
 copy_and_flush:
        addi    r5,r5,-4
        addi    r6,r6,-4

-4:     li      r0,L1_CACHE_LINE_SIZE/4
+4:     li      r0,L1_CACHE_BYTES/4

        mtctr   r0
 3:     addi    r6,r6,4                 /* copy a cache line */
        lwzx    r0,r6,r4
        mtctr   r0
 3:     addi    r6,r6,4                 /* copy a cache line */
        lwzx    r0,r6,r4

diff --git a/arch/ppc/kernel/l2cr.S b/arch/ppc/kernel/l2cr.S
index 861115249b3595fcadcb6319fef16e97de96c940..d7f4e982b53924b61d11e1df357e73487cdc0eac 100644 (file)
--- a/arch/ppc/kernel/l2cr.S
+++ b/arch/ppc/kernel/l2cr.S
@@ -203,7 +203,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
         * L1 icache
         */
        b       20f
         * L1 icache
         */
        b       20f

-       .balign L1_CACHE_LINE_SIZE
+       .balign L1_CACHE_BYTES

 22:
        sync
        mtspr   SPRN_L2CR,r3
 22:
        sync
        mtspr   SPRN_L2CR,r3

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 2b9a16274b0b4f1b9a45f88bd6f99ee69817b78d..2350f3e09f953e04ce1e1b57be8cbdab919531d2 100644 (file)
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -498,21 +498,21 @@ _GLOBAL(flush_icache_range)
 BEGIN_FTR_SECTION
        blr                             /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
 BEGIN_FTR_SECTION
        blr                             /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
        mr      r6,r3
 1:     dcbst   0,r3
        beqlr
        mtctr   r4
        mr      r6,r3
 1:     dcbst   0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        mtctr   r4
 2:     icbi    0,r6
        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        mtctr   r4
 2:     icbi    0,r6

-       addi    r6,r6,L1_CACHE_LINE_SIZE
+       addi    r6,r6,L1_CACHE_BYTES

        bdnz    2b
        sync                            /* additional sync needed on g4 */
        isync
        bdnz    2b
        sync                            /* additional sync needed on g4 */
        isync


@@ -525,16 +525,16 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
  * clean_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(clean_dcache_range)
  * clean_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(clean_dcache_range)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
 
 1:     dcbst   0,r3
        beqlr
        mtctr   r4
 
 1:     dcbst   0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr
        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr


@@ -546,16 +546,16 @@ _GLOBAL(clean_dcache_range)
  * flush_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(flush_dcache_range)
  * flush_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(flush_dcache_range)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
 
 1:     dcbf    0,r3
        beqlr
        mtctr   r4
 
 1:     dcbf    0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr
        bdnz    1b
        sync                            /* wait for dcbst's to get to ram */
        blr


@@ -568,16 +568,16 @@ _GLOBAL(flush_dcache_range)
  * invalidate_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(invalidate_dcache_range)
  * invalidate_dcache_range(unsigned long start, unsigned long stop)
  */
 _GLOBAL(invalidate_dcache_range)

-       li      r5,L1_CACHE_LINE_SIZE-1
+       li      r5,L1_CACHE_BYTES-1

        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5
        andc    r3,r3,r5
        subf    r4,r3,r4
        add     r4,r4,r5

-       srwi.   r4,r4,LG_L1_CACHE_LINE_SIZE
+       srwi.   r4,r4,L1_CACHE_SHIFT

        beqlr
        mtctr   r4
 
 1:     dcbi    0,r3
        beqlr
        mtctr   r4
 
 1:     dcbi    0,r3

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        sync                            /* wait for dcbi's to get to ram */
        blr
        bdnz    1b
        sync                            /* wait for dcbi's to get to ram */
        blr


@@ -598,7 +598,7 @@ _GLOBAL(flush_dcache_all)
        mtctr   r4
        lis     r5, KERNELBASE@h
 1:     lwz     r3, 0(r5)               /* Load one word from every line */
        mtctr   r4
        lis     r5, KERNELBASE@h
 1:     lwz     r3, 0(r5)               /* Load one word from every line */

-       addi    r5, r5, L1_CACHE_LINE_SIZE
+       addi    r5, r5, L1_CACHE_BYTES

        bdnz    1b
        blr
 #endif /* CONFIG_NOT_COHERENT_CACHE */
        bdnz    1b
        blr
 #endif /* CONFIG_NOT_COHERENT_CACHE */


@@ -616,16 +616,16 @@ BEGIN_FTR_SECTION
        blr                                     /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
        rlwinm  r3,r3,0,0,19                    /* Get page base address */
        blr                                     /* for 601, do nothing */
 END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
        rlwinm  r3,r3,0,0,19                    /* Get page base address */

-       li      r4,4096/L1_CACHE_LINE_SIZE      /* Number of lines in a page */
+       li      r4,4096/L1_CACHE_BYTES  /* Number of lines in a page */

        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */
        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6
        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6

-       addi    r6,r6,L1_CACHE_LINE_SIZE
+       addi    r6,r6,L1_CACHE_BYTES

        bdnz    1b
        sync
        isync
        bdnz    1b
        sync
        isync


@@ -648,16 +648,16 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
        mtmsr   r0
        isync
        rlwinm  r3,r3,0,0,19                    /* Get page base address */
        mtmsr   r0
        isync
        rlwinm  r3,r3,0,0,19                    /* Get page base address */

-       li      r4,4096/L1_CACHE_LINE_SIZE      /* Number of lines in a page */
+       li      r4,4096/L1_CACHE_BYTES  /* Number of lines in a page */

        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */
        mtctr   r4
        mr      r6,r3
 0:     dcbst   0,r3                            /* Write line to ram */

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6
        bdnz    0b
        sync
        mtctr   r4
 1:     icbi    0,r6

-       addi    r6,r6,L1_CACHE_LINE_SIZE
+       addi    r6,r6,L1_CACHE_BYTES

        bdnz    1b
        sync
        mtmsr   r10                             /* restore DR */
        bdnz    1b
        sync
        mtmsr   r10                             /* restore DR */


@@ -672,7 +672,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
  * void clear_pages(void *page, int order) ;
  */
 _GLOBAL(clear_pages)
  * void clear_pages(void *page, int order) ;
  */
 _GLOBAL(clear_pages)

-       li      r0,4096/L1_CACHE_LINE_SIZE
+       li      r0,4096/L1_CACHE_BYTES

        slw     r0,r0,r4
        mtctr   r0
 #ifdef CONFIG_8xx
        slw     r0,r0,r4
        mtctr   r0
 #ifdef CONFIG_8xx


@@ -684,7 +684,7 @@ _GLOBAL(clear_pages)
 #else
 1:     dcbz    0,r3
 #endif
 #else
 1:     dcbz    0,r3
 #endif

-       addi    r3,r3,L1_CACHE_LINE_SIZE
+       addi    r3,r3,L1_CACHE_BYTES

        bdnz    1b
        blr
 
        bdnz    1b
        blr
 


@@ -710,7 +710,7 @@ _GLOBAL(copy_page)
 
 #ifdef CONFIG_8xx
        /* don't use prefetch on 8xx */
 
 #ifdef CONFIG_8xx
        /* don't use prefetch on 8xx */

-       li      r0,4096/L1_CACHE_LINE_SIZE
+       li      r0,4096/L1_CACHE_BYTES

        mtctr   r0
 1:     COPY_16_BYTES
        bdnz    1b
        mtctr   r0
 1:     COPY_16_BYTES
        bdnz    1b


@@ -724,13 +724,13 @@ _GLOBAL(copy_page)
        li      r11,4
        mtctr   r0
 11:    dcbt    r11,r4
        li      r11,4
        mtctr   r0
 11:    dcbt    r11,r4

-       addi    r11,r11,L1_CACHE_LINE_SIZE
+       addi    r11,r11,L1_CACHE_BYTES

        bdnz    11b
 #else /* MAX_COPY_PREFETCH == 1 */
        dcbt    r5,r4
        bdnz    11b
 #else /* MAX_COPY_PREFETCH == 1 */
        dcbt    r5,r4

-       li      r11,L1_CACHE_LINE_SIZE+4
+       li      r11,L1_CACHE_BYTES+4

 #endif /* MAX_COPY_PREFETCH */
 #endif /* MAX_COPY_PREFETCH */

-       li      r0,4096/L1_CACHE_LINE_SIZE - MAX_COPY_PREFETCH
+       li      r0,4096/L1_CACHE_BYTES - MAX_COPY_PREFETCH

        crclr   4*cr0+eq
 2:
        mtctr   r0
        crclr   4*cr0+eq
 2:
        mtctr   r0


@@ -738,12 +738,12 @@ _GLOBAL(copy_page)
        dcbt    r11,r4
        dcbz    r5,r3
        COPY_16_BYTES
        dcbt    r11,r4
        dcbz    r5,r3
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES

diff --git a/arch/ppc/lib/string.S b/arch/ppc/lib/string.S
index 36c9b97fd92abf9c6728f425e73d9d88fa0d8a84..2e258c49e8bea826a05b377289e95c1ccb3fc744 100644 (file)
--- a/arch/ppc/lib/string.S
+++ b/arch/ppc/lib/string.S
@@ -65,9 +65,9 @@
        .stabs  "arch/ppc/lib/",N_SO,0,0,0f
        .stabs  "string.S",N_SO,0,0,0f
 
        .stabs  "arch/ppc/lib/",N_SO,0,0,0f
        .stabs  "string.S",N_SO,0,0,0f
 

-CACHELINE_BYTES = L1_CACHE_LINE_SIZE
-LG_CACHELINE_BYTES = LG_L1_CACHE_LINE_SIZE
-CACHELINE_MASK = (L1_CACHE_LINE_SIZE-1)
+CACHELINE_BYTES = L1_CACHE_BYTES
+LG_CACHELINE_BYTES = L1_CACHE_SHIFT
+CACHELINE_MASK = (L1_CACHE_BYTES-1)

 
 _GLOBAL(strcpy)
        addi    r5,r3,-1
 
 _GLOBAL(strcpy)
        addi    r5,r3,-1


@@ -265,12 +265,12 @@ _GLOBAL(cacheable_memcpy)
        dcbz    r11,r6
 #endif
        COPY_16_BYTES
        dcbz    r11,r6
 #endif
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES
        COPY_16_BYTES


@@ -485,12 +485,12 @@ _GLOBAL(__copy_tofrom_user)
        .text
 /* the main body of the cacheline loop */
        COPY_16_BYTES_WITHEX(0)
        .text
 /* the main body of the cacheline loop */
        COPY_16_BYTES_WITHEX(0)

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES_WITHEX(1)
        COPY_16_BYTES_WITHEX(1)

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES_WITHEX(2)
        COPY_16_BYTES_WITHEX(3)
        COPY_16_BYTES_WITHEX(2)
        COPY_16_BYTES_WITHEX(3)

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES_WITHEX(4)
        COPY_16_BYTES_WITHEX(5)
        COPY_16_BYTES_WITHEX(6)
        COPY_16_BYTES_WITHEX(4)
        COPY_16_BYTES_WITHEX(5)
        COPY_16_BYTES_WITHEX(6)


@@ -544,12 +544,12 @@ _GLOBAL(__copy_tofrom_user)
  * 104f (if in read part) or 105f (if in write part), after updating r5
  */
        COPY_16_BYTES_EXCODE(0)
  * 104f (if in read part) or 105f (if in write part), after updating r5
  */
        COPY_16_BYTES_EXCODE(0)

-#if L1_CACHE_LINE_SIZE >= 32
+#if L1_CACHE_BYTES >= 32

        COPY_16_BYTES_EXCODE(1)
        COPY_16_BYTES_EXCODE(1)

-#if L1_CACHE_LINE_SIZE >= 64
+#if L1_CACHE_BYTES >= 64

        COPY_16_BYTES_EXCODE(2)
        COPY_16_BYTES_EXCODE(3)
        COPY_16_BYTES_EXCODE(2)
        COPY_16_BYTES_EXCODE(3)

-#if L1_CACHE_LINE_SIZE >= 128
+#if L1_CACHE_BYTES >= 128

        COPY_16_BYTES_EXCODE(4)
        COPY_16_BYTES_EXCODE(5)
        COPY_16_BYTES_EXCODE(6)
        COPY_16_BYTES_EXCODE(4)
        COPY_16_BYTES_EXCODE(5)
        COPY_16_BYTES_EXCODE(6)

diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index 3eb611e23f69b3e83e99597d9547cfc92550b0bb..a301c5ac58ddf985244fa5fd8e8fe55f93a614c3 100644 (file)
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -521,7 +521,7 @@ katana_fixup_resources(struct pci_dev *dev)
 {
        u16     v16;
 
 {
        u16     v16;
 

-       pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, L1_CACHE_LINE_SIZE>>2);
+       pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, L1_CACHE_BYTES>>2);

 
        pci_read_config_word(dev, PCI_COMMAND, &v16);
        v16 |= PCI_COMMAND_INVALIDATE | PCI_COMMAND_FAST_BACK;
 
        pci_read_config_word(dev, PCI_COMMAND, &v16);
        v16 |= PCI_COMMAND_INVALIDATE | PCI_COMMAND_FAST_BACK;

diff --git a/arch/ppc/platforms/pmac_sleep.S b/arch/ppc/platforms/pmac_sleep.S
index 88419c77ac439cd72b341c59dab10201efee9240..22b113d19b2442089726f7901a5e2e07a3a3b491 100644 (file)
--- a/arch/ppc/platforms/pmac_sleep.S
+++ b/arch/ppc/platforms/pmac_sleep.S
@@ -387,10 +387,10 @@ turn_on_mmu:
 #endif /* defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ) */
 
        .section .data
 #endif /* defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ) */
 
        .section .data

-       .balign L1_CACHE_LINE_SIZE
+       .balign L1_CACHE_BYTES

 sleep_storage:
        .long 0
 sleep_storage:
        .long 0

-       .balign L1_CACHE_LINE_SIZE, 0
+       .balign L1_CACHE_BYTES, 0

 
 #endif /* CONFIG_6xx */
        .section .text
 
 #endif /* CONFIG_6xx */
        .section .text

diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 4849850a59edd55c872bbb92a13c327842b7ad0e..a781c50d2f4caed443aa67d6433d41a8914f32fa 100644 (file)
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -1304,7 +1304,7 @@ mv64x60_config_pci_params(struct pci_controller *hose,
        early_write_config_word(hose, 0, devfn, PCI_COMMAND, u16_val);
 
        /* Set latency timer, cache line size, clear BIST */
        early_write_config_word(hose, 0, devfn, PCI_COMMAND, u16_val);
 
        /* Set latency timer, cache line size, clear BIST */

-       u16_val = (pi->latency_timer << 8) | (L1_CACHE_LINE_SIZE >> 2);
+       u16_val = (pi->latency_timer << 8) | (L1_CACHE_BYTES >> 2);

        early_write_config_word(hose, 0, devfn, PCI_CACHE_LINE_SIZE, u16_val);
 
        mv64x60_pci_exclude_bridge = save_exclude;
        early_write_config_word(hose, 0, devfn, PCI_CACHE_LINE_SIZE, u16_val);
 
        mv64x60_pci_exclude_bridge = save_exclude;

diff --git a/include/asm-ppc/cache.h b/include/asm-ppc/cache.h
index 38f2f1be4a87ddf908bf123f22e167a1bd93bd22..7a157d0f4b5fd646294fff69827f4746ef96e085 100644 (file)
--- a/include/asm-ppc/cache.h
+++ b/include/asm-ppc/cache.h
@@ -9,21 +9,18 @@
 
 /* bytes per L1 cache line */
 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
 
 /* bytes per L1 cache line */
 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)

-#define        L1_CACHE_LINE_SIZE      16
-#define LG_L1_CACHE_LINE_SIZE  4
+#define L1_CACHE_SHIFT 4

 #define MAX_COPY_PREFETCH      1
 #elif defined(CONFIG_PPC64BRIDGE)
 #define MAX_COPY_PREFETCH      1
 #elif defined(CONFIG_PPC64BRIDGE)

-#define L1_CACHE_LINE_SIZE     128
-#define LG_L1_CACHE_LINE_SIZE  7
+#define L1_CACHE_SHIFT 7

 #define MAX_COPY_PREFETCH      1
 #else
 #define MAX_COPY_PREFETCH      1
 #else

-#define        L1_CACHE_LINE_SIZE      32
-#define LG_L1_CACHE_LINE_SIZE  5
+#define L1_CACHE_SHIFT 5

 #define MAX_COPY_PREFETCH      4
 #endif
 
 #define MAX_COPY_PREFETCH      4
 #endif
 

-#define        L1_CACHE_BYTES L1_CACHE_LINE_SIZE
-#define L1_CACHE_SHIFT LG_L1_CACHE_LINE_SIZE
+#define        L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
+

 #define        SMP_CACHE_BYTES L1_CACHE_BYTES
 #define L1_CACHE_SHIFT_MAX 7   /* largest L1 which this arch supports */
 
 #define        SMP_CACHE_BYTES L1_CACHE_BYTES
 #define L1_CACHE_SHIFT_MAX 7   /* largest L1 which this arch supports */