Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: Delegate guest page faults to HS-mode

Browse Source 
As-per RISC-V hypervisor v0.5 spec, we have new guest page faults
which need to be delegated to HS-mode.

Also, we can have bits in in MIDELEG and MEDELEG hardwired to 1
which means we need to fix the sainty check on these CSRs at the
end of delegate_traps() function.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Anup Patel
2019-12-12 07:00:59 +05:30
committed by Anup Patel
parent bd732ae612
commit 6590a7dab9
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/sbi/sbi_hart.c
View File

@@ -88,19 +88,25 @@ static int delegate_traps(struct sbi_scratch *scratch, u32 hartid)
(1U << CAUSE_STORE_PAGE_FAULT); (1U << CAUSE_STORE_PAGE_FAULT);
/* /*
* If hypervisor extension available then we only handle * If hypervisor extension available then we only handle hypervisor
* hypervisor calls (i.e. ecalls from HS-mode) and we let * calls (i.e. ecalls from HS-mode) in M-mode.
* HS-mode handle supervisor calls (i.e. ecalls from VS-mode) *
* The HS-mode will additionally handle supervisor calls (i.e. ecalls
* from VS-mode), Guest page faults and Virtual interrupts.
*/ */
if (misa_extension('H')) if (misa_extension('H')) {
exceptions |= (1U << CAUSE_SUPERVISOR_ECALL); exceptions |= (1U << CAUSE_SUPERVISOR_ECALL);
exceptions |= (1U << CAUSE_FETCH_GUEST_PAGE_FAULT);
exceptions |= (1U << CAUSE_LOAD_GUEST_PAGE_FAULT);
exceptions |= (1U << CAUSE_STORE_GUEST_PAGE_FAULT);
}
csr_write(CSR_MIDELEG, interrupts); csr_write(CSR_MIDELEG, interrupts);
csr_write(CSR_MEDELEG, exceptions); csr_write(CSR_MEDELEG, exceptions);
if (csr_read(CSR_MIDELEG) != interrupts) if ((csr_read(CSR_MIDELEG) & interrupts) != interrupts)
return SBI_EFAIL; return SBI_EFAIL;
if (csr_read(CSR_MEDELEG) != exceptions) if ((csr_read(CSR_MEDELEG) & exceptions) != exceptions)
return SBI_EFAIL; return SBI_EFAIL;
return 0; return 0;