From owner-svn-src-head@FreeBSD.ORG  Fri Feb 22 19:53:12 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A76AB475;
 Fri, 22 Feb 2013 19:53:12 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9A3E8855;
 Fri, 22 Feb 2013 19:53:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1MJrCM1092352;
 Fri, 22 Feb 2013 19:53:12 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1MJrCtg092351;
 Fri, 22 Feb 2013 19:53:12 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201302221953.r1MJrCtg092351@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 22 Feb 2013 19:53:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247161 - head/sys/cam/ata
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Feb 2013 19:53:12 -0000

Author: mav
Date: Fri Feb 22 19:53:12 2013
New Revision: 247161
URL: http://svnweb.freebsd.org/changeset/base/247161

Log:
  Hide SEMB port of the SiI3826 Port Multiplier by default to avoid extra
  errors while it tries to talk via I2C to usually missing external SEP.
  There is tunable to enable it back when needed.

Modified:
  head/sys/cam/ata/ata_pmp.c

Modified: head/sys/cam/ata/ata_pmp.c
==============================================================================
--- head/sys/cam/ata/ata_pmp.c	Fri Feb 22 19:23:33 2013	(r247160)
+++ head/sys/cam/ata/ata_pmp.c	Fri Feb 22 19:53:12 2013	(r247161)
@@ -595,7 +595,9 @@ pmpdone(struct cam_periph *periph, union
 			 * causes timeouts if external SEP is not connected
 			 * to PMP over I2C.
 			 */
-			if (softc->pm_pid == 0x37261095 && softc->pm_ports == 6)
+			if ((softc->pm_pid == 0x37261095 ||
+			     softc->pm_pid == 0x38261095) &&
+			    softc->pm_ports == 6)
 				softc->pm_ports = 5;
 
 			/*