The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=595a12f18bc4cf9b707a4cfc18e9c923ef6036ff
commit 595a12f18bc4cf9b707a4cfc18e9c923ef6036ff Author: Chuck Tuffli <[email protected]> AuthorDate: 2022-01-30 07:04:25 +0000 Commit: Chuck Tuffli <[email protected]> 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: [email protected] 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;
