Module Name: src
Committed By: msaitoh
Date: Mon Jul 27 15:46:03 UTC 2015
Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h
Log Message:
Add NVMe.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.133 src/sys/dev/pci/pci_subr.c:1.134
--- src/sys/dev/pci/pci_subr.c:1.133 Mon Nov 24 07:53:43 2014
+++ src/sys/dev/pci/pci_subr.c Mon Jul 27 15:46:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.133 2014/11/24 07:53:43 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.134 2015/07/27 15:46:03 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.133 2014/11/24 07:53:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.134 2015/07/27 15:46:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -114,6 +114,7 @@ static const struct pci_class pci_interf
static const struct pci_class pci_interface_nvm[] = {
{ "vendor specific", PCI_INTERFACE_NVM_VND, NULL, },
{ "NVMHCI 1.0", PCI_INTERFACE_NVM_NVMHCI10, NULL, },
+ { "NVMe", PCI_INTERFACE_NVM_NVME, NULL, },
{ NULL, 0, NULL, },
};
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.102 src/sys/dev/pci/pcireg.h:1.103
--- src/sys/dev/pci/pcireg.h:1.102 Mon Apr 27 07:03:58 2015
+++ src/sys/dev/pci/pcireg.h Mon Jul 27 15:46:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.102 2015/04/27 07:03:58 knakahara Exp $ */
+/* $NetBSD: pcireg.h,v 1.103 2015/07/27 15:46:03 msaitoh Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -187,6 +187,7 @@ typedef u_int8_t pci_revision_t;
#define PCI_SUBCLASS_MASS_STORAGE_NVM 0x08
#define PCI_INTERFACE_NVM_VND 0x00
#define PCI_INTERFACE_NVM_NVMHCI10 0x01
+#define PCI_INTERFACE_NVM_NVME 0x02
#define PCI_SUBCLASS_MASS_STORAGE_MISC 0x80
/* 0x02 network subclasses */