From owner-svn-src-all@FreeBSD.ORG  Thu Dec  6 15:36:25 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 D67CFF53;
 Thu,  6 Dec 2012 15:36:25 +0000 (UTC)
 (envelope-from jimharris@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 B993E8FC0C;
 Thu,  6 Dec 2012 15:36:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB6FaPM8075599;
 Thu, 6 Dec 2012 15:36:25 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB6FaPdt075596;
 Thu, 6 Dec 2012 15:36:25 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201212061536.qB6FaPdt075596@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Thu, 6 Dec 2012 15:36:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243951 - head/sys/dev/nvme
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.14
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: Thu, 06 Dec 2012 15:36:26 -0000

Author: jimharris
Date: Thu Dec  6 15:36:24 2012
New Revision: 243951
URL: http://svnweb.freebsd.org/changeset/base/243951

Log:
  Add PCI device ID for 8-channel IDT NVMe controller, and clarify that the
  previously defined IDT PCI device ID was for a 32-channel controller.
  
  Submitted by:	Joe Golio <joseph.golio@isilon.com>

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

Modified: head/sys/dev/nvme/nvme.c
==============================================================================
--- head/sys/dev/nvme/nvme.c	Thu Dec  6 13:03:57 2012	(r243950)
+++ head/sys/dev/nvme/nvme.c	Thu Dec  6 15:36:24 2012	(r243951)
@@ -80,7 +80,8 @@ static struct _pcsid
 } pci_ids[] = {
 	{ 0x01118086,		"NVMe Controller"  },
 	{ CHATHAM_PCI_ID,	"Chatham Prototype NVMe Controller"  },
-	{ IDT_PCI_ID,		"IDT NVMe Controller"  },
+	{ IDT32_PCI_ID,		"IDT NVMe Controller (32 channel)"  },
+	{ IDT8_PCI_ID,		"IDT NVMe Controller (8 channel)" },
 	{ 0x00000000,		NULL  }
 };
 

Modified: head/sys/dev/nvme/nvme_private.h
==============================================================================
--- head/sys/dev/nvme/nvme_private.h	Thu Dec  6 13:03:57 2012	(r243950)
+++ head/sys/dev/nvme/nvme_private.h	Thu Dec  6 15:36:24 2012	(r243951)
@@ -55,7 +55,8 @@ MALLOC_DECLARE(M_NVME);
 #define CHATHAM_CONTROL_BAR	0
 #endif
 
-#define IDT_PCI_ID		0x80d0111d
+#define IDT32_PCI_ID		0x80d0111d /* 32 channel board */
+#define IDT8_PCI_ID		0x80d2111d /* 8 channel board */
 
 #define NVME_MAX_PRP_LIST_ENTRIES	(32)