D40241.diff
No OneTemporary
Actions

Size

786 B

Referenced Files

None

Subscribers

None

D40241.diff
View Options

	diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c
	--- a/sys/riscv/riscv/timer.c
	+++ b/sys/riscv/riscv/timer.c
	@@ -53,6 +53,7 @@

	#include <machine/cpufunc.h>
	#include <machine/intr.h>
	+#include <machine/md_var.h>
	#include <machine/sbi.h>

	#include <dev/ofw/openfirm.h>
	@@ -84,6 +85,16 @@
	return (rdtime());
	}

	+static inline void
	+set_timecmp(uint64_t timecmp)
	+{
	+
	+ if (has_sstc)
	+ csr_write(stimecmp, timecmp);
	+ else
	+ sbi_set_timer(timecmp);
	+}
	+
	static u_int
	riscv_timer_tc_get_timecount(struct timecounter *tc __unused)
	{
	@@ -107,7 +118,7 @@

	if (first != 0) {
	counts = ((uint32_t)et->et_frequency * first) >> 32;
	- sbi_set_timer(get_timecount() + counts);
	+ set_timecmp(get_timecount() + counts);
	csr_set(sie, SIE_STIE);

	return (0);