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

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

details:   https://anonhg.NetBSD.org/src/rev/ca11966ef158
branches:  netbsd-8
changeset: 454686:ca11966ef158
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Sep 25 15:49:16 2019 +0000

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

        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 6ef06bc0aea5 -r ca11966ef158 sys/dev/ic/nvme.c
--- a/sys/dev/ic/nvme.c Tue Sep 24 18:28:19 2019 +0000
+++ b/sys/dev/ic/nvme.c Wed Sep 25 15:49:16 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme.c,v 1.30.2.4 2018/04/19 15:37:56 martin Exp $     */
+/*     $NetBSD: nvme.c,v 1.30.2.5 2019/09/25 15:49:16 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.30.2.4 2018/04/19 15:37:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.5 2019/09/25 15:49:16 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1202,8 +1202,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);