i386/57131: Device ID for Intel 82801DBM IDE Controller (UltraATA/100)

[Tai-hwa Liang]

>Number:         57131
>Category:       i386
>Synopsis:       Device ID for Intel 82801DBM IDE Controller (UltraATA/100)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-i386
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 23 07:30:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Tai-hwa Liang
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
	IBM Thinkpad T40 model 2379D6U(Centrino)
	FreeBSD 4.9-20030923-PRERELEASE #0 i386
	
>Description:
	Adding new device ID for Intel 82801DBM(ICH4-M) based IDE controller.
	
>How-To-Repeat:
	The original kernel.GENERIC, ATA related booting message:

atapci0: <Generic PCI ATA controller> port 0x1860-0x186f,0-0x3,0-0x7,0-0x3,0-0x7 at device 31.1 on pci0
ata0: at 0x1f0 irq 14 on atapci0
ata1: at 0x170 irq 15 on atapci0
ata1-slave: ATAPI identify retries exceeded
ad0: 35174MB <IC25N040ATCS05-0> [71465/16/63] at ata0-master BIOSDMA
acd0: CD-RW <UJDA745 DVD/CDRW> at ata1-master PIO4

	Verbose ATA related booting message after patched:

atapci0: <Intel ICH4-M ATA100 controller> port 0x1860-0x186f,0-0x3,0-0x7,0-0x3,0-0x7 at device 31.1 on pci0
ata0: iobase=0x01f0 altiobase=0x03f6 bmaddr=0x1860
ata0: mask=03 ostat0=50 ostat2=00
ata0-master: ATAPI 00 00
ata0-slave: ATAPI 00 00
ata0: mask=03 stat0=50 stat1=00
ata0-master: ATA 01 a5
ata0: devices=01
ata0: at 0x1f0 irq 14 on atapci0
ata1: iobase=0x0170 altiobase=0x0376 bmaddr=0x1868
ata1: mask=03 ostat0=50 ostat2=00
ata1-master: ATAPI 14 eb
ata1-slave: ATAPI 14 eb
ata1: mask=03 stat0=00 stat1=00
ata1: devices=0c
ata1: at 0x170 irq 15 on atapci0
ata1-slave: ATAPI identify retries exceeded
ad0: success setting UDMA5 on Intel chip
Creating DISK ad0
ad0: <IC25N040ATCS05-0/CS4OA61A> ATA-5 disk at ata0-master
ad0: 35174MB (72037362 sectors), 71465 C, 16 H, 63 S, 512 B
ad0: 16 secs/int, 1 depth queue, UDMA100
ad0: piomode=4 dmamode=2 udmamode=5 cblid=1
ata1-master: piomode=4 dmamode=2 udmamode=2 dmaflag=1
ata1-master: success setting PIO4 on generic chip
acd0: <UJDA745 DVD/CDRW/1.02> CD-RW drive at ata1 as master
acd0: read 4134KB/s (34515KB/s) write 689KB/s (689KB/s), 2048KB buffer, PIO4
acd0: Reads: CD-R, CD-RW, CD-DA stream, DVD-ROM, DVD-R, DVD-RAM, packet
acd0: Writes: CD-R, CD-RW, test write, burnproof
acd0: Audio: play, 256 volume levels
acd0: Mechanism: ejectable tray, unlocked
acd0: Medium: CD-RW 120mm photo disc

	Complete "pciconf -lv" output:

agp0 at pci0:0:0:	class=0x060000 card=0x05291014 chip=0x33408086 rev=0x03 hdr=0x00
    vendor   = 'Intel Corporation'
    class    = bridge
    subclass = HOST-PCI
pcib1 at pci0:1:0:	class=0x060400 card=0x00000000 chip=0x33418086 rev=0x03 hdr=0x01
    vendor   = 'Intel Corporation'
    class    = bridge
    subclass = PCI-PCI
uhci0 at pci0:29:0:	class=0x0c0300 card=0x052d1014 chip=0x24c28086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) USB UHCI Controller #1'
    class    = serial bus
    subclass = USB
uhci1 at pci0:29:1:	class=0x0c0300 card=0x052d1014 chip=0x24c48086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) USB UHCI Controller #2'
    class    = serial bus
    subclass = USB
uhci2 at pci0:29:2:	class=0x0c0300 card=0x052d1014 chip=0x24c78086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) USB UHCI Controller #3'
    class    = serial bus
    subclass = USB
none0 at pci0:29:7:	class=0x0c0320 card=0x052e1014 chip=0x24cd8086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) USB EHCI Controller'
    class    = serial bus
    subclass = USB
pcib2 at pci0:30:0:	class=0x060400 card=0x00000000 chip=0x24488086 rev=0x81 hdr=0x01
    vendor   = 'Intel Corporation'
    device   = '82801BAM/CAM (ICH2/3) PCI to I/O Hub Bridge (2448)'
    class    = bridge
    subclass = PCI-PCI
isab0 at pci0:31:0:	class=0x060100 card=0x00000000 chip=0x24cc8086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DBM LPC Interface Bridge'
    class    = bridge
    subclass = PCI-ISA
atapci0 at pci0:31:1:	class=0x01018a card=0x052d1014 chip=0x24ca8086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DBM IDE Controller (UltraATA/100)'
    class    = mass storage
    subclass = ATA
none1 at pci0:31:3:	class=0x0c0500 card=0x052d1014 chip=0x24c38086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) SMBus Controller'
    class    = serial bus
    subclass = SMBus
pcm0 at pci0:31:5:	class=0x040100 card=0x05371014 chip=0x24c58086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) AC'97 Audio Controller'
    class    = multimedia
    subclass = audio
chip0 at pci0:31:6:	class=0x070300 card=0x05241014 chip=0x24c68086 rev=0x01 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801DB (ICH4) AC'97 Modem Controller'
    class    = simple comms
drm0 at pci1:0:0:	class=0x030000 card=0x05311014 chip=0x4c661002 rev=0x02 hdr=0x00
    vendor   = 'ATI Technologies'
    device   = 'Radeon Mobility M9'
    class    = display
    subclass = VGA
pcic0 at pci2:0:0:	class=0x060700 card=0x05121014 chip=0xac55104c rev=0x01 hdr=0x02
    vendor   = 'Texas Instruments (TI)'
    device   = 'PCI1520 PC card CardBus Controller'
    class    = bridge
    subclass = PCI-CardBus
pcic1 at pci2:0:1:	class=0x060700 card=0x05121014 chip=0xac55104c rev=0x01 hdr=0x02
    vendor   = 'Texas Instruments (TI)'
    device   = 'PCI1520 PC card CardBus Controller'
    class    = bridge
    subclass = PCI-CardBus
em0 at pci2:1:0:	class=0x020000 card=0x05491014 chip=0x101e8086 rev=0x03 hdr=0x00
    vendor   = 'Intel Corporation'
    class    = network
    subclass = ethernet
none2 at pci2:2:0:	class=0x028000 card=0x25518086 chip=0x10438086 rev=0x04 hdr=0x00
    vendor   = 'Intel Corporation'
    class    = network
	
>Fix:
	Following is the difference against 4.9-PRERELEASE(cvsupped on
Sep-18-2003 CST). This patch has been tested on the target machine with
"make buildworld buildkernel."
	
diff -ru sys/dev/ata/ata-dma.c sys.old/dev/ata/ata-dma.c
--- sys/dev/ata/ata-dma.c	Mon Sep  8 08:30:29 2003
+++ sys.old/dev/ata/ata-dma.c	Tue Sep 23 16:09:40 2003
@@ -217,6 +217,7 @@
     switch (chiptype) {
 
     case 0x24db8086:	/* Intel ICH5 */
+    case 0x24ca8086:	/* Intel ICH4 mobile */
     case 0x24cb8086:	/* Intel ICH4 */
     case 0x248a8086:	/* Intel ICH3 mobile */ 
     case 0x248b8086:	/* Intel ICH3 */
diff -ru sys/dev/ata/ata-pci.c sys.old/dev/ata/ata-pci.c
--- sys/dev/ata/ata-pci.c	Mon Sep  1 13:15:24 2003
+++ sys.old/dev/ata/ata-pci.c	Tue Sep 23 16:52:58 2003
@@ -149,6 +149,9 @@
     case 0x24cb8086:
 	return "Intel ICH4 ATA100 controller";
 
+    case 0x24ca8086:
+	return "Intel ICH4-M ATA100 controller";
+
     case 0x24db8086:
 	return "Intel ICH5 ATA100 controller";
 
>Release-Note:
>Audit-Trail:
>Unformatted: