From nobody Mon Aug 26 18:03:15 2024 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 4Wsz783qNtz5TLnd; Mon, 26 Aug 2024 18:03:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wsz781BNvz44t8; Mon, 26 Aug 2024 18:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724695396; 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=lylXJh9hdcV1zeMVQD+IMQE+SenVc5RuYhkZpssTHEo=; b=FplfaWT2KA7LxbW6ndeou/gpOv0D4jZaxW8r7w0oH5H++AfI0hy8tveoM2rv5AT+3XbYBm U4UxaIZ1aw41hsI8wQ32XxO28aokV2C0GopOx9ZexZaVosfo6IZZDmzz3Gmh0lPJjRO1p4 maj2C5luoYmVm9gYM4qV7JFAj/b3/ymiFg5QjdfKXK2XlmFc0NcgM4bE+1+0bVdE/LtiKv NusHEealr9Zv3LRBhYMwhvO5MlAQ8CivoUT4tYl7qHEUVljT7tXegcA5EBymenZaIhSpyS 3w0OsLun1jusdUWdR/yat0cFg5WaZJTEYewRId0M0Y639y6KR6op3SZ1GlPKvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724695396; a=rsa-sha256; cv=none; b=V6JmcTM9/w0fkKHcNSOfFteIPZR9s6WUfjHXnF3K17iApcRiVawocTOrCwKw5L4m+ThLcJ t8vAiC+qIc6DbojoQkb/8d84VsNyY7qp6mz3wAfrxOQmvikl5O07hJx2+HPTXZWNFu7z2D PZDGF3IG7eIc6YeiDyzAunpfGTquSeN/RG7gS2V8EnPngDbnhNlkmEFTEh4GUFDDFjQ9Sl B5t5bc9bB+K/gfn3b2YpqqCiZCyS8mGrIJS99WF0QpK3DRDkO7lndlX3HUGWVzqBsiQSp0 kSNML41jGfvZCfmrtxEwHUU1Guw0StQQ+OQGl8m1cZa8s099Zu8D6/aTGbGZHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724695396; 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=lylXJh9hdcV1zeMVQD+IMQE+SenVc5RuYhkZpssTHEo=; b=Muqv9jAuoHVHaGfDaXfdwceUMkqpriSmNBQXApn3tzRfknWziyEDbI//iqR2vjZuKYI1Uf FM+xdezkq4B8c3Jebe6c4o6yCw3edlw7ffvZzGDECWN5ZqNbGcBIE/GwvxRkXy4pTKN5Gd T9dsba6BuAYrAnTpvGpiQz1XiWQHlSfKTn78JCT0dwS69m+ToURIYbbvwI8GM2MOSQrUXy iVI3pf5cSMxOV3WDqRSBlD75bKz5i18J7wpgosNeqxlw9hSNeR6L3xNqSu7CLv4Myc+nLm 15hWkJ9HlqNwaitoHvTdusFWJhEnexZBR8gVF9hJCOYPHNVnPrOXnG2mofOlMg== 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 4Wsz780mSrzHHL; Mon, 26 Aug 2024 18:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47QI3GHl042566; Mon, 26 Aug 2024 18:03:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47QI3Fcv042563; Mon, 26 Aug 2024 18:03:15 GMT (envelope-from git) Date: Mon, 26 Aug 2024 18:03:15 GMT Message-Id: <202408261803.47QI3Fcv042563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a918e5e9f88c - stable/14 - bhyve: Use NVMEV to read the ASQS field of AQA 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a918e5e9f88c82a2e47e4675ff92bf7735e98f77 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a918e5e9f88c82a2e47e4675ff92bf7735e98f77 commit a918e5e9f88c82a2e47e4675ff92bf7735e98f77 Author: John Baldwin AuthorDate: 2024-01-29 18:51:07 +0000 Commit: John Baldwin 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);