From owner-svn-src-head@FreeBSD.ORG  Wed Sep 19 16:21:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1A2C4106571F;
	Wed, 19 Sep 2012 16:21:24 +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 660148FC14;
	Wed, 19 Sep 2012 16:21:24 +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 q8JGLOeq024648;
	Wed, 19 Sep 2012 16:21:24 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8JGLOaR024645;
	Wed, 19 Sep 2012 16:21:24 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201209191621.q8JGLOaR024645@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 19 Sep 2012 16:21:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240697 - head/sys/dev/nvme
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 19 Sep 2012 16:21:25 -0000

Author: jimharris
Date: Wed Sep 19 16:21:23 2012
New Revision: 240697
URL: http://svn.freebsd.org/changeset/base/240697

Log:
  Report nvme(4) as a generic driver for NVMe devices if PCI class, subclass
  and programming interface codes match.
  
  Sponsored by:	Intel

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

Modified: head/sys/dev/nvme/nvme.c
==============================================================================
--- head/sys/dev/nvme/nvme.c	Wed Sep 19 16:20:49 2012	(r240696)
+++ head/sys/dev/nvme/nvme.c	Wed Sep 19 16:21:23 2012	(r240697)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/module.h>
 
+#include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #include "nvme_private.h"
@@ -82,17 +83,29 @@ static struct _pcsid
 static int
 nvme_probe (device_t device)
 {
-	u_int32_t type = pci_get_devid(device);
-	struct _pcsid *ep = pci_ids;
+	struct _pcsid	*ep;
+	int		probe_val = ENXIO;
+	u_int32_t	type;
+
+	type = pci_get_devid(device);
+	ep = pci_ids;
+
+#if defined(PCIS_STORAGE_NVM)
+	if (pci_get_class(device)    == PCIC_STORAGE &&
+	    pci_get_subclass(device) == PCIS_STORAGE_NVM &&
+	    pci_get_progif(device)   == PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0)
+		probe_val = BUS_PROBE_GENERIC;
+#endif
 
 	while (ep->type && ep->type != type)
 		++ep;
 
 	if (ep->desc) {
 		device_set_desc(device, ep->desc);
-		return (BUS_PROBE_DEFAULT);
-	} else
-		return (ENXIO);
+		probe_val = BUS_PROBE_DEFAULT;
+	}
+
+	return (probe_val);
 }
 
 static void