* [PATCH] hw/block/nvme: fix bad clearing of CAP
@ 2020-12-08 9:16 Klaus Jensen
2020-12-08 22:08 ` Keith Busch
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Klaus Jensen @ 2020-12-08 9:16 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, qemu-block, Klaus Jensen, Max Reitz, Klaus Jensen,
Keith Busch
From: Klaus Jensen <k.jensen@samsung.com>
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>
---
hw/block/nvme.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 8814201364c1..28416b18a5c0 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -3040,7 +3040,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);
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] hw/block/nvme: fix bad clearing of CAP
2020-12-08 9:16 [PATCH] hw/block/nvme: fix bad clearing of CAP Klaus Jensen
@ 2020-12-08 22:08 ` Keith Busch
2020-12-09 11:24 ` Minwoo Im
2020-12-09 11:43 ` Klaus Jensen
2 siblings, 0 replies; 4+ messages in thread
From: Keith Busch @ 2020-12-08 22:08 UTC (permalink / raw)
To: Klaus Jensen; +Cc: Kevin Wolf, Klaus Jensen, qemu-devel, qemu-block, Max Reitz
On Tue, Dec 08, 2020 at 10:16:58AM +0100, Klaus Jensen wrote:
> From: Klaus Jensen <k.jensen@samsung.com>
>
> 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>
Oops, nice catch.
Reviewed-by: Keith Busch <kbusch@kernel.org>
> ---
> hw/block/nvme.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index 8814201364c1..28416b18a5c0 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -3040,7 +3040,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);
> --
> 2.29.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] hw/block/nvme: fix bad clearing of CAP
2020-12-08 9:16 [PATCH] hw/block/nvme: fix bad clearing of CAP Klaus Jensen
2020-12-08 22:08 ` Keith Busch
@ 2020-12-09 11:24 ` Minwoo Im
2020-12-09 11:43 ` Klaus Jensen
2 siblings, 0 replies; 4+ messages in thread
From: Minwoo Im @ 2020-12-09 11:24 UTC (permalink / raw)
To: Klaus Jensen
Cc: Kevin Wolf, qemu-block, Klaus Jensen, qemu-devel, Max Reitz,
Keith Busch
Hello,
Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/block/nvme: fix bad clearing of CAP
2020-12-08 9:16 [PATCH] hw/block/nvme: fix bad clearing of CAP Klaus Jensen
2020-12-08 22:08 ` Keith Busch
2020-12-09 11:24 ` Minwoo Im
@ 2020-12-09 11:43 ` Klaus Jensen
2 siblings, 0 replies; 4+ messages in thread
From: Klaus Jensen @ 2020-12-09 11:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Klaus Jensen, Keith Busch, qemu-block, Max Reitz
[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]
On Dec 8 10:16, Klaus Jensen wrote:
> From: Klaus Jensen <k.jensen@samsung.com>
>
> 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>
> ---
> hw/block/nvme.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index 8814201364c1..28416b18a5c0 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -3040,7 +3040,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);
> --
> 2.29.2
>
>
Thanks for the reviews, applied to nvme-next.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-09 11:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-08 9:16 [PATCH] hw/block/nvme: fix bad clearing of CAP Klaus Jensen
2020-12-08 22:08 ` Keith Busch
2020-12-09 11:24 ` Minwoo Im
2020-12-09 11:43 ` Klaus Jensen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).