ZAP GENERIC!

6 files changed, 341 insertions, 103 deletions

diff --git a/sys/arch/arc/arc/arctype.h b/sys/arch/arc/arc/arctype.h
index b8588877637..0e0c55c9d1a 100644
--- a/sys/arch/arc/arc/arctype.h
+++ b/sys/arch/arc/arc/arctype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arctype.h,v 1.2 1996/07/30 20:24:12 pefo Exp $	*/
+/*	$OpenBSD: arctype.h,v 1.3 1996/09/02 11:33:22 pefo Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,12 +36,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)arctype.h	8.1 (Berkeley) 6/10/93
- *      $Id: arctype.h,v 1.2 1996/07/30 20:24:12 pefo Exp $
+ *      $Id: arctype.h,v 1.3 1996/09/02 11:33:22 pefo Exp $
  */
 
 /*
  * Mother board type byte of "systype" environment variable.
  */
-#define	ACER_PICA_61	0x1	/* Acer Labs Pica 61 */
-#define	DESKSTATION	0x2	/* Deskstation xxx */
-#define	MAGNUM		0x3	/* Mips MAGNUM R4000 */
+#define	ACER_PICA_61		0x1	/* Acer Labs Pica 61 */
+#define	MAGNUM			0x2	/* Mips MAGNUM R4000 */
+#define	DESKSTATION_RPC44	0x3	/* Deskstation xxx */
+#define	DESKSTATION_TYNE	0x4	/* Deskstation xxx */
diff --git a/sys/arch/arc/arc/autoconf.c b/sys/arch/arc/arc/autoconf.c
index 8f8e452c0d1..dd612da7821 100644
--- a/sys/arch/arc/arc/autoconf.c
+++ b/sys/arch/arc/arc/autoconf.c
@@ -1,5 +1,7 @@
-/*	$OpenBSD: autoconf.c,v 1.2 1996/08/26 11:01:33 pefo Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.3 1996/09/02 11:33:22 pefo Exp $	*/
 /*
+ * Copyright (c) 1996 Per Fogelstrom
+ * Copyright (c) 1995 Theo de Raadt
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,7 +41,7 @@
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
  *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.2 1996/08/26 11:01:33 pefo Exp $
+ *      $Id: autoconf.c,v 1.3 1996/09/02 11:33:22 pefo Exp $
  */
 
 /*
@@ -60,6 +62,9 @@
 
 #include <machine/autoconf.h>
 
+struct  device *parsedisk __P((char *, int, int, dev_t *));
+void    setroot __P((void));
+
 /*
  * The following several variables are related to
  * the configuration process, and are used in initializing
@@ -67,6 +72,8 @@
  */
 int	cold = 1;	/* if 1, still working on cold-start */
 int	cpuspeed = 150;	/* approx # instr per usec. */
+char	bootdev[16];	/* to hold boot dev name */
+struct device *bootdv = NULL;
 
 /*
  *  Configure all devices found that we know about.
@@ -79,13 +86,7 @@ configure()
 		panic("no mainbus found");
 	(void)spl0();
 
-#ifdef GENERIC
-	if ((boothowto & RB_ASKNAME) == 0)
-		setroot();
-	setconf();
-#else
 	setroot();
-#endif
 	swapconf();
 	cold = 0;
 }
@@ -111,59 +112,276 @@ swapconf()
 	dumpconf();
 }
 
-#define	DOSWAP			/* Change swdevt and dumpdev too */
-u_long	bootdev;		/* should be dev_t, but not until 32 bits */
-
-static	char devname[][2] = {
-	's','d',	/* 0 = sd */
-	'x','x',	/* 1 = unused */
-	'x','x',	/* 2 = unused */
-	'x','x',	/* 3 = unused */
-	'x','x',	/* 4 = unused */
-	'x','x',	/* 5 = unused */
-	'x','x',	/* 6 = unused */
-	'f','d',	/* 7 = floppy */
+/*                                                                        
+ * the rest of this file was influenced/copied from Theo de Raadt's
+ * code in the sparc port to nuke the "options GENERIC" stuff.
+ */
+
+static	struct nam2blk {
+	char *name;
+	int  maj;
+} nam2blk[] = {
+	{ "sd",	0 },	/* 0 = sd */
+	{ "fd", 7 },	/* 7 = floppy  (ick!)*/
 };
 
+static int
+findblkmajor(dv)
+	struct device *dv;
+{
+	char *name = dv->dv_xname;
+	register int i;
+
+	for (i = 0; i < sizeof(nam2blk)/sizeof(nam2blk[0]); ++i)
+		if (strncmp(name, nam2blk[i].name, strlen(nam2blk[0].name)) == 0)
+			return (nam2blk[i].maj);
+	 return (-1);
+}
+
+static struct device *
+getdisk(str, len, defpart, devp)
+	char *str;
+	int len, defpart;
+	dev_t *devp;
+{
+	register struct device *dv;
+
+	if ((dv = parsedisk(str, len, defpart, devp)) == NULL) {
+		printf("use one of:");
+		for (dv = alldevs.tqh_first; dv != NULL;
+		    dv = dv->dv_list.tqe_next) {
+			if (dv->dv_class == DV_DISK)
+				printf(" %s[a-h]", dv->dv_xname);
+#ifdef NFSCLIENT
+			if (dv->dv_class == DV_IFNET)
+				printf(" %s", dv->dv_xname); 
+#endif
+		}
+		printf("\n");
+	}
+	return (dv);
+}
+
+struct device *
+parsedisk(str, len, defpart, devp)
+	char *str;
+	int len, defpart;
+	dev_t *devp;
+{
+	register struct device *dv;
+	register char *cp, c;
+	int majdev, mindev, part;
+
+	if (len == 0)
+		return (NULL);
+	cp = str + len - 1;
+	c = *cp;
+	if (c >= 'a' && c <= 'h') {
+		part = c - 'a';
+		*cp = '\0';
+	} else
+		part = defpart;
+
+	for (dv = alldevs.tqh_first; dv != NULL; dv = dv->dv_list.tqe_next) {
+		if (dv->dv_class == DV_DISK &&
+		    strcmp(str, dv->dv_xname) == 0) {
+			majdev = findblkmajor(dv);
+			if (majdev < 0)
+				panic("parsedisk");
+			mindev = (dv->dv_unit << PARTITIONSHIFT) + part;
+			*devp = makedev(majdev, mindev);
+			break;
+		}
+#ifdef NFSCLIENT
+		if (dv->dv_class == DV_IFNET &&
+		    strcmp(str, dv->dv_xname) == 0) {
+			*devp = NODEV;
+			break;
+		}
+#endif
+	}
+
+	*cp = c;
+	return (dv);
+}
+
 /*
  * Attempt to find the device from which we were booted.
  * If we can do so, and not instructed not to do so,
  * change rootdev to correspond to the load device.
  */
+void
 setroot()
 {
-	int  majdev, mindev, unit, part, controller;
-	dev_t temp, orootdev;
+	int  majdev, mindev, unit, part, len;
+	dev_t temp;
 	struct swdevt *swp;
+	struct device *dv;
+	dev_t nrootdev, nswapdev = NODEV;
+	char buf[128];
+	extern int (*mountroot) __P((void *));
+
+#if defined(NFSCLIENT)
+	extern char *nfsbootdevname;
+	extern int nfs_mountroot __P((void *));
+#endif
+#if defined(FFS)
+	extern int ffs_mountroot __P((void *));
+#endif
 
-	if (boothowto & RB_DFLTROOT ||
-	    (bootdev & B_MAGICMASK) != B_DEVMAGIC)
+	/* Lookup boot device from boot if not set by configuration */
+	if(bootdv == NULL) {
+		bootdv = parsedisk(bootdev, strlen(bootdev), 0, &temp);
+	}
+	if(bootdv == NULL) {
+		printf("boot device: lookup '%s' failed.\n", bootdev);
+		boothowto |= RB_ASKNAME; /* Don't Panic :-) */
+	}
+	else {
+		printf("boot device: %s.\n", bootdv->dv_xname);
+	}
+
+	if (boothowto & RB_ASKNAME) {
+		for (;;) {
+			 printf("root device ");
+			if (bootdv != NULL)
+				 printf("(default %s%c)",
+					bootdv->dv_xname,
+					bootdv->dv_class == DV_DISK
+						? 'a' : ' ');
+			printf(": ");
+			len = getsn(buf, sizeof(buf));
+			if (len == 0 && bootdv != NULL) {
+				strcpy(buf, bootdv->dv_xname);
+				len = strlen(buf);
+			}
+			if (len > 0 && buf[len - 1] == '*') {
+				buf[--len] = '\0';
+				dv = getdisk(buf, len, 1, &nrootdev);
+				if (dv != NULL) {
+					bootdv = dv;
+					nswapdev = nrootdev;
+					goto gotswap;
+				}
+			}
+			dv = getdisk(buf, len, 0, &nrootdev);
+			if (dv != NULL) {
+				bootdv = dv;
+				break;
+			}
+		}
+		/*
+		 * because swap must be on same device as root, for
+		 * network devices this is easy.
+		 */
+		if (bootdv->dv_class == DV_IFNET) {
+			goto gotswap;
+		}
+		for (;;) {
+			printf("swap device ");
+			if (bootdv != NULL)
+				printf("(default %s%c)",
+					bootdv->dv_xname,
+					bootdv->dv_class == DV_DISK?'b':' ');
+			printf(": ");
+			len = getsn(buf, sizeof(buf));
+			if (len == 0 && bootdv != NULL) {
+				switch (bootdv->dv_class) {
+				case DV_IFNET:
+					nswapdev = NODEV;
+					break;
+				case DV_DISK:
+					nswapdev = makedev(major(nrootdev),
+					    (minor(nrootdev) & ~ PARTITIONMASK)
+| 1);
+					break;
+				case DV_TAPE:
+				case DV_TTY:
+				case DV_DULL:
+				case DV_CPU:
+					break;
+				}
+				break;
+			}
+			dv = getdisk(buf, len, 1, &nswapdev);
+			if (dv) {
+				if (dv->dv_class == DV_IFNET)
+					nswapdev = NODEV;
+				break;
+			}
+		}
+
+gotswap:
+		rootdev = nrootdev;
+		dumpdev = nswapdev;
+		swdevt[0].sw_dev = nswapdev;
+		swdevt[1].sw_dev = NODEV;
+	}
+	else if(mountroot == NULL) {
+		/*
+		 * `swap generic': Use the device the ROM told us to use.
+		 */
+		if (bootdv == NULL)
+			panic("boot device not known");
+
+		majdev = findblkmajor(bootdv);
+
+		if (majdev >= 0) {
+			/*
+			 * Root and Swap are on disk.
+			 * Boot is always from partition 0.
+			 */
+			rootdev = MAKEDISKDEV(majdev, bootdv->dv_unit, 0);
+			nswapdev = MAKEDISKDEV(majdev, bootdv->dv_unit, 1);
+			dumpdev = nswapdev;
+		}
+		else {
+			/*
+			 *  Root and Swap are on net.
+			 */	
+			nswapdev = dumpdev = NODEV;
+		}
+		swdevt[0].sw_dev = nswapdev;
+		swdevt[1].sw_dev = NODEV;
+
+	} else {
+
+		/*
+		 * `root DEV swap DEV': honour rootdev/swdevt.
+		 * rootdev/swdevt/mountroot already properly set.
+		 */
+		return;
+	}
+
+	switch (bootdv->dv_class) {
+#if defined(NFSCLIENT)
+	case DV_IFNET:
+		mountroot = nfs_mountroot;
+		nfsbootdevname = bootdv->dv_xname;
 		return;
-	majdev = B_TYPE(bootdev);
-	if (majdev >= sizeof(devname) / sizeof(devname[0]))
+#endif
+#if defined(FFS)
+	case DV_DISK:
+		mountroot = ffs_mountroot;
+		majdev = major(rootdev);
+		mindev = minor(rootdev);
+		printf("root on %s%c\n", bootdv->dv_xname,
+		    (mindev & PARTITIONMASK) + 'a');
+		break;
+#endif
+	default:
+		printf("can't figure root, hope your kernel is right\n");
 		return;
-	controller = B_CONTROLLER(bootdev);
-	part = B_PARTITION(bootdev);
-	unit = B_UNIT(bootdev);
+	}
 
-	mindev = (unit << PARTITIONSHIFT) + part;
-	orootdev = rootdev;
-	rootdev = makedev(majdev, mindev);
 	/*
-	 * If the original rootdev is the same as the one
-	 * just calculated, don't need to adjust the swap configuration.
+	 * XXX: What is this doing?
 	 */
-	if (rootdev == orootdev)
-		return;
-
-	printf("changing root device to %c%c%d%c\n",
-		devname[majdev][0], devname[majdev][1],
-		unit, part + 'a');
-
-#ifdef DOSWAP
+	mindev &= ~PARTITIONMASK;
+	temp = NODEV;
 	for (swp = swdevt; swp->sw_dev != NODEV; swp++) {
 		if (majdev == major(swp->sw_dev) &&
-		    (mindev / MAXPARTITIONS) == (minor(swp->sw_dev) / MAXPARTITIONS)) {
+		    mindev == (minor(swp->sw_dev) & ~PARTITIONMASK)) {
 			temp = swdevt[0].sw_dev;
 			swdevt[0].sw_dev = swp->sw_dev;
 			swp->sw_dev = temp;
@@ -174,38 +392,59 @@ setroot()
 		return;
 
 	/*
-	 * If dumpdev was the same as the old primary swap
-	 * device, move it to the new primary swap device.
+	 * If dumpdev was the same as the old primary swap device, move
+	 * it to the new primary swap device.
 	 */
 	if (temp == dumpdev)
 		dumpdev = swdevt[0].sw_dev;
-#endif
+}
+
+/*
+ * find a device matching "name" and unit number
+ */
+struct device *
+getdevunit(name, unit)
+	char *name;
+	int unit;
+{
+	struct device *dev = alldevs.tqh_first;
+	char num[10], fullname[16];
+	int lunit;
+
+	/* compute length of name and decimal expansion of unit number */
+	sprintf(num, "%d", unit);
+	lunit = strlen(num);
+	if (strlen(name) + lunit >= sizeof(fullname) - 1)
+		panic("config_attach: device name too long");
+
+	strcpy(fullname, name);
+	strcat(fullname, num);
+
+	while (strcmp(dev->dv_xname, fullname) != 0) {
+		if ((dev = dev->dv_list.tqe_next) == NULL)
+			return NULL;
+	}
+	return dev;
 }
 
 /*
  * Look at the string 'cp' and decode the boot device.
  * Boot names look like: scsi()disk(n)rdisk()partition(1)\bsd
+ * (beware for empty scsi id's...)
  */
 void
 makebootdev(cp)
 	char *cp;
 {
-	int majdev, unit, part, ctrl;
-	char dv[8];
+	int	unit, part, ctrl;
 
-	bootdev = B_DEVMAGIC;
-
-	dv[0] = *cp;
+	bootdev[0] = *cp;
 	ctrl = getpno(&cp);
 	if(*cp++ == ')') {
-		dv[1] = *cp;
+		bootdev[1] = *cp;
 		unit = getpno(&cp);
-
-		for (majdev = 0; majdev < sizeof(devname)/sizeof(devname[0]); majdev++)
-			if (dv[0] == devname[majdev][0] &&
-			    dv[1] == devname[majdev][1] && cp[0] == ')')
-				bootdev = MAKEBOOTDEV(majdev, 0, ctrl, unit,0);
 	}
+	sprintf(&bootdev[2], "%d", ctrl*16 + unit);
 }
 getpno(cp)
 	char **cp;
diff --git a/sys/arch/arc/arc/machdep.c b/sys/arch/arc/arc/machdep.c
index 060d1a22aff..5d281afcc92 100644
--- a/sys/arch/arc/arc/machdep.c
+++ b/sys/arch/arc/arc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.5 1996/08/26 11:11:54 pefo Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.6 1996/09/02 11:33:23 pefo Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	8.3 (Berkeley) 1/12/94
- *      $Id: machdep.c,v 1.5 1996/08/26 11:11:54 pefo Exp $
+ *      $Id: machdep.c,v 1.6 1996/09/02 11:33:23 pefo Exp $
  */
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -208,10 +208,13 @@ mips_init(argc, argv, code)
 		isa_mem_base = PICA_V_ISA_MEM;
 		break;
 
-	case DESKSTATION:
+	case MAGNUM:
 		break;
 
-	case MAGNUM:
+	case DESKSTATION_RPC44:
+		break;
+
+	case DESKSTATION_TYNE:
 		break;
 
 	default:
@@ -224,12 +227,9 @@ mips_init(argc, argv, code)
 
 	/*
 	 * Look at arguments passed to us and compute boothowto.
+	 * Default to SINGLE and ASKNAME if no args.
 	 */
-#ifdef GENERIC
 	boothowto = RB_SINGLE | RB_ASKNAME;
-#else
-	boothowto = RB_SINGLE;
-#endif
 #ifdef KADB
 	boothowto |= RB_KDB;
 #endif
@@ -390,14 +390,18 @@ mips_init(argc, argv, code)
 		strcpy(cpu_model, "ACER PICA_61");
 		break;
 
-	case DESKSTATION:
-		strcpy(cpu_model, "DESKSTATION");
-		break;
-
 	case MAGNUM:
 		strcpy(cpu_model, "MIPS MAGNUM");
 		break;
 
+	case DESKSTATION_RPC44:
+		strcpy(cpu_model, "DESKSTATION_RPC44");
+		break;
+
+	case DESKSTATION_TYNE:
+		strcpy(cpu_model, "DESKSTATION_TYNE");
+		break;
+
 	default:
 		printf("kernel not configured for systype 0x%x\n", i);
 		boot(RB_HALT | RB_NOSYNC);
@@ -432,13 +436,8 @@ mips_init(argc, argv, code)
 		physmem = btoc(physmem);
 		break;
 
-	case MAGNUM:
-		memcfg = in32(R4030_SYS_CONFIG);
-
-		physmem = btoc(physmem);
-		break;
-
-	case DESKSTATION:
+	case DESKSTATION_RPC44:
+	case DESKSTATION_TYNE:
 		/*XXX Need to find out how to size mem */
 		physmem = 1024 * 1024 * 32;
 		mem_layout[0].mem_start = 0x00100000;
@@ -450,6 +449,12 @@ mips_init(argc, argv, code)
 		physmem = btoc(physmem);
 		break;
 
+	case MAGNUM:
+		memcfg = in32(R4030_SYS_CONFIG);
+
+		physmem = btoc(physmem);
+		break;
+
 	default:
 		physmem = btoc((u_int)v - KERNBASE);
 		cp = (char *)PHYS_TO_UNCACHED(physmem << PGSHIFT);
diff --git a/sys/arch/arc/arc/trap.c b/sys/arch/arc/arc/trap.c
index a3b65a018c0..615004f9935 100644
--- a/sys/arch/arc/arc/trap.c
+++ b/sys/arch/arc/arc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.4 1996/08/26 11:11:56 pefo Exp $	*/
+/*	$OpenBSD: trap.c,v 1.5 1996/09/02 11:33:24 pefo Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
  * from: Utah Hdr: trap.c 1.32 91/04/06
  *
  *	from: @(#)trap.c	8.5 (Berkeley) 1/11/94
- *      $Id: trap.c,v 1.4 1996/08/26 11:11:56 pefo Exp $
+ *      $Id: trap.c,v 1.5 1996/09/02 11:33:24 pefo Exp $
  */
 
 #include <sys/param.h>
@@ -936,7 +936,9 @@ set_intr(mask, int_hand, prio)
 		out32(R4030_SYS_EXT_IMASK, cpu_int_mask & (~INT_MASK_4 >> 10));
 		break;
 
-	case DESKSTATION:
+	case DESKSTATION_TYNE:
+		break;
+	case DESKSTATION_RPC44:
 		break;
 	}
 }
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 9e0a6ce73f7..2904f35b042 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -6,9 +6,6 @@ machine		arc
 
 maxusers	8
 
-# does not really do anything anymore, but this replaces "ident GENERIC"
-options		GENERIC
-
 # Need to set locally
 options		TIMEZONE="8*60"		# minutes west of GMT (for)
 options		DST=1			# use daylight savings rules
diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index 4afc62a349e..19da0300699 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -1,4 +1,4 @@
-
+#
 #	Generic configuration file for MIPS R4400 PICA system
 #
 
@@ -6,9 +6,6 @@ machine		arc
 
 maxusers	8
 
-# does not really do anything anymore, but this replaces "ident GENERIC"
-# options		GENERIC
-
 # Need to set locally
 options		TIMEZONE="8*60"		# minutes west of GMT (for)
 options		DST=1			# use daylight savings rules
@@ -49,17 +46,17 @@ options		FDESC		# user file descriptor filesystem
 #options	PORTAL		# portal filesystem (still experimental)
 
 # Networking options
-options		INET		# Internet protocols
-#options		"TCP_COMPAT_42"	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	MULTICAST	# Multicast support
-#options	MROUTING	# Multicast routing support
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
+options 	INET		# Internet protocols
+#options 	"TCP_COMPAT_42"	# compatibility with 4.2BSD TCP/IP
+options 	GATEWAY		# IP packet forwarding
+#options 	MULTICAST	# Multicast support
+#options 	MROUTING	# Multicast routing support
+#options 	ISO		# OSI networking
+#options 	TPIP
+#options 	EON
 
 # Special options
-#options		MACHINE_NONCONTIG # Support noncontigous memory.
+#options 	MACHINE_NONCONTIG # Support noncontigous memory.
 
 # Specify storage configuration
 config		bsd	root on sd0 swap on sd0 and sd1
@@ -70,9 +67,6 @@ config		bsd	root on sd0 swap on sd0 and sd1
 mainbus0	at root
 cpu*		at mainbus0
 
-#
-#	PICA Bus
-#
 pica*		at mainbus0
 
 clock0		at pica?