Merge tag 'for-4.16-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[linux-2.6-microblaze.git] / arch / powerpc / kernel / cpu_setup_power.S

diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S
index 679bbe7..3f30c99 100644 (file)
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@ -31,7 +31,6 @@ _GLOBAL(__setup_cpu_power7)
        mfspr   r3,SPRN_LPCR
        li      r4,(LPCR_LPES1 >> LPCR_LPES_SH)
        bl      __init_LPCR_ISA206
-       bl      __init_tlb_power7
        mtlr    r11
        blr
 
@@ -45,7 +44,6 @@ _GLOBAL(__restore_cpu_power7)
        mfspr   r3,SPRN_LPCR
        li      r4,(LPCR_LPES1 >> LPCR_LPES_SH)
        bl      __init_LPCR_ISA206
-       bl      __init_tlb_power7
        mtlr    r11
        blr
 
@@ -64,7 +62,6 @@ _GLOBAL(__setup_cpu_power8)
        li      r4,0 /* LPES = 0 */
        bl      __init_LPCR_ISA206
        bl      __init_HFSCR
-       bl      __init_tlb_power8
        bl      __init_PMU_HV
        bl      __init_PMU_HV_ISA207
        mtlr    r11
@@ -86,7 +83,6 @@ _GLOBAL(__restore_cpu_power8)
        li      r4,0 /* LPES = 0 */
        bl      __init_LPCR_ISA206
        bl      __init_HFSCR
-       bl      __init_tlb_power8
        bl      __init_PMU_HV
        bl      __init_PMU_HV_ISA207
        mtlr    r11
@@ -111,7 +107,6 @@ _GLOBAL(__setup_cpu_power9)
        li      r4,0 /* LPES = 0 */
        bl      __init_LPCR_ISA300
        bl      __init_HFSCR
-       bl      __init_tlb_power9
        bl      __init_PMU_HV
        mtlr    r11
        blr
@@ -136,7 +131,6 @@ _GLOBAL(__restore_cpu_power9)
        li      r4,0 /* LPES = 0 */
        bl      __init_LPCR_ISA300
        bl      __init_HFSCR
-       bl      __init_tlb_power9
        bl      __init_PMU_HV
        mtlr    r11
        blr
@@ -194,50 +188,6 @@ __init_HFSCR:
        mtspr   SPRN_HFSCR,r3
        blr
 
-/*
- * Clear the TLB using the specified IS form of tlbiel instruction
- * (invalidate by congruence class). P7 has 128 CCs., P8 has 512.
- */
-__init_tlb_power7:
-       li      r6,POWER7_TLB_SETS
-       mtctr   r6
-       li      r7,0xc00        /* IS field = 0b11 */
-       ptesync
-2:     tlbiel  r7
-       addi    r7,r7,0x1000
-       bdnz    2b
-       ptesync
-1:     blr
-
-__init_tlb_power8:
-       li      r6,POWER8_TLB_SETS
-       mtctr   r6
-       li      r7,0xc00        /* IS field = 0b11 */
-       ptesync
-2:     tlbiel  r7
-       addi    r7,r7,0x1000
-       bdnz    2b
-       ptesync
-1:     blr
-
-/*
- * Flush the TLB in hash mode. Hash must flush with RIC=2 once for process
- * and one for partition scope to clear process and partition table entries.
- */
-__init_tlb_power9:
-       li      r6,POWER9_TLB_SETS_HASH - 1
-       mtctr   r6
-       li      r7,0xc00        /* IS field = 0b11 */
-       li      r8,0
-       ptesync
-       PPC_TLBIEL(7, 8, 2, 1, 0)
-       PPC_TLBIEL(7, 8, 2, 0, 0)
-2:     addi    r7,r7,0x1000
-       PPC_TLBIEL(7, 8, 0, 0, 0)
-       bdnz    2b
-       ptesync
-1:     blr
-
 __init_PMU_HV:
        li      r5,0
        mtspr   SPRN_MMCRC,r5