From nobody Mon Feb 21 21:58:00 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 B340419EB5F6; Mon, 21 Feb 2022 21:58:02 +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 4K2blD72pCz4ghn; Mon, 21 Feb 2022 21:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480681; 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=YkY5V+s+11uQYMgSXmNss1QFhGOFvObzwzH4w7Dw/lY=; b=ZP/AFq2kG/7e7JC3esuCq/Eka3zJNIUoJrhvlVkmJXyMTv+U+SSiqw9fo4euP1Hp4KSCI1 1Tk8PKXpN+3Xr9tFF1zZHKkpwOEiseqtC8ckoGRlE0T5Yu0de0dxrhVPvOB6wAq17Nb9h0 4CicCjwJn3N9uAD3UsxLETmBr7htmsqb1KI4vibJv4vmxhmggURHkluV0sBkhT1swbHL23 UJA5be4CeZt2wAgXDzNNR6BmAkLUYR+WxZfjEXF2FHdZvKoNaYODjCresuD9jz0iMZg3Ur 4dor/WIo/uzAemyxLxa6fU2Y+K/HBlZVJ4D7Os4YIg33scIPsQmRf38umlksKQ== 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 23AC918324; Mon, 21 Feb 2022 21:58:00 +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 21LLw0q2052190; Mon, 21 Feb 2022 21:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LLw0Kx052189; Mon, 21 Feb 2022 21:58:00 GMT (envelope-from git) Date: Mon, 21 Feb 2022 21:58:00 GMT Message-Id: <202202212158.21LLw0Kx052189@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: 06ec065bede0 - stable/13 - bhyve nvme: Update v1.4 Identify Controller data 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: 06ec065bede041d2b35ae90aaf51d7641612d72c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480681; 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=YkY5V+s+11uQYMgSXmNss1QFhGOFvObzwzH4w7Dw/lY=; b=pNa6+61hXo0vzpRKTBLCj7qouJVQhhC8hNZCu4KeKUc+kuN5dFwLLsQczzfUCBJNXg2t1q TGy3xJ3rMFVVj/gNjUtuDUJ+n9edXRa9sNveK+TPHyA1bW3wSfqnlrLomgcb5GV9b6T/ji lkOQaVi0E/K9AgKhf9EWY04J8jsgPNrkKcmnwsVLjluyNlDBtl/0ksPPKKK+jAqKVy0sTm 0GkSNNdp8BAB348hmN6IRKakNJ1i6tjrRj7iE+Pl0tqjm3bttqWiN9VsE+0KzxJr+zzvHL zxGk6ufo2jBoF2DlKxtXPALLN0TwWA9L3whcJ2fHGlS+hnU61WjS5oQKJ/8q8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645480681; a=rsa-sha256; cv=none; b=Z7s8SEakWcWS4CI2wOYsImx71x2Wrb0kMbOOwfRMSBHCYJALE5rHqTk40r5bQirRn2dAOv su+cl4ID+2fh970h6GpaAzIT9U1H5Iz0PpS2ZkYqjA84GSkTLfK/D2SP+Jr7xLG8luqSf3 rTeOKHAAvKZNFxiGa3pYOEgtl8xzo6v80tnN3Tr8xFG1wndhqtY3hWzPar8kO9YEDygf0Y TLDYt6kUhN2W1KixbcvNIqknSA8aZRPZhlrZUQq7gatinImXxf0eQMBSMEuI0LNOEGiohF dHX5YI2x2rqatsI966tXBRK31Na3KA09xUeepbVYclB6g8KXx1DO8WEE7CtP4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=06ec065bede041d2b35ae90aaf51d7641612d72c commit 06ec065bede041d2b35ae90aaf51d7641612d72c Author: Chuck Tuffli AuthorDate: 2022-01-30 07:09:10 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-22 03:27:03 +0000 bhyve nvme: Update v1.4 Identify Controller data Compliant v1.4 Controllers must report a Controller Type (CNTRLTYPE). Also, do not advertise secure erase functionality in the Format NVM Attributes field of the Identify Controller data structure as the Controller does not implement secure erase. Fixes UNH ILO Test 1.1, Case 2 (cherry picked from commit 29241c96f75b38f09fb8752a18ac1ae1b864325e) --- usr.sbin/bhyve/pci_nvme.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 94eb2137d1e6..29c5aec4f44c 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -287,6 +287,12 @@ struct pci_nvme_aen { bool posted; }; +typedef enum { + NVME_CNTRLTYPE_IO = 1, + NVME_CNTRLTYPE_DISCOVERY = 2, + NVME_CNTRLTYPE_ADMIN = 3, +} pci_nvme_cntrl_type; + struct pci_nvme_softc { struct pci_devinst *nsc_pi; @@ -517,6 +523,7 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->ver = NVME_REV(1,4); + cd->cntrltype = NVME_CNTRLTYPE_IO; cd->oacs = 1 << NVME_CTRLR_DATA_OACS_FORMAT_SHIFT; cd->acl = 2; cd->aerl = 4; @@ -551,7 +558,8 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) break; } - cd->fna = 0x03; + cd->fna = NVME_CTRLR_DATA_FNA_FORMAT_ALL_MASK << + NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->power_state[0].mp = 10; }