kern/102426: Support for ServerWorks HT1000 SATA chipset

[Daniel Rock]

>Number:         102426
>Category:       kern
>Synopsis:       Support for ServerWorks HT1000 SATA chipset
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 23 09:30:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Rock
>Release:        7.0-CURRENT from Aug, 21st
>Organization:
>Environment:
FreeBSD deadcafe.de 7.0-CURRENT FreeBSD 7.0-CURRENT #3: Wed Aug 23 11:03:48 CEST 2006     root at deadcafe.de:/usr/src/sys/amd64/compile/DEADCAFE  amd64

>Description:
ServerWorks HT1000 SATA chipset isn't detected by FreeBSD. Relevant output of pciconf -l

atapci0 at pci1:14:0:      class=0x010400 card=0x024a1166 chip=0x02401166 rev=0x00 hdr=0x00



>How-To-Repeat:
N/A
>Fix:
Add a definition for this specific chip-ID to the ata chipset detection:

cvs diff: Diffing .
Index: ata-chipset.c
===================================================================
RCS file: /export/cvs/src/sys/dev/ata/ata-chipset.c,v
retrieving revision 1.171
diff -u -r1.171 ata-chipset.c
--- ata-chipset.c       18 Aug 2006 09:56:12 -0000      1.171
+++ ata-chipset.c       23 Aug 2006 09:03:36 -0000
@@ -3953,6 +3953,7 @@
      { ATA_CSB6,      0x00, SWKS100, 0x00, ATA_UDMA5, "CSB6" },
      { ATA_CSB6_1,    0x00, SWKS66,  0x00, ATA_UDMA4, "CSB6" },
      { ATA_HT1000,    0x00, SWKS100, 0x00, ATA_UDMA5, "HT1000" },
+     { ATA_HT1000_S1a,0x00, SWKSMIO, 0x00, ATA_SA150, "HT1000 SATA" },
      { ATA_HT1000_S1, 0x00, SWKS100, 0x00, ATA_SA150, "HT1000 SATA" },
      { ATA_HT1000_S2, 0x00, SWKSMIO, 0x00, ATA_SA150, "HT1000 SATA mmio" },
      { 0, 0, 0, 0, 0, 0}};
Index: ata-pci.h
===================================================================
RCS file: /export/cvs/src/sys/dev/ata/ata-pci.h,v
retrieving revision 1.69
diff -u -r1.69 ata-pci.h
--- ata-pci.h   14 Aug 2006 19:39:33 -0000      1.69
+++ ata-pci.h   23 Aug 2006 00:21:53 -0000
@@ -264,6 +264,7 @@
 #define ATA_CSB6                0x02131166
 #define ATA_CSB6_1              0x02171166
 #define ATA_HT1000              0x02141166
+#define ATA_HT1000_S1a          0x02401166
 #define ATA_HT1000_S1           0x024b1166
 #define ATA_HT1000_S2           0x024a1166


After that the chipset and attached disks are detected:

atapci0: <ServerWorks HT1000 SATA SATA150 controller> port 0xbc00-0xbc07,0xb880-0xb883,0xb800-0xb807,0xb480-0xb483,0xb400-0xb41f mem 0xfcafe000-0xfcafffff irq 11 at device 14.0 on pci1
ata2: <ATA channel 0> on atapci0
ata3: <ATA channel 1> on atapci0
ata4: <ATA channel 2> on atapci0
ata5: <ATA channel 3> on atapci0
ad4: 78533MB <ExcelStor Technology J880S PF2OA60A> at ata2-master SATA150
ad6: 78533MB <ExcelStor Technology J880S PF2OA60A> at ata3-master SATA150

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