[src/netbsd-9]: src/sys/dev/ic Pull up following revision(s) (requested by no...

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

details:   https://anonhg.NetBSD.org/src/rev/1d6c7347ce0f
branches:  netbsd-9
changeset: 458369:1d6c7347ce0f
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 22 12:18:56 2019 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #218):

        sys/dev/ic/nvme.c: revision 1.45

Don't set Phase Tag bit of Completion Queue entry at nvme_poll_done().

A new completion queue entry check incorrectly determined that there was
a Completion Queue entry for a command that was not submitted.

Fix PR kern/54275, PR kern/54503, PR kern/54532.

diffstat:

 sys/dev/ic/nvme.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r b0748939e468 -r 1d6c7347ce0f sys/dev/ic/nvme.c
--- a/sys/dev/ic/nvme.c Sun Sep 22 12:15:28 2019 +0000
+++ b/sys/dev/ic/nvme.c Sun Sep 22 12:18:56 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme.c,v 1.44 2019/06/28 15:08:47 jmcneill Exp $       */
+/*     $NetBSD: nvme.c,v 1.44.2.1 2019/09/22 12:18:56 martin 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.44 2019/06/28 15:08:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.44.2.1 2019/09/22 12:18:56 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1302,8 +1302,8 @@
 {
        struct nvme_poll_state *state = ccb->ccb_cookie;
 
-       SET(cqe->flags, htole16(NVME_CQE_PHASE));
        state->c = *cqe;
+       SET(state->c.flags, htole16(NVME_CQE_PHASE));
 
        ccb->ccb_cookie = state->cookie;
        state->done(q, ccb, &state->c);