Commit e8208828 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Kill off broken direct-mapped cache mode. 



Forcing direct-mapped worked on certain older 2-way set associative
parts, but was always error prone on 4-way parts. As these are the
norm these days, there is not much point in continuing to support this
mode. Most of the folks that used direct-mapped mode generally just
wanted writethrough caching in the first place..

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent e869a90e

arch/sh/kernel/cpu/sh4/probe.c

+0 −5
Original line number Diff line number Diff line
@@ -199,11 +199,6 @@ int __init detect_cpu_and_cache_system(void) 
		break;

	}



#ifdef CONFIG_SH_DIRECT_MAPPED

	boot_cpu_data.icache.ways = 1;

	boot_cpu_data.dcache.ways = 1;

#endif



#ifdef CONFIG_CPU_HAS_PTEA

	boot_cpu_data.flags |= CPU_HAS_PTEA;

#endif

arch/sh/mm/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -251,18 +251,6 @@ config SH7705_CACHE_32KB 
	depends on CPU_SUBTYPE_SH7705

	default y



config SH_DIRECT_MAPPED

	bool "Use direct-mapped caching"

	default n

	help

	  Selecting this option will configure the caches to be direct-mapped,

	  even if the cache supports a 2 or 4-way mode. This is useful primarily

	  for debugging on platforms with 2 and 4-way caches (SH7750R/SH7751R,

	  SH4-202, SH4-501, etc.)



	  Turn this option off for platforms that do not have a direct-mapped

	  cache, and you have no need to run the caches in such a configuration.



choice

	prompt "Cache mode"

	default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5

CRA Git | Maintained and supported by SUSTech CRA and CCSE