From nobody Mon Jan 29 19:03:05 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 4TNyP56xRjz59DMv; Mon, 29 Jan 2024 19:03:05 +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 4TNyP55qSMz40TJ; Mon, 29 Jan 2024 19:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554985; 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=YjCI/pdAR6RclLaPL1ap8Nm789qYnZkVw0Kpieq73ig=; b=yICMBEVWieGNlr44pydG5ULyTXqEmAXkmzPVMcl41oElup2IsAw9b/WMILpA3Og5r4QEH7 s/UNcuwSclrs5IpI8FnagR+ztwPmdyAtmdjnR3CuChQRpgStmD240rID6ikhvT+jhhYYB6 y3rSDQwJyi9M2NuHAMHdqLi9pKP9qI6EzyuqgKR47F1kI7d3ggU2sAacUyNLPPN4iDPGQx NyM8NWWEvbEPlzfuRQo7QSNlVTNfK/j+z9SUCeDVa9idplk8W+zXQMCHjXZsH8yabhHwcG NRZRo2ZIW5l1/AfXx1W3YReUEpx2R5LJOzkmCxTtKZPHN8ojTvyC5WqsaRgF2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554985; 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=YjCI/pdAR6RclLaPL1ap8Nm789qYnZkVw0Kpieq73ig=; b=vbf2vhWM3DE6vZmlZPvIu4lVW9GX9Vm8YGLLnXqC4ngmOsEcQeiP82J2z5jDDrK5WAZjIl l8KDqxP3RlzLIDQ6Z6FI61ToWswbq3Nz5Ezfn0FUS5FGskffe/xfvYUpeUxfX+kv2RowS3 45F9LI99jI9FhxWeV2DgVN9ILRYAx3aaQaJop8muUeaeQRroIObsFRiJ7oRzO1TiuqZUQh MHxIM90FBqnLCk6vcvxu2X+W1nX5G121GM7F0RB0EGRXRYLDftoBsJLxuYt/crhzEMZSLD YYrJbn0DDnkgj3ZA0XS5TB0KVqgg4Sl29kk7mKGVpdJVN93bWSr7QGps6Irhdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554985; a=rsa-sha256; cv=none; b=FwpIw7wLPX3bRGXz5K1xY3WThYz/dzYPJEdC9RzXHLOpmWlGpZx02VhE8eyEAJ48ko4sbx V7C7Z8dcMF5OnC2PCwWAsXulTRkAsY0s6wo4xuIkgbb6Xgph2qnqlewk3hOwF+aDPcO+3k doW7FeLyk+JE17HFeEwnl/kM9pHiBKZ7cFozki9p/Gd4961/S6DDXl515rH4Ibhz5YadHu trx8DWO1TdBguuWhca2iqxSRS3A0z7bEWG1dEi0EgkbM2bX9Uqht7JDvf4g9o2fkzsh4T9 yCsefXTc4tEWxdsZcRULgttMviYBsRuvcvs5VER6fkgf/82Wnbl9RbC0lt3o9g== 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 4TNyP5480Qz13rT; Mon, 29 Jan 2024 19:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40TJ35eS058589; Mon, 29 Jan 2024 19:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ35f1058586; Mon, 29 Jan 2024 19:03:05 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:05 GMT Message-Id: <202401291903.40TJ35f1058586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c42692360611 - main - 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: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c42692360611c8afce6ee7bb937a858d64a133f4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c42692360611c8afce6ee7bb937a858d64a133f4 commit c42692360611c8afce6ee7bb937a858d64a133f4 Author: John Baldwin AuthorDate: 2024-01-29 18:51:07 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:51:07 +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 --- 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);