b36d41c519
- cvm : bug fix for undefined reference to 'virtcca_cvm_allowed' while compiling - cvm : bug-fix for incorrect device name check for vhost-user-fs - target/i386: add control bits support for LAM - target/i386: add support for LAM in CPUID enumeration - Add support for the virtcca cvm feature. - target/sparc: use signed denominator in sdiv helper - crypto: Introduce SM4 symmetric cipher algorithm - ppc/vof: Fix unaligned FDT property access - vl: fix "type is NULL" in -vga help - hw/display/bcm2835_fb: fix fb_use_offsets condition - aspeed/smc: Fix possible integer overflow - hw/nvme: fix number of PIDs for FDP RUH update - hw/nvme: fix memory leak in nvme_dsm - hvf: arm: Do not advance PC when raising an exception - physmem: Bail out qemu_ram_block_from_host() for invalid ram addrs Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 3696b12c582440669de12d127701187828c5598f Mon Sep 17 00:00:00 2001
|
|
From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 19 Jul 2024 22:11:17 +0800
|
|
Subject: [PATCH] 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")
|
|
|
|
cherry-pick from 3936bbdf9a2e9233875f850c7576c79d06add261
|
|
Signed-off-by: Vincent Fu <vincent.fu@samsung.com>
|
|
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/nvme/ctrl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
|
|
index 237b5c8871..d7e83c3d55 100644
|
|
--- a/hw/nvme/ctrl.c
|
|
+++ b/hw/nvme/ctrl.c
|
|
@@ -4352,7 +4352,7 @@ static uint16_t nvme_io_mgmt_send_ruh_update(NvmeCtrl *n, NvmeRequest *req)
|
|
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;
|
|
--
|
|
2.41.0.windows.1
|
|
|