Problem with ata-chipset.c

[Bruce M Simpson]

With the latest revision 1.182 of ata-chipset.c my system will not boot: 
with rev 1.180 it was ok.

%%%
 atapci0: <JMicron JMB363 SATA300 controller> port
          
0xdc00-0xdc07,0xd880-0xd883,0xd800-0xd807,0xd480-0xd483,0xd400-0xd40
          f mem 0xfe5fe000-0xfe5fffff irq 19 at device 0.0 on pci3
 atapci0: AHCI Version 01.00 controller with 2 ports detected
 ata0: <ATA channel 0> on atapci0
 ata1: <ATA channel 1> on atapci0
 ata2: <ATA channel 2> on atapci0
 device_attach: ata2 attach returned 6
...
 Trying to mount root from ufs:/dev/ad4s2a
%%%

At this point the system fails to mount root as it cannot see the disk.

Backing out to 1.180 and removing the definitions now in ata-all.h 
results in a booting kernel.

anglepoise:~ % s atacontrol list
Password:
ATA channel 0:
    Master:      no device present
    Slave:       no device present
ATA channel 1:
    Master: acd0 <SONY DVD-ROM DDU1615/FYS3> ATA/ATAPI revision 5
    Slave:       no device present
ATA channel 2:
    Master:  ad4 <WDC WD1600YD-01NVB1/10.02E01> Serial ATA v1.0
    Slave:       no device present
ATA channel 3:
    Master:      no device present
    Slave:       no device present
ATA channel 4:
    Master:      no device present
    Slave:       no device present

anglepoise:~ % dmesg | grep \^ata
atapci0: <JMicron JMB363 SATA300 controller> port 
0xdc00-0xdc07,0xd880-0xd883,0xd800-0xd807,0xd480-0xd483,0xd400-0xd40f 
mem 0xfe5fe000-0xfe5fffff irq 19 at device 0.0 on pci3
atapci0: AHCI Version 01.00 controller with 2 ports detected
ata2: <ATA channel 0> on atapci0
ata3: <ATA channel 1> on atapci0
ata4: <ATA channel 2> on atapci0
atapci1: <AcerLabs M5229 UDMA133 controller> port 
0x1f0-0x1f7,0x3f6,0x170-0x177,0x376,0xff00-0xff0f at device 31.0 on pci0
ata0: <ATA channel 0> on atapci1
ata1: <ATA channel 1> on atapci1
atapci0: <JMicron JMB363 SATA300 controller> port 
0xdc00-0xdc07,0xd880-0xd883,0xd800-0xd807,0xd480-0xd483,0xd400-0xd40f 
mem 0xfe5fe000-0xfe5fffff irq 19 at device 0.0 on pci3
atapci0: AHCI Version 01.00 controller with 2 ports detected
ata2: <ATA channel 0> on atapci0
ata3: <ATA channel 1> on atapci0
ata4: <ATA channel 2> on atapci0
atapci1: <AcerLabs M5229 UDMA133 controller> port 
0x1f0-0x1f7,0x3f6,0x170-0x177,0x376,0xff00-0xff0f at device 31.0 on pci0
ata0: <ATA channel 0> on atapci1
ata1: <ATA channel 1> on atapci1



Regards,
BMS