Module Name: src
Committed By: nonaka
Date: Mon May 29 02:25:37 UTC 2017
Modified Files:
src/sys/dev/ic: nvme.c
Log Message:
nvme(4): Don't set prp1 for DEL_IOCQ
> NVM_ADMIN_DEL_IOCQ does not need prp1 (just as NVM_ADMIN_DEL_IOSQ).
> Remove what is likely a cut'n'paste error from the *_ADD_* code.
from OpenBSD nvme.c r1.56.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/nvme.c
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.28 src/sys/dev/ic/nvme.c:1.29
--- src/sys/dev/ic/nvme.c:1.28 Mon May 29 02:24:00 2017
+++ src/sys/dev/ic/nvme.c Mon May 29 02:25:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.28 2017/05/29 02:24:00 nonaka Exp $ */
+/* $NetBSD: nvme.c,v 1.29 2017/05/29 02:25:37 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.28 2017/05/29 02:24:00 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.29 2017/05/29 02:25:37 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1296,7 +1296,6 @@ nvme_q_delete(struct nvme_softc *sc, str
memset(&sqe, 0, sizeof(sqe));
sqe.opcode = NVM_ADMIN_DEL_IOCQ;
- htolem64(&sqe.prp1, NVME_DMA_DVA(q->q_sq_dmamem));
htolem16(&sqe.qid, q->q_id);
rv = nvme_poll(sc, sc->sc_admin_q, ccb, nvme_sqe_fill, NVME_TIMO_QOP);