github-mirrors/cva6
1
0
Fork 0
mirror of https://github.com/openhwgroup/cva6.git synced 2025-04-22 13:17:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix vcs simulation errors regarding hypervisor extension code (#1889)

Browse source
This commit is contained in:
AngelaGonzalezMarino 2024-03-05 14:36:08 +01:00 • committed by GitHub
parent 9f928e4c12
commit 5ff5f164fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/cva6_mmu/cva6_mmu.sv
View file

@ -563,7 +563,7 @@ module cva6_mmu
hs_ld_st_inst_n = hs_ld_st_inst_i;
lsu_vaddr_n[HYP_EXT] = dtlb_gpaddr;
csr_hs_ld_st_inst_o = hs_ld_st_inst_i || hs_ld_st_inst_q;
daccess_err[HYP_EXT] = en_ld_st_translation_i[HYP_EXT] && !dtlb_pte_q[1].u;
daccess_err[HYP_EXT] = en_ld_st_translation_i[HYP_EXT] && !dtlb_pte_q[HYP_EXT].u;
end
lsu_paddr_o = (riscv::PLEN)'(lsu_vaddr_q[0]);
@ -609,7 +609,7 @@ module cva6_mmu
lsu_exception_o = {
riscv::STORE_GUEST_PAGE_FAULT,
{{riscv::XLEN - riscv::VLEN{lsu_vaddr_q[0][riscv::VLEN-1]}}, lsu_vaddr_q[0]},
lsu_vaddr_q[1][riscv::GPLEN-1:0],
lsu_vaddr_q[HYP_EXT][riscv::GPLEN-1:0],
{riscv::XLEN{1'b0}},
en_ld_st_translation_i[HYP_EXT*2],
1'b1
@ -657,7 +657,7 @@ module cva6_mmu
lsu_exception_o = {
riscv::LOAD_GUEST_PAGE_FAULT,
{{riscv::XLEN - riscv::VLEN{lsu_vaddr_q[0][riscv::VLEN-1]}}, lsu_vaddr_q[0]},
lsu_vaddr_q[1][riscv::GPLEN-1:0],
lsu_vaddr_q[HYP_EXT][riscv::GPLEN-1:0],
{riscv::XLEN{1'b0}},
en_ld_st_translation_i[HYP_EXT*2],
1'b1

12
core/cva6_mmu/cva6_tlb.sv
View file

@ -128,7 +128,7 @@ module cva6_tlb
//identify if vpn matches at all PT levels for all TLB entries
assign vpn_match[i][x] = (HYP_EXT == 1 && x == (PT_LEVELS - 1) && ~v_st_enbl[0]) ? //
lu_vaddr_i[12+((VPN_LEN/PT_LEVELS)*(x+1))-1:12+((VPN_LEN/PT_LEVELS)*x)] == tags_q[i].vpn[x] && lu_vaddr_i[12+VPN_LEN-1: 12+VPN_LEN-(VPN_LEN%PT_LEVELS)] == tags_q[i].vpn[x+1][(VPN_LEN%PT_LEVELS)-1:0]: //
lu_vaddr_i[12+((VPN_LEN/PT_LEVELS)*(x+1))-1:12+((VPN_LEN/PT_LEVELS)*x)] == tags_q[i].vpn[x] && lu_vaddr_i[12+HYP_EXT*(VPN_LEN-1): 12+HYP_EXT*(VPN_LEN-(VPN_LEN%PT_LEVELS))] == tags_q[i].vpn[x+HYP_EXT][(VPN_LEN%PT_LEVELS)-HYP_EXT:0]: //
lu_vaddr_i[12+((VPN_LEN/PT_LEVELS)*(x+1))-1:12+((VPN_LEN/PT_LEVELS)*x)] == tags_q[i].vpn[x];
//identify if there is a hit at each PT level for all TLB entries
@ -245,11 +245,11 @@ module cva6_tlb
gppn[i] = make_gppn(
tags_q[i].v_st_enbl[0],
tags_q[i].is_page[0][0],
tags_q[i].is_page[1][0],
tags_q[i].is_page[HYP_EXT][0],
{
tags_q[i].vpn[3][(VPN_LEN%PT_LEVELS)-1:0],
tags_q[i].vpn[2],
tags_q[i].vpn[1],
tags_q[i].vpn[3*HYP_EXT][(VPN_LEN%PT_LEVELS)-1:0],
tags_q[i].vpn[2*HYP_EXT],
tags_q[i].vpn[HYP_EXT],
tags_q[i].vpn[0]
},
content_q[i][0]
@ -279,7 +279,7 @@ module cva6_tlb
if (asid_to_be_flushed_is0[0] && vaddr_to_be_flushed_is0[0] && ((tags_q[i].v_st_enbl[HYP_EXT] && lu_asid_i[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0] == tags_q[i].asid[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0]) || !tags_q[i].v_st_enbl[HYP_EXT]))
tags_n[i].valid = 1'b0;
// flush vaddr in all addressing space if current VMID matches ("SFENCE.VMA/HFENCE.VVMA vaddr x0" case), it should happen only for leaf pages
else if (asid_to_be_flushed_is0[0] && (|vaddr_level_match[i][0]) && (~vaddr_to_be_flushed_is0[0]) && ((tags_q[i].v_st_enbl[HYP_EXT] && lu_asid_i[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0] == tags_q[i].asid[1][ASID_WIDTH[HYP_EXT]-1:0]) || !tags_q[i].v_st_enbl[HYP_EXT]))
else if (asid_to_be_flushed_is0[0] && (|vaddr_level_match[i][0]) && (~vaddr_to_be_flushed_is0[0]) && ((tags_q[i].v_st_enbl[HYP_EXT] && lu_asid_i[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0] == tags_q[i].asid[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0]) || !tags_q[i].v_st_enbl[HYP_EXT]))
tags_n[i].valid = 1'b0;
// the entry is flushed if it's not global and asid and vaddr and current VMID matches with the entry to be flushed ("SFENCE.VMA/HFENCE.VVMA vaddr asid" case)
else if ((!content_q[i][0].g) && (|vaddr_level_match[i][0]) && (asid_to_be_flushed_i[0][ASID_WIDTH[0]-1:0] == tags_q[i].asid[0][ASID_WIDTH[0]-1:0] && ((tags_q[i].v_st_enbl[HYP_EXT] && lu_asid_i[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0] == tags_q[i].asid[HYP_EXT][ASID_WIDTH[HYP_EXT]-1:0]) || !tags_q[i].v_st_enbl[HYP_EXT])) && (!vaddr_to_be_flushed_is0[0]) && (!asid_to_be_flushed_is0[0]))