/* Words 13 14 15 are for PBDE support */
 
+       /* add the VMID tags as per switch response */
+       if (unlikely(lpfc_ncmd->cur_iocbq.cmd_flag & LPFC_IO_VMID)) {
+               if (phba->pport->vmid_priority_tagging) {
+                       bf_set(wqe_ccpe, &wqe->fcp_iwrite.wqe_com, 1);
+                       bf_set(wqe_ccp, &wqe->fcp_iwrite.wqe_com,
+                              lpfc_ncmd->cur_iocbq.vmid_tag.cs_ctl_vmid);
+               } else {
+                       bf_set(wqe_appid, &wqe->fcp_iwrite.wqe_com, 1);
+                       bf_set(wqe_wqes, &wqe->fcp_iwrite.wqe_com, 1);
+                       wqe->words[31] = lpfc_ncmd->cur_iocbq.vmid_tag.app_id;
+               }
+       }
+
        pwqeq->vport = vport;
        return 0;
 }
        struct lpfc_nvme_fcpreq_priv *freqpriv;
        struct nvme_common_command *sqe;
        uint64_t start = 0;
+#if (IS_ENABLED(CONFIG_NVME_FC))
+       u8 *uuid = NULL;
+       int err;
+       enum dma_data_direction iodir;
+#endif
 
        /* Validate pointers. LLDD fault handling with transport does
         * have timing races.
        lpfc_ncmd->ndlp = ndlp;
        lpfc_ncmd->qidx = lpfc_queue_info->qidx;
 
+#if (IS_ENABLED(CONFIG_NVME_FC))
+       /* check the necessary and sufficient condition to support VMID */
+       if (lpfc_is_vmid_enabled(phba) &&
+           (ndlp->vmid_support ||
+            phba->pport->vmid_priority_tagging ==
+            LPFC_VMID_PRIO_TAG_ALL_TARGETS)) {
+               /* is the I/O generated by a VM, get the associated virtual */
+               /* entity id */
+               uuid = nvme_fc_io_getuuid(pnvme_fcreq);
+
+               if (uuid) {
+                       if (pnvme_fcreq->io_dir == NVMEFC_FCP_WRITE)
+                               iodir = DMA_TO_DEVICE;
+                       else if (pnvme_fcreq->io_dir == NVMEFC_FCP_READ)
+                               iodir = DMA_FROM_DEVICE;
+                       else
+                               iodir = DMA_NONE;
+
+                       err = lpfc_vmid_get_appid(vport, uuid, iodir,
+                                       (union lpfc_vmid_io_tag *)
+                                               &lpfc_ncmd->cur_iocbq.vmid_tag);
+                       if (!err)
+                               lpfc_ncmd->cur_iocbq.cmd_flag |= LPFC_IO_VMID;
+               }
+       }
+#endif
+
        /*
         * Issue the IO on the WQ indicated by index in the hw_queue_handle.
         * This identfier was create in our hardware queue create callback