From nobody Fri Jan 21 02:26:57 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 26D111968EB0; Fri, 21 Jan 2022 02:27:01 +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 4Jg3DK5r5qz4p3j; Fri, 21 Jan 2022 02:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642732019; 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=cFO7L4rK+4uLSjHCEWBC9+88SB464Cu7nkNYHL9eZg4=; b=lTLEU31I2Dsv7fhR5Q8jtu2AQ6zx/MZUL0PaaGaYuaopTQ+Yp//jfsNlFOp1ouAbqXvnH9 VzA2U7MklGG3IdCYdqT+Tb23ecu49HW4pKOW0pKj64kbfDJs3SeEezvsy6Hg7C9JhLlKep mwJQAf1oumo6MlkhZPtxY6VqT8Lyv4gewFMfwgATbFkwSjA2PlmnJmArRKV8Sleiy0mD6o 6FyRSAxm8eJJt+kAHiRyEBZ1aLbzWRrmauZ303E8jA+QB6e+qIyR024TtujHe2khDZhJN+ 5TW3RJguVarCRX0PymHTPqRyXOb+95O/7+byks9Okj7HArSxOH1iV46mAfJbOg== 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 457BF13625; Fri, 21 Jan 2022 02:26:57 +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 20L2Qv3K001336; Fri, 21 Jan 2022 02:26:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L2QvY0001335; Fri, 21 Jan 2022 02:26:57 GMT (envelope-from git) Date: Fri, 21 Jan 2022 02:26:57 GMT Message-Id: <202201210226.20L2QvY0001335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 21de49b06cb8 - stable/13 - nvme: Use MS_2_TICKS rather than rolling our own 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21de49b06cb85225e5b4a26ff99f4d3aa4604ca6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642732019; 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=cFO7L4rK+4uLSjHCEWBC9+88SB464Cu7nkNYHL9eZg4=; b=lFsoeUTGMLO4aJ/+FV0NcYL3k+rNkF7Mmdd+6O+/9cQ6Cu0svtR2ItFa7IqSIyv0RNIMwB NrshC/XibaIrLdOENcucOSjgoExfskDeAUjbobDfnCcRh+ziLaDroyrw/wfcelhIf0pMTa 5InqbLGSOGqq3vmMZl04SJJ6gwFeb7MJ5s8VS2WB0b/SaqYAmqQHpd/2lu92/M6vVtB8oS lQVpnH8UsAnA5q3YSVT8hLSNQuOXrglSQr1VBQyn7i0+6xCxBGfrZ/3fA2tMLYeHzE6SVZ +vubHVC30Ex6gYljoXSYiiMJ6kFTCPf9mUn064c7NcGmNJf6petGkeXoWwYqkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642732019; a=rsa-sha256; cv=none; b=R+FYXNqB+RvJsFkAtgajM7F3V4sWwimwJ/VuuhVZEX/+fclg9I4F8B7JSA9lV935xM9NyT K5aMcjCqGra5moXk7/pcGSFyS/4ss1sr4svZM2PN5x1RKJgHl0BVSEr6zz6my8DGaeq0x4 YO6BXEy+CuvAWLapmL5aJKsCi5nhFBFHkD+Mbt4jGquIYQeu/S67aWbuP7wdq0JOvpb5N3 qisjcT769B1bUlCPq6Ggw4vyYgB6OdfTIo5P5Fc9QxjZIpV6r6yvhG74E/LhEqC+pLxzVz Z65cWl/rLVKMLjrWFTSOOb0c9LTA3qRt6V4sHLO5W11kN98BJlJPtbRUeom8Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=21de49b06cb85225e5b4a26ff99f4d3aa4604ca6 commit 21de49b06cb85225e5b4a26ff99f4d3aa4604ca6 Author: Warner Losh AuthorDate: 2021-10-01 16:50:04 +0000 Commit: Alexander Motin CommitDate: 2022-01-21 02:07:30 +0000 nvme: Use MS_2_TICKS rather than rolling our own Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D32246 (cherry picked from commit 26259f6ab96e68766556b973d3a4ca0ad125e174) --- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 897d832047ce..f22e21eaf54a 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -262,7 +262,7 @@ nvme_ctrlr_fail_req_task(void *arg, int pending) static int nvme_ctrlr_wait_for_ready(struct nvme_controller *ctrlr, int desired_val) { - int timeout = ticks + (uint64_t)ctrlr->ready_timeout_in_ms * hz / 1000; + int timeout = ticks + MSEC_2_TICKS(ctrlr->ready_timeout_in_ms); uint32_t csts; while (1) { @@ -326,7 +326,7 @@ nvme_ctrlr_disable(struct nvme_controller *ctrlr) * cope with these issues. */ if (ctrlr->quirks & QUIRK_DELAY_B4_CHK_RDY) - pause("nvmeR", B4_CHK_RDY_DELAY_MS * hz / 1000); + pause("nvmeR", MSEC_2_TICKS(B4_CHK_RDY_DELAY_MS)); return (nvme_ctrlr_wait_for_ready(ctrlr, 0)); }