diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 6400857d..1e53dcda 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -5707,6 +5707,7 @@ riscv_symbols = (
     'helper_fsqrt_s',
     'helper_fsub_d',
     'helper_fsub_s',
+    'helper_hyp_tlb_flush',
     'helper_mret',
     'helper_tlb_flush',
     'helper_set_rounding_mode',
diff --git a/qemu/riscv32.h b/qemu/riscv32.h
index fbb9714d..40bd2cc1 100644
--- a/qemu/riscv32.h
+++ b/qemu/riscv32.h
@@ -3458,6 +3458,7 @@
 #define helper_fsqrt_s helper_fsqrt_s_riscv32
 #define helper_fsub_d helper_fsub_d_riscv32
 #define helper_fsub_s helper_fsub_s_riscv32
+#define helper_hyp_tlb_flush helper_hyp_tlb_flush_riscv32
 #define helper_mret helper_mret_riscv32
 #define helper_tlb_flush helper_tlb_flush_riscv32
 #define helper_set_rounding_mode helper_set_rounding_mode_riscv32
diff --git a/qemu/riscv64.h b/qemu/riscv64.h
index f36b6149..a1bbc53d 100644
--- a/qemu/riscv64.h
+++ b/qemu/riscv64.h
@@ -3458,6 +3458,7 @@
 #define helper_fsqrt_s helper_fsqrt_s_riscv64
 #define helper_fsub_d helper_fsub_d_riscv64
 #define helper_fsub_s helper_fsub_s_riscv64
+#define helper_hyp_tlb_flush helper_hyp_tlb_flush_riscv64
 #define helper_mret helper_mret_riscv64
 #define helper_tlb_flush helper_tlb_flush_riscv64
 #define helper_set_rounding_mode helper_set_rounding_mode_riscv64
diff --git a/qemu/target/riscv/helper.h b/qemu/target/riscv/helper.h
index 7f819c47..c9b6e2ee 100644
--- a/qemu/target/riscv/helper.h
+++ b/qemu/target/riscv/helper.h
@@ -79,3 +79,8 @@ DEF_HELPER_2(mret, tl, env, tl)
 DEF_HELPER_1(wfi, void, env)
 DEF_HELPER_1(tlb_flush, void, env)
 #endif
+
+/* Hypervisor functions */
+#ifndef CONFIG_USER_ONLY
+DEF_HELPER_1(hyp_tlb_flush, void, env)
+#endif
diff --git a/qemu/target/riscv/insn_trans/trans_rvh.inc.c b/qemu/target/riscv/insn_trans/trans_rvh.inc.c
index 40a31c70..26182f66 100644
--- a/qemu/target/riscv/insn_trans/trans_rvh.inc.c
+++ b/qemu/target/riscv/insn_trans/trans_rvh.inc.c
@@ -18,40 +18,22 @@
 
 static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a)
 {
+    REQUIRE_EXT(ctx, RVH);
 #ifndef CONFIG_USER_ONLY
     TCGContext *tcg_ctx = ctx->uc->tcg_ctx;
-    if (has_ext(ctx, RVH)) {
-        /* Hpervisor extensions exist */
-        /*
-         * if (env->priv == PRV_M ||
-         *   (env->priv == PRV_S &&
-         *    !riscv_cpu_virt_enabled(env) &&
-         *    get_field(ctx->mstatus_fs, MSTATUS_TVM))) {
-         */
-            gen_helper_tlb_flush(tcg_ctx, tcg_ctx->cpu_env);
-            return true;
-        /* } */
-    }
+    gen_helper_hyp_tlb_flush(tcg_ctx, tcg_ctx->cpu_env);
+    return true;
 #endif
     return false;
 }
 
 static bool trans_hfence_vvma(DisasContext *ctx, arg_sfence_vma *a)
 {
+    REQUIRE_EXT(ctx, RVH);
 #ifndef CONFIG_USER_ONLY
     TCGContext *tcg_ctx = ctx->uc->tcg_ctx;
-    if (has_ext(ctx, RVH)) {
-        /* Hpervisor extensions exist */
-        /*
-         * if (env->priv == PRV_M ||
-         *   (env->priv == PRV_S &&
-         *    !riscv_cpu_virt_enabled(env) &&
-         *    get_field(ctx->mstatus_fs, MSTATUS_TVM))) {
-         */
-            gen_helper_tlb_flush(tcg_ctx, tcg_ctx->cpu_env);
-            return true;
-        /* } */
-    }
+    gen_helper_hyp_tlb_flush(tcg_ctx, tcg_ctx->cpu_env);
+    return true;
 #endif
     return false;
 }
diff --git a/qemu/target/riscv/op_helper.c b/qemu/target/riscv/op_helper.c
index b1269ced..790dce20 100644
--- a/qemu/target/riscv/op_helper.c
+++ b/qemu/target/riscv/op_helper.c
@@ -193,4 +193,17 @@ void helper_tlb_flush(CPURISCVState *env)
     }
 }
 
+void helper_hyp_tlb_flush(CPURISCVState *env)
+{
+    CPUState *cs = env_cpu(env);
+
+    if (env->priv == PRV_M ||
+        (env->priv == PRV_S && !riscv_cpu_virt_enabled(env))) {
+        tlb_flush(cs);
+        return;
+    }
+
+    riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC());
+}
+
 #endif /* !CONFIG_USER_ONLY */