Skip to contentSkip to conversation

OpenSBI FWFT ADUE update fix

PATCH Applied Anup Patel 2 participants 4 messages Nov 27, 2025 – Dec 16, 2025

lore
Share & tools
lore

Anup Patel

author
#0 lore raw

cover OpenSBI FWFT ADUE update fix

As-per latest RISC-V Privileged ISA spec, TLBs must be flushed upon FWFT ADUE changes hence this series.
(Refer, https://lists.riscv.org/g/tech-privileged/message/2728)

This series based upon the "OpenSBI hart protection abstraction" series.

These patches can also found in fwft_adue_fix_v1 branch at:
https://github.com/avpatel/opensbi.git

Andrew Waterman (2):
lib: sbi: Expose __sbi_sfence_vma_all() function
lib: sbi: Flush TLBs upon FWFT ADUE change

 include/sbi/sbi_tlb.h  |  2 ++
 lib/sbi/sbi_fwft.c     | 13 ++++++++++++-
 lib/sbi/sbi_hart_pmp.c |  3 ++-
 lib/sbi/sbi_tlb.c      |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)
Signature · 7 lines
2.43.0


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#1 lore raw

PATCH 1/2 lib: sbi: Expose __sbi_sfence_vma_all() function

From: Andrew Waterman <[email protected]>

The __sbi_sfence_vma_all() can be shared by different parts of OpenSBI so rename __tlb_flush_all() to __sbi_sfence_vma_all() and make it global function.

---
 include/sbi/sbi_tlb.h  | 2 ++
 lib/sbi/sbi_hart_pmp.c | 3 ++-
 lib/sbi/sbi_tlb.c      | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)
include/sbi/sbi_tlb.h +2 -0
index 2c50fe85..3936e857 100644
@@ -54,6 +54,8 @@ do { \
 
 #define SBI_TLB_INFO_SIZE		sizeof(struct sbi_tlb_info)
 
+void __sbi_sfence_vma_all();
+
 int sbi_tlb_request(ulong hmask, ulong hbase, struct sbi_tlb_info *tinfo);
 
 int sbi_tlb_init(struct sbi_scratch *scratch, bool cold_boot);
lib/sbi/sbi_hart_pmp.c +2 -1
index ab96e2fa..1655d87c 100644
@@ -12,6 +12,7 @@
 #include <sbi/sbi_hfence.h>
 #include <sbi/sbi_math.h>
 #include <sbi/sbi_platform.h>
+#include <sbi/sbi_tlb.h>
 #include <sbi/riscv_asm.h>
 
 /*
@@ -74,7 +75,7 @@ static void sbi_hart_pmp_fence(void)
 	 * conditions.
 	 */
 	if (misa_extension('S')) {
-		__asm__ __volatile__("sfence.vma");
+		__sbi_sfence_vma_all();
 
 		/*
 		 * If hypervisor mode is supported, flush caching
lib/sbi/sbi_tlb.c +2 -2
index 01b31f4e..ada60c32 100644
@@ -29,7 +29,7 @@ static unsigned long tlb_fifo_off;
 static unsigned long tlb_fifo_mem_off;
 static unsigned long tlb_range_flush_limit;
 
-static void tlb_flush_all(void)
+void __sbi_sfence_vma_all(void)
 {
 	__asm__ __volatile("sfence.vma");
 }
@@ -86,7 +86,7 @@ static void sbi_tlb_local_sfence_vma(struct sbi_tlb_info *tinfo)
 	sbi_pmu_ctr_incr_fw(SBI_PMU_FW_SFENCE_VMA_RCVD);
 
 	if ((start == 0 && size == 0) || (size == SBI_TLB_FLUSH_ALL)) {
-		tlb_flush_all();
+		__sbi_sfence_vma_all();
 		return;
 	}
 
Signature · 7 lines
2.43.0


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#2 lore raw

PATCH 2/2 lib: sbi: Flush TLBs upon FWFT ADUE change

In reply to Anup Patel

From: Andrew Waterman <[email protected]>

A clarification has been added to the RISC-V privileged specification regarding synchronization requirements when xenvcfg.ADUE changes. (Refer, the following commit in the RISC-V Privileged ISA spec
https://github.com/riscv/riscv-isa-manual/commit/4e540263db8ae3a27d132a1752cc0fad222facd8)

As-per these requirements, the SBI FWFT ADUE implementation must flush TLBs upon changes in ADUE state on a hart.

---
 lib/sbi/sbi_fwft.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
lib/sbi/sbi_fwft.c +12 -1
index a2aefb9a..373140b7 100644
@@ -13,8 +13,10 @@
 #include <sbi/sbi_error.h>
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_heap.h>
+#include <sbi/sbi_hfence.h>
 #include <sbi/sbi_scratch.h>
 #include <sbi/sbi_string.h>
+#include <sbi/sbi_tlb.h>
 #include <sbi/sbi_types.h>
 
 #include <sbi/riscv_asm.h>
@@ -167,7 +169,16 @@ static int fwft_adue_supported(struct fwft_config *conf)
 
 static int fwft_set_adue(struct fwft_config *conf, unsigned long value)
 {
-	return fwft_menvcfg_set_bit(value, ENVCFG_ADUE_SHIFT);
+	int res = fwft_menvcfg_set_bit(value, ENVCFG_ADUE_SHIFT);
+
+	if (res == SBI_OK) {
+		__sbi_sfence_vma_all();
+
+		if (misa_extension('H'))
+			__sbi_hfence_gvma_all();
+	}
+
+	return res;
 }
 
 static int fwft_get_adue(struct fwft_config *conf, unsigned long *value)
Signature · 7 lines
2.43.0


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Applied
#3 lore raw
In reply to Anup Patel
Quoted 8 lines · Anup Patel

As-per latest RISC-V Privileged ISA spec, TLBs must be flushed upon FWFT ADUE changes hence this series.
(Refer, https://lists.riscv.org/g/tech-privileged/message/2728)

This series based upon the "OpenSBI hart protection abstraction" series.

Quoted 6 lines

These patches can also found in fwft_adue_fix_v1 branch at:
https://github.com/avpatel/opensbi.git

Andrew Waterman (2):
lib: sbi: Expose __sbi_sfence_vma_all() function
lib: sbi: Flush TLBs upon FWFT ADUE change

Applied this series to the riscv/opensbi repo.

Regards,
Anup

Quoted 10 lines
 include/sbi/sbi_tlb.h  |  2 ++
 lib/sbi/sbi_fwft.c     | 13 ++++++++++++-
 lib/sbi/sbi_hart_pmp.c |  3 ++-
 lib/sbi/sbi_tlb.c      |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

--
2.43.0

Signature · 3 lines
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi