From owner-svn-src-stable@FreeBSD.ORG  Tue Oct  9 20:05:20 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8E96FBD4;
 Tue,  9 Oct 2012 20:05:20 +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 769F68FC08;
 Tue,  9 Oct 2012 20:05:20 +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 q99K5KAe069034;
 Tue, 9 Oct 2012 20:05:20 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q99K5KPW069032;
 Tue, 9 Oct 2012 20:05:20 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201210092005.q99K5KPW069032@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Tue, 9 Oct 2012 20:05:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r241383 - stable/9/sys/dev/pci
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Oct 2012 20:05:20 -0000

Author: jimharris
Date: Tue Oct  9 20:05:19 2012
New Revision: 241383
URL: http://svn.freebsd.org/changeset/base/241383

Log:
  MFC r240695:
  
  Add constants for programming interfaces for NVM/solid state storage
  controller sub-class code.
  
  Reference:  PCI Code and ID Assignment Specification Rev 1.2

Modified:
  stable/9/sys/dev/pci/pcireg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/pci/pcireg.h
==============================================================================
--- stable/9/sys/dev/pci/pcireg.h	Tue Oct  9 19:59:22 2012	(r241382)
+++ stable/9/sys/dev/pci/pcireg.h	Tue Oct  9 20:05:19 2012	(r241383)
@@ -264,6 +264,8 @@
 #define	PCIP_STORAGE_SATA_AHCI_1_0	0x01
 #define	PCIS_STORAGE_SAS	0x07
 #define	PCIS_STORAGE_NVM	0x08
+#define	PCIP_STORAGE_NVM_NVMHCI_1_0	0x01
+#define	PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0	0x02
 #define	PCIS_STORAGE_OTHER	0x80
 
 #define	PCIC_NETWORK	0x02