diff --git a/lib/sbi/sbi_domain_context.c b/lib/sbi/sbi_domain_context.c index d6843a6..8daf629 100755 --- a/lib/sbi/sbi_domain_context.c +++ b/lib/sbi/sbi_domain_context.c @@ -55,8 +55,10 @@ static void switch_to_next_domain_context(struct sbi_context *ctx, ctx->stval = csr_swap(CSR_STVAL, dom_ctx->stval); ctx->sip = csr_swap(CSR_SIP, dom_ctx->sip); ctx->satp = csr_swap(CSR_SATP, dom_ctx->satp); - ctx->scounteren = csr_swap(CSR_SCOUNTEREN, dom_ctx->scounteren); - ctx->senvcfg = csr_swap(CSR_SENVCFG, dom_ctx->senvcfg); + if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_10) + ctx->scounteren = csr_swap(CSR_SCOUNTEREN, dom_ctx->scounteren); + if (sbi_hart_priv_version(scratch) >= SBI_HART_PRIV_VER_1_12) + ctx->senvcfg = csr_swap(CSR_SENVCFG, dom_ctx->senvcfg); /* Save current trap state and restore target domain's trap state */ trap_regs = (struct sbi_trap_regs *)(csr_read(CSR_MSCRATCH) -