From: Klaus Jensen <k.jensen@samsung.com>
Date: Tue, 8 Dec 2020 07:43:04 +0000 (+0100)
Subject: hw/block/nvme: fix bad clearing of CAP
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e1f81c1478398713f14c1b6ba011d4bb841dea27;p=qmiga%2Fqemu.git

hw/block/nvme: fix bad clearing of CAP

Commit 37712e00b1f0 ("hw/block/nvme: factor out pmr setup") changed the
control flow such that the CAP register is erronously cleared after
nvme_init_pmr() has configured it. Since the entire NvmeCtrl structure
is zero-filled initially, there is no need for the explicit clearing, so
just remove it.

Fixes: 37712e00b1f0 ("hw/block/nvme: factor out pmr setup")
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
---

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index b9313fdc47..de52487aaf 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -3038,7 +3038,6 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
     id->psd[0].enlat = cpu_to_le32(0x10);
     id->psd[0].exlat = cpu_to_le32(0x4);
 
-    n->bar.cap = 0;
     NVME_CAP_SET_MQES(n->bar.cap, 0x7ff);
     NVME_CAP_SET_CQR(n->bar.cap, 1);
     NVME_CAP_SET_TO(n->bar.cap, 0xf);