[PATCH 3/5] lib: sbi: Set gva when creating sbi_trap_info

[Andrew Jones]

On Thu, Aug 04, 2022 at 11:17:04AM +0800, Vivian Wang wrote:
> In some cases the sbi_trap_info argument passed to sbi_trap_redirect is
> created from scratch by filling its fields. Since we previously added a
> gva field to struct sbi_trap_info, initialize gva in these cases also.
> 
> Suggested-by: Andrew Jones <ajones at ventanamicro.com>
> Signed-off-by: Vivian Wang <dramforever at live.com>
> ---
>  lib/sbi/sbi_illegal_insn.c    | 1 +
>  lib/sbi/sbi_misaligned_ldst.c | 2 ++
>  lib/sbi/sbi_trap.c            | 7 +++++++
>  3 files changed, 10 insertions(+)
> 
> diff --git a/lib/sbi/sbi_illegal_insn.c b/lib/sbi/sbi_illegal_insn.c
> index 84c04f8..ecd3508 100644
> --- a/lib/sbi/sbi_illegal_insn.c
> +++ b/lib/sbi/sbi_illegal_insn.c
> @@ -30,6 +30,7 @@ static int truly_illegal_insn(ulong insn, struct sbi_trap_regs *regs)
>  	trap.tval = insn;
>  	trap.tval2 = 0;
>  	trap.tinst = 0;
> +	trap.gva   = 0;
>  
>  	return sbi_trap_redirect(regs, &trap);
>  }
> diff --git a/lib/sbi/sbi_misaligned_ldst.c b/lib/sbi/sbi_misaligned_ldst.c
> index fd11798..92a2393 100644
> --- a/lib/sbi/sbi_misaligned_ldst.c
> +++ b/lib/sbi/sbi_misaligned_ldst.c
> @@ -129,6 +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;
>  		return sbi_trap_redirect(regs, &uptrap);
>  	}
>  
> @@ -244,6 +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;
>  		return sbi_trap_redirect(regs, &uptrap);
>  	}
>  
> diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c
> index ee3e4e9..f782fbf 100644
> --- a/lib/sbi/sbi_trap.c
> +++ b/lib/sbi/sbi_trap.c
> @@ -311,6 +311,13 @@ struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs)
>  		trap.tval = mtval;
>  		trap.tval2 = mtval2;
>  		trap.tinst = mtinst;
> +
> +#if __riscv_xlen == 32
> +		trap.gva = (regs->mstatusH & MSTATUSH_GVA) ? 1 : 0;
> +#else
> +		trap.gva = (regs->mstatus & MSTATUS_GVA) ? 1 : 0;
> +#endif

We need to put this in the if (misa_extension('H')) block at the top of
the function. Something like

diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c
index ee3e4e9f3f0b..684438e3f150 100644
--- a/lib/sbi/sbi_trap.c
+++ b/lib/sbi/sbi_trap.c
@@ -260,12 +260,17 @@ struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs)
        int rc = SBI_ENOTSUPP;
        const char *msg = "trap handler failed";
        ulong mcause = csr_read(CSR_MCAUSE);
-       ulong mtval = csr_read(CSR_MTVAL), mtval2 = 0, mtinst = 0;
+       ulong mtval = csr_read(CSR_MTVAL), mtval2 = 0, mtinst = 0, gva = 0;
        struct sbi_trap_info trap;

        if (misa_extension('H')) {
                mtval2 = csr_read(CSR_MTVAL2);
                mtinst = csr_read(CSR_MTINST);
+#if __riscv_xlen == 32
+               trap.gva = (regs->mstatusH & MSTATUSH_GVA) ? 1 : 0;
+#else
+               trap.gva = (regs->mstatus & MSTATUS_GVA) ? 1 : 0;
+#endif
        }

        if (mcause & (1UL << (__riscv_xlen - 1))) {
@@ -311,6 +316,7 @@ struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs)
                trap.tval = mtval;
                trap.tval2 = mtval2;
                trap.tinst = mtinst;
+               trap.gva = gva;
                rc = sbi_trap_redirect(regs, &trap);
                break;
        };


Thanks,
drew