Date: Sat, 28 Nov 2015 12:11:45 +0000 (UTC) From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291425 - in head/sys/arm: arm include Message-ID: <201511281211.tASCBjs3043376@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmel Date: Sat Nov 28 12:11:44 2015 New Revision: 291425 URL: https://svnweb.freebsd.org/changeset/base/291425 Log: ARM: Add support for new KRAIT 300 CPU revision. Approved by: kib (mentor) Modified: head/sys/arm/arm/cpufunc.c head/sys/arm/arm/identcpu.c head/sys/arm/include/armreg.h Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Sat Nov 28 12:09:36 2015 (r291424) +++ head/sys/arm/arm/cpufunc.c Sat Nov 28 12:11:44 2015 (r291425) @@ -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(); Modified: head/sys/arm/arm/identcpu.c ============================================================================== --- head/sys/arm/arm/identcpu.c Sat Nov 28 12:09:36 2015 (r291424) +++ head/sys/arm/arm/identcpu.c Sat Nov 28 12:11:44 2015 (r291425) @@ -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", Modified: head/sys/arm/include/armreg.h ============================================================================== --- head/sys/arm/include/armreg.h Sat Nov 28 12:09:36 2015 (r291424) +++ head/sys/arm/include/armreg.h Sat Nov 28 12:11:44 2015 (r291425) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511281211.tASCBjs3043376>