Skip to content

Commit d62cf15

Browse files
maciej-w-rozyckitsbogend
authored andcommitted
MIPS: SiByte: Bring back cache initialisation
Bring back cache initialisation for Broadcom SiByte SB1 cores, which has been removed causing the kernel to hang at bootstrap right after: Dentry cache hash table entries: 524288 (order: 8, 4194304 bytes, linear) Inode-cache hash table entries: 262144 (order: 7, 2097152 bytes, linear) The cause of the problem is R4k cache handlers are also used by Broadcom SiByte SB1 cores, however with a different cache error exception handler and therefore not using CPU_R4K_CACHE_TLB: obj-$(CONFIG_CPU_R4K_CACHE_TLB) += c-r4k.o cex-gen.o tlb-r4k.o obj-$(CONFIG_CPU_SB1) += c-r4k.o cerr-sb1.o cex-sb1.o tlb-r4k.o (from arch/mips/mm/Makefile). Fixes: bbe4f63 ("mips: fix r3k_cache_init build regression") Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk> Cc: stable@vger.kernel.org # v6.8+ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent 43985a6 commit d62cf15

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/mips/mm/cache.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ void cpu_cache_init(void)
207207
{
208208
if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache)
209209
r3k_cache_init();
210-
if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache)
210+
if ((IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) ||
211+
IS_ENABLED(CONFIG_CPU_SB1)) && cpu_has_4k_cache)
211212
r4k_cache_init();
212213

213214
if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache)

0 commit comments

Comments
 (0)