kern/89227: [patch] Intel ICH6-M SATA controller on Vaio VGN-S5M/S

[Ruben de Groot]

>Number:         89227
>Category:       kern
>Synopsis:       [patch] Intel ICH6-M SATA controller on Vaio VGN-S5M/S
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 18 11:30:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ruben de Groot
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
bzerk.org
>Environment:
System: FreeBSD bentobox.lan 5.4-RELEASE FreeBSD 5.4-RELEASE #2: Tue Nov 15 21:51:19 CET 2005     rdg at bzerk.org:/usr/obj/usr/src/sys/GENERIC i386


>Description:

The sony vaio has a sata disk connected to the second controller in the
laptop. However this controller is not recognized and falls back to a
GENERIC ATA controller with UDMA33

>How-To-Repeat:

dmesg snippet:

atapci0: <Intel ICH6 UDMA100 controller> port 0x1880-0x188f,0x376,0x170-0x177,0x3f6,0x1f0-0x1f7 at device 31.1 on pci0
ata0: channel #0 on atapci0
ata1: channel #1 on atapci0
atapci1: <GENERIC ATA controller> port 0x18a0-0x18af,0x1894-0x1897,0x18b0-0x18b7,0x18b8-0x18bb,0x18c0-0x18c7 irq 18 at device 31.2 on pci0
ata2: channel #0 on atapci1
ata3: channel #1 on atapci1
acd0: DVDR <MATSHITAUJ-832D/1.02> at ata0-master PIO4
Interrupt storm detected on "irq18: atapci1"; throttling interrupt source
ad4: 76319MB <FUJITSU MHV2080BH/00000025> [155061/16/63] at ata2-master UDMA33

pciconf -lv snippet:

atapci0 at pci0:31:1:      class=0x01018a card=0x81b9104d chip=0x266f8086 rev=0x03 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801FB ICH6 Ultra ATA Storage Controller'
    class    = mass storage
    subclass = ATA
atapci1 at pci0:31:2:      class=0x01018f card=0x81ba104d chip=0x26538086 rev=0x03 hdr=0x00
    vendor   = 'Intel Corporation'
    device   = '82801FBM ICH6M SATA Controller'
    class    = mass storage
    subclass = ATA

>Fix:

Apply the following patch to 5.4-RELEASE; rebuild kernel and reboot
Afterwards, controller and drive are correctly detected:

atapci1: <Intel ICH6-M SATA150 controller> port 0x18a0-0x18af,0x1894-0x1897,0x18b0-0x18b7,0x18b8-0x18bb,0x18c0-0
x18c7 irq 18 at device 31.2 on pci0
ad4: 76319MB <FUJITSU MHV2080BH/00000025> [155061/16/63] at ata2-master SATA150

--- vaio-sata.patch begins here ---
diff -u sys/dev/ata.orig/ata-chipset.c sys/dev/ata/ata-chipset.c
--- sys/dev/ata.orig/ata-chipset.c	Wed Mar 23 06:14:11 2005
+++ sys/dev/ata/ata-chipset.c	Tue Nov 15 21:39:17 2005
@@ -838,6 +838,7 @@
      { ATA_I82801FB,   0, 0, 0x00, ATA_UDMA5, "Intel ICH6" },
      { ATA_I82801FB_S1,0, 0, 0x00, ATA_SA150, "Intel ICH6" },
      { ATA_I82801FB_R1,0, 0, 0x00, ATA_SA150, "Intel ICH6" },
+     { ATA_I82801FBM,  0, 0, 0x00, ATA_SA150, "Intel ICH6-M" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64]; 
 
diff -u sys/dev/ata.orig/ata-pci.h sys/dev/ata/ata-pci.h
--- sys/dev/ata.orig/ata-pci.h	Wed Mar 23 06:14:11 2005
+++ sys/dev/ata/ata-pci.h	Tue Nov 15 21:41:07 2005
@@ -127,6 +127,7 @@
 #define ATA_I82801FB		0x266f8086
 #define ATA_I82801FB_S1		0x26518086
 #define ATA_I82801FB_R1		0x26528086
+#define ATA_I82801FBM		0x26538086
 
 #define ATA_ITE_ID		0x1283
 #define ATA_IT8212F		0x82121283
--- vaio-sata.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: