D54857.id170346.diff
No OneTemporary
Actions

Size

815 B

Referenced Files

None

Subscribers

None

D54857.id170346.diff
View Options

	diff --git a/sys/riscv/include/cpufunc.h b/sys/riscv/include/cpufunc.h
	--- a/sys/riscv/include/cpufunc.h
	+++ b/sys/riscv/include/cpufunc.h
	@@ -119,6 +119,12 @@
	: "memory");
	}

	+static __inline void
	+hfence_gvma(void)
	+{
	+ __asm __volatile("hfence.gvma" ::: "memory");
	+}
	+
	#define rdcycle() csr_read64(cycle)
	#define rdtime() csr_read64(time)
	#define rdinstret() csr_read64(instret)
	diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c
	--- a/sys/riscv/vmm/vmm_riscv.c
	+++ b/sys/riscv/vmm/vmm_riscv.c
	@@ -625,7 +625,7 @@
	* have been modified, it may be necessary to execute an HFENCE.GVMA
	* instruction (see Section 5.3.2) before or after writing hgatp.
	*/
	- __asm __volatile("hfence.gvma" ::: "memory");
	+ hfence_gvma();

	csr_write(hgatp, pmap->pm_satp);
	if (has_sstc)