From owner-svn-src-all@FreeBSD.ORG  Wed Jan  1 20:18:03 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 96D87CEE;
 Wed,  1 Jan 2014 20:18:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8330B1208;
 Wed,  1 Jan 2014 20:18:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01KI3QY014442;
 Wed, 1 Jan 2014 20:18:03 GMT (envelope-from zbb@svn.freebsd.org)
Received: (from zbb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01KI31L014441;
 Wed, 1 Jan 2014 20:18:03 GMT (envelope-from zbb@svn.freebsd.org)
Message-Id: <201401012018.s01KI31L014441@svn.freebsd.org>
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Wed, 1 Jan 2014 20:18:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260163 - head/sys/dev/ahci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jan 2014 20:18:03 -0000

Author: zbb
Date: Wed Jan  1 20:18:03 2014
New Revision: 260163
URL: http://svnweb.freebsd.org/changeset/base/260163

Log:
  Do not attach to PCI bridges in AHCI driver
  
  Some vendors use the same VID:PID combination in AHCI and PCI bridge cards
  
  Submitted by:	Wojciech Macek <wma@semihalf.com>
  Obtained from:	Semihalf

Modified:
  head/sys/dev/ahci/ahci.c

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Wed Jan  1 20:04:43 2014	(r260162)
+++ head/sys/dev/ahci/ahci.c	Wed Jan  1 20:18:03 2014	(r260163)
@@ -375,6 +375,13 @@ ahci_probe(device_t dev)
 	uint32_t devid = pci_get_devid(dev);
 	uint8_t revid = pci_get_revid(dev);
 
+	/*
+	 * Ensure it is not a PCI bridge (some vendors use
+	 * the same PID and VID in PCI bridge and AHCI cards).
+	 */
+	if (pci_get_class(dev) == PCIC_BRIDGE)
+		return (ENXIO);
+
 	/* Is this a possible AHCI candidate? */
 	if (pci_get_class(dev) == PCIC_STORAGE &&
 	    pci_get_subclass(dev) == PCIS_STORAGE_SATA &&