Module Name: src
Committed By: nonaka
Date: Mon Feb 13 11:11:32 UTC 2017
Modified Files:
src/sys/dev/ic: nvme.c nvmereg.h
Log Message:
NVMe 1.2.1
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ic/nvme.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/nvmereg.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/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.23 src/sys/dev/ic/nvme.c:1.24
--- src/sys/dev/ic/nvme.c:1.23 Mon Feb 13 11:10:45 2017
+++ src/sys/dev/ic/nvme.c Mon Feb 13 11:11:32 2017
@@ -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 @@ nvme_version(struct nvme_softc *sc, uint
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;
Index: src/sys/dev/ic/nvmereg.h
diff -u src/sys/dev/ic/nvmereg.h:1.6 src/sys/dev/ic/nvmereg.h:1.7
--- src/sys/dev/ic/nvmereg.h:1.6 Sat Oct 8 16:05:32 2016
+++ src/sys/dev/ic/nvmereg.h Mon Feb 13 11:11:32 2017
@@ -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 */
