MIPS: Add 1074K CPU support explicitly.
The 1074K is a multiprocessing coherent processing system (CPS) based on modified 74K cores. This patch makes the 1074K an actual unique CPU type, instead of a 74K derivative, which it is not. Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com> Reviewed-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6389/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:

committed by
Ralf Baechle

parent
02dc6bfb08
commit
442e14a2c5
@@ -806,7 +806,7 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
|
||||
__cpu_name[cpu] = "MIPS 1004Kc";
|
||||
break;
|
||||
case PRID_IMP_1074K:
|
||||
c->cputype = CPU_74K;
|
||||
c->cputype = CPU_1074K;
|
||||
__cpu_name[cpu] = "MIPS 1074Kc";
|
||||
break;
|
||||
case PRID_IMP_INTERAPTIV_UP:
|
||||
|
@@ -184,6 +184,7 @@ void __init check_wait(void)
|
||||
case CPU_24K:
|
||||
case CPU_34K:
|
||||
case CPU_1004K:
|
||||
case CPU_1074K:
|
||||
case CPU_INTERAPTIV:
|
||||
case CPU_PROAPTIV:
|
||||
cpu_wait = r4k_wait;
|
||||
|
@@ -1442,6 +1442,7 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
|
||||
#endif
|
||||
break;
|
||||
case CPU_74K:
|
||||
case CPU_1074K:
|
||||
if (IS_BOTH_COUNTERS_74K_EVENT(base_id))
|
||||
raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
|
||||
else
|
||||
@@ -1584,6 +1585,11 @@ init_hw_perf_events(void)
|
||||
mipspmu.general_event_map = &mipsxxcore_event_map;
|
||||
mipspmu.cache_event_map = &mipsxxcore_cache_map;
|
||||
break;
|
||||
case CPU_1074K:
|
||||
mipspmu.name = "mips/1074K";
|
||||
mipspmu.general_event_map = &mipsxxcore_event_map;
|
||||
mipspmu.cache_event_map = &mipsxxcore_cache_map;
|
||||
break;
|
||||
case CPU_LOONGSON1:
|
||||
mipspmu.name = "mips/loongson1";
|
||||
mipspmu.general_event_map = &mipsxxcore_event_map;
|
||||
|
@@ -205,6 +205,7 @@ void spram_config(void)
|
||||
case CPU_34K:
|
||||
case CPU_74K:
|
||||
case CPU_1004K:
|
||||
case CPU_1074K:
|
||||
case CPU_INTERAPTIV:
|
||||
case CPU_PROAPTIV:
|
||||
config0 = read_c0_config();
|
||||
|
@@ -1337,6 +1337,7 @@ static inline void parity_protection_init(void)
|
||||
case CPU_34K:
|
||||
case CPU_74K:
|
||||
case CPU_1004K:
|
||||
case CPU_1074K:
|
||||
case CPU_INTERAPTIV:
|
||||
case CPU_PROAPTIV:
|
||||
{
|
||||
|
Reference in New Issue
Block a user