From 46e744ab6736c0d14a1a1609d9dda3b802c164fe Mon Sep 17 00:00:00 2001 From: Vivian Wang Date: Fri, 2 Sep 2022 23:48:35 +0800 Subject: [PATCH] lib: sbi_misaligned_ldst: Set GVA if not emulating If a particular misaligned load or store cannot be emulated at all, for the redirected trap, trap.gva is set to 0, but it should be the same as mstatus[h].GVA of the original trap. Fix this so that if the trap is destined for HS-mode, hstatus.GVA is then set correctly. Fixes: 1c4ce74f5128 ("lib: sbi: Set gva when creating sbi_trap_info") Signed-off-by: Vivian Wang Reviewed-by: Andrew Jones Reviewed-by: Anup Patel --- lib/sbi/sbi_misaligned_ldst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sbi/sbi_misaligned_ldst.c b/lib/sbi/sbi_misaligned_ldst.c index 92a23939..4b91e072 100644 --- a/lib/sbi/sbi_misaligned_ldst.c +++ b/lib/sbi/sbi_misaligned_ldst.c @@ -129,7 +129,7 @@ int sbi_misaligned_load_handler(ulong addr, ulong tval2, ulong tinst, uptrap.tval = addr; uptrap.tval2 = tval2; uptrap.tinst = tinst; - uptrap.gva = 0; + uptrap.gva = sbi_regs_gva(regs); return sbi_trap_redirect(regs, &uptrap); } @@ -245,7 +245,7 @@ int sbi_misaligned_store_handler(ulong addr, ulong tval2, ulong tinst, uptrap.tval = addr; uptrap.tval2 = tval2; uptrap.tinst = tinst; - uptrap.gva = 0; + uptrap.gva = sbi_regs_gva(regs); return sbi_trap_redirect(regs, &uptrap); }