Module Name: src
Committed By: thorpej
Date: Mon Apr 8 00:47:21 UTC 2019
Modified Files:
src/sys/arch/alpha/alpha: cpu.c cpuconf.c
src/sys/arch/alpha/include: rpb.h
Log Message:
Add some additional CPU and system types.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/alpha/alpha/cpu.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/alpha/cpuconf.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/include/rpb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/cpu.c
diff -u src/sys/arch/alpha/alpha/cpu.c:1.96 src/sys/arch/alpha/alpha/cpu.c:1.97
--- src/sys/arch/alpha/alpha/cpu.c:1.96 Sat Oct 10 17:00:12 2015
+++ src/sys/arch/alpha/alpha/cpu.c Mon Apr 8 00:47:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.96 2015/10/10 17:00:12 martin Exp $ */
+/* $NetBSD: cpu.c,v 1.97 2019/04/08 00:47:21 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.96 2015/10/10 17:00:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.97 2019/04/08 00:47:21 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -147,6 +147,9 @@ const struct cputable_struct {
{ PCS_PROC_EV68CB, "21264C", NULL },
{ PCS_PROC_EV68AL, "21264B", NULL },
{ PCS_PROC_EV68CX, "21264D", NULL },
+ { PCS_PROC_EV7, "21364", NULL },
+ { PCS_PROC_EV79, "EV79", NULL },
+ { PCS_PROC_EV69, "EV69", NULL },
};
/*
Index: src/sys/arch/alpha/alpha/cpuconf.c
diff -u src/sys/arch/alpha/alpha/cpuconf.c:1.36 src/sys/arch/alpha/alpha/cpuconf.c:1.37
--- src/sys/arch/alpha/alpha/cpuconf.c:1.36 Mon Sep 23 16:41:56 2013
+++ src/sys/arch/alpha/alpha/cpuconf.c Mon Apr 8 00:47:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuconf.c,v 1.36 2013/09/23 16:41:56 tsutsui Exp $ */
+/* $NetBSD: cpuconf.c,v 1.37 2019/04/08 00:47:21 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.36 2013/09/23 16:41:56 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.37 2019/04/08 00:47:21 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -226,14 +226,18 @@ static const struct cpuinit cpuinit[] =
cpu_init(ST_DEC_4100, dec_kn300_init, "DEC_KN300"),
cpu_notsupp(ST_DEC_EV45_PBP, "EV45 Passive Backplane Board"),
cpu_init(ST_DEC_2100A_A500, dec_2100a_a500_init, "DEC_2100A_A500"),
+ cpu_notsupp(ST_DEC_XL, "Alpha XL"),
cpu_init(ST_EB164, dec_eb164_init, "DEC_EB164"),
cpu_init(ST_DEC_1000A, dec_1000a_init, "DEC_1000A"),
cpu_notsupp(ST_DEC_ALPHAVME_224, "AlphaVME 224"),
cpu_init(ST_DEC_550, dec_550_init, "DEC_550"),
+ cpu_notsupp(ST_DEC_XXM, "DEC XXM"),
cpu_notsupp(ST_DEC_EV56_PBP, "EV56 Passive Backplane Board"),
cpu_notsupp(ST_DEC_ALPHAVME_320, "AlphaVME 320"),
cpu_init(ST_DEC_6600, dec_6600_init, "DEC_6600"),
cpu_init(ST_DEC_TITAN, dec_6600_init, "DEC_6600"),
+ cpu_notsupp(ST_DEC_MARVEL, "DEC_MARVEL"),
+ cpu_notsupp(ST_DTI_RUFFIAN, "DTI_RUFFIAN"),
cpu_init(ST_API_NAUTILUS, api_up1000_init, "API_UP1000"),
};
static const int ncpuinit = (sizeof(cpuinit) / sizeof(cpuinit[0]));
Index: src/sys/arch/alpha/include/rpb.h
diff -u src/sys/arch/alpha/include/rpb.h:1.42 src/sys/arch/alpha/include/rpb.h:1.43
--- src/sys/arch/alpha/include/rpb.h:1.42 Mon Feb 6 02:14:13 2012
+++ src/sys/arch/alpha/include/rpb.h Mon Apr 8 00:47:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpb.h,v 1.42 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: rpb.h,v 1.43 2019/04/08 00:47:21 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -71,10 +71,12 @@ struct rpb {
#define ST_DEC_4100 22 /* "Rawhide" (PCI/EISA) */
#define ST_DEC_EV45_PBP 23 /* "Lego" K2 Passive SBC */
#define ST_DEC_2100A_A500 24 /* "Lynx" */
+#define ST_DEC_XL 25 /* Alpha XL */
#define ST_EB164 26 /* EB164 (PCI/ISA) */
#define ST_DEC_1000A 27 /* "Noritake" (PCI/EISA)*/
#define ST_DEC_ALPHAVME_224 28 /* "Cortex" */
#define ST_DEC_550 30 /* "Miata" (PCI/ISA) */
+#define ST_DEC_XXM 31 /* XXM */
#define ST_DEC_EV56_PBP 32 /* "Takara" */
#define ST_DEC_ALPHAVME_320 33 /* "Yukon" (VME) */
#define ST_DEC_6600 34 /* EV6-Tsunami based systems */
@@ -82,6 +84,10 @@ struct rpb {
#define ST_DEC_CUSCO 36 /* "CUSCO" */
#define ST_DEC_EIGER 37 /* "Eiger" */
#define ST_DEC_TITAN 38 /* "Titan" */
+#define ST_DEC_MARVEL 39 /* "Marvel" */
+
+ /* DTI systypes */
+#define ST_DTI_RUFFIAN 101 /* EV56-Pyxis + ARC? */
/* Alpha Processor, Inc. systypes */
#define ST_API_NAUTILUS 201 /* EV6-AMD 751 UP1000 */
@@ -284,6 +290,9 @@ struct pcs {
#define PCS_PROC_EV68CB 12 /* EV68CB: 21264C */
#define PCS_PROC_EV68AL 13 /* EV68AL: 21264B */
#define PCS_PROC_EV68CX 14 /* EV68CX: 21264D */
+#define PCS_PROC_EV7 15 /* EV7: 21364 */
+#define PCS_PROC_EV79 16 /* EV79: 21364?? */
+#define PCS_PROC_EV69 17 /* EV69: 21264/EV69A */
#define PCS_CPU_MAJORTYPE(p) ((p)->pcs_proc_type & 0xffffffff)
#define PCS_CPU_MINORTYPE(p) ((p)->pcs_proc_type >> 32)
