From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Mon, 29 Jun 2009 15:07:58 +0000 (-0700)
Subject: AHCI/SILI - Do manual chipid check to PMs with fake ports
X-Git-Tag: v2.3.2~70
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/19b34835af33d6ccee845ff4ce754e7a936fe178

AHCI/SILI - Do manual chipid check to PMs with fake ports

* Add a switch() on the chipid for PMs which add a fake port at the
  end and avoid probing the fake port.  Probing the port is harmless and
  typically fails in the softreset sequence, but takes time.
---

diff --git a/sys/dev/disk/ahci/ahci_pm.c b/sys/dev/disk/ahci/ahci_pm.c
index f1ce4add51..4d1cb5df52 100644
--- a/sys/dev/disk/ahci/ahci_pm.c
+++ b/sys/dev/disk/ahci/ahci_pm.c
@@ -278,6 +278,7 @@ ahci_pm_identify(struct ahci_port *ap)
 	u_int32_t nports;
 	u_int32_t data1;
 	u_int32_t data2;
+	int	  has_dummy_port;
 
 	ap->ap_probe = ATA_PROBE_FAILED;
 	if (ahci_pm_read(ap, 15, 0, &chipid))
@@ -288,11 +289,33 @@ ahci_pm_identify(struct ahci_port *ap)
 		goto err;
 	nports &= 0x0000000F;	/* only the low 4 bits */
 	ap->ap_probe = ATA_PROBE_GOOD;
+
+	/*
+	 * Ignore fake port on PMs which have it.  We can probe it but the
+	 * softreset will probably fail.
+	 */
+	switch(chipid) {
+	case 0x37261095:
+		has_dummy_port = 1;
+		break;
+	default:
+		has_dummy_port = 0;
+		break;
+	}
+	if (has_dummy_port) {
+		if (nports > 1)
+			--nports;
+	}
+
 	kprintf("%s: Port multiplier: chip=%08x rev=0x%b nports=%d\n",
 		PORTNAME(ap),
 		chipid,
 		rev, SATA_PFMT_PM_REV,
 		nports);
+	if (has_dummy_port) {
+		kprintf("%s: Port multiplier: Ignoring dummy port #%d\n",
+		PORTNAME(ap), nports);
+	}
 	ap->ap_pmcount = nports;
 
 	if (ahci_pm_read(ap, 15, SATA_PMREG_FEA, &data1)) {
diff --git a/sys/dev/disk/sili/sili_pm.c b/sys/dev/disk/sili/sili_pm.c
index bf01278882..53ec22bd52 100644
--- a/sys/dev/disk/sili/sili_pm.c
+++ b/sys/dev/disk/sili/sili_pm.c
@@ -162,6 +162,7 @@ sili_pm_identify(struct sili_port *ap)
 	u_int32_t nports;
 	u_int32_t data1;
 	u_int32_t data2;
+	int	  has_dummy_port;
 
 	ap->ap_probe = ATA_PROBE_FAILED;
 	if (sili_pm_read(ap, 15, 0, &chipid))
@@ -172,11 +173,33 @@ sili_pm_identify(struct sili_port *ap)
 		goto err;
 	nports &= 0x0000000F;	/* only the low 4 bits */
 	ap->ap_probe = ATA_PROBE_GOOD;
+
+	/*
+	 * Ignore fake port on PMs which have it.  We can probe it but the
+	 * softreset will probably fail.
+	 */
+	switch(chipid) {
+	case 0x37261095:
+		has_dummy_port = 1;
+		break;
+	default:
+		has_dummy_port = 0;
+		break;
+	}
+	if (has_dummy_port) {
+		if (nports > 1)
+			--nports;
+	}
+
 	kprintf("%s: Port multiplier: chip=%08x rev=0x%b nports=%d\n",
 		PORTNAME(ap),
 		chipid,
 		rev, SATA_PFMT_PM_REV,
 		nports);
+	if (has_dummy_port) {
+		kprintf("%s: Port multiplier: Ignoring dummy port #%d\n",
+			PORTNAME(ap), nports);
+	}
 	ap->ap_pmcount = nports;
 
 	if (sili_pm_read(ap, 15, SATA_PMREG_FEA, &data1)) {