diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/smp-mt.c | 47 | ||||
-rw-r--r-- | arch/mips/kernel/smtc.c | 8 | ||||
-rw-r--r-- | arch/mips/mipssim/sim_setup.c | 6 |
3 files changed, 0 insertions, 61 deletions
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 89e6f6aa5166..e9c393a41775 100644 --- 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) | |||
58 | } | 58 | } |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | void __init sanitize_tlb_entries(void) | ||
62 | { | ||
63 | int i, tlbsiz; | ||
64 | unsigned long mvpconf0, ncpu; | ||
65 | |||
66 | if (!cpu_has_mipsmt) | ||
67 | return; | ||
68 | |||
69 | /* Enable VPC */ | ||
70 | set_c0_mvpcontrol(MVPCONTROL_VPC); | ||
71 | |||
72 | back_to_back_c0_hazard(); | ||
73 | |||
74 | /* Disable TLB sharing */ | ||
75 | clear_c0_mvpcontrol(MVPCONTROL_STLB); | ||
76 | |||
77 | mvpconf0 = read_c0_mvpconf0(); | ||
78 | |||
79 | printk(KERN_INFO "MVPConf0 0x%lx TLBS %lx PTLBE %ld\n", mvpconf0, | ||
80 | (mvpconf0 & MVPCONF0_TLBS) >> MVPCONF0_TLBS_SHIFT, | ||
81 | (mvpconf0 & MVPCONF0_PTLBE) >> MVPCONF0_PTLBE_SHIFT); | ||
82 | |||
83 | tlbsiz = (mvpconf0 & MVPCONF0_PTLBE) >> MVPCONF0_PTLBE_SHIFT; | ||
84 | ncpu = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1; | ||
85 | |||
86 | printk(" tlbsiz %d ncpu %ld\n", tlbsiz, ncpu); | ||
87 | |||
88 | if (tlbsiz > 0) { | ||
89 | /* share them out across the vpe's */ | ||
90 | tlbsiz /= ncpu; | ||
91 | |||
92 | printk(KERN_INFO "setting Config1.MMU_size to %d\n", tlbsiz); | ||
93 | |||
94 | for (i = 0; i < ncpu; i++) { | ||
95 | settc(i); | ||
96 | |||
97 | if (i == 0) | ||
98 | write_c0_config1((read_c0_config1() & ~(0x3f << 25)) | (tlbsiz << 25)); | ||
99 | else | ||
100 | write_vpe_c0_config1((read_vpe_c0_config1() & ~(0x3f << 25)) | | ||
101 | (tlbsiz << 25)); | ||
102 | } | ||
103 | } | ||
104 | |||
105 | clear_c0_mvpcontrol(MVPCONTROL_VPC); | ||
106 | } | ||
107 | |||
108 | static void ipi_resched_dispatch(void) | 61 | static void ipi_resched_dispatch(void) |
109 | { | 62 | { |
110 | do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_IPI_RESCHED_IRQ); | 63 | 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 b42e71c71119..4705b3c11e5f 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -174,14 +174,6 @@ static int clock_hang_reported[NR_CPUS]; | |||
174 | 174 | ||
175 | #endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */ | 175 | #endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */ |
176 | 176 | ||
177 | /* Initialize shared TLB - the should probably migrate to smtc_setup_cpus() */ | ||
178 | |||
179 | void __init sanitize_tlb_entries(void) | ||
180 | { | ||
181 | printk("Deprecated sanitize_tlb_entries() invoked\n"); | ||
182 | } | ||
183 | |||
184 | |||
185 | /* | 177 | /* |
186 | * Configure shared TLB - VPC configuration bit must be set by caller | 178 | * Configure shared TLB - VPC configuration bit must be set by caller |
187 | */ | 179 | */ |
diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c index d49fe73426b7..7c7148ef2646 100644 --- a/arch/mips/mipssim/sim_setup.c +++ b/arch/mips/mipssim/sim_setup.c | |||
@@ -39,9 +39,6 @@ | |||
39 | static void __init serial_init(void); | 39 | static void __init serial_init(void); |
40 | unsigned int _isbonito = 0; | 40 | unsigned int _isbonito = 0; |
41 | 41 | ||
42 | extern void __init sanitize_tlb_entries(void); | ||
43 | |||
44 | |||
45 | const char *get_system_type(void) | 42 | const char *get_system_type(void) |
46 | { | 43 | { |
47 | return "MIPSsim"; | 44 | return "MIPSsim"; |
@@ -55,9 +52,6 @@ void __init plat_mem_setup(void) | |||
55 | 52 | ||
56 | pr_info("Linux started...\n"); | 53 | pr_info("Linux started...\n"); |
57 | 54 | ||
58 | #ifdef CONFIG_MIPS_MT_SMP | ||
59 | sanitize_tlb_entries(); | ||
60 | #endif | ||
61 | } | 55 | } |
62 | 56 | ||
63 | extern struct plat_smp_ops ssmtc_smp_ops; | 57 | extern struct plat_smp_ops ssmtc_smp_ops; |