[ On Saturday, October 26, 2002 at 13:44:01 (+0200), Martin Husemann wrote: ]
> Subject: Re: netbsd-1-6 branch vs. recent esp(4) fixes....
>
> No, you don't want the config changes.

I wasn't trying to pull up the cfdata changes, only the various changes
Jason had made last August to bsd_openprom.h and to merge the iommu/sbus
registers....

I did go to source-changes to look for all of Jason's commit messages
and I though I had found all the right ones, but I was still getting a
panic in bus_dmamem_alloc() from leattach_ledma().

> What you want is:
> 
> dev/ic/lsi64854.c  - catch up to current (1.22)
> dev/ic/ncr53c9x.c - catch up to current (1.103)
> dev/ic/ncr53c9xvar.h - catch up to current (1.39)
> dev/sbus/esp_sbus.c - pull up rev 1.21 and rev 1.22
>    (the cvs diff aplies cleanly)

I think you mean just 1.22 of dev/sbus/esp_sbus.c -- now that I look at
it again in isolation I see that it is in fact rev. 1.21 that got me
started pulling up all those other changes in the first place!  :-)

> This compiles, but I can not test it myself.
> Can you test it and report back? I'll do a pullup request if it works.

Yes, without esp_sbus.c:1.21 a kernel with the above pullups boots to
multi-user just fine in a sparc-5 -- I've not yet tried popping a drive
to see if the bus will reset properly though, but at least this should
be a lot closer.  I'll reboot the Axil with this kernel tomorrow and try
testing the bus reset.


NetBSD 1.6_STABLE (SOMETIMES) #5: Sat Oct 26 20:51:06 EDT 2002
    woods@sometimes:/proven/work/woods/NetBSD-1.6/sys/arch/sparc/compile/SOMETIMES
....
mainbus0 (root): SUNW,SPARCstation-5
....
iommu0 at mainbus0 addr 0x10000000: version 0x4/0x0, page-size 4096, range 64MB
sbus0 at iommu0: clock = 21.250 MHz
dma0 at sbus0 slot 5 offset 0x8400000: dma rev 2
esp0 at dma0 slot 5 offset 0x8800000 level 4: ESP200, 40MHz, SCSI ID 7
scsibus0 at esp0: 8 targets, 8 luns per target
....
scsibus0: waiting 2 seconds for devices to settle...
sd0 at scsibus0 target 1 lun 0: <CONNER, CFP1080E SUN1.05, 4649> SCSI2 0/direct fixed
sd0: 1030 MB, 3658 cyl, 6 head, 96 sec, 512 bytes/sect x 2110812 sectors
sd0: sync (100.0ns offset 15), 8-bit (10.000MB/s) transfers, tagged queueing
sd1 at scsibus0 target 3 lun 0: <SEAGATE, ST31200W SUN1.05, 9462> SCSI2 0/direct fixed
sd1: 1006 MB, 2700 cyl, 9 head, 84 sec, 512 bytes/sect x 2061108 sectors
sd1: sync (100.0ns offset 15), 8-bit (10.000MB/s) transfers, tagged queueing

-- 
								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>