From nobody Sun Aug 14 18:18:30 2022 X-Original-To: dev-commits-src-all@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 4M5Qdf37jhz4YbYC; Sun, 14 Aug 2022 18:18:30 +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 4M5Qdf2f52z47PC; Sun, 14 Aug 2022 18:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660501110; 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=9w6oK/mx1PHBcbfFRRJ5TGAAgWlIJ74r+fj1ZyawmLA=; b=P7BGIp9qO+DB3rAvGzjgMuVoSIYBS0LZrFmVz3BI7lglviZIlD4SiCzaWwyJQDPrOn/OuN PYuNYPmRFavKTerAtSstJkql0VFhcRUfZNpKe2rpmoxtizyeQmUfH1RMkc2IqvJWheSpw/ sBxjChvyNII1gtYfEvuZ6988INSQmPqCQjEF1atEFzByKR6xeQeRtKjWM+lS5j8hQmhD9E UurKLuZrOZcc3cNu8H/k9OVGq4IAcgvNJE+E9yY6E+v+wF4SVpUZI0wjQY6qeiqYFmSRQh X9Mjdw5KQAbQKz5FMCRru+1bYa0QB4I2RM3FI0eLdguW8NLi90RziM4Y5Vnteg== 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 4M5Qdf1mCyz10pT; Sun, 14 Aug 2022 18:18:30 +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 27EIIUqC045512; Sun, 14 Aug 2022 18:18:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27EIIUb3045511; Sun, 14 Aug 2022 18:18:30 GMT (envelope-from git) Date: Sun, 14 Aug 2022 18:18:30 GMT Message-Id: <202208141818.27EIIUb3045511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 9f678cfcb42d - main - bhyve nvme: Fix firmware read only initialization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 9f678cfcb42d1d0ce3898b0e38bb147a3e14834a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660501110; 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=9w6oK/mx1PHBcbfFRRJ5TGAAgWlIJ74r+fj1ZyawmLA=; b=whTxzk7ffdGk1iFXxPtyeBgHiHIN+sznsNA7+BGpK92IB0FdK5RVdvzjHK6uIm+1iUOExR vMqgbyXuTcK3iXc7rs63fhGLbKeSD0pXNLVwm7WFwnc75Z4H49Y8JwhU2ChfpXVPlOT/vz sy9OIz5I2xCWBmbsCET/T0juSNI7HchV1LTDZXR/D8r0fhgXoKWb9+pxXm26n0hkMezXbH DusXDsvGF5qs7Rp2oEzrH+Z4jR+5uMaMvlX3MYijf839u1zujDOOJk6t1l+JKmRVh8HNHY KxnS1bumBKT0sZAnU353GmpVzrLZ+/XVEUnN67eMA4BnGM98j4kXtNVa1eATUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660501110; a=rsa-sha256; cv=none; b=Z8908RF78dRjkp9r+cAAypMZ0Y0Y6RKQJ9/pinfqSzzEEtpn6EbHb20JhRRWdpGa74NcmR eyfGdI1d7mQmF5oK8zpJswUmYtAONoBt+11ew5IpoYugtnSM6f+65xg5TC8FQ/GU3JfTHc rj4NT5R809wrjwRN3IjpiyKjrrMloc/1VQva4JVGgQsc884r2SjkDU+poyyq6ZCIOJHtW0 cuaZg2BDTKgiU/jOA2+v+ynGMknp/HO3Qk6rL3cbrM+3Q7DQqlwAhZJuOS4M24aj0KMYNx usTm1+QxXYSpuR7bwqcwPzFGTvcvOXw3DJTlpr3zOfD1ZAepCLu/wmdgpsSjow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=9f678cfcb42d1d0ce3898b0e38bb147a3e14834a commit 9f678cfcb42d1d0ce3898b0e38bb147a3e14834a Author: Wanpeng Qian AuthorDate: 2022-08-14 15:30:06 +0000 Commit: Chuck Tuffli CommitDate: 2022-08-14 16:59:36 +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. Reviewed by: chuck, imp MFC after: 2 weeks Signed-off-by: Wanpeng Qian Differential Revision: https://reviews.freebsd.org/D32659 --- 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 afb5327ecd20..70ae22c71a37 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -546,7 +546,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 */