tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Blackfin arch: When icache is off, make sure people know it

Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

authored by

Robin Getz and committed by
Bryan Wu 9de3a0b6 0d1cdd7a

+12 -5
unified split
+12 -5
arch/blackfin/kernel/setup.c
··· 948 948 uint32_t revid; 949 949 950 950 u_long cclk = 0, sclk = 0; 951 - u_int dcache_size = 0, dsup_banks = 0; 951 + u_int icache_size = BFIN_ICACHESIZE / 1024, dcache_size = 0, dsup_banks = 0; 952 952 953 953 cpu = CPU; 954 954 mmu = "none"; ··· 1017 1017 } 1018 1018 1019 1019 /* Is it turned on? */ 1020 - if (!((bfin_read_DMEM_CONTROL()) & (ENDCPLB | DMC_ENABLE))) 1020 + if (bfin_read_DMEM_CONTROL() & (ENDCPLB | DMC_ENABLE) != (ENDCPLB | DMC_ENABLE)) 1021 1021 dcache_size = 0; 1022 + 1023 + if (bfin_read_IMEM_CONTROL() & (IMC | ENICPLB) == (IMC | ENICPLB)) 1024 + icache_size = 0; 1022 1025 1023 1026 seq_printf(m, "cache size\t: %d KB(L1 icache) " 1024 1027 "%d KB(L1 dcache-%s) %d KB(L2 cache)\n", 1025 - BFIN_ICACHESIZE / 1024, dcache_size, 1028 + icache_size, dcache_size, 1026 1029 #if defined CONFIG_BFIN_WB 1027 1030 "wb" 1028 1031 #elif defined CONFIG_BFIN_WT ··· 1035 1032 1036 1033 seq_printf(m, "%s\n", cache); 1037 1034 1038 - seq_printf(m, "icache setup\t: %d Sub-banks/%d Ways, %d Lines/Way\n", 1039 - BFIN_ISUBBANKS, BFIN_IWAYS, BFIN_ILINES); 1035 + if (icache_size) 1036 + seq_printf(m, "icache setup\t: %d Sub-banks/%d Ways, %d Lines/Way\n", 1037 + BFIN_ISUBBANKS, BFIN_IWAYS, BFIN_ILINES); 1038 + else 1039 + seq_printf(m, "icache setup\t: off\n"); 1040 + 1040 1041 seq_printf(m, 1041 1042 "dcache setup\t: %d Super-banks/%d Sub-banks/%d Ways, %d Lines/Way\n", 1042 1043 dsup_banks, BFIN_DSUBBANKS, BFIN_DWAYS,