[MIPS] Remove TLB sanitation code

It is not being used by Malta and shouldn't be needed for MIPSsim.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 89e6f6aa5166f310c20ae91fafe0c829def00c94..e9c393a41775a4b6dfe2b0b2f543b449201e45e1 100644 (file)
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -58,53 +58,6 @@ static void dump_mtregisters(int vpe, int tc)
 }
 #endif
 
-void __init sanitize_tlb_entries(void)
-{
-       int i, tlbsiz;
-       unsigned long mvpconf0, ncpu;
-
-       if (!cpu_has_mipsmt)
-               return;
-
-       /* Enable VPC */
-       set_c0_mvpcontrol(MVPCONTROL_VPC);
-
-       back_to_back_c0_hazard();
-
-       /* Disable TLB sharing */
-       clear_c0_mvpcontrol(MVPCONTROL_STLB);
-
-       mvpconf0 = read_c0_mvpconf0();
-
-       printk(KERN_INFO "MVPConf0 0x%lx TLBS %lx PTLBE %ld\n", mvpconf0,
-                  (mvpconf0 & MVPCONF0_TLBS) >> MVPCONF0_TLBS_SHIFT,
-                          (mvpconf0 & MVPCONF0_PTLBE) >> MVPCONF0_PTLBE_SHIFT);
-
-       tlbsiz = (mvpconf0 & MVPCONF0_PTLBE) >> MVPCONF0_PTLBE_SHIFT;
-       ncpu = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1;
-
-       printk(" tlbsiz %d ncpu %ld\n", tlbsiz, ncpu);
-
-       if (tlbsiz > 0) {
-               /* share them out across the vpe's */
-               tlbsiz /= ncpu;
-
-               printk(KERN_INFO "setting Config1.MMU_size to %d\n", tlbsiz);
-
-               for (i = 0; i < ncpu; i++) {
-                       settc(i);
-
-                       if (i == 0)
-                               write_c0_config1((read_c0_config1() & ~(0x3f << 25)) | (tlbsiz << 25));
-                       else
-                               write_vpe_c0_config1((read_vpe_c0_config1() & ~(0x3f << 25)) |
-                                                  (tlbsiz << 25));
-               }
-       }
-
-       clear_c0_mvpcontrol(MVPCONTROL_VPC);
-}
-
 static void ipi_resched_dispatch(void)
 {
        do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_RESCHED_IRQ);

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index b42e71c711199a4f169f717e8467240b8ebbae57..4705b3c11e5feb52b944945b87255c845c6b3e31 100644 (file)
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -174,14 +174,6 @@ static int clock_hang_reported[NR_CPUS];
 
 #endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
 
-/* Initialize shared TLB - the should probably migrate to smtc_setup_cpus() */
-
-void __init sanitize_tlb_entries(void)
-{
-       printk("Deprecated sanitize_tlb_entries() invoked\n");
-}
-
-
 /*
  * Configure shared TLB - VPC configuration bit must be set by caller
  */

diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c
index d49fe73426b74e017a788c82cbb70fdc9156e4fb..7c7148ef26463f5d159ef7ceaf538ecceb8b0dde 100644 (file)
--- a/arch/mips/mipssim/sim_setup.c
+++ b/arch/mips/mipssim/sim_setup.c
@@ -39,9 +39,6 @@
 static void __init serial_init(void);
 unsigned int _isbonito = 0;
 
-extern void __init sanitize_tlb_entries(void);
-
-
 const char *get_system_type(void)
 {
        return "MIPSsim";
@@ -55,9 +52,6 @@ void __init plat_mem_setup(void)
 
        pr_info("Linux started...\n");
 
-#ifdef CONFIG_MIPS_MT_SMP
-       sanitize_tlb_entries();
-#endif
 }
 
 extern struct plat_smp_ops ssmtc_smp_ops;