From owner-svn-src-user@FreeBSD.ORG  Sat Mar 14 15:53:06 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D81D8106564A;
	Sat, 14 Mar 2009 15:53:06 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C6E898FC18;
	Sat, 14 Mar 2009 15:53:06 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EFr6YX097391;
	Sat, 14 Mar 2009 15:53:06 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2EFr6F1097390;
	Sat, 14 Mar 2009 15:53:06 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200903141553.n2EFr6F1097390@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 14 Mar 2009 15:53:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189796 - user/mav/ata/sys/dev/ata
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Mar 2009 15:53:07 -0000

Author: mav
Date: Sat Mar 14 15:53:06 2009
New Revision: 189796
URL: http://svn.freebsd.org/changeset/base/189796

Log:
  Add SiI 4726 Port Multiplier quirk.

Modified:
  user/mav/ata/sys/dev/ata/ata-sata.c

Modified: user/mav/ata/sys/dev/ata/ata-sata.c
==============================================================================
--- user/mav/ata/sys/dev/ata/ata-sata.c	Sat Mar 14 15:37:19 2009	(r189795)
+++ user/mav/ata/sys/dev/ata/ata-sata.c	Sat Mar 14 15:53:06 2009	(r189796)
@@ -307,13 +307,24 @@ ata_pm_identify(device_t dev)
     switch (pm_chipid) {
     case 0x37261095:
 	/* Some of these bogusly reports 6 ports */
+	device_printf(dev, "SiI 3726 (rev=%x) Port Multiplier with %d (5) ports\n",
+		      pm_revision, pm_ports);
 	pm_ports = 5;
-	device_printf(dev, "SiI 3726 r%x Portmultiplier with %d ports\n",
+	break;
+
+    case 0x47261095:
+	/* This PM declares 7 ports, while only 5 of them are real.
+	 * Port 5 is some fake "Config  Disk" with 640 sectors size,
+	 * port 6 is enclosure management bridge port.
+	 * Both fake ports has implementation problems, causing
+	 * probe faults. Hide them for now. */
+	device_printf(dev, "SiI 4726 (rev=%x) Port Multiplier with %d (5) ports\n",
 		      pm_revision, pm_ports);
+	pm_ports = 5;
 	break;
 
     default:
-	device_printf(dev, "Portmultiplier (id=%08x rev=%x) with %d ports\n",
+	device_printf(dev, "Port Multiplier (id=%08x rev=%x) with %d ports\n",
 		      pm_chipid, pm_revision, pm_ports);
     }