From patchwork Fri Apr 29 08:33:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 12831653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E782FC433EF for ; Fri, 29 Apr 2022 08:58:26 +0000 (UTC) Received: from localhost ([::1]:46834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkMSH-0003CG-JH for qemu-devel@archiver.kernel.org; Fri, 29 Apr 2022 04:58:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkM4X-0000Vr-KC; Fri, 29 Apr 2022 04:33:53 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:40241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkM4W-0005Al-4I; Fri, 29 Apr 2022 04:33:53 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5BB1B5C0125; Fri, 29 Apr 2022 04:33:51 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 29 Apr 2022 04:33:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1651221231; x= 1651307631; bh=bI14oC0u4Q+ZjrEilFFFIb7wHdQ/tqnnaE7dh6MQ8cA=; b=G fJ4xOTM2RGJHNWRbqVQM3JjmxLMij/eOOEb0N+kFg/pN3nszMpX3y/vvDDl2scmk dF8B4erv3k6M43ryn4S2gl7YZfF6bQlUKj1KAGrvaOplC6DKuPx8CSHiqvCH3fNq 6vFQ43vVj6+vM5EvKJgXinyDMjapo2hgqvf0FlwFOkIF66tFBgddu+l+QoP4Z1Di 4NxsFmNGujHaN6R/yawHcLFeveYMCdlkaB+vDKspvCrSf/VcoHZVpoQ7Aahx/X2t 3yEgfPz535ex8nPpp/TUieJ0aMxdTEeynaLw+2IIiut5npLD5m0nPEJo1Dk646O2 C9htKes/IWJ0VpzOvLyeg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1651221231; x=1651307631; bh=bI14oC0u4Q+ZjrEilFFFIb7wHdQ/tqnnaE7 dh6MQ8cA=; b=YytnamAt0/Mx+a9cGJjbfCwvKQw7Db1c07FmGX/ACmncb0t1bBt r9cbmu3qaC7+Orl/BVuZOo4EAD+wFYm61i6ib0B96kMsrW7oPf8zp5WUnelFR6uy MnFnyOJf9aGZ+7QyakRGyT+jEt5C5s7+QgjnkysxTSgy608kq7yJXYevHY+fi8Jb FY16rrmfLQxDjbRHout/wribzFnzJXclHGfBv2Qx6VYfsafZVTPMETmA/t71xrNA dfQRRROjH1nGuvWlXv/az4q5yW22FNNWGKsg27DYWCowGD/Jv6fjWuc8neAHr7tF w2kYx+/qfFtR52XbnJnlT0i5hwRYwSSubrg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudelgddtfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeejgfeilefgieevheekueevheehkeefveegiefgheefgfejjeehffefgedujedu geenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehith hssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Apr 2022 04:33:49 -0400 (EDT) From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v2 5/5] hw/nvme: bump firmware revision Date: Fri, 29 Apr 2022 10:33:36 +0200 Message-Id: <20220429083336.2201286-6-its@irrelevant.dk> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429083336.2201286-1-its@irrelevant.dk> References: <20220429083336.2201286-1-its@irrelevant.dk> MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.29; envelope-from=its@irrelevant.dk; helo=out5-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , qemu-block@nongnu.org, Klaus Jensen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Keith Busch , Luis Chamberlain , Klaus Jensen , Christoph Hellwig Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen The Linux kernel quirks the QEMU NVMe controller pretty heavily because of the namespace identifier mess. Since this is now fixed, bump the firmware revision number to allow the quirk to be disabled for this revision. As of now, bump the firmware revision number to be equal to the QEMU release version number. Reviewed-by: Keith Busch Signed-off-by: Klaus Jensen --- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 5a727b6ec344..650b606c6c24 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -6713,7 +6713,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) id->vid = cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID)); id->ssvid = cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID)); strpadcpy((char *)id->mn, sizeof(id->mn), "QEMU NVMe Ctrl", ' '); - strpadcpy((char *)id->fr, sizeof(id->fr), "1.0", ' '); + strpadcpy((char *)id->fr, sizeof(id->fr), QEMU_VERSION, ' '); strpadcpy((char *)id->sn, sizeof(id->sn), n->params.serial, ' '); id->cntlid = cpu_to_le16(n->cntlid);