aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Meloun <mmel@FreeBSD.org>2015-11-28 12:11:44 +0000
committerMichal Meloun <mmel@FreeBSD.org>2015-11-28 12:11:44 +0000
commit1d687ba2d1404cad3f75866d5f0ea1e38ca9a3f9 (patch)
treed605a3cbd1814285c40deff63eb9631d86eb7e79
parent20fc8f2bb54928ac4711a7597817dd37b42aa854 (diff)
downloadsrc-1d687ba2d1404cad3f75866d5f0ea1e38ca9a3f9.tar.gz
src-1d687ba2d1404cad3f75866d5f0ea1e38ca9a3f9.zip
ARM: Add support for new KRAIT 300 CPU revision.
Approved by: kib (mentor)
Notes
Notes: svn path=/head/; revision=291425
-rw-r--r--sys/arm/arm/cpufunc.c3
-rw-r--r--sys/arm/arm/identcpu.c4
-rw-r--r--sys/arm/include/armreg.h4
3 files changed, 8 insertions, 3 deletions
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 734ee587abea..0dd9241f27df 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -910,7 +910,8 @@ set_cpufuncs()
cputype == CPU_ID_CORTEXA15R1 ||
cputype == CPU_ID_CORTEXA15R2 ||
cputype == CPU_ID_CORTEXA15R3 ||
- cputype == CPU_ID_KRAIT ) {
+ cputype == CPU_ID_KRAIT300R0 ||
+ cputype == CPU_ID_KRAIT300R1 ) {
cpufuncs = cortexa_cpufuncs;
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
get_cachetype_cp15();
diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c
index be1393b1a17d..6c5764c297ce 100644
--- a/sys/arm/arm/identcpu.c
+++ b/sys/arm/arm/identcpu.c
@@ -197,7 +197,9 @@ const struct cpuidtab cpuids[] = {
generic_steppings },
{ CPU_ID_CORTEXA15R3, CPU_CLASS_CORTEXA, "Cortex A15-r3",
generic_steppings },
- { CPU_ID_KRAIT, CPU_CLASS_KRAIT, "Krait",
+ { CPU_ID_KRAIT300R0, CPU_CLASS_KRAIT, "Krait 300-r0",
+ generic_steppings },
+ { CPU_ID_KRAIT300R1, CPU_CLASS_KRAIT, "Krait 300-r1",
generic_steppings },
{ CPU_ID_80200, CPU_CLASS_XSCALE, "i80200",
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 5cc022bc232b..5596b7f900d9 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -139,7 +139,9 @@
#define CPU_ID_CORTEXA15R1 0x411fc0f0
#define CPU_ID_CORTEXA15R2 0x412fc0f0
#define CPU_ID_CORTEXA15R3 0x413fc0f0
-#define CPU_ID_KRAIT 0x510f06f0 /* Snapdragon S4 Pro/APQ8064 */
+#define CPU_ID_KRAIT300R0 0x510f06f0 /* Snapdragon S4 Pro/APQ8064 */
+#define CPU_ID_KRAIT300R1 0x511f06f0
+
#define CPU_ID_TI925T 0x54029250
#define CPU_ID_MV88FR131 0x56251310 /* Marvell Feroceon 88FR131 Core */
#define CPU_ID_MV88FR331 0x56153310 /* Marvell Feroceon 88FR331 Core */