From owner-svn-src-all@freebsd.org  Fri Jan 10 03:17:28 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D0A47221FE4;
 Fri, 10 Jan 2020 03:17:28 +0000 (UTC)
 (envelope-from mhorne@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47v7T457nGz45Rq;
 Fri, 10 Jan 2020 03:17:28 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB0A2B83C;
 Fri, 10 Jan 2020 03:17:28 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00A3HSxu008303;
 Fri, 10 Jan 2020 03:17:28 GMT (envelope-from mhorne@FreeBSD.org)
Received: (from mhorne@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00A3HSNC008302;
 Fri, 10 Jan 2020 03:17:28 GMT (envelope-from mhorne@FreeBSD.org)
Message-Id: <202001100317.00A3HSNC008302@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mhorne set sender to
 mhorne@FreeBSD.org using -f
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Fri, 10 Jan 2020 03:17:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r356592 - head/sys/riscv/riscv
X-SVN-Group: head
X-SVN-Commit-Author: mhorne
X-SVN-Commit-Paths: head/sys/riscv/riscv
X-SVN-Commit-Revision: 356592
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2020 03:17:28 -0000

Author: mhorne
Date: Fri Jan 10 03:17:28 2020
New Revision: 356592
URL: https://svnweb.freebsd.org/changeset/base/356592

Log:
  Replace inline assembly with rdtime macro
  
  This macro is used elsewhere and is slightly cleaner. NFC.

Modified:
  head/sys/riscv/riscv/timer.c

Modified: head/sys/riscv/riscv/timer.c
==============================================================================
--- head/sys/riscv/riscv/timer.c	Fri Jan 10 03:16:40 2020	(r356591)
+++ head/sys/riscv/riscv/timer.c	Fri Jan 10 03:17:28 2020	(r356592)
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
+#include <machine/cpufunc.h>
 #include <machine/intr.h>
 #include <machine/asm.h>
 #include <machine/trap.h>
@@ -91,11 +92,8 @@ static struct timecounter riscv_timer_timecount = {
 static inline uint64_t
 get_cycles(void)
 {
-	uint64_t cycles;
 
-	__asm __volatile("rdtime %0" : "=r" (cycles));
-
-	return (cycles);
+	return (rdtime());
 }
 
 static long