From nobody Mon Jul 4 16:40:12 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 5DB2818940FA; Mon, 4 Jul 2022 16:40:13 +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 4LcBP85v5Sz4SJc; Mon, 4 Jul 2022 16:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656952812; 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=0qXhU6gkSyP03FZeDv/FaPp6IFzjxpxl/vjVQyTMCeU=; b=nN2QnzpuJNplxtiigIerxU1+bI5k65aeDymEdk4nKzoSdf/+009YiKusHhifrSNtpkHCIa XktZikSnvd7bUlOyYFQRmK1jjIom4lhjziKniWq9mKE5kpW2LWwyZEKcmWL17X41ndqNJu QVzCfPV6ZZC1bfaf5b+ZgxCUCg7OC690JnBwfNpYHoMq70RHD+zl81bOsYaVTUZS+F1cx3 GWqIwdLM7t9bs26n8XT04DG0YZwVJ75bZvcXygcBtynDwElV1FFobC+dh3cCnhHcqTUC6P 6y08HbI0eYagQIsjWeNUc4CKkP8t0/7H2a54Yf7PaU4HBD2fQFxIMFUEdOicVA== 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 8171414DA2; Mon, 4 Jul 2022 16:40:12 +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 264GeCIm045124; Mon, 4 Jul 2022 16:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264GeCMx045118; Mon, 4 Jul 2022 16:40:12 GMT (envelope-from git) Date: Mon, 4 Jul 2022 16:40:12 GMT Message-Id: <202207041640.264GeCMx045118@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f0577f42b24a - stable/13 - riscv timer: remove intermediate helper 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f0577f42b24a699f56c910e54551e9e7f8e7c9d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656952812; 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=0qXhU6gkSyP03FZeDv/FaPp6IFzjxpxl/vjVQyTMCeU=; b=c42E8LOon3uJPvZ4aTJOAPa6aCXJRg2APoxA7pcNj5wLUa4Ni0O3YtqaBVem12Xfr30yg/ 4G6BqCIJO6EA6bbZ9ByC/79HZuVWVm1bFTo4HIsl6t+qKZpD1ypwi9Ll7nP1kx1YysUHWF 7PT5mAe7mppfizXSeldHPf1R3b4zKWF66qC4ziEmnODlGq+B1o5aePmsKS0vUihduNy5Bb Y2eszuA7eq5l88msPBeykfhTBaKIlVLWbrY/nL6qPWELc0DV07x+TgTryoLOZBC07oBMyg 8cIqelRZo8+ykf4fQUkAP7Dq7sX6mKvfJtG2q1jdgy0dAi4nv2RINPx6CoYsMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656952812; a=rsa-sha256; cv=none; b=Cya8nFwIiV5Nk6TJSvAeWAoFBk0mKfy0FF0BlONUbpcdWFRsKAPxiol19CqWRiAnbXck+t uv1Ts2TAGLDERQrqw3WIT/0OZqUizO3t3W1Fab2bxtNEQXqr9j2GGM6JB5iOuX/HK+UR4B XJfm4bFnbF/PxUpk9tBflirjmRzkkXeLVou58zYdfgPSUZWrSHt49ZAXOwtrfNlu2PRYjg NeYhje3NBLahV+8ee4hIuCLHvkA+mBnwDQgtAIjZMGPYPxvveQ55QFDMmuvALr16mKSj+X hRts7ATnZSGlSexomV9jAhLDEuR+CqNj/EdxbYf7vDUd+PeNCLNZ0IH6XjfsyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f0577f42b24a699f56c910e54551e9e7f8e7c9d3 commit f0577f42b24a699f56c910e54551e9e7f8e7c9d3 Author: Mitchell Horne AuthorDate: 2022-06-21 16:23:21 +0000 Commit: Mitchell Horne CommitDate: 2022-07-04 16:37:05 +0000 riscv timer: remove intermediate helper get_counts() doesn't do anything at the moment but return the result of get_cycles(), so remove it. For clarity, rename get_cycles() to get_timecount(); RISC-V defines separate time and cyclecount CSRs, so let's avoid confusing the two. They may be backed by the same underlying clock, but this is an implementation detail. MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35461 (cherry picked from commit b82f4170fca86e9b41b613715852d4f225b26e3a) --- sys/riscv/riscv/timer.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index c852d3dbe0f1..9c333b42059e 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -78,30 +78,17 @@ static struct timecounter riscv_timer_timecount = { }; static inline uint64_t -get_cycles(void) +get_timecount(void) { return (rdtime()); } -static long -get_counts(struct riscv_timer_softc *sc) -{ - uint64_t counts; - - counts = get_cycles(); - - return (counts); -} - static u_int -riscv_timer_tc_get_timecount(struct timecounter *tc) +riscv_timer_tc_get_timecount(struct timecounter *tc __unused) { - struct riscv_timer_softc *sc; - - sc = tc->tc_priv; - return (get_counts(sc)); + return (get_timecount()); } static uint32_t @@ -120,7 +107,7 @@ riscv_timer_et_start(struct eventtimer *et, sbintime_t first, sbintime_t period) if (first != 0) { counts = ((uint32_t)et->et_frequency * first) >> 32; - sbi_set_timer(get_cycles() + counts); + sbi_set_timer(get_timecount() + counts); csr_set(sie, SIE_STIE); return (0); @@ -291,10 +278,10 @@ DELAY(int usec) else counts = usec * counts_per_usec; - first = get_counts(riscv_timer_sc); + first = get_timecount(); while (counts > 0) { - last = get_counts(riscv_timer_sc); + last = get_timecount(); counts -= (int64_t)(last - first); first = last; }