From nobody Sat Jan 29 23:15:36 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 9D43B197AC2F; Sat, 29 Jan 2022 23:15:36 +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 4JmVYN3mxBz3sRd; Sat, 29 Jan 2022 23:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643498136; 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=92A7WTaujbg0I+9QSRXfhcYyJx0Y8NwtY3Tg84Fe3u0=; b=JaDDWy5jEUGJvFMChRNC2mAhjZAtsg/eyvkB/03jKmH4q4eHhUjAXmQFb8/3Ny0PCuBVfk 7/RCuSQDhf+Iltnvdzh4C2Z3RvdWoSW2fUCD0aJFJLWgWYE2sJWu8g/5hDjhcn9PhdOx6a KIwFG6VLM46XV4fgEj7hXyHWUPnQiI+UgSVh9ybjnkuKyLr/H6S/BraKWVe+5hYgX0YcKB UKUFS5ZDURSNHpFzgUJvnIE2hoKeDFNq1lXzrAgq9Ob6RI28x8zh7nw3JiKm1zre+mfOe4 Ht8+i0h19BVH+yAIFEg1stZCeEHRBRW4uEzDEbBRG7PN7wGjqlrPaefK2OzUTg== 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 623071E32B; Sat, 29 Jan 2022 23:15:36 +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 20TNFawW008104; Sat, 29 Jan 2022 23:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20TNFaBs008103; Sat, 29 Jan 2022 23:15:36 GMT (envelope-from git) Date: Sat, 29 Jan 2022 23:15:36 GMT Message-Id: <202201292315.20TNFaBs008103@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: 595a12f18bc4 - main - bhyve nvme: Advertise v1.4 support 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: 595a12f18bc4cf9b707a4cfc18e9c923ef6036ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643498136; 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=92A7WTaujbg0I+9QSRXfhcYyJx0Y8NwtY3Tg84Fe3u0=; b=TPjGgsYCApTJ4ORtmru03efkYPivW3CVA//xYIJ/cp3rXxocPFLhvmO532jdLth+FmgK8B 35x26wGH0agGyO2id42BuR60dSO5brXu7zhnoZIMlLU+cIyq9bj3KdFrk7KumyRwNg60xX niFkC8C6aIqQyqkd3/DUbulaj4m8jKjKhvbwviKt13v5q+LVMnWzFPRadY4v9KgaCIOn4N R86xNzhwxvCdGlD6Z0D4BOQqxdCexOuqfRPsuA8rn13nCOk9LCu1GNS3f+K8bFQslXp4of 8UTMAdXJ6onE91vK+IDvmy4dKm5gEncXTTe7DXUA27qNIdq87xt9ioCDAXUU0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643498136; a=rsa-sha256; cv=none; b=DgdgGm9Ff3SPsk66WgDGL0KTFk7IibNLtm5vXJFAIqWo2kOLLWWYl0vxX2DcIIGxeCWJWD QJxliVgrsIRkpMB1xWKhHUlmZ3xfoZYvXshxK6SPdDWYovfo40GRR26K0aY2Fs/779SyJE J5X6FR4Hp6y2UY3wiPy7O6HvNgKbn3jIUasgvyvU73EBdGDgFFmdr1wOf/hdNqULPtpTTa /ycD0ujx0B2fJf2wQPQ47u9C3H8y8tRwll/9QFYykuhlPcQtZTinh7nRIuGgXk9slFy+xH 93hpUh/X54c/wp8Ait8LzoOLXouBlnvy50Bg64TPI9Kow7BR0gE7/e1OD9Y+kA== 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=595a12f18bc4cf9b707a4cfc18e9c923ef6036ff commit 595a12f18bc4cf9b707a4cfc18e9c923ef6036ff Author: Chuck Tuffli AuthorDate: 2022-01-30 07:04:25 +0000 Commit: Chuck Tuffli CommitDate: 2022-01-30 07:04:25 +0000 bhyve nvme: Advertise v1.4 support Bump advertised NVMe support from v1.3 to v1.4 Reviewed by: allanjude Tested by: jason@tubnor.net MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33564 --- usr.sbin/bhyve/pci_nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2410366de197..af24f41116a0 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -508,7 +508,7 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->mdts = NVME_MDTS; /* max data transfer size (2^mdts * CAP.MPSMIN) */ - cd->ver = 0x00010300; + cd->ver = NVME_REV(1,4); cd->oacs = 1 << NVME_CTRLR_DATA_OACS_FORMAT_SHIFT; cd->acl = 2; @@ -988,7 +988,7 @@ pci_nvme_reset_locked(struct pci_nvme_softc *sc) sc->regs.cap_hi = 1 << NVME_CAP_HI_REG_CSS_NVM_SHIFT; - sc->regs.vs = 0x00010300; /* NVMe v1.3 */ + sc->regs.vs = NVME_REV(1,4); /* NVMe v1.4 */ sc->regs.cc = 0; sc->regs.csts = 0;