Author: chuck
Date: Mon Sep  9 14:16:57 2019
New Revision: 352061
URL: https://svnweb.freebsd.org/changeset/base/352061

Log:
  MFC r350077
  
  bhyve: update the NVMe CQ based on the status
  
  Approved by:  imp (mentor)

Modified:
  stable/12/usr.sbin/bhyve/pci_nvme.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/bhyve/pci_nvme.c
==============================================================================
--- stable/12/usr.sbin/bhyve/pci_nvme.c Mon Sep  9 12:42:48 2019        
(r352060)
+++ stable/12/usr.sbin/bhyve/pci_nvme.c Mon Sep  9 14:16:57 2019        
(r352061)
@@ -99,6 +99,10 @@ static int nvme_debug = 0;
 #define        NVME_PRP2_ITEMS         (PAGE_SIZE/sizeof(uint64_t))
 #define        NVME_MAX_BLOCKIOVS      512
 
+/* This is a synthetic status code to indicate there is no status */
+#define NVME_NO_STATUS         0xffff
+#define NVME_COMPLETION_VALID(c)       ((c).status != NVME_NO_STATUS)
+
 /* helpers */
 
 /* Convert a zero-based value into a one-based value */
@@ -1092,14 +1096,16 @@ pci_nvme_handle_admin_cmd(struct pci_nvme_softc* sc, u
                        /* XXX dont care, unhandled for now
                        do_intr |= nvme_opc_async_event_req(sc, cmd, &compl);
                        */
+                       compl.status = NVME_NO_STATUS;
                        break;
                default:
                        WPRINTF(("0x%x command is not implemented\r\n",
                            cmd->opc));
+                       pci_nvme_status_genc(&compl.status, 
NVME_SC_INVALID_OPCODE);
+                       do_intr |= 1;
                }
        
-               /* for now skip async event generation */
-               if (cmd->opc != NVME_OPC_ASYNC_EVENT_REQUEST) {
+               if (NVME_COMPLETION_VALID(compl)) {
                        struct nvme_completion *cp;
                        int phase;
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to