Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Aug 2024 18:03:15 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: a918e5e9f88c - stable/14 - bhyve: Use NVMEV to read the ASQS field of AQA
Message-ID:  <202408261803.47QI3Fcv042563@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=a918e5e9f88c82a2e47e4675ff92bf7735e98f77

commit a918e5e9f88c82a2e47e4675ff92bf7735e98f77
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-01-29 18:51:07 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-08-26 17:26:32 +0000

    bhyve: Use NVMEV to read the ASQS field of AQA
    
    This is not a functional change, but just being consistent instead of
    omitting a shift by 0.
    
    Reviewed by:    corvink, chuck, imp
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D43600
    
    (cherry picked from commit c42692360611c8afce6ee7bb937a858d64a133f4)
---
 usr.sbin/bhyve/pci_nvme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c
index 4084f9b007ba..dd6c9a41d17f 100644
--- a/usr.sbin/bhyve/pci_nvme.c
+++ b/usr.sbin/bhyve/pci_nvme.c
@@ -1065,7 +1065,7 @@ pci_nvme_init_controller(struct pci_nvme_softc *sc)
 	 * cleared to 0h produces undefined results" for both ACQS and
 	 * ASQS. If zero, set CFS and do not become ready.
 	 */
-	asqs = ONE_BASED(sc->regs.aqa & NVME_AQA_REG_ASQS_MASK);
+	asqs = ONE_BASED(NVMEV(NVME_AQA_REG_ASQS, sc->regs.aqa));
 	if (asqs < 2) {
 		EPRINTLN("%s: illegal ASQS value %#x (aqa=%#x)", __func__,
 		    asqs - 1, sc->regs.aqa);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408261803.47QI3Fcv042563>