[src/trunk]: src/sys/dev/ic NVMe 1.2.1

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dc076bc00d8f
branches:  trunk
changeset: 821694:dc076bc00d8f
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Mon Feb 13 11:11:32 2017 +0000

description:
NVMe 1.2.1

diffstat:

 sys/dev/ic/nvme.c    |  7 +++++--
 sys/dev/ic/nvmereg.h |  3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 0045dee9effe -r dc076bc00d8f sys/dev/ic/nvme.c
--- a/sys/dev/ic/nvme.c Mon Feb 13 11:10:45 2017 +0000
+++ b/sys/dev/ic/nvme.c Mon Feb 13 11:11:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme.c,v 1.23 2017/02/13 11:10:45 nonaka Exp $ */
+/*     $NetBSD: nvme.c,v 1.24 2017/02/13 11:11:32 nonaka Exp $ */
 /*     $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.23 2017/02/13 11:10:45 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.24 2017/02/13 11:11:32 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -173,6 +173,9 @@
        case NVME_VS_1_2:
                v = "1.2";
                break;
+       case NVME_VS_1_2_1:
+               v = "1.2.1";
+               break;
        default:
                aprint_error_dev(sc->sc_dev, "unknown version 0x%08x\n", ver);
                return;
diff -r 0045dee9effe -r dc076bc00d8f sys/dev/ic/nvmereg.h
--- a/sys/dev/ic/nvmereg.h      Mon Feb 13 11:10:45 2017 +0000
+++ b/sys/dev/ic/nvmereg.h      Mon Feb 13 11:11:32 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvmereg.h,v 1.6 2016/10/08 16:05:32 jdolecek Exp $     */
+/*     $NetBSD: nvmereg.h,v 1.7 2017/02/13 11:11:32 nonaka Exp $       */
 /*     $OpenBSD: nvmereg.h,v 1.10 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -41,6 +41,7 @@
 #define  NVME_VS_1_0           0x00010000
 #define  NVME_VS_1_1           0x00010100
 #define  NVME_VS_1_2           0x00010200
+#define  NVME_VS_1_2_1         0x00010201
 #define NVME_INTMS     0x000c  /* Interrupt Mask Set */
 #define NVME_INTMC     0x0010  /* Interrupt Mask Clear */
 #define NVME_CC                0x0014  /* Controller Configuration */