Commit 26ab96df authored by Leonid Yegoshin's avatar Leonid Yegoshin Committed by Ralf Baechle

MIPS: Add support for interAptiv cores

The interAptiv is a power-efficient multi-core microprocessor
for use in system-on-chip (SoC) applications. The interAptiv combines
a multi-threading pipeline with a coherence manager to deliver improved
computational throughput and power efficiency. The interAptiv can
contain one to four MIPS32R3 interAptiv cores, system level
coherence manager with L2 cache, optional coherent I/O port,
and optional floating point unit.
Signed-off-by: default avatarLeonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6163/
parent 0ce7d58e
...@@ -44,6 +44,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) ...@@ -44,6 +44,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
case CPU_74K: case CPU_74K:
case CPU_M14KC: case CPU_M14KC:
case CPU_M14KEC: case CPU_M14KEC:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
#endif #endif
......
...@@ -295,7 +295,7 @@ enum cpu_type_enum { ...@@ -295,7 +295,7 @@ enum cpu_type_enum {
CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K, CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350, CPU_ALCHEMY, CPU_PR4450, CPU_BMIPS32, CPU_BMIPS3300, CPU_BMIPS4350,
CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC, CPU_LOONGSON1, CPU_M14KC, CPU_BMIPS4380, CPU_BMIPS5000, CPU_JZRISC, CPU_LOONGSON1, CPU_M14KC,
CPU_M14KEC, CPU_PROAPTIV, CPU_M14KEC, CPU_INTERAPTIV, CPU_PROAPTIV,
/* /*
* MIPS64 class processors * MIPS64 class processors
......
...@@ -184,6 +184,7 @@ void __init check_wait(void) ...@@ -184,6 +184,7 @@ void __init check_wait(void)
case CPU_24K: case CPU_24K:
case CPU_34K: case CPU_34K:
case CPU_1004K: case CPU_1004K:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
cpu_wait = r4k_wait; cpu_wait = r4k_wait;
if (read_c0_config7() & MIPS_CONF7_WII) if (read_c0_config7() & MIPS_CONF7_WII)
......
...@@ -206,6 +206,7 @@ void spram_config(void) ...@@ -206,6 +206,7 @@ void spram_config(void)
case CPU_34K: case CPU_34K:
case CPU_74K: case CPU_74K:
case CPU_1004K: case CPU_1004K:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
config0 = read_c0_config(); config0 = read_c0_config();
/* FIXME: addresses are Malta specific */ /* FIXME: addresses are Malta specific */
......
...@@ -1337,6 +1337,7 @@ static inline void parity_protection_init(void) ...@@ -1337,6 +1337,7 @@ static inline void parity_protection_init(void)
case CPU_34K: case CPU_34K:
case CPU_74K: case CPU_74K:
case CPU_1004K: case CPU_1004K:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
{ {
#define ERRCTL_PE 0x80000000 #define ERRCTL_PE 0x80000000
......
...@@ -1106,6 +1106,7 @@ static void probe_pcache(void) ...@@ -1106,6 +1106,7 @@ static void probe_pcache(void)
case CPU_34K: case CPU_34K:
case CPU_74K: case CPU_74K:
case CPU_1004K: case CPU_1004K:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
if (current_cpu_type() == CPU_74K) if (current_cpu_type() == CPU_74K)
alias_74k_erratum(c); alias_74k_erratum(c);
......
...@@ -76,6 +76,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c) ...@@ -76,6 +76,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
case CPU_34K: case CPU_34K:
case CPU_74K: case CPU_74K:
case CPU_1004K: case CPU_1004K:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
case CPU_BMIPS5000: case CPU_BMIPS5000:
if (config2 & (1 << 12)) if (config2 & (1 << 12))
......
...@@ -86,6 +86,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ...@@ -86,6 +86,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
case CPU_34K: case CPU_34K:
case CPU_1004K: case CPU_1004K:
case CPU_74K: case CPU_74K:
case CPU_INTERAPTIV:
case CPU_PROAPTIV: case CPU_PROAPTIV:
case CPU_LOONGSON1: case CPU_LOONGSON1:
case CPU_SB1: case CPU_SB1:
......
...@@ -376,6 +376,10 @@ static int __init mipsxx_init(void) ...@@ -376,6 +376,10 @@ static int __init mipsxx_init(void)
op_model_mipsxx_ops.cpu_type = "mips/74K"; op_model_mipsxx_ops.cpu_type = "mips/74K";
break; break;
case CPU_INTERAPTIV:
op_model_mipsxx_ops.cpu_type = "mips/interAptiv";
break;
case CPU_PROAPTIV: case CPU_PROAPTIV:
op_model_mipsxx_ops.cpu_type = "mips/proAptiv"; op_model_mipsxx_ops.cpu_type = "mips/proAptiv";
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment