i386/101980: [PATCH] Intel 631xESB ata and ichsmb support (i386/amd64)

[Reed A. Cartwright]

>Number:         101980
>Category:       i386
>Synopsis:       [PATCH] Intel 631xESB ata and ichsmb support (i386/amd64)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-i386
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 14 00:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Reed A. Cartwright
>Release:        6.1-Release-p3
>Organization:
NCSU
>Environment:
>Description:
FreeBSD does not support Intel's new 631xESB/632xESB I/O Controller Hub.  It would not  install onto my Dell Precision 490 workstation, because it couldn't recognize the hard drives.  I found a patch on the freebsd-stable email list and have modified it to include all of the device IDS for the sata controller.

Intel Documention: http://www.intel.com/design/chipsets/datashts/313082.htm

Initial Patch: http://lists.freebsd.org/pipermail/freebsd-stable/2006-June/025930.html

FreeBSD also doesn't support the audio out of the box, but installing the Open Sound System fixes that.  I don't think the snd_ich driver supports the AC'97 audio on the 631xESB controller; however, since my machine doesn't have AC'97 I can't test a patch for it.
>How-To-Repeat:
Try to install on a system with an Intel 631xESB/632xESB I/O Controller Hub.
>Fix:
Index: sys/dev/ata/ata-chipset.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/ata-chipset.c,v
retrieving revision 1.126.2.11
diff -u -r1.126.2.11 ata-chipset.c
--- sys/dev/ata/ata-chipset.c	16 Mar 2006 21:28:51 -0000	1.126.2.11
+++ sys/dev/ata/ata-chipset.c	9 Aug 2006 20:28:30 -0000
@@ -1595,6 +1595,11 @@
      { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" },
      { ATA_I82801GB_M,  0, AHCI, 0x00, ATA_SA300, "ICH7" },
      { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" },
+     { ATA_I631xESB,    0,    0, 0x00, ATA_UDMA5, "631xESB" },
+     { ATA_I631xESB_C1, 0,    0, 0x00, ATA_UDMA5, "631xESB" }, 
+     { ATA_I631xESB_S1, 0, AHCI, 0x00, ATA_SA300, "631xESB" }, 
+     { ATA_I631xESB_R1, 0, AHCI, 0x00, ATA_SA300, "631xESB" }, 
+     { ATA_I631xESB_R2, 0, AHCI, 0x00, ATA_SA300, "631xESB" }, 
      { ATA_I31244,      0,    0, 0x00, ATA_SA150, "31244" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64]; 
Index: sys/dev/ata/ata-pci.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/ata-pci.h,v
retrieving revision 1.49.2.8
diff -u -r1.49.2.8 ata-pci.h
--- sys/dev/ata/ata-pci.h	16 Mar 2006 21:28:51 -0000	1.49.2.8
+++ sys/dev/ata/ata-pci.h	9 Aug 2006 20:28:30 -0000
@@ -148,6 +148,11 @@
 #define ATA_I82801FB_S1         0x26518086
 #define ATA_I82801FB_R1         0x26528086
 #define ATA_I82801FB_M          0x26538086
+#define ATA_I631xESB_C1         0x26808086
+#define ATA_I631xESB_S1         0x26818086
+#define ATA_I631xESB_R1         0x26828086
+#define ATA_I631xESB_R2         0x26838086
+#define ATA_I631xESB            0x269e8086
 #define ATA_I82801GB            0x27df8086
 #define ATA_I82801GB_S1         0x27c08086
 #define ATA_I82801GB_R1         0x27c38086
Index: sys/dev/ichsmb/ichsmb_pci.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ichsmb/ichsmb_pci.c,v
retrieving revision 1.16.2.1
diff -u -r1.16.2.1 ichsmb_pci.c
--- sys/dev/ichsmb/ichsmb_pci.c	19 Aug 2005 18:38:55 -0000	1.16.2.1
+++ sys/dev/ichsmb/ichsmb_pci.c	9 Aug 2006 20:28:31 -0000
@@ -74,6 +74,7 @@
 #define ID_82801DC			0x24C38086
 #define ID_82801EB			0x24D38086
 #define ID_6300ESB			0x25a48086
+#define ID_631xESB			0x269b8086
 
 #define PCIS_SERIALBUS_SMBUS_PROGIF	0x00
 
@@ -146,6 +147,9 @@
 	case ID_6300ESB:
 		device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller");
 		break;
+	case ID_631xESB:
+		device_set_desc(dev, "Intel 631xESB (ESB2) SMBus controller");
+		break;
 	default:
 		if (pci_get_class(dev) == PCIC_SERIALBUS
 		    && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS

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