Hi Philippe,
On 10/26/20 11:54 AM, Philippe Mathieu-Daudé wrote:
> While trying to simplify the code using a macro, we forgot
> the 12-bit shift... Correct that.
>
> Fixes: fad1eb68862 ("block/nvme: Use register definitions from
> 'block/nvme.h'")
> Reported-by: Eric Auger <eric.au...@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> block/nvme.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/nvme.c b/block/nvme.c
> index b48f6f25881..029694975b9 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -724,7 +724,7 @@ static int nvme_init(BlockDriverState *bs, const char
> *device, int namespace,
> goto out;
> }
>
> - s->page_size = MAX(4096, 1 << NVME_CAP_MPSMIN(cap));
> + s->page_size = MAX(4096, 1u << (12 + NVME_CAP_MPSMIN(cap)));
nit the MAX(4096,) could have been removed
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Thanks
Eric
> s->doorbell_scale = (4 << NVME_CAP_DSTRD(cap)) / sizeof(uint32_t);
> bs->bl.opt_mem_alignment = s->page_size;
> timeout_ms = MIN(500 * NVME_CAP_TO(cap), 30000);
>
