From nobody Mon Feb 9 16:19:30 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=1611051709; cv=none; d=zohomail.com; s=zohoarc; b=ikdpUS01eCoyA660zXxUVvAB6jlR6U+a8NQCHD++SU9sIYz2jJxyRPoM4UBih2zal0+LJIOTKk4v3/hbPuSG0O+Qh+l0L13c3NMfCx5XA6KxGF5zo0mTXkUwPxeuZBWLR5+D8lVe1Ymu3rb7FI8+jgANWmrbCa5A5trFQ5I6/Gk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611051709; 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=mJVLB/WGdVWqNaTjqp4aIkVY7ievaaG46upf1c0VMZQ=; b=M1nWZWuj8DXbJ0pM/QbxBjKrOYUvyb7lIvovIIJD0TmLHPc+QMgvh4tzOF9GFumhxniJLGcxEO4n86Qy436JktSYuBASwcExlgj8M/ZjGIOvNw1f9q4WQ9uFwqSVIg1q6AUpEAdZzXQqw7sxUmNiNe5guAmba2ghD71+5KXMcVw= 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 1611051709162799.7241491067665; Tue, 19 Jan 2021 02:21:49 -0800 (PST) Received: from localhost ([::1]:42354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1o8y-0004Jv-18 for importer@patchew.org; Tue, 19 Jan 2021 05:21:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1o2i-00025Q-LP; Tue, 19 Jan 2021 05:15:20 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:39143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1o2g-0004Hz-UM; Tue, 19 Jan 2021 05:15:20 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id D66AAF5B; Tue, 19 Jan 2021 05:15:16 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 19 Jan 2021 05:15:17 -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 17CD724005A; Tue, 19 Jan 2021 05:15:14 -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=mJVLB/WGdVWqN aTjqp4aIkVY7ievaaG46upf1c0VMZQ=; b=CdyI9wzRuSd9kMIQFfiW5N83BUq6m MrVbtscrAyNtP3bz5p43rbbAxgI+vm4yz0tUUxmfOwqNGnHxp+ah9p0IFu/BLYZZ +kBwYjAC7IwTAuji1wQvMLcEkXiSRoxKAIpbjAn5ZqhJRSALDnqQqetC6Fu50STS mXH5LGoDN5cxRWkhQhsIJaRYHQAts+7DNNUKg9M/ECWN9rKfhgvn0BVamPIF2HGS tBNzAKZaHVVUJ+87k7n7pouFocTCzMvsMbc1DVygQgcHYbxrA2R/6K7t4YXfIDmT NnQuWsfNZXJ/yVFQhbXmW4uV5498v5peGPj/5NUQybMnJzXzrthnhc8vg== 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= fm1; bh=mJVLB/WGdVWqNaTjqp4aIkVY7ievaaG46upf1c0VMZQ=; b=IOTaXkUU 9nuzgW84fDkL3ku7bcLxQflaX9UssFQXZ/NeJZyWlVgWs12STXjnfvcX265yh7a4 4TlvajoelXLJzAQ3OUOrQoHpzgDBzT3Q0GOfUWfCc1mDphsJFGTDbfbsIhl2PYEz sGMecbg2nujG6/Wns2gi2QjfBrZibEGFXmxRhFejhrRtWU/XqPcDbJQk9fO+8v3V yFYNiiGBrJyblcvoMeRYUDJRurzf4YjMCjrr1K3MFXce9irU6V96hODMdT8EWrBy xMr07OyQQ6ZkCoTuSLs2Xb8llYUf64rh07jL14A+Sb78WupHxKAmrzVfE4Crr5VJ 3KvKuL620X8ZBg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddtgdduvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghushcu lfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrthhtvg hrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffevgfek necukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgepudenuc frrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v3 06/12] hw/block/nvme: rename PMR/CMB shift/mask fields Date: Tue, 19 Jan 2021 11:14:58 +0100 Message-Id: <20210119101504.231259-7-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210119101504.231259-1-its@irrelevant.dk> References: <20210119101504.231259-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.25; envelope-from=its@irrelevant.dk; helo=wout2-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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 , Keith Busch , Minwoo Im , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Use the correct field names. Reviewed-by: Minwoo Im Signed-off-by: Klaus Jensen --- include/block/nvme.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/block/nvme.h b/include/block/nvme.h index 86d7fc2f905c..f3cbe17d0971 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -35,8 +35,8 @@ enum NvmeCapShift { CAP_CSS_SHIFT =3D 37, CAP_MPSMIN_SHIFT =3D 48, CAP_MPSMAX_SHIFT =3D 52, - CAP_PMR_SHIFT =3D 56, - CAP_CMB_SHIFT =3D 57, + CAP_PMRS_SHIFT =3D 56, + CAP_CMBS_SHIFT =3D 57, }; =20 enum NvmeCapMask { @@ -49,8 +49,8 @@ enum NvmeCapMask { CAP_CSS_MASK =3D 0xff, CAP_MPSMIN_MASK =3D 0xf, CAP_MPSMAX_MASK =3D 0xf, - CAP_PMR_MASK =3D 0x1, - CAP_CMB_MASK =3D 0x1, + CAP_PMRS_MASK =3D 0x1, + CAP_CMBS_MASK =3D 0x1, }; =20 #define NVME_CAP_MQES(cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK) @@ -81,10 +81,10 @@ enum NvmeCapMask { << CAP_MPSMIN_S= HIFT) #define NVME_CAP_SET_MPSMAX(cap, val) (cap |=3D (uint64_t)(val & CAP_MPSMA= X_MASK)\ << 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) +#define NVME_CAP_SET_PMRS(cap, val) (cap |=3D (uint64_t)(val & CAP_PMRS_= MASK) \ + << CAP_PMRS_SHI= FT) +#define NVME_CAP_SET_CMBS(cap, val) (cap |=3D (uint64_t)(val & CAP_CMBS_= MASK) \ + << CAP_CMBS_SHI= FT) =20 enum NvmeCapCss { NVME_CAP_CSS_NVM =3D 1 << 0, --=20 2.30.0