From owner-svn-src-all@FreeBSD.ORG  Mon Mar  5 18:20:32 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 16B0F106564A;
	Mon,  5 Mar 2012 18:20:32 +0000 (UTC)
	(envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 05AF68FC0A;
	Mon,  5 Mar 2012 18:20:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q25IKVYc098302;
	Mon, 5 Mar 2012 18:20:31 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q25IKVxF098300;
	Mon, 5 Mar 2012 18:20:31 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201203051820.q25IKVxF098300@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Mon, 5 Mar 2012 18:20:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232559 - releng/8.3/sys/dev/isci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 05 Mar 2012 18:20:32 -0000

Author: jimharris
Date: Mon Mar  5 18:20:31 2012
New Revision: 232559
URL: http://svn.freebsd.org/changeset/base/232559

Log:
  Merge r232554 from stable/8 (r232225 from head):
  
  Include missing device IDs for isci(4) driver.
  
  The C600 chipset will surface one of device IDs 0x1D6C-0x1D6F for the
  integrated SAS controller on systems that are shipped with a 3rd party
  (i.e. non-Intel) device driver.
  
  These changes add the 0x1D6C-0x1D6F device IDs, as well as change isci_probe()
  to return a value that would allow a 3rd-party FreeBSD driver to load
  against this device, should such a driver ever come to fruition.
  
  Approved by: re (kib), sbruno

Modified:
  releng/8.3/sys/dev/isci/isci.c
Directory Properties:
  releng/8.3/sys/   (props changed)

Modified: releng/8.3/sys/dev/isci/isci.c
==============================================================================
--- releng/8.3/sys/dev/isci/isci.c	Mon Mar  5 18:15:54 2012	(r232558)
+++ releng/8.3/sys/dev/isci/isci.c	Mon Mar  5 18:20:31 2012	(r232559)
@@ -98,7 +98,11 @@ static struct _pcsid
 	 { 0x1d688086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d698086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d6a8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
-	 { 0x1d6b8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
+	 { 0x1d6b8086,  "Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
+	 { 0x1d6c8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
+	 { 0x1d6d8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
+	 { 0x1d6e8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
+	 { 0x1d6f8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
 	 { 0x00000000,	NULL				}
 };
 
@@ -114,7 +118,7 @@ isci_probe (device_t device)
 	if (ep->desc)
 	{
 		device_set_desc(device, ep->desc);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 	else
 		return (ENXIO);