Subject: Re: netbsd-1-6 branch vs. recent esp(4) fixes....
To: NetBSD/sparc Discussion List <port-sparc@NetBSD.ORG>
From: Greg A. Woods <woods@weird.com>
List: port-sparc
Date: 10/25/2002 18:54:48
[ On Wednesday, October 23, 2002 at 20:12:15 (-0400), Greg A. Woods wrote: ]
> Subject: Re: netbsd-1-6 branch vs. recent esp(4) fixes....
>
> OK, I'll try copying over the changes to my 1.6.x directory and see if I
> can test those changes on an SS20 where I can power cycle this external
> drive to simulate the problem it has and see if it'll come back online.
Well, it almost turned into a wild goose chase, and even though I still
don't have the golden egg, I think I'm close.
In the interests of getting as much as possible of related changes
(without any of the recent more wide-sweeping architectural changes in
device-driver land) I've ended up pulling up quite a wide variety of
files and diffs. I think this is good in that if it's done in the
official netbsd-1-6 then it'll keep 1.6.x as close as possible to
-current). It's certainly good for me since it'll hopefully keep things
closer to -current for my own maintanance. However it's probably also
part of my problem.
Here's where I am at -- I'm getting a crash while attaching iommu:
Axil-320 (1 X 390Z55), No Keyboard
ROM Rev. 2.19, 288 MB memory installed, Serial #9902402.
Ethernet address 0:0:3b:80:3c:56, Host ID: 72971942.
Initializing Memory |
Rebooting with command:
Boot device: /iommu/sbus/espdma@f,400000/esp@f,800000/sd@0,0 File and args: netbsd
>> NetBSD/sparc Secondary Boot, Revision 1.9
>> (woods@sometimes, Tue Mar 27 17:22:23 EST 2001)
Booting netbsd
OBP version 3, revision 2.19 (plugin rev 2)
[ using 255272 bytes of netbsd ELF symbol table ]
Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002
The NetBSD Foundation, Inc. All rights reserved.
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
NetBSD 1.6_STABLE (SOMETIMES) #0: Fri Oct 25 18:06:23 EDT 2002
woods@sometimes:/proven/work/woods/NetBSD-1.6/sys/arch/sparc/compile/SOMETIMES
total memory = 287 MB
nbuf at 7350 is too large for VM_MAX_KERNEL_BUF... adjusted to 896
avail memory = 248 MB
using 896 buffers containing 29400 KB of memory
bootpath: /iommu@f,e0000000/sbus@f,e0001000/espdma@f,400000/esp@f,800000/sd@0,0
mainbus0 (root): SUNW,Axil-320
cpu0 at mainbus0: TMS390Z50 v0 or TMS390Z55 @ 75 MHz, on-chip FPU
cpu0: physical 20K instruction (64 b/l), 16K data (32 b/l), 1024K external (32 b/l): cache enabled
obio0 at mainbus0
clock0 at obio0 slot 0 offset 0x200000: mk48t08: hostid 72971942
timer0 at obio0 slot 0 offset 0x300000: delay constant 35
zs0 at obio0 slot 0 offset 0x100000 level 12 softpri 6
zstty0 at zs0 channel 0 (console i/o)
zstty1 at zs0 channel 1
zs1 at obio0 slot 0 offset 0x0 level 12 softpri 6
kbd0 at zs1 channel 0: baud rate 1200
ms0 at zs1 channel 1: baud rate 1200
fdc0 at obio0 slot 0 offset 0x700000 level 11 softpri 4: chip 82077
fd0 at fdc0 drive 0: 1.44MB 80 cyl, 2 head, 18 sec
auxreg0 at obio0 slot 0 offset 0x800000
power0 at obio0 slot 0 offset 0xa01000 level 2
iommu0 at mainbus0 ioaddr 0xe0000000data fault: pc=0xf017e694 addr=0xf00 sfsr=1a6<PERR=0,LVL=1,AT=5,FT=1,FAV,OW>
panic: kernel fault
Stopped in pid 0 (swapper) at cpu_Debugger+0x4: jmpl [%o7 + 0x8], %g0
db> trace
mem_access_fault4m(0x0, 0x1a6, 0xf00, 0xf021e7e8, 0x0, 0x0) at mem_access_fault4m+0x308
memfault_sun4m(0xf00, 0xf00, 0xf0295b20, 0x0, 0x0, 0x0) at memfault_sun4m+0xe4
uvm_pglistalloc(0xf039fb98, 0x20d7, 0x17fe5000, 0x10000, 0x0, 0xf021e958) at uvm_pglistalloc+0x2e8
iommu_attach(0xf0884fc0, 0xf0828b80, 0xf021eae8, 0xf018103c, 0x20, 0xf0828bc8) at iommu_attach+0x16c
config_attach(0xf0828b80, 0xf021f878, 0xf021eae8, 0xf01a9fd8, 0xf021ea38, 0x8) at config_attach+0x288
config_found_sm(0xf0884fc0, 0xf021eae8, 0xf01a9fd8, 0x0, 0x0, 0xe0000000) at config_found_sm+0x24
mainbus_attach(0xf0228000, 0xf0884fc0, 0xf0228000, 0xf0201378, 0x20, 0xf0884fec) at mainbus_attach+0x444
config_attach(0xf0884fc0, 0xf021f878, 0x0, 0x0, 0x0, 0xf0296740) at config_attach+0x288
config_rootfound(0xf0201300, 0x0, 0xf01af940, 0xf01f05f0, 0x20, 0xf08225c4) at config_rootfound+0x40
cpu_configure(0x1000, 0xf028ea28, 0xf028bc00, 0x0, 0x0, 0xf01edc00) at cpu_configure+0x38
configure(0x2728, 0x26b5, 0xf021f800, 0x4a40, 0xffffffff, 0x76c0) at configure+0x54
main(0x0, 0xfffffff8, 0x0, 0x0, 0x38b908, 0xf0002208) at main+0x3d8
startmap_done(0x388110, 0x3951b0, 0x387eb4, 0x0, 0x397400, 0xffffffff) at startmap_done+0x12c
db> machine prom
Type 'go' to resume
Type help for more information
ok boot /netbsd.old
Resetting ...
I'm going to try a "make clean && make" just in case some important
dependency wasn't tracked.....
Here's what I've pulled up so far. These are the first hunks of all the
diffs against the TNF repository in a working directory checked out on
the netbsd-1-6 branch so they show the base revisions I started with and
the RCS IDs of the files I copied over, or the comments I added after
using patch to move over limited changes.
Index: sys/dev/sbus/sbusvar.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/dev/sbus/sbusvar.h,v
retrieving revision 1.17
diff -c -r1.17 sbusvar.h
*** sys/dev/sbus/sbusvar.h 20 Mar 2002 19:32:42 -0000 1.17
--- sys/dev/sbus/sbusvar.h 24 Oct 2002 15:50:09 -0000
***************
*** 1,4 ****
! /* $NetBSD: sbusvar.h,v 1.17 2002/03/20 19:32:42 eeh Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: sbusvar.h,v 1.19 2002/09/27 20:41:35 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Index: sys/dev/sbus/esp_sbus.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/dev/sbus/esp_sbus.c,v
retrieving revision 1.20
diff -c -r1.20 esp_sbus.c
*** sys/dev/sbus/esp_sbus.c 21 Mar 2002 00:16:15 -0000 1.20
--- sys/dev/sbus/esp_sbus.c 24 Oct 2002 15:38:29 -0000
***************
*** 1,4 ****
! /* $NetBSD: esp_sbus.c,v 1.20 2002/03/21 00:16:15 eeh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: esp_sbus.c,v 1.22 2002/09/25 05:19:23 mycroft Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
Index: sys/dev/ic/ncr53c9xvar.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/dev/ic/ncr53c9xvar.h,v
retrieving revision 1.35
diff -c -r1.35 ncr53c9xvar.h
*** sys/dev/ic/ncr53c9xvar.h 3 Dec 2001 23:27:32 -0000 1.35
--- sys/dev/ic/ncr53c9xvar.h 24 Oct 2002 04:04:30 -0000
***************
*** 1,4 ****
! /* $NetBSD: ncr53c9xvar.h,v 1.35 2001/12/03 23:27:32 jdolecek Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: ncr53c9xvar.h,v 1.39 2002/10/22 17:58:45 petrov Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
Index: sys/dev/ic/ncr53c9x.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/dev/ic/ncr53c9x.c,v
retrieving revision 1.93
diff -c -r1.93 ncr53c9x.c
*** sys/dev/ic/ncr53c9x.c 5 Apr 2002 18:27:53 -0000 1.93
--- sys/dev/ic/ncr53c9x.c 24 Oct 2002 04:04:30 -0000
***************
*** 1,7 ****
! /* $NetBSD: ncr53c9x.c,v 1.93 2002/04/05 18:27:53 bouyer Exp $ */
/*-
! * Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
--- 1,7 ----
! /* $NetBSD: ncr53c9x.c,v 1.103 2002/10/06 21:35:33 petrov Exp $ */
/*-
! * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
Index: sys/dev/ic/lsi64854.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/dev/ic/lsi64854.c,v
retrieving revision 1.20
diff -c -r1.20 lsi64854.c
*** sys/dev/ic/lsi64854.c 15 Nov 2001 09:48:06 -0000 1.20
--- sys/dev/ic/lsi64854.c 24 Oct 2002 04:04:30 -0000
***************
*** 1,4 ****
! /* $NetBSD: lsi64854.c,v 1.20 2001/11/15 09:48:06 lukem Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: lsi64854.c,v 1.22 2002/10/01 07:07:03 petrov Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Index: timer.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/sparc/timer.c,v
retrieving revision 1.3.6.1
diff -c -c -r1.3.6.1 timer.c
*** timer.c 15 Jul 2002 16:27:48 -0000 1.3.6.1
--- timer.c 25 Oct 2002 22:43:50 -0000
***************
*** 1,6 ****
--- 1,10 ----
/* $NetBSD: timer.c,v 1.3.6.1 2002/07/15 16:27:48 thorpej Exp $ */
/*
+ * pull up 1.4 through 1.6 with patch
+ */
+
+ /*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1994 Gordon W. Ross
Index: sys/arch/sparc/sparc/pmap.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/sparc/pmap.c,v
retrieving revision 1.207
diff -c -r1.207 pmap.c
*** sys/arch/sparc/sparc/pmap.c 11 Apr 2002 11:08:40 -0000 1.207
--- sys/arch/sparc/sparc/pmap.c 25 Oct 2002 21:57:04 -0000
***************
*** 1,4 ****
! /* $NetBSD: pmap.c,v 1.207 2002/04/11 11:08:40 pk Exp $ */
/*
* Copyright (c) 1996
--- 1,9 ----
! /* $NetBSD: pmap.c,v 1.212 2002/09/08 05:35:42 tsutsui Exp $ */
!
! /*
! * changes from 1.207 to 1.212 applied locally via patch to avoid messing with
! * other local changes.
! */
/*
* Copyright (c) 1996
Index: sys/arch/sparc/sparc/machdep.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.193
diff -c -r1.193 machdep.c
*** sys/arch/sparc/sparc/machdep.c 28 Mar 2002 15:45:01 -0000 1.193
--- sys/arch/sparc/sparc/machdep.c 24 Oct 2002 21:35:54 -0000
***************
*** 1,4 ****
! /* $NetBSD: machdep.c,v 1.193 2002/03/28 15:45:01 pk Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
--- 1,5 ----
! /* $NetBSD: machdep.c,v 1.200 2002/08/30 20:38:31 thorpej Exp $ */
! /* --- machdep.c,v 1.194 -> 1.195 --- removed by patch */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/sparc/iommuvar.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/sparc/iommuvar.h,v
retrieving revision 1.5
diff -c -r1.5 iommuvar.h
*** sys/arch/sparc/sparc/iommuvar.h 11 Jan 2000 13:01:52 -0000 1.5
--- sys/arch/sparc/sparc/iommuvar.h 24 Oct 2002 19:29:55 -0000
***************
*** 1,4 ****
! /* $NetBSD: iommuvar.h,v 1.5 2000/01/11 13:01:52 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: iommuvar.h,v 1.6 2002/08/23 02:53:12 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/sparc/iommu.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/sparc/iommu.c,v
retrieving revision 1.63
diff -c -r1.63 iommu.c
*** sys/arch/sparc/sparc/iommu.c 11 Mar 2002 16:27:03 -0000 1.63
--- sys/arch/sparc/sparc/iommu.c 24 Oct 2002 19:31:43 -0000
***************
*** 1,4 ****
! /* $NetBSD: iommu.c,v 1.63 2002/03/11 16:27:03 pk Exp $ */
/*
* Copyright (c) 1996
--- 1,4 ----
! /* $NetBSD: iommu.c,v 1.66 2002/08/23 02:53:12 thorpej Exp $ */
/*
* Copyright (c) 1996
Index: sys/arch/sparc/sparc/autoconf.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/sparc/autoconf.c,v
retrieving revision 1.168.4.1
diff -c -r1.168.4.1 autoconf.c
*** sys/arch/sparc/sparc/autoconf.c 21 Jun 2002 14:45:42 -0000 1.168.4.1
--- sys/arch/sparc/sparc/autoconf.c 24 Oct 2002 19:39:27 -0000
***************
*** 1,4 ****
! /* $NetBSD: autoconf.c,v 1.168.4.1 2002/06/21 14:45:42 lukem Exp $ */
/*
* Copyright (c) 1996
--- 1,4 ----
! /* $NetBSD: autoconf.c,v 1.174 2002/08/25 17:55:01 thorpej Exp $ */
/*
* Copyright (c) 1996
Index: sys/arch/sparc/include/param.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/include/param.h,v
retrieving revision 1.51
diff -c -r1.51 param.h
*** sys/arch/sparc/include/param.h 26 Feb 2002 15:13:26 -0000 1.51
--- sys/arch/sparc/include/param.h 24 Oct 2002 21:29:39 -0000
***************
*** 1,4 ****
! /* $NetBSD: param.h,v 1.51 2002/02/26 15:13:26 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
--- 1,4 ----
! /* $NetBSD: param.h,v 1.57 2002/07/17 06:19:45 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
Index: sys/arch/sparc/include/bus.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/include/bus.h,v
retrieving revision 1.32
diff -c -r1.32 bus.h
*** sys/arch/sparc/include/bus.h 7 May 2002 06:45:22 -0000 1.32
--- sys/arch/sparc/include/bus.h 24 Oct 2002 19:25:58 -0000
***************
*** 1,4 ****
! /* $NetBSD: bus.h,v 1.32 2002/05/07 06:45:22 uwe Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: bus.h,v 1.33 2002/08/25 17:55:00 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/include/bsd_openprom.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/include/bsd_openprom.h,v
retrieving revision 1.17
diff -c -r1.17 bsd_openprom.h
*** sys/arch/sparc/include/bsd_openprom.h 15 Nov 2000 16:12:01 -0000 1.17
--- sys/arch/sparc/include/bsd_openprom.h 24 Oct 2002 16:10:40 -0000
***************
*** 1,4 ****
! /* $NetBSD: bsd_openprom.h,v 1.17 2000/11/15 16:12:01 pk Exp $ */
/*
* Copyright (c) 1992, 1993
--- 1,4 ----
! /* $NetBSD: bsd_openprom.h,v 1.18 2002/08/23 01:08:45 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
Index: sys/arch/sparc/include/autoconf.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/include/autoconf.h,v
retrieving revision 1.34
diff -c -r1.34 autoconf.h
*** sys/arch/sparc/include/autoconf.h 11 Mar 2002 16:06:42 -0000 1.34
--- sys/arch/sparc/include/autoconf.h 25 Oct 2002 21:00:25 -0000
***************
*** 1,4 ****
! /* $NetBSD: autoconf.h,v 1.34 2002/03/11 16:06:42 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: autoconf.h,v 1.35 2002/08/25 16:05:42 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/dev/vme_machdep.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/dev/vme_machdep.c,v
retrieving revision 1.35
diff -c -r1.35 vme_machdep.c
*** sys/arch/sparc/dev/vme_machdep.c 11 Mar 2002 16:27:02 -0000 1.35
--- sys/arch/sparc/dev/vme_machdep.c 24 Oct 2002 19:32:55 -0000
***************
*** 1,4 ****
! /* $NetBSD: vme_machdep.c,v 1.35 2002/03/11 16:27:02 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: vme_machdep.c,v 1.36 2002/08/23 02:53:11 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/dev/sbusvar.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/dev/sbusvar.h,v
retrieving revision 1.11
diff -c -r1.11 sbusvar.h
*** sys/arch/sparc/dev/sbusvar.h 21 Mar 2002 04:32:25 -0000 1.11
--- sys/arch/sparc/dev/sbusvar.h 24 Oct 2002 17:46:58 -0000
***************
*** 1,4 ****
! /* $NetBSD: sbusvar.h,v 1.11 2002/03/21 04:32:25 uwe Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: sbusvar.h,v 1.13 2002/08/25 17:54:59 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/dev/sbus.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/dev/sbus.c,v
retrieving revision 1.45
diff -c -r1.45 sbus.c
*** sys/arch/sparc/dev/sbus.c 11 Mar 2002 16:27:02 -0000 1.45
--- sys/arch/sparc/dev/sbus.c 24 Oct 2002 19:28:12 -0000
***************
*** 1,4 ****
! /* $NetBSD: sbus.c,v 1.45 2002/03/11 16:27:02 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
--- 1,4 ----
! /* $NetBSD: sbus.c,v 1.48 2002/08/25 17:54:58 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
Index: sys/arch/sparc/dev/cgfourteenvar.h
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/dev/cgfourteenvar.h,v
retrieving revision 1.3
diff -c -r1.3 cgfourteenvar.h
*** sys/arch/sparc/dev/cgfourteenvar.h 29 Jul 1998 18:36:08 -0000 1.3
--- sys/arch/sparc/dev/cgfourteenvar.h 24 Oct 2002 19:37:31 -0000
***************
*** 1,4 ****
! /* $NetBSD: cgfourteenvar.h,v 1.3 1998/07/29 18:36:08 pk Exp $ */
/*
* Copyright (c) 1996
--- 1,4 ----
! /* $NetBSD: cgfourteenvar.h,v 1.4 2002/08/23 02:53:11 thorpej Exp $ */
/*
* Copyright (c) 1996
Index: sys/arch/sparc/dev/cgfourteen.c
===================================================================
RCS file: /cvs/master/m-NetBSD/main/syssrc/sys/arch/sparc/dev/cgfourteen.c,v
retrieving revision 1.23.4.1
diff -c -r1.23.4.1 cgfourteen.c
*** sys/arch/sparc/dev/cgfourteen.c 7 Aug 2002 01:32:10 -0000 1.23.4.1
--- sys/arch/sparc/dev/cgfourteen.c 24 Oct 2002 19:38:06 -0000
***************
*** 1,4 ****
! /* $NetBSD: cgfourteen.c,v 1.23.4.1 2002/08/07 01:32:10 lukem Exp $ */
/*
* Copyright (c) 1996
--- 1,4 ----
! /* $NetBSD: cgfourteen.c,v 1.25 2002/08/23 02:53:11 thorpej Exp $ */
/*
* Copyright (c) 1996
--
Greg A. Woods
+1 416 218-0098; <g.a.woods@ieee.org>; <woods@robohack.ca>
Planix, Inc. <woods@planix.com>; VE3TCP; Secrets of the Weird <woods@weird.com>