From nobody Sat Nov 19 17:55:25 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NF1XF50jRz4hV5X; Sat, 19 Nov 2022 17:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NF1XF4RCTz46Mj; Sat, 19 Nov 2022 17:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668880525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjS/fcX8WwtXf5IjF2TcXNuqOI9EYLT6cufHNWzELes=; b=gFUvP0ozOxXtozkvkK6dli9u2ptXNqz3fJS2EH1gn7R1m3P5GW4gXPacRWp7NgsBnHY6bB ZOj05ydpECAzI4dC3zsP+42g4cmXp1Z4SZ56YKAonwzEP34V29bmOX/l6H+s6wI6i8eltf vpbUdVyW5J2sVcWFQB+OmcRwmNcs61y/GBubo7+QtABscpd7/fraTAE/rEG4JINWfyIzwn GPJGNz0eAybLBk9UzvpQctnX45zmtQcOYJ5bpypcqXGs+FmmDyaAu06q6r4lsbp/0Klh5m h8MYVh0Ldwt7Ga/e0/B0/GWYYsYhOthJ6ALiy5WK/y58cd2OVud12TQE9Y97iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668880525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjS/fcX8WwtXf5IjF2TcXNuqOI9EYLT6cufHNWzELes=; b=eAohvEXOvUvIP3GqoRvx149TxqqUaiLfM/uhH7cxz3C+irBMBOZ0K4feOV5I9VzTRI+wFv 0SdxsSPQks9klNNQuaZzJvKfPs6yYVkrrkrPOJBZ8NSlGkDH11kQEHReeFtevcQhJapebk D03eB67P0y/8/aLWrlpr7ENUXmboZjGTj05JSzR0bFeYrS9QNww1ljYj1BTuol8sRBXKbg 8tCqcyEV8EL7TJ7HcbK5Un9Mjs1fi/JBoCI0Uiz+3OrJTnIifgUVuvR8AdkFZvbO+DSKI4 aIkvzzXrVJOAf6NVBvvBQnRz9V9jFtDXvgugZyslvby4JwynffOPz3Jon5vzyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668880525; a=rsa-sha256; cv=none; b=v1WKdTAkH7ru2QJW0VT7c78jE/4HfkDZDLAjc0wpO5kVoTHgEo5s9bv8JmKP1n2B6WNuKb Yuhv50llaJDj7mAfQkBShS9RhUZyb0i8VvNPp5QEfxOm9q6SLwE7VTxx9ZOCT4HN+H1Nbk TgVUPVWoeWf6KS4+nZazUgVMoyPatZnqgZmn1tWbqWOG4Ok+nhydWl6QRLGUWSNwnBYyk+ K7WLLx5W5TtDoSAM45hyaaoaSxVo5Ch62uurqwr6w4/j7T9TZlLfaax1P1KU7ARqx6sIN+ MJ37Lq2ie1yF74psUe3X14LvvmzM3e+EsS2kwMK/C8JZZiMOXelT4yeg4g4O0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NF1XF1nySzv3w; Sat, 19 Nov 2022 17:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AJHtPTp039043; Sat, 19 Nov 2022 17:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJHtPZG039042; Sat, 19 Nov 2022 17:55:25 GMT (envelope-from git) Date: Sat, 19 Nov 2022 17:55:25 GMT Message-Id: <202211191755.2AJHtPZG039042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: dcdb43f28fac - stable/13 - bhyve nvme: Fix firmware read only initialization List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dcdb43f28fac9b3885601811e44401bbac6db517 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=dcdb43f28fac9b3885601811e44401bbac6db517 commit dcdb43f28fac9b3885601811e44401bbac6db517 Author: Wanpeng Qian AuthorDate: 2022-08-14 15:30:06 +0000 Commit: Chuck Tuffli CommitDate: 2022-11-20 01:54:04 +0000 bhyve nvme: Fix firmware read only initialization Summary: Code was using the mask value without the shift. Test Plan: Within FreeBSD/Linux guest, Identify NVMe controller to check the result. (cherry picked from commit 9f678cfcb42d1d0ce3898b0e38bb147a3e14834a) --- usr.sbin/bhyve/pci_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 4b0920860e5b..9a465f3b1910 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -545,7 +545,7 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->aerl = 4; /* Advertise 1, Read-only firmware slot */ - cd->frmw = NVME_CTRLR_DATA_FRMW_SLOT1_RO_MASK | + cd->frmw = NVMEB(NVME_CTRLR_DATA_FRMW_SLOT1_RO) | (1 << NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT); cd->lpa = 0; /* TODO: support some simple things like SMART */ cd->elpe = 0; /* max error log page entries */