Add Intel Cougar Point PCH SATA Controller DeviceIDs. Correct some existing

entries for Intel Ibex Peak (5 Series/3400 Series) PCH SATA controllers.

Submitted by:	jfv@
MFC after:	1 week

2 files changed, 43 insertions, 16 deletions

diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 7fa7644..258212e 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -204,6 +204,29 @@ struct ata_pci_controller {
 #define ATA_I82801JI_AH         0x3a228086
 #define ATA_I82801JI_R1         0x3a258086
 #define ATA_I82801JI_S2         0x3a268086
+
+#define ATA_5Series_S1          0x3b208086
+#define ATA_5Series_S2          0x3b218086
+#define ATA_5Series_AH1         0x3b228086
+#define ATA_5Series_AH2         0x3b238086
+#define ATA_5Series_R1          0x3b258086
+#define ATA_5Series_S3          0x3b268086
+#define ATA_5Series_S4          0x3b288086
+#define ATA_5Series_AH3         0x3b298086
+#define ATA_5Series_R2          0x3b2c8086
+#define ATA_5Series_S5          0x3b2d8086
+#define ATA_5Series_S6          0x3b2e8086
+#define ATA_5Series_AH4         0x3b2f8086
+
+#define ATA_CPT_S1              0x1c008086
+#define ATA_CPT_S2              0x1c018086
+#define ATA_CPT_AH1             0x1c028086
+#define ATA_CPT_AH2             0x1c038086
+#define ATA_CPT_R1              0x1c048086
+#define ATA_CPT_R2              0x1c058086
+#define ATA_CPT_S3              0x1c088086
+#define ATA_CPT_S4              0x1c098086
+
 #define ATA_I31244              0x32008086
 #define ATA_ISCH                0x811a8086
 
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index 0638b39..0f47bc7 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -140,22 +140,26 @@ ata_intel_probe(device_t dev)
      { ATA_I82801JI_AH,  0, INTEL_AHCI, 0, ATA_SA300, "ICH10" },
      { ATA_I82801JI_R1,  0, INTEL_AHCI, 0, ATA_SA300, "ICH10" },
      { ATA_I82801JI_S2,  0, INTEL_AHCI, 0, ATA_SA300, "ICH10" },
-     { 0x3b208086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b218086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b228086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b238086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b248086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b258086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b268086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b278086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b288086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b298086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b2a8086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b2b8086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b2c8086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b2d8086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b2e8086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
-     { 0x3b2f8086,       0, INTEL_AHCI, 0, ATA_SA300, "PCH" },
+     { ATA_5Series_S1,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_S2,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_AH1,  0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_AH2,  0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_R1,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_S3,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_S4,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_AH3,  0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_R2,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_S5,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_S6,   0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_5Series_AH4,  0, INTEL_AHCI, 0, ATA_SA300, "5 Series/3400 Series PCH" },
+     { ATA_CPT_S1,       0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_S2,       0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_AH1,      0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_AH2,      0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_R1,       0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_R2,       0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_S3,       0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
+     { ATA_CPT_S4,       0, INTEL_AHCI, 0, ATA_SA300, "Cougar Point" },
      { ATA_I31244,       0,          0, 2, ATA_SA150, "31244" },
      { ATA_ISCH,         0,          0, 1, ATA_UDMA5, "SCH" },
      { 0, 0, 0, 0, 0, 0}};