Skip to content

Commit

Permalink
[MIPS] Remove TLB sanitation code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chris Dearman authored and Ralf Baechle committed Apr 28, 2008
1 parent 0b6d497 commit 0bfa130
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 61 deletions.
47 changes: 0 additions & 47 deletions arch/mips/kernel/smp-mt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions arch/mips/kernel/smtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
6 changes: 0 additions & 6 deletions arch/mips/mipssim/sim_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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;
Expand Down

0 comments on commit 0bfa130

Please sign in to comment.