From d0b256a72f74b59c7197f77488d6159c8cd27e4c Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Tue, 1 Jan 2008 12:16:40 +0000
Subject: [PATCH] Add PCI IDs for ICH9.

Taken-from: FreeBSD
---
 share/man/man4/nata.4           | 6 +++---
 sys/dev/disk/nata/ata-chipset.c | 7 ++++++-
 sys/dev/disk/nata/ata-pci.h     | 7 ++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/share/man/man4/nata.4 b/share/man/man4/nata.4
index 20987ba8ba..00e80e371a 100644
--- a/share/man/man4/nata.4
+++ b/share/man/man4/nata.4
@@ -26,9 +26,9 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/ata.4,v 1.72 2007/03/10 12:44:22 brueffer Exp $
-.\" $DragonFly: src/share/man/man4/nata.4,v 1.3 2007/06/24 10:50:43 swildner Exp $
+.\" $DragonFly: src/share/man/man4/nata.4,v 1.4 2008/01/01 12:16:40 swildner Exp $
 .\"
-.Dd June 14, 2007
+.Dd January 1, 2008
 .Dt NATA 4
 .Os
 .Sh NAME
@@ -110,7 +110,7 @@ Cyrix 5530.
 .It HighPoint:
 HPT302, HPT366, HPT368, HPT370, HPT371, HPT372, HPT372N, HPT374.
 .It Intel:
-6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8.
+6300ESB, 31244, PIIX, PIIX3, PIIX4, ESB2, ICH, ICH0, ICH2, ICH3, ICH4, ICH5, ICH6, ICH7, ICH8, ICH9.
 .It ITE:
 IT8211F, IT8212F.
 .It JMicron:
diff --git a/sys/dev/disk/nata/ata-chipset.c b/sys/dev/disk/nata/ata-chipset.c
index 0f9556ce20..0ea2a06446 100644
--- a/sys/dev/disk/nata/ata-chipset.c
+++ b/sys/dev/disk/nata/ata-chipset.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.196 2007/04/08 19:18:51 sos Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-chipset.c,v 1.11 2007/12/17 09:24:40 hasso Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-chipset.c,v 1.12 2008/01/01 12:16:40 swildner Exp $
  */
 
 #include "opt_ata.h"
@@ -1836,6 +1836,11 @@ ata_intel_ident(device_t dev)
      { ATA_I82801HBM_S1, 0,    0, 0x00, ATA_SA300, "ICH8M" },
      { ATA_I82801HBM_S2, 0, AHCI, 0x00, ATA_SA300, "ICH8M" },
      { ATA_I82801HBM_S3, 0, AHCI, 0x00, ATA_SA300, "ICH8M" },
+     { ATA_I82801IB_S1,  0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_S2,  0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_AH2, 0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_AH4, 0, AHCI, 0x00, ATA_SA300, "ICH9" },
+     { ATA_I82801IB_AH6, 0, AHCI, 0x00, ATA_SA300, "ICH9" },
      { ATA_I31244,      0,    0, 0x00, ATA_SA150, "31244" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64]; 
diff --git a/sys/dev/disk/nata/ata-pci.h b/sys/dev/disk/nata/ata-pci.h
index 2e661caa26..b4af1a57ba 100644
--- a/sys/dev/disk/nata/ata-pci.h
+++ b/sys/dev/disk/nata/ata-pci.h
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $
- * $DragonFly: src/sys/dev/disk/nata/ata-pci.h,v 1.6 2007/12/17 09:24:40 hasso Exp $
+ * $DragonFly: src/sys/dev/disk/nata/ata-pci.h,v 1.7 2008/01/01 12:16:40 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -177,6 +177,11 @@ struct ata_connect_task {
 #define ATA_I82801HBM_S1        0x28288086
 #define ATA_I82801HBM_S2        0x28298086
 #define ATA_I82801HBM_S3        0x282a8086
+#define ATA_I82801IB_S1         0x29208086
+#define ATA_I82801IB_AH2        0x29218086
+#define ATA_I82801IB_AH6        0x29228086
+#define ATA_I82801IB_AH4        0x29238086
+#define ATA_I82801IB_S2         0x29268086
 #define ATA_I31244              0x32008086
 
 #define ATA_ITE_ID              0x1283
-- 
2.41.0