[PATCH 2/2] lib: sbi_misaligned_ldst: Set GVA if not emulating

[Andrew Jones]

On Fri, Sep 02, 2022 at 11:48:35PM +0800, Vivian Wang wrote:
> 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 <dramforever at live.com>
> ---
>  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 92a2393..4b91e07 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);
>  	}
>  
> -- 
> 2.37.1

Reviewed-by: Andrew Jones <ajones at ventanamicro.com>