From nobody Mon Feb 9 12:43:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1612860049; cv=none; d=zohomail.com; s=zohoarc; b=SYLlNkPW/B82/tqWnRmgJYYFLzYJPzsR7scBnCQ+R3hHME98IQ0G4snHLDKh5lbIGNpMhcSo4E7B9umoKSwwcgR7Se3fvxgxrtRfyzj5wO8JIcCKMryl58kVmQ4UYBpwg7alnPxFtgj0yLeIdXE8ulL6zx0EMPjdet+Btgc69cI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612860049; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NrVWDaVT+3VTuJ9vQAD7AHsGTiPQ2AG76IAsmZqrs+E=; b=eb2wlTPW7AIZRw+sUFekKCnkJa0lh7+8aHURTDNZPqDpATta+suvFomaP1ntZBmtIMcjqLBwzzRv2jbPU6hB4vdpllRzJPrhY17+LNt07OvgkMjxl4fRbl8R24mkl30CJKis2db9bMIuN89SLDAyKJfgeLpY9xESimvCaNkxPUg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16128600490491010.4436866729438; Tue, 9 Feb 2021 00:40:49 -0800 (PST) Received: from localhost ([::1]:58664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9OZj-00032V-Uy for importer@patchew.org; Tue, 09 Feb 2021 03:40:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9NW7-0005Zm-Iq; Tue, 09 Feb 2021 02:33:00 -0500 Received: from wnew1-smtp.messagingengine.com ([64.147.123.26]:54425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9NVw-0005rI-Us; Tue, 09 Feb 2021 02:32:59 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 21D4198E; Tue, 9 Feb 2021 02:32:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 09 Feb 2021 02:32:27 -0500 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id D247C108005B; Tue, 9 Feb 2021 02:32:23 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=NrVWDaVT+3VTu J9vQAD7AHsGTiPQ2AG76IAsmZqrs+E=; b=nJRh8juEi7XI1SU96ubtIxK/v6Dqu D0qE7bT9SgNEL0Z+cNZyEPD3lNZZ8N1kQU33tjbXbCwmc6a6xK3pazVFHDcFNwuM KllrOMpOisR7HcNNrgZH+NjrP2OaixhQePNPyJICB+Izwt04zl6UTynHi3G/5ajS rSGBU4EuuJgmu97sr06za6/QjnvyaWPno3NOHxLYXtWcRUmZl5z2zOhy+BS+2Xou zUNJHJPRyXthJTNB5PqFToqRvr/b3XcyDTB/Tag39zmpku7jk/JNjUXVXnHiEESU UsLeJzFEq+X/GGIqCr5/LUIqggCbTsbQL731uD95amzBGwz2L16Hcpuxw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=NrVWDaVT+3VTuJ9vQAD7AHsGTiPQ2AG76IAsmZqrs+E=; b=lRhTZFtN iJ2yGtcCI64fyJkJyqNcbq5YIDbiHBtYIpecEnkaDHHQek8duP+5EAqfwf0ETcog sYmv0HzNfnVgnr4m6V3wxIJ1bGlpRr9r/fkb2A4Kx/+NOArgKEnPMLyrbaHkKAi5 40QxhLysbuISMWKGP3PLgHPGVd4zNVQOZdIGlz8LAHV3DIdeSmwvCS/z9TomEI36 7bvxUciLqQ8ZOJmVdh7F4Dx4eoWh+fSu3/QqbBTMyHscY9MUwc4XBlaMssFQKBQ5 dzCZlBqvSzwVxRijwjYMX+c1P0bAtALCbtTwourG6LoHi+sTKUdvWiUDIjwJnaXU gtRtUhoP+sJWqg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrheeggdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedufe enucfrrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 40/56] hw/block/nvme: indicate CMB support through controller capabilities register Date: Tue, 9 Feb 2021 08:30:45 +0100 Message-Id: <20210209073101.548811-41-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210209073101.548811-1-its@irrelevant.dk> References: <20210209073101.548811-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=64.147.123.26; envelope-from=its@irrelevant.dk; helo=wnew1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Klaus Jensen , Andrzej Jakowski , Maxim Levitsky , Stefan Hajnoczi , Keith Busch , Minwoo Im Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Andrzej Jakowski This patch sets CMBS bit in controller capabilities register when user configures NVMe driver with CMB support, so capabilites are correctly reported to guest OS. Signed-off-by: Andrzej Jakowski Reviewed-by: Maxim Levitsky Reviewed-by: Minwoo Im Reviewed-by: Keith Busch Signed-off-by: Klaus Jensen --- include/block/nvme.h | 10 +++++++--- hw/block/nvme.c | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/block/nvme.h b/include/block/nvme.h index 854fb2abb6f8..151921da21f9 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -36,6 +36,7 @@ enum NvmeCapShift { CAP_MPSMIN_SHIFT =3D 48, CAP_MPSMAX_SHIFT =3D 52, CAP_PMR_SHIFT =3D 56, + CAP_CMB_SHIFT =3D 57, }; =20 enum NvmeCapMask { @@ -49,6 +50,7 @@ enum NvmeCapMask { CAP_MPSMIN_MASK =3D 0xf, CAP_MPSMAX_MASK =3D 0xf, CAP_PMR_MASK =3D 0x1, + CAP_CMB_MASK =3D 0x1, }; =20 #define NVME_CAP_MQES(cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK) @@ -79,9 +81,11 @@ enum NvmeCapMask { #define NVME_CAP_SET_MPSMIN(cap, val) (cap |=3D (uint64_t)(val & CAP_MPSMI= N_MASK)\ << CAP_MPSMIN_S= HIFT) #define NVME_CAP_SET_MPSMAX(cap, val) (cap |=3D (uint64_t)(val & CAP_MPSMA= X_MASK)\ - << CAP_MPSMAX_= SHIFT) -#define NVME_CAP_SET_PMRS(cap, val) (cap |=3D (uint64_t)(val & CAP_PMR_MAS= K)\ - << CAP_PMR_SHI= FT) + << CAP_MPSMAX_S= HIFT) +#define NVME_CAP_SET_PMRS(cap, val) (cap |=3D (uint64_t)(val & CAP_PMR_M= ASK) \ + << CAP_PMR_SHIF= T) +#define NVME_CAP_SET_CMBS(cap, val) (cap |=3D (uint64_t)(val & CAP_CMB_M= ASK) \ + << CAP_CMB_SHIF= T) =20 enum NvmeCapCss { NVME_CAP_CSS_NVM =3D 1 << 0, diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 2785127037db..5f12ac1200ec 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -4374,6 +4374,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pc= i_dev) NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_CSI_SUPP); NVME_CAP_SET_CSS(n->bar.cap, NVME_CAP_CSS_ADMIN_ONLY); NVME_CAP_SET_MPSMAX(n->bar.cap, 4); + NVME_CAP_SET_CMBS(n->bar.cap, n->params.cmb_size_mb ? 1 : 0); =20 n->bar.vs =3D NVME_SPEC_VER; n->bar.intmc =3D n->bar.intms =3D 0; --=20 2.30.0