Update the ICH6 support so all 4 SATA channels can be used.

We still use "normal" mode, AHCI mode is in the works still.

HW donated by:	Sentex
HW donated by:	Yahoo!

1 files changed, 13 insertions, 5 deletions

diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index 4d8446b..6c20240 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -919,13 +919,21 @@ static void
 ata_intel_reset(struct ata_channel *ch)
 {
     device_t parent = device_get_parent(ch->dev);
+    struct ata_pci_controller *ctlr = device_get_softc(parent);
     int mask, timeout = 100;
 
-    if (pci_read_config(parent, 0x90, 1) & 0x04)
-	mask = 0x0003;
-    else
-	mask = (0x0001 << ch->unit);
-
+    /* ICH6 has 4 SATA ports as master/slave on 2 channels so deal with pairs */
+    if (ctlr->chip->chipid == ATA_I82801FB_S1 ||
+	ctlr->chip->chipid == ATA_I82801FB_R1) {
+	mask = (0x0005 << ch->unit);
+    }
+    else {
+	/* ICH5 in compat mode has SATA ports as master/slave on 1 channel */
+	if (pci_read_config(parent, 0x90, 1) & 0x04)
+	    mask = 0x0003;
+	else
+	    mask = (0x0001 << ch->unit);
+    }
     pci_write_config(parent, 0x92, pci_read_config(parent, 0x92, 2) & ~mask, 2);
     DELAY(10);
     pci_write_config(parent, 0x92, pci_read_config(parent, 0x92, 2) | mask, 2);