svn commit: r241103 - in stable/7: sys/dev/pci usr.sbin/pciconf

[Gavin Atkinson]

Author: gavin
Date: Mon Oct  1 15:47:35 2012
New Revision: 241103
URL: http://svn.freebsd.org/changeset/base/241103

Log:
  Merge the following from head:
  
    r240694
      Add PCI subclass for NVM Express devices.
  
    r240699, r240739
      Recognise NVM devices and pretty-print their name.

Modified:
  stable/7/sys/dev/pci/pci.c
  stable/7/sys/dev/pci/pcireg.h
  stable/7/usr.sbin/pciconf/pciconf.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/usr.sbin/pciconf/   (props changed)

Modified: stable/7/sys/dev/pci/pci.c
==============================================================================
--- stable/7/sys/dev/pci/pci.c	Mon Oct  1 15:47:13 2012	(r241102)
+++ stable/7/sys/dev/pci/pci.c	Mon Oct  1 15:47:35 2012	(r241103)
@@ -3071,6 +3071,7 @@ static struct
 	{PCIC_STORAGE,		PCIS_STORAGE_ATA_ADMA,	"ATA (ADMA)"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SATA,	"SATA"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SAS,	"SAS"},
+	{PCIC_STORAGE,		PCIS_STORAGE_NVM,	"NVM"},
 	{PCIC_NETWORK,		-1,			"network"},
 	{PCIC_NETWORK,		PCIS_NETWORK_ETHERNET,	"ethernet"},
 	{PCIC_NETWORK,		PCIS_NETWORK_TOKENRING,	"token ring"},

Modified: stable/7/sys/dev/pci/pcireg.h
==============================================================================
--- stable/7/sys/dev/pci/pcireg.h	Mon Oct  1 15:47:13 2012	(r241102)
+++ stable/7/sys/dev/pci/pcireg.h	Mon Oct  1 15:47:35 2012	(r241103)
@@ -263,6 +263,7 @@
 #define	PCIS_STORAGE_SATA	0x06
 #define	PCIP_STORAGE_SATA_AHCI_1_0	0x01
 #define	PCIS_STORAGE_SAS	0x07
+#define	PCIS_STORAGE_NVM	0x08
 #define	PCIS_STORAGE_OTHER	0x80
 
 #define	PCIC_NETWORK	0x02

Modified: stable/7/usr.sbin/pciconf/pciconf.c
==============================================================================
--- stable/7/usr.sbin/pciconf/pciconf.c	Mon Oct  1 15:47:13 2012	(r241102)
+++ stable/7/usr.sbin/pciconf/pciconf.c	Mon Oct  1 15:47:35 2012	(r241103)
@@ -337,6 +337,7 @@ static struct
 	{PCIC_STORAGE,		PCIS_STORAGE_ATA_ADMA,	"ATA (ADMA)"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SATA,	"SATA"},
 	{PCIC_STORAGE,		PCIS_STORAGE_SAS,	"SAS"},
+	{PCIC_STORAGE,		PCIS_STORAGE_NVM,	"NVM"},
 	{PCIC_NETWORK,		-1,			"network"},
 	{PCIC_NETWORK,		PCIS_NETWORK_ETHERNET,	"ethernet"},
 	{PCIC_NETWORK,		PCIS_NETWORK_TOKENRING,	"token ring"},