From nobody Sat Nov 19 17:55:26 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 4NF1XG4BBBz4hV5Z; Sat, 19 Nov 2022 17:55:26 +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 4NF1XG3RBjz46Lh; Sat, 19 Nov 2022 17:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668880526; 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=9stI45UL5RpGlkWjzsjfKlFj1seCzCF3g39si2Wzcxw=; b=aA9FMusA4A0pca8a/kM9+wQro2i8I9+GQcNeMovJkQKPkXOqFXBV2UBB6CdTfzV7a37nqc G0oYhBWXvoJhjtzjJf1Sxr81YK52vzfwSnTf5fDe+s16HVqaSpreVJU3sEyoCMxOBDNeA6 Wg8aX84ojuVJSfTXtiK6Viywb3TXy/N2+2JUAttmVuDnQzlnsz/j7zgyoTWkWIXeE+ZjEi qW2tBfsF+09glJBEIVHf+jajcbY7DJAIfqprqhY+HUGHREu6EwrNcnykzE2yUvTiWvYG/R yKuChkmyQ62EFj1/h5h2MQDF80c0xlecrJcgdzKjm+a3eiwNiRIWXql2XU4UNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668880526; 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=9stI45UL5RpGlkWjzsjfKlFj1seCzCF3g39si2Wzcxw=; b=w86ehU/WP/Iq7H04TpzhTrNtWT7e9cBCFZIIpZGi3oDOPluikp6eAQ43IIjz/t97Bw7tCq 4gZbQpwThGCl/19zIf7LjXHh7Q0PVQl6CwOT2oLfTQiGP3KdAzpoN14yqi/bj3md7Be673 BRA9OTS6jLkMxGkcBEjLuGANvzRQo22+E7Ug416FZMP6mLApLLU5S3dR78V9zDCQ6BPC0a xi3AofoFNqkvGOcq3eMiI9T85PYdODdh8YndhGyuZg0jT5Pna5qMNB+EP8MwcQpiMpzZGp wO2JxHzblYCdMED4PJE8cLdJmuvL4YBcpPaA9cBTsORct30KpaSMGr7KEc92dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668880526; a=rsa-sha256; cv=none; b=cgsz03kcuBPldUau6ha4p0DTbCqacKPyXxYufy/js4C6SzFx1mr2JQyTIizbT0xmLtp62F XeVZR3i58UvZedzJYIiDIsBY2v2R2XQ//2uOsN+sXUIDPt5XKwoBhfiuey9+lNpT8x9/9d mu/m3AlWiuQGDKXtJmOxkp6VQV2TXOD8rKkN48wKGOMKHt72bokxH1IS5q/nA3NPhzQML6 6EXTWM4WcKzt+RwoTLgwmNtKdIsaFG/BokSkuxqtzhFHkpYVkwWdoag4AvrS+ERWxYazb4 aKICNfVbrYGcQ9KQiYrGyRfM6jOo/Co39JkIYYil9o9vG46ERlELf7dV/XLe5A== 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 4NF1XG2XyMzvN2; Sat, 19 Nov 2022 17:55:26 +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 2AJHtQtn039072; Sat, 19 Nov 2022 17:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJHtQFQ039071; Sat, 19 Nov 2022 17:55:26 GMT (envelope-from git) Date: Sat, 19 Nov 2022 17:55:26 GMT Message-Id: <202211191755.2AJHtQFQ039071@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: 2ef32d016b9f - stable/13 - bhyve nvme: Fix reported SANICAP value 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ef32d016b9ff85f1ac747af3505ad7795af2e47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=2ef32d016b9ff85f1ac747af3505ad7795af2e47 commit 2ef32d016b9ff85f1ac747af3505ad7795af2e47 Author: Chuck Tuffli AuthorDate: 2022-08-16 16:14:43 +0000 Commit: Chuck Tuffli CommitDate: 2022-11-20 01:54:34 +0000 bhyve nvme: Fix reported SANICAP value The NVMe specification only allows Controllers compliant with the revision 1.3 and earlier specification to report a value of 0x0 in the No-Deallocate Modifies Media After Sanitize (NODMMAS) field. For our revision 1.4 Controller, report that media is not modified after Sanitize as the implementation does not implement Sanitize. Fixes UNH Test 1.1.2 (cherry picked from commit ec0efe34dd486359d57bc1e792a0e4f9280f66d7) --- usr.sbin/bhyve/pci_nvme.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 9a465f3b1910..9ab23792d58d 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -559,6 +559,10 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->wctemp = 0x0157; cd->cctemp = 0x0157; + /* SANICAP must not be 0 for Revision 1.4 and later NVMe Controllers */ + cd->sanicap = (NVME_CTRLR_DATA_SANICAP_NODMMAS_NO << + NVME_CTRLR_DATA_SANICAP_NODMMAS_SHIFT); + cd->sqes = (6 << NVME_CTRLR_DATA_SQES_MAX_SHIFT) | (6 << NVME_CTRLR_DATA_SQES_MIN_SHIFT); cd->cqes = (4 << NVME_CTRLR_DATA_CQES_MAX_SHIFT) |