Plan 9 from Bell Labs 2010-10-02

sys/src/9/kw/ether1116.c

@@ -599,7 +599,8 @@ ethercheck(Ether *ether)
 	if (ether->starttime != 0 &&
 	    TK2MS(MACHP(0)->ticks)/1000 - ether->starttime > Etherstuck) {
 		etheractive(ether);
-		iprint("ethernet stuck\n");
+		if (ether->ctlrno == 0)	/* only complain about main ether */
+			iprint("#l%d: ethernet stuck\n", ether->ctlrno);
 	}
 }
 

sys/src/9/kw/l.s

@@ -174,6 +174,7 @@ WAVE('a')
 
 	BL	cacheuwbinv(SB)
 
+WAVE('n')
 	/* undo double map of 0, KZERO */
 	MOVW	$PADDR(L1+L1X(0)), R4		/* address of PTE for 0 */
 	MOVW	$0, R0
@@ -189,7 +190,6 @@ _ptudbl:
 	MCR	CpSC, 0, R0, C(CpTLB), C(CpTLBinvu), CpTLBinv
 	BARRIERS
 
-WAVE('n')
 WAVE(' ')
 	/* pass Mach to main and set up the stack */
 	MOVW	$(MACHADDR), R0			/* Mach */

sys/src/9/kw/main.c

@@ -312,8 +312,7 @@ wave(' ');
 	procinit0();
 	initseg();
 	links();
-	chandevreset();
-//	spiprobe();
+	chandevreset();			/* most devices are discovered here */
 
 	pageinit();
 	swapinit();

sys/src/9/kw/reboot.h

@@ -1,104 +0,0 @@
-uchar rebootcode[]={
-0x18,0xc6,0x9f,0xe5,0x04,0x00,0x8d,0xe5,0x00,0x80,0xa8,0xe1,0x08,0x90,0x9d,0xe5,
-0x0c,0xa0,0x9d,0xe5,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0xf4,0x75,0x9f,0xe5,0x52,0x10,0xa1,0xe3,
-0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x8f,0x00,0x00,0xeb,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0xbc,0x75,0x9f,0xe5,0x65,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x0e,0x72,0xa7,0xe3,0x00,0x00,0xa0,0xe3,0xaf,0x00,0x00,0xeb,0x07,0xc0,0xcc,0xe1,
-0x07,0xd0,0xcd,0xe1,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x74,0x75,0x9f,0xe5,0x62,0x10,0xa1,0xe3,
-0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0xac,0x00,0x00,0xeb,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x3c,0x75,0x9f,0xe5,0x6f,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x94,0x00,0x00,0xeb,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x04,0x75,0x9f,0xe5,0x6f,0x10,0xa1,0xe3,
-0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x09,0x40,0xa4,0xe1,0x0a,0x50,0xa5,0xe1,
-0x08,0x60,0xa6,0xe1,0x06,0xd0,0xad,0xe1,0x24,0xd0,0x4d,0xe2,0x30,0xe0,0x0d,0xe5,
-0x30,0xd0,0x4d,0xe2,0x2c,0x60,0x8d,0xe5,0x28,0x50,0x8d,0xe5,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0xac,0x74,0x9f,0xe5,0x74,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x00,0x60,0x8d,0xe5,0x04,0x60,0x8d,0xe5,0x06,0x00,0xa0,0xe1,0x08,0x40,0x8d,0xe5,
-0x0c,0x50,0x8d,0xe5,0x1b,0x01,0x00,0xeb,0x2c,0x60,0x9d,0xe5,0x28,0x50,0x9d,0xe5,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0x58,0x74,0x9f,0xe5,0x2d,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0x6d,0x00,0x00,0xeb,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,
-0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x20,0x74,0x9f,0xe5,
-0x3e,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,
-0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0xec,0x73,0x9f,0xe5,0x0d,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0xb8,0x73,0x9f,0xe5,0x0a,0x10,0xa1,0xe3,0x00,0x10,0x87,0xe5,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0x06,0x60,0x86,0xe1,0x00,0xf0,0x86,0xe2,0xd3,0x00,0xa0,0xe3,
-0x00,0xf0,0x29,0xe1,0x8c,0x73,0x9f,0xe5,0x00,0xe0,0x87,0xe5,0x3f,0x00,0x00,0xeb,
-0x10,0x0f,0x11,0xee,0x80,0xb3,0x9f,0xe5,0x0b,0x00,0xc0,0xe1,0x10,0x0f,0x01,0xee,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0x64,0x43,0x9f,0xe5,0x64,0x23,0x9f,0xe5,0x00,0x30,0xa3,0xe3,
-0x02,0x5c,0xa5,0xe3,0x03,0x10,0x82,0xe1,0x00,0x10,0x84,0xe5,0x04,0x40,0x84,0xe2,
-0x01,0x36,0x83,0xe2,0x01,0x50,0x55,0xe2,0xf9,0xff,0xff,0x1a,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x00,0x00,0xa0,0xe3,0x16,0x0f,0x08,0xee,0x17,0x0f,0x08,0xee,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x10,0x0f,0x11,0xee,0x30,0x00,0xc0,0xe3,0x10,0x0f,0x01,0xee,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0xe0,0x72,0x9f,0xe5,0x00,0xe0,0x97,0xe5,0x00,0xf0,0x8e,0xe2,0x0f,0xe2,0xce,0xe3,
-0x00,0xe0,0x8e,0xe1,0x00,0xf0,0x8e,0xe2,0x10,0x0f,0x11,0xee,0xd4,0xb2,0x9f,0xe5,
-0x0b,0x00,0xc0,0xe1,0x10,0x0f,0x01,0xee,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,
-0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x00,0xf0,0x8e,0xe2,
-0x00,0x00,0xa0,0xe3,0x17,0x0f,0x08,0xee,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,
-0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x00,0xf0,0x8e,0xe2,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0x00,0x30,0x0f,0xe1,0x80,0x10,0x83,0xe3,0x01,0xf0,0x29,0xe1,
-0x7e,0xff,0x17,0xee,0xfd,0xff,0xff,0x1a,0x19,0xff,0x2f,0xee,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x1b,0xff,0x2f,0xee,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,0x00,0x00,0xa0,0xe3,0x15,0x0f,0x07,0xee,
-0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,
-0x3b,0xff,0x2f,0xee,0x00,0x00,0xa0,0xe3,0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,
-0x9a,0x0f,0x07,0xee,0x00,0x00,0xa0,0xe3,0x95,0x0f,0x07,0xee,0x3b,0xff,0x2f,0xee,
-0x03,0xf0,0x29,0xe1,0x00,0xf0,0x8e,0xe2,0x04,0x00,0x8d,0xe5,0x08,0x20,0x9d,0xe5,
-0x0c,0x30,0x9d,0xe5,0x03,0x10,0x80,0xe0,0x02,0x00,0x50,0xe1,0x3a,0x00,0x00,0x9a,
-0x03,0x20,0x82,0xe0,0x04,0x00,0x53,0xe3,0x15,0x00,0x00,0xba,0x03,0x30,0x11,0xe2,
-0x03,0x00,0x00,0x0a,0x01,0x30,0x72,0xe5,0x01,0x30,0x61,0xe5,0x03,0x30,0x11,0xe2,
-0xfb,0xff,0xff,0x1a,0x03,0x30,0x12,0xe2,0x15,0x00,0x00,0x1a,0x1f,0x30,0x80,0xe2,
-0x03,0x00,0x51,0xe1,0x04,0x00,0x00,0x9a,0xf0,0x00,0x32,0xe9,0xf0,0x00,0x21,0xe9,
-0xf0,0x00,0x32,0xe9,0xf0,0x00,0x21,0xe9,0xf8,0xff,0xff,0xea,0x03,0x30,0x80,0xe2,
-0x03,0x00,0x51,0xe1,0x02,0x00,0x00,0x9a,0x04,0x40,0x32,0xe5,0x04,0x40,0x21,0xe5,
-0xfa,0xff,0xff,0xea,0x01,0x00,0x50,0xe1,0x03,0x00,0x00,0x0a,0x01,0x30,0x72,0xe5,
-0x01,0x30,0x61,0xe5,0x01,0x00,0x50,0xe1,0xfb,0xff,0xff,0x1a,0x04,0x00,0x9d,0xe5,
-0x00,0xf0,0x8e,0xe2,0x02,0x00,0x53,0xe3,0x08,0x40,0xa4,0xb3,0x18,0x50,0xa5,0xb3,
-0x01,0xb0,0xab,0xb3,0x10,0x40,0xa4,0x03,0x10,0x50,0xa5,0x03,0x02,0xb0,0xab,0x03,
-0x18,0x40,0xa4,0xc3,0x08,0x50,0xa5,0xc3,0x03,0xb0,0xab,0xc3,0x08,0x30,0x80,0xe2,
-0x03,0x00,0x51,0xe1,0xea,0xff,0xff,0x9a,0x03,0x20,0xc2,0xe3,0x00,0x60,0x92,0xe5,
-0x03,0x00,0x51,0xe1,0x06,0x00,0x00,0x9a,0x16,0x85,0xa8,0xe1,0xc0,0x00,0x32,0xe9,
-0x37,0x84,0x88,0xe1,0x17,0x75,0xa7,0xe1,0x36,0x74,0x87,0xe1,0x80,0x01,0x21,0xe9,
-0xf6,0xff,0xff,0xea,0x0b,0x20,0x82,0xe0,0xdd,0xff,0xff,0xea,0x04,0x00,0x53,0xe3,
-0x15,0x00,0x00,0xba,0x03,0x30,0x10,0xe2,0x03,0x00,0x00,0x0a,0x01,0x30,0xd2,0xe4,
-0x01,0x30,0xc0,0xe4,0x03,0x30,0x10,0xe2,0xfb,0xff,0xff,0x1a,0x03,0x30,0x12,0xe2,
-0x12,0x00,0x00,0x1a,0x1f,0x30,0x41,0xe2,0x03,0x00,0x50,0xe1,0x04,0x00,0x00,0x2a,
-0xf0,0x00,0xb2,0xe8,0xf0,0x00,0xa0,0xe8,0xf0,0x00,0xb2,0xe8,0xf0,0x00,0xa0,0xe8,
-0xf8,0xff,0xff,0xea,0x03,0x30,0x41,0xe2,0x03,0x00,0x50,0xe1,0x02,0x00,0x00,0x2a,
-0x04,0x40,0x92,0xe4,0x04,0x40,0x80,0xe4,0xfa,0xff,0xff,0xea,0x00,0x00,0x51,0xe1,
-0xc9,0xff,0xff,0x0a,0x01,0x30,0xd2,0xe4,0x01,0x30,0xc0,0xe4,0xfa,0xff,0xff,0xea,
-0x02,0x00,0x53,0xe3,0x08,0x40,0xa4,0xb3,0x18,0x50,0xa5,0xb3,0x03,0xb0,0xab,0xb3,
-0x10,0x40,0xa4,0x03,0x10,0x50,0xa5,0x03,0x02,0xb0,0xab,0x03,0x18,0x40,0xa4,0xc3,
-0x08,0x50,0xa5,0xc3,0x01,0xb0,0xab,0xc3,0x08,0x30,0x41,0xe2,0x03,0x00,0x50,0xe1,
-0xed,0xff,0xff,0x2a,0x03,0x20,0xc2,0xe3,0x04,0x80,0x92,0xe4,0x03,0x00,0x50,0xe1,
-0x06,0x00,0x00,0x2a,0x38,0x64,0xa6,0xe1,0x80,0x01,0xb2,0xe8,0x17,0x65,0x86,0xe1,
-0x37,0x74,0xa7,0xe1,0x18,0x75,0x87,0xe1,0xc0,0x00,0xa0,0xe8,0xf6,0xff,0xff,0xea,
-0x0b,0x20,0x42,0xe0,0xe0,0xff,0xff,0xea,0x86,0xff,0xff,0xea,0xfe,0xff,0xff,0xea,
-0x3c,0x17,0x00,0x00,0x00,0x20,0x01,0xf1,0xfc,0x00,0x00,0x60,0x0e,0x10,0x00,0x00,
-0x00,0x40,0x00,0x60,0x1e,0x04,0x00,0x00,0x0d,0x30,0x00,0x00,0x00,0x00,0x00,0x00,
-
-
-};