Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src separate cputypes.h for CPU_ID_* from armreg.h,
details: https://anonhg.NetBSD.org/src/rev/2798db1da3cf
branches: trunk
changeset: 831289:2798db1da3cf
user: ryo <ryo%NetBSD.org@localhost>
date: Tue Mar 20 10:14:29 2018 +0000
description:
separate cputypes.h for CPU_ID_* from armreg.h,
and add some implementor IDs, CortexA55,73,75 IDs.
(preliminary changes for merging aarch64)
diffstat:
distrib/sets/lists/comp/ad.aarch64 | 3 +-
distrib/sets/lists/comp/ad.arm | 3 +-
sys/arch/aarch64/include/armreg.h | 3 +-
sys/arch/arm/include/Makefile | 4 +-
sys/arch/arm/include/armreg.h | 163 +---------------------------
sys/arch/arm/include/cputypes.h | 214 +++++++++++++++++++++++++++++++++++++
6 files changed, 225 insertions(+), 165 deletions(-)
diffs (truncated from 469 to 300 lines):
diff -r 56294c116041 -r 2798db1da3cf distrib/sets/lists/comp/ad.aarch64
--- a/distrib/sets/lists/comp/ad.aarch64 Tue Mar 20 09:50:33 2018 +0000
+++ b/distrib/sets/lists/comp/ad.aarch64 Tue Mar 20 10:14:29 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.16 2018/01/24 09:51:26 wiz Exp $
+# $NetBSD: ad.aarch64,v 1.17 2018/03/20 10:14:29 ryo Exp $
./usr/include/aarch64 comp-c-include
./usr/include/aarch64/ansi.h comp-c-include
./usr/include/aarch64/aout_machdep.h comp-c-include
@@ -72,6 +72,7 @@
./usr/include/arm/cdefs.h comp-c-include
./usr/include/arm/cpu.h comp-c-include
./usr/include/arm/cpuconf.h comp-c-include
+./usr/include/arm/cputypes.h comp-c-include
./usr/include/arm/disklabel.h comp-c-include
./usr/include/arm/elf_machdep.h comp-c-include
./usr/include/arm/endian.h comp-c-include
diff -r 56294c116041 -r 2798db1da3cf distrib/sets/lists/comp/ad.arm
--- a/distrib/sets/lists/comp/ad.arm Tue Mar 20 09:50:33 2018 +0000
+++ b/distrib/sets/lists/comp/ad.arm Tue Mar 20 10:14:29 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.83 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: ad.arm,v 1.84 2018/03/20 10:14:29 ryo Exp $
./usr/include/acorn26 comp-obsolete obsolete
./usr/include/acorn26/ansi.h comp-obsolete obsolete
./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete
@@ -133,6 +133,7 @@
./usr/include/arm/cdefs.h comp-c-include
./usr/include/arm/cpu.h comp-c-include
./usr/include/arm/cpuconf.h comp-c-include
+./usr/include/arm/cputypes.h comp-c-include
./usr/include/arm/db_machdep.h comp-obsolete obsolete
./usr/include/arm/disklabel.h comp-c-include
./usr/include/arm/disklabel_acorn.h comp-obsolete obsolete
diff -r 56294c116041 -r 2798db1da3cf sys/arch/aarch64/include/armreg.h
--- a/sys/arch/aarch64/include/armreg.h Tue Mar 20 09:50:33 2018 +0000
+++ b/sys/arch/aarch64/include/armreg.h Tue Mar 20 10:14:29 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.7 2018/03/06 08:20:22 skrll Exp $ */
+/* $NetBSD: armreg.h,v 1.8 2018/03/20 10:14:29 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
#ifdef __aarch64__
+#include <arm/cputypes.h>
#include <sys/types.h>
#define AARCH64REG_READ_INLINE2(regname, regdesc) \
diff -r 56294c116041 -r 2798db1da3cf sys/arch/arm/include/Makefile
--- a/sys/arch/arm/include/Makefile Tue Mar 20 09:50:33 2018 +0000
+++ b/sys/arch/arm/include/Makefile Tue Mar 20 10:14:29 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2014/07/23 18:19:43 alnsn Exp $
+# $NetBSD: Makefile,v 1.50 2018/03/20 10:14:29 ryo Exp $
INCSDIR= /usr/include/arm
INCS= aeabi.h ansi.h aout_machdep.h apmvar.h armreg.h asm.h atomic.h \
bswap.h byte_swap.h \
- cdefs.h cpu.h cpuconf.h \
+ cdefs.h cpu.h cpuconf.h cputypes.h \
disklabel.h \
elf_machdep.h endian.h endian_machdep.h \
fenv.h float.h frame.h \
diff -r 56294c116041 -r 2798db1da3cf sys/arch/arm/include/armreg.h
--- a/sys/arch/arm/include/armreg.h Tue Mar 20 09:50:33 2018 +0000
+++ b/sys/arch/arm/include/armreg.h Tue Mar 20 10:14:29 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.118 2018/03/02 22:23:17 christos Exp $ */
+/* $NetBSD: armreg.h,v 1.119 2018/03/20 10:14:29 ryo Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -39,6 +39,8 @@
#ifndef _ARM_ARMREG_H
#define _ARM_ARMREG_H
+#include <arm/cputypes.h>
+
/*
* ARM Process Status Register
*
@@ -101,165 +103,6 @@
#define ARM_CP15_CPU_ID 0
-/*
- * The CPU ID register is theoretically structured, but the definitions of
- * the fields keep changing.
- */
-
-/* The high-order byte is always the implementor */
-#define CPU_ID_IMPLEMENTOR_MASK 0xff000000
-#define CPU_ID_ARM_LTD 0x41000000 /* 'A' */
-#define CPU_ID_DEC 0x44000000 /* 'D' */
-#define CPU_ID_INTEL 0x69000000 /* 'i' */
-#define CPU_ID_TI 0x54000000 /* 'T' */
-#define CPU_ID_MARVELL 0x56000000 /* 'V' */
-#define CPU_ID_FARADAY 0x66000000 /* 'f' */
-
-/* How to decide what format the CPUID is in. */
-#define CPU_ID_ISOLD(x) (((x) & 0x0000f000) == 0x00000000)
-#define CPU_ID_IS7(x) (((x) & 0x0000f000) == 0x00007000)
-#define CPU_ID_ISNEW(x) (!CPU_ID_ISOLD(x) && !CPU_ID_IS7(x))
-
-/* On ARM3 and ARM6, this byte holds the foundry ID. */
-#define CPU_ID_FOUNDRY_MASK 0x00ff0000
-#define CPU_ID_FOUNDRY_VLSI 0x00560000
-
-/* On ARM7 it holds the architecture and variant (sub-model) */
-#define CPU_ID_7ARCH_MASK 0x00800000
-#define CPU_ID_7ARCH_V3 0x00000000
-#define CPU_ID_7ARCH_V4T 0x00800000
-#define CPU_ID_7VARIANT_MASK 0x007f0000
-
-/* On more recent ARMs, it does the same, but in a different format */
-#define CPU_ID_ARCH_MASK 0x000f0000
-#define CPU_ID_ARCH_V3 0x00000000
-#define CPU_ID_ARCH_V4 0x00010000
-#define CPU_ID_ARCH_V4T 0x00020000
-#define CPU_ID_ARCH_V5 0x00030000
-#define CPU_ID_ARCH_V5T 0x00040000
-#define CPU_ID_ARCH_V5TE 0x00050000
-#define CPU_ID_ARCH_V5TEJ 0x00060000
-#define CPU_ID_ARCH_V6 0x00070000
-#define CPU_ID_VARIANT_MASK 0x00f00000
-
-/* Next three nybbles are part number */
-#define CPU_ID_PARTNO_MASK 0x0000fff0
-
-/* Intel XScale has sub fields in part number */
-#define CPU_ID_XSCALE_COREGEN_MASK 0x0000e000 /* core generation */
-#define CPU_ID_XSCALE_COREREV_MASK 0x00001c00 /* core revision */
-#define CPU_ID_XSCALE_PRODUCT_MASK 0x000003f0 /* product number */
-
-/* And finally, the revision number. */
-#define CPU_ID_REVISION_MASK 0x0000000f
-
-/* Individual CPUs are probably best IDed by everything but the revision. */
-#define CPU_ID_CPU_MASK 0xfffffff0
-
-/* Fake CPU IDs for ARMs without CP15 */
-#define CPU_ID_ARM2 0x41560200
-#define CPU_ID_ARM250 0x41560250
-
-/* Pre-ARM7 CPUs -- [15:12] == 0 */
-#define CPU_ID_ARM3 0x41560300
-#define CPU_ID_ARM600 0x41560600
-#define CPU_ID_ARM610 0x41560610
-#define CPU_ID_ARM620 0x41560620
-
-/* ARM7 CPUs -- [15:12] == 7 */
-#define CPU_ID_ARM700 0x41007000 /* XXX This is a guess. */
-#define CPU_ID_ARM710 0x41007100
-#define CPU_ID_ARM7500 0x41027100
-#define CPU_ID_ARM710A 0x41067100
-#define CPU_ID_ARM7500FE 0x41077100
-#define CPU_ID_ARM710T 0x41807100
-#define CPU_ID_ARM720T 0x41807200
-#define CPU_ID_ARM740T8K 0x41807400 /* XXX no MMU, 8KB cache */
-#define CPU_ID_ARM740T4K 0x41817400 /* XXX no MMU, 4KB cache */
-
-/* Post-ARM7 CPUs */
-#define CPU_ID_ARM810 0x41018100
-#define CPU_ID_ARM920T 0x41129200
-#define CPU_ID_ARM922T 0x41029220
-#define CPU_ID_ARM926EJS 0x41069260
-#define CPU_ID_ARM940T 0x41029400 /* XXX no MMU */
-#define CPU_ID_ARM946ES 0x41049460 /* XXX no MMU */
-#define CPU_ID_ARM966ES 0x41049660 /* XXX no MMU */
-#define CPU_ID_ARM966ESR1 0x41059660 /* XXX no MMU */
-#define CPU_ID_ARM1020E 0x4115a200 /* (AKA arm10 rev 1) */
-#define CPU_ID_ARM1022ES 0x4105a220
-#define CPU_ID_ARM1026EJS 0x4106a260
-#define CPU_ID_ARM11MPCORE 0x410fb020
-#define CPU_ID_ARM1136JS 0x4107b360
-#define CPU_ID_ARM1136JSR1 0x4117b360
-#define CPU_ID_ARM1156T2S 0x4107b560 /* MPU only */
-#define CPU_ID_ARM1176JZS 0x410fb760
-#define CPU_ID_ARM11_P(n) ((n & 0xff07f000) == 0x4107b000)
-#define CPU_ID_CORTEXA5R0 0x410fc050
-#define CPU_ID_CORTEXA7R0 0x410fc070
-#define CPU_ID_CORTEXA8R1 0x411fc080
-#define CPU_ID_CORTEXA8R2 0x412fc080
-#define CPU_ID_CORTEXA8R3 0x413fc080
-#define CPU_ID_CORTEXA9R1 0x411fc090
-#define CPU_ID_CORTEXA9R2 0x412fc090
-#define CPU_ID_CORTEXA9R3 0x413fc090
-#define CPU_ID_CORTEXA9R4 0x414fc090
-#define CPU_ID_CORTEXA15R2 0x412fc0f0
-#define CPU_ID_CORTEXA15R3 0x413fc0f0
-#define CPU_ID_CORTEXA17R1 0x411fc0e0
-#define CPU_ID_CORTEXA35R0 0x410fd040
-#define CPU_ID_CORTEXA53R0 0x410fd030
-#define CPU_ID_CORTEXA57R0 0x410fd070
-#define CPU_ID_CORTEXA57R1 0x411fd070
-#define CPU_ID_CORTEXA72R0 0x410fd080
-
-#define CPU_ID_CORTEX_P(n) ((n & 0xff0fe000) == 0x410fc000)
-#define CPU_ID_CORTEX_A5_P(n) ((n & 0xff0ff0f0) == 0x410fc050)
-#define CPU_ID_CORTEX_A7_P(n) ((n & 0xff0ff0f0) == 0x410fc070)
-#define CPU_ID_CORTEX_A8_P(n) ((n & 0xff0ff0f0) == 0x410fc080)
-#define CPU_ID_CORTEX_A9_P(n) ((n & 0xff0ff0f0) == 0x410fc090)
-#define CPU_ID_CORTEX_A15_P(n) ((n & 0xff0ff0f0) == 0x410fc0f0)
-#define CPU_ID_CORTEX_A35_P(n) ((n & 0xff0ff0f0) == 0x410fd040)
-#define CPU_ID_CORTEX_A53_P(n) ((n & 0xff0ff0f0) == 0x410fd030)
-#define CPU_ID_CORTEX_A57_P(n) ((n & 0xff0ff0f0) == 0x410fd070)
-#define CPU_ID_CORTEX_A72_P(n) ((n & 0xff0ff0f0) == 0x410fd080)
-#define CPU_ID_SA110 0x4401a100
-#define CPU_ID_SA1100 0x4401a110
-#define CPU_ID_TI925T 0x54029250
-#define CPU_ID_MV88FR571_VD 0x56155710
-#define CPU_ID_MV88SV131 0x56251310
-#define CPU_ID_FA526 0x66015260
-#define CPU_ID_SA1110 0x6901b110
-#define CPU_ID_IXP1200 0x6901c120
-#define CPU_ID_80200 0x69052000
-#define CPU_ID_PXA250 0x69052100 /* sans core revision */
-#define CPU_ID_PXA210 0x69052120
-#define CPU_ID_PXA250A 0x69052100 /* 1st version Core */
-#define CPU_ID_PXA210A 0x69052120 /* 1st version Core */
-#define CPU_ID_PXA250B 0x69052900 /* 3rd version Core */
-#define CPU_ID_PXA210B 0x69052920 /* 3rd version Core */
-#define CPU_ID_PXA250C 0x69052d00 /* 4th version Core */
-#define CPU_ID_PXA210C 0x69052d20 /* 4th version Core */
-#define CPU_ID_PXA27X 0x69054110
-#define CPU_ID_80321_400 0x69052420
-#define CPU_ID_80321_600 0x69052430
-#define CPU_ID_80321_400_B0 0x69052c20
-#define CPU_ID_80321_600_B0 0x69052c30
-#define CPU_ID_80219_400 0x69052e20
-#define CPU_ID_80219_600 0x69052e30
-#define CPU_ID_IXP425_533 0x690541c0
-#define CPU_ID_IXP425_400 0x690541d0
-#define CPU_ID_IXP425_266 0x690541f0
-#define CPU_ID_MV88SV58XX_P(n) ((n & 0xff0fff00) == 0x560f5800)
-#define CPU_ID_MV88SV581X_V6 0x560f5810 /* Marvell Sheeva 88SV581x v6 Core */
-#define CPU_ID_MV88SV581X_V7 0x561f5810 /* Marvell Sheeva 88SV581x v7 Core */
-#define CPU_ID_MV88SV584X_V6 0x561f5840 /* Marvell Sheeva 88SV584x v6 Core */
-#define CPU_ID_MV88SV584X_V7 0x562f5840 /* Marvell Sheeva 88SV584x v7 Core */
-/* Marvell's CPUIDs with ARM ID in implementor field */
-#define CPU_ID_ARM_88SV581X_V6 0x410fb760 /* Marvell Sheeva 88SV581x v6 Core */
-#define CPU_ID_ARM_88SV581X_V7 0x413fc080 /* Marvell Sheeva 88SV581x v7 Core */
-#define CPU_ID_ARM_88SV584X_V6 0x410fb020 /* Marvell Sheeva 88SV584x v6 Core */
-
/* CPUID registers */
#define ARM_ISA3_SYNCHPRIM_MASK 0x0000f000
#define ARM_ISA4_SYNCHPRIM_MASK 0x00f00000
diff -r 56294c116041 -r 2798db1da3cf sys/arch/arm/include/cputypes.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/include/cputypes.h Tue Mar 20 10:14:29 2018 +0000
@@ -0,0 +1,214 @@
+/* $NetBSD: cputypes.h,v 1.1 2018/03/20 10:14:29 ryo Exp $ */
+
+/*
+ * Copyright (c) 1998, 2001 Ben Harris
+ * Copyright (c) 1994-1996 Mark Brinicombe.
+ * Copyright (c) 1994 Brini.
+ * All rights reserved.
+ *
+ * This code is derived from software written for Brini by Mark Brinicombe
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Brini.
+ * 4. The name of the company nor the name of the author may be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _ARM_CPUTYPES_H_
+#define _ARM_CPUTYPES_H_
+
+/*
+ * The CPU ID register is theoretically structured, but the definitions of
+ * the fields keep changing.
+ */
Home |
Main Index |
Thread Index |
Old Index