summaryrefslogtreecommitdiff
path: root/sys/arch/octeon
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2018-12-04 16:24:14 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2018-12-04 16:24:14 +0000
commitbb8320d336a3cae8365e042f13a4679a650cbdff (patch)
tree3917cf3efbf626b59af6c90606c2d9950145ab63 /sys/arch/octeon
parentc94e2ebe9e718f93992b2e3a3546d649c87aa00c (diff)
Add processor IDs for several OCTEON II and III SoCs.
Diffstat (limited to 'sys/arch/octeon')
-rw-r--r--sys/arch/octeon/include/octeon_model.h6
-rw-r--r--sys/arch/octeon/octeon/machdep.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/octeon/include/octeon_model.h b/sys/arch/octeon/include/octeon_model.h
index a8eb647f0a4..c031ee9b8ee 100644
--- a/sys/arch/octeon/include/octeon_model.h
+++ b/sys/arch/octeon/include/octeon_model.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: octeon_model.h,v 1.6 2017/04/07 14:17:38 visa Exp $ */
+/* $OpenBSD: octeon_model.h,v 1.7 2018/12/04 16:24:13 visa Exp $ */
/*
* Copyright (c) 2007
@@ -52,7 +52,11 @@
#define OCTEON_MODEL_FAMILY_CN31XX 0x000d0100
#define OCTEON_MODEL_FAMILY_CN30XX 0x000d0200
#define OCTEON_MODEL_FAMILY_CN50XX 0x000d0600
+#define OCTEON_MODEL_FAMILY_CN63XX 0x000d9000
+#define OCTEON_MODEL_FAMILY_CN68XX 0x000d9100
+#define OCTEON_MODEL_FAMILY_CN66XX 0x000d9200
#define OCTEON_MODEL_FAMILY_CN61XX 0x000d9300
+#define OCTEON_MODEL_FAMILY_CN78XX 0x000d9500
#define OCTEON_MODEL_FAMILY_CN71XX 0x000d9600
#define OCTEON_MODEL_FAMILY_CN73XX 0x000d9700
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c
index 726c8374170..784f01e8e9f 100644
--- a/sys/arch/octeon/octeon/machdep.c
+++ b/sys/arch/octeon/octeon/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.106 2018/06/13 14:38:42 visa Exp $ */
+/* $OpenBSD: machdep.c,v 1.107 2018/12/04 16:24:13 visa Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -285,10 +285,14 @@ mips_init(register_t a0, register_t a1, register_t a2, register_t a3)
octeon_ver = OCTEON_PLUS;
break;
case OCTEON_MODEL_FAMILY_CN61XX:
+ case OCTEON_MODEL_FAMILY_CN63XX:
+ case OCTEON_MODEL_FAMILY_CN66XX:
+ case OCTEON_MODEL_FAMILY_CN68XX:
octeon_ver = OCTEON_2;
break;
case OCTEON_MODEL_FAMILY_CN71XX:
case OCTEON_MODEL_FAMILY_CN73XX:
+ case OCTEON_MODEL_FAMILY_CN78XX:
octeon_ver = OCTEON_3;
break;
}