OSDN Git Service

powerpc: Use defines for __init_tlb_power[78]
authorMichael Neuling <mikey@neuling.org>
Fri, 19 Feb 2016 00:16:23 +0000 (11:16 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 22 Feb 2016 09:47:47 +0000 (20:47 +1100)
Use defines for literals __init_tlb_power[78] rather than hand coding
them.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/cpu_setup_power.S

index 9c9b741..cb3e272 100644 (file)
@@ -15,6 +15,7 @@
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
 #include <asm/cache.h>
+#include <asm/mmu-hash64.h>
 
 /* Entry: r3 = crap, r4 = ptr to cputable entry
  *
@@ -139,7 +140,7 @@ __init_HFSCR:
  * (invalidate by congruence class). P7 has 128 CCs., P8 has 512.
  */
 __init_tlb_power7:
-       li      r6,128
+       li      r6,POWER7_TLB_SETS
        mtctr   r6
        li      r7,0xc00        /* IS field = 0b11 */
        ptesync
@@ -150,7 +151,7 @@ __init_tlb_power7:
 1:     blr
 
 __init_tlb_power8:
-       li      r6,512
+       li      r6,POWER8_TLB_SETS
        mtctr   r6
        li      r7,0xc00        /* IS field = 0b11 */
        ptesync