From nobody Mon Nov 17 12:05:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603807062; cv=none; d=zohomail.com; s=zohoarc; b=mE8f+c1RdKoxlyVwmXtChq9SqlqbPZzRfwuoBv2LTMQxDFKL1GZH8F3bi6Xn7C6Nn82BID9OShYT5wD8KvdgklizuDzLv6Cy2vRo9wsw3wzNPKB1s1bM4zYL/LF0FoIe9l4jo6BTgKSP01viafX6bp4GJlzT8qwjJ/gpTm6iyTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603807062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=rsADHQhtdYEPnOhTT91bO7gVSjhtNIdy1KjQXQ/oHWM=; b=Lbttxe468K2CksFBdo5HlqOhaWDsMAICyw+xzDOagVbFHjlkVOfddUesnooZqhruy9Ug3HuEgaKu+xHOWbDuQtQWjKl3iyD0hRRe8tKNBN8OGTLaVDeL2L2a3nZFxhd5WwtklVB9bWmyWIZpQz/mCCtNQ/smoS6Q3LbNbMxvLMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 16038070627551012.5130068988146; Tue, 27 Oct 2020 06:57:42 -0700 (PDT) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-38-41dHXsmEMyCPQCXzLow15A-1; Tue, 27 Oct 2020 09:57:39 -0400 Received: by mail-ej1-f69.google.com with SMTP id x12so862469eju.22 for ; Tue, 27 Oct 2020 06:57:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id o15sm1094135ejm.38.2020.10.27.06.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603807062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rsADHQhtdYEPnOhTT91bO7gVSjhtNIdy1KjQXQ/oHWM=; b=c7nZ9TKIWo4ARpuHlBvBSNDp3cZJC3T0j7Iyf7BX5YDTpZFpi/SwdWt1VsIniS+NkfyxLq DUTm7e6c4CH+qhYau8SKqQAcbEcIEGnQPsMRbVtSFgXfZIlQVh8wUS/haNmb50b92Vkf78 OAv79Rbf/tVBf5sRE9M6dwwqNBpATqU= X-MC-Unique: 41dHXsmEMyCPQCXzLow15A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rsADHQhtdYEPnOhTT91bO7gVSjhtNIdy1KjQXQ/oHWM=; b=pZGRdw+aOmHyVtl+OsLEdk6TP72Akugeckv1vUhAswg4nqdb6xtOfMkBYTV90uh0/c zQvbaiBut6kdLI6m5iqGHfK5ao4VsQecz/i1miTN1oTZ6guh/W/amgT/kkKNgOgGKfTO kmSLR89coJ49NnOYQJc81MmAH1HaJVhvt0MjXlMNT6P8ejfNvAYlfcKIrCjp9J0JfU0n hiLtE3phXO5BKWgQAO6apAgN08lzOt9S+ix2Dd/vMHug71d3s8iwxi7oQOJz3YfpHwxY n7EZHhyWXKrTvKZaoQCg1LviLW1uT1AzozRb4zdXtPcVsFyuWzshcHsMNTL7lxIMaXVf rNVw== X-Gm-Message-State: AOAM532oCAkuU0KMCT4QOhCClDXYzG0YJQuutlcoTwwJc8HarBrzxVRv +GTyzgR/yCKzHqUZ3QTByBLrMH+7Pd+l2F17fn6KBKDyFeDKkNVByzvXkTjIzrYvxX2ay+ZmIfS ExkE/7gH6WeNieQ== X-Received: by 2002:a17:906:1804:: with SMTP id v4mr2599342eje.201.1603807058348; Tue, 27 Oct 2020 06:57:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQg64kvfwxBTN6dBbJosJW+jhiXkzsWkbQRbAwazI6wMTkUszv724DkBTtGmnHEKM0pFdGdA== X-Received: by 2002:a17:906:1804:: with SMTP id v4mr2599331eje.201.1603807058175; Tue, 27 Oct 2020 06:57:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Klaus Jensen , qemu-block@nongnu.org, Fam Zheng , Keith Busch , Eric Auger , Stefan Hajnoczi , Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 20/25] block/nvme: Correct minimum device page size Date: Tue, 27 Oct 2020 14:55:42 +0100 Message-Id: <20201027135547.374946-21-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201027135547.374946-1-philmd@redhat.com> References: <20201027135547.374946-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Auger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/nvme.c b/block/nvme.c index 682946ad840..d2d57a287cc 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -756,7 +756,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, goto out; } =20 - s->page_size =3D MAX(4096, 1 << NVME_CAP_MPSMIN(cap)); + s->page_size =3D 1u << (12 + NVME_CAP_MPSMIN(cap)); s->doorbell_scale =3D (4 << NVME_CAP_DSTRD(cap)) / sizeof(uint32_t); bs->bl.opt_mem_alignment =3D s->page_size; bs->bl.request_alignment =3D s->page_size; --=20 2.26.2