From 0b7987da38d6186c5c2d509af345a7b1831c13ff Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 24 May 2006 01:43:25 -0400
Subject: [PATCH] --- yaml --- r: 29455 b: refs/heads/master c:
 d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 h: refs/heads/master i:   29453:
 a9083c7ac43708224ed620305fd900fec712683a   29451:
 e5f6fefe244fcd15927d5f7f5548cc0d053e168f   29447:
 d7ade3357164bef97012d8f1e29c36b61fb690c6   29439:
 d7a8cd60ba761d03273c6864907ed2a4cd107b25 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/scsi/sata_promise.c | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f6f07c1bd85a..012820fe9023 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c5c81613b0eb0dba97a8f312a2f1162f39fd47b
+refs/heads/master: d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5
diff --git a/trunk/drivers/scsi/sata_promise.c b/trunk/drivers/scsi/sata_promise.c
index bb000438cb6c..285ab0263d91 100644
--- a/trunk/drivers/scsi/sata_promise.c
+++ b/trunk/drivers/scsi/sata_promise.c
@@ -364,12 +364,23 @@ static void pdc_sata_phy_reset(struct ata_port *ap)
 	sata_phy_reset(ap);
 }
 
-static void pdc_pata_phy_reset(struct ata_port *ap)
+static void pdc_pata_cbl_detect(struct ata_port *ap)
 {
-	/* FIXME: add cable detect.  Don't assume 40-pin cable */
-	ap->cbl = ATA_CBL_PATA40;
-	ap->udma_mask &= ATA_UDMA_MASK_40C;
+	u8 tmp;
+	void __iomem *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
+
+	tmp = readb(mmio);
+
+	if (tmp & 0x01) {
+		ap->cbl = ATA_CBL_PATA40;
+		ap->udma_mask &= ATA_UDMA_MASK_40C;
+	} else
+		ap->cbl = ATA_CBL_PATA80;
+}
 
+static void pdc_pata_phy_reset(struct ata_port *ap)
+{
+	pdc_pata_cbl_detect(ap);
 	pdc_reset_port(ap);
 	ata_port_probe(ap);
 	ata_bus_reset(ap);