commit 3936bbdf9a2e9233875f850c7576c79d06add261
author Vincent Fu <vincentfu@gmail.com> Fri May 03 13:50:04 2024 -0400
committer Klaus Jensen <k.jensen@samsung.com> Thu Jul 11 17:05:37 2024 +0200
tree 1af33a4a6ca401a15a13ca4bfc97f658ce66c3cb
parent bc432bc522f5f4ab57e8994d63be41ba20f95b37

hw/nvme: fix number of PIDs for FDP RUH update

The number of PIDs is in the upper 16 bits of cdw10. So we need to
right-shift by 16 bits instead of only a single bit.

Fixes: 73064edfb864 ("hw/nvme: flexible data placement emulation")
Cc: qemu-stable@nongnu.org
Signed-off-by: Vincent Fu <vincent.fu@samsung.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>

hw/nvme/ctrl.c

diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index fa7ec0e..231e112 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -4352,7 +4352,7 @@
     NvmeNamespace *ns = req->ns;
     uint32_t cdw10 = le32_to_cpu(cmd->cdw10);
     uint16_t ret = NVME_SUCCESS;
-    uint32_t npid = (cdw10 >> 1) + 1;
+    uint32_t npid = (cdw10 >> 16) + 1;
     unsigned int i = 0;
     g_autofree uint16_t *pids = NULL;
     uint32_t maxnpid;