From nobody Mon Feb 21 21:57:50 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 4333719EAE93; Mon, 21 Feb 2022 21:57:52 +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 4K2bl33vsyz4gJ4; Mon, 21 Feb 2022 21:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480671; 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=4g1B2Ruht7QbtCYbcer1FCRf1sx2Gs3rdkTrk2hqA2U=; b=NR8296dHMR0PYwPG9dtYY3vO40fbOGeG9c78GBjtEeiPP0Ovg3fJ1WXQhyoqgN2V1iOgci exgzFTMEFZxDmDsbgVXrYsUOtW287I4EEBHrSnNt3rGv23kuPGmcb4UYVL06GCJvqd1bON iJ+7XAk2VktHt7GyytFHg3YBlTJcxm6k/qO41SBJrOBl/pjh7ye6+UzGnXGSF3vEG8Kjii KrMX6LnnVjadjaHYj5qzG5CxMYzNyy5gDM1pynpPvZnfeVUKveZHgyhc1UNrJCIr8jqTpc 1aSJTE4PKHpmdzNW4wftKCapFuOxKIT/h2Ni1UqI5Ie/h6MG272y/B/u0mN88A== 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 0FA2818499; Mon, 21 Feb 2022 21:57:51 +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 21LLvoQ9051986; Mon, 21 Feb 2022 21:57:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LLvopa051985; Mon, 21 Feb 2022 21:57:50 GMT (envelope-from git) Date: Mon, 21 Feb 2022 21:57:50 GMT Message-Id: <202202212157.21LLvopa051985@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: bed94664db02 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: bed94664db02cd9673c1be96d69b362b2246f20f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645480671; 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=4g1B2Ruht7QbtCYbcer1FCRf1sx2Gs3rdkTrk2hqA2U=; b=XcDxpkVWFxwoWBJYPk6HgwWtbWIQkVwsllxh4fqFXV+qNtBKkoD4s3pBnIl0WisRvwJXeV AAbpBScyvBDz3cCKadnuj3ENNasEZodAvMjtsS2vgWhMtD+Wxe9a+hh3vXb8CssDuP+1fo ha30vl3FJMdvboe1KSCiqRrzcfrTdmEMSM8olxszMDVZ24QHthaD9PgA81JtxePWavNwVk dV1InNYLJ7c/TV9YEYUDrsdOQ4rZ0emRrVTPTT8U9VhkmaEhgVFQnORclcGBZGiZlu4RWW KZ8DDXY2Ddf9f9JEOLmcRbJjyuIs2ypPkLYFWTzhY8PCREn4l7kaV4OOB9OwjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645480671; a=rsa-sha256; cv=none; b=wSLx/rN6mIZotO3L6CLa1e2KYTfzxz0SRAaNOOnrCnXpku0zX1vxjcrROsj/Lc4GJk6AnZ RwS4elWXr+xDqxS/jWh/Aa5B/2t6rkliGacbrY02qFcsXenBeaC74oDwa7wIl0xyMjKNOe HWPqWW78ormIvRs1+nrh2Kba6nwI0jEB3EDHb46m0+St5HrPKvnvO+G3XJRQByK2oPz0QG I09W1Dub91vFOsg6lS0qaPf5PcaHaIKHzwuQV0Wl700OcY3WSHnROHu9G6t8TGGT+gDewW hFoYSVEPrK7RZTT7RkEiaSeRjAFz5UMK4fxGQZBTs+nWNzJoZHhmG0XsatZa0w== 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=bed94664db02cd9673c1be96d69b362b2246f20f commit bed94664db02cd9673c1be96d69b362b2246f20f Author: Chuck Tuffli AuthorDate: 2022-01-30 07:04:25 +0000 Commit: Chuck Tuffli CommitDate: 2022-02-22 03:24:50 +0000 bhyve nvme: Advertise v1.4 support Bump advertised NVMe support from v1.3 to v1.4 (cherry picked from commit 595a12f18bc4cf9b707a4cfc18e9c923ef6036ff) --- 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 07b079ecd4a1..8352e00cf12b 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;