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

sh: Split out cache status bits per-CPU family.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+20 -5
-5
include/asm-sh/cache.h
··· 12 12 #include <linux/init.h> 13 13 #include <asm/cpu/cache.h> 14 14 15 - #define SH_CACHE_VALID 1 16 - #define SH_CACHE_UPDATED 2 17 - #define SH_CACHE_COMBINED 4 18 - #define SH_CACHE_ASSOC 8 19 - 20 15 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 21 16 22 17 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
+5
include/asm-sh/cpu-sh2/cache.h
··· 12 12 13 13 #define L1_CACHE_SHIFT 4 14 14 15 + #define SH_CACHE_VALID 1 16 + #define SH_CACHE_UPDATED 2 17 + #define SH_CACHE_COMBINED 4 18 + #define SH_CACHE_ASSOC 8 19 + 15 20 #if defined(CONFIG_CPU_SUBTYPE_SH7619) 16 21 #define CCR1 0xffffffec 17 22 #define CCR CCR1
+5
include/asm-sh/cpu-sh2a/cache.h
··· 12 12 13 13 #define L1_CACHE_SHIFT 4 14 14 15 + #define SH_CACHE_VALID 1 16 + #define SH_CACHE_UPDATED 2 17 + #define SH_CACHE_COMBINED 4 18 + #define SH_CACHE_ASSOC 8 19 + 15 20 #define CCR1 0xfffc1000 16 21 #define CCR2 0xfffc1004 17 22
+5
include/asm-sh/cpu-sh3/cache.h
··· 12 12 13 13 #define L1_CACHE_SHIFT 4 14 14 15 + #define SH_CACHE_VALID 1 16 + #define SH_CACHE_UPDATED 2 17 + #define SH_CACHE_COMBINED 4 18 + #define SH_CACHE_ASSOC 8 19 + 15 20 #define CCR 0xffffffec /* Address of Cache Control Register */ 16 21 17 22 #define CCR_CACHE_CE 0x01 /* Cache Enable */
+5
include/asm-sh/cpu-sh4/cache.h
··· 12 12 13 13 #define L1_CACHE_SHIFT 5 14 14 15 + #define SH_CACHE_VALID 1 16 + #define SH_CACHE_UPDATED 2 17 + #define SH_CACHE_COMBINED 4 18 + #define SH_CACHE_ASSOC 8 19 + 15 20 #define CCR 0xff00001c /* Address of Cache Control Register */ 16 21 #define CCR_CACHE_OCE 0x0001 /* Operand Cache Enable */ 17 22 #define CCR_CACHE_WT 0x0002 /* Write-Through (for P0,U0,P3) (else writeback)*/