4603f53a1d
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/sh uses of the __cpuinit macros from
all C files. Currently sh does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
112 lines
3 KiB
C
112 lines
3 KiB
C
/*
|
|
* arch/sh/kernel/cpu/sh3/probe.c
|
|
*
|
|
* CPU Subtype Probing for SH-3.
|
|
*
|
|
* Copyright (C) 1999, 2000 Niibe Yutaka
|
|
* Copyright (C) 2002 Paul Mundt
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/cache.h>
|
|
#include <asm/io.h>
|
|
|
|
void cpu_probe(void)
|
|
{
|
|
unsigned long addr0, addr1, data0, data1, data2, data3;
|
|
|
|
jump_to_uncached();
|
|
/*
|
|
* Check if the entry shadows or not.
|
|
* When shadowed, it's 128-entry system.
|
|
* Otherwise, it's 256-entry system.
|
|
*/
|
|
addr0 = CACHE_OC_ADDRESS_ARRAY + (3 << 12);
|
|
addr1 = CACHE_OC_ADDRESS_ARRAY + (1 << 12);
|
|
|
|
/* First, write back & invalidate */
|
|
data0 = __raw_readl(addr0);
|
|
__raw_writel(data0&~(SH_CACHE_VALID|SH_CACHE_UPDATED), addr0);
|
|
data1 = __raw_readl(addr1);
|
|
__raw_writel(data1&~(SH_CACHE_VALID|SH_CACHE_UPDATED), addr1);
|
|
|
|
/* Next, check if there's shadow or not */
|
|
data0 = __raw_readl(addr0);
|
|
data0 ^= SH_CACHE_VALID;
|
|
__raw_writel(data0, addr0);
|
|
data1 = __raw_readl(addr1);
|
|
data2 = data1 ^ SH_CACHE_VALID;
|
|
__raw_writel(data2, addr1);
|
|
data3 = __raw_readl(addr0);
|
|
|
|
/* Lastly, invaliate them. */
|
|
__raw_writel(data0&~SH_CACHE_VALID, addr0);
|
|
__raw_writel(data2&~SH_CACHE_VALID, addr1);
|
|
|
|
back_to_cached();
|
|
|
|
boot_cpu_data.dcache.ways = 4;
|
|
boot_cpu_data.dcache.entry_shift = 4;
|
|
boot_cpu_data.dcache.linesz = L1_CACHE_BYTES;
|
|
boot_cpu_data.dcache.flags = 0;
|
|
|
|
/*
|
|
* 7709A/7729 has 16K cache (256-entry), while 7702 has only
|
|
* 2K(direct) 7702 is not supported (yet)
|
|
*/
|
|
if (data0 == data1 && data2 == data3) { /* Shadow */
|
|
boot_cpu_data.dcache.way_incr = (1 << 11);
|
|
boot_cpu_data.dcache.entry_mask = 0x7f0;
|
|
boot_cpu_data.dcache.sets = 128;
|
|
boot_cpu_data.type = CPU_SH7708;
|
|
|
|
boot_cpu_data.flags |= CPU_HAS_MMU_PAGE_ASSOC;
|
|
} else { /* 7709A or 7729 */
|
|
boot_cpu_data.dcache.way_incr = (1 << 12);
|
|
boot_cpu_data.dcache.entry_mask = 0xff0;
|
|
boot_cpu_data.dcache.sets = 256;
|
|
boot_cpu_data.type = CPU_SH7729;
|
|
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7706)
|
|
boot_cpu_data.type = CPU_SH7706;
|
|
#endif
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7710)
|
|
boot_cpu_data.type = CPU_SH7710;
|
|
#endif
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7712)
|
|
boot_cpu_data.type = CPU_SH7712;
|
|
#endif
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7720)
|
|
boot_cpu_data.type = CPU_SH7720;
|
|
#endif
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7721)
|
|
boot_cpu_data.type = CPU_SH7721;
|
|
#endif
|
|
#if defined(CONFIG_CPU_SUBTYPE_SH7705)
|
|
boot_cpu_data.type = CPU_SH7705;
|
|
|
|
#if defined(CONFIG_SH7705_CACHE_32KB)
|
|
boot_cpu_data.dcache.way_incr = (1 << 13);
|
|
boot_cpu_data.dcache.entry_mask = 0x1ff0;
|
|
boot_cpu_data.dcache.sets = 512;
|
|
__raw_writel(CCR_CACHE_32KB, CCR3_REG);
|
|
#else
|
|
__raw_writel(CCR_CACHE_16KB, CCR3_REG);
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* SH-3 doesn't have separate caches
|
|
*/
|
|
boot_cpu_data.dcache.flags |= SH_CACHE_COMBINED;
|
|
boot_cpu_data.icache = boot_cpu_data.dcache;
|
|
|
|
boot_cpu_data.family = CPU_FAMILY_SH3;
|
|
}
|