github-mirrors/cvw
1
0
Fork 0
mirror of https://github.com/openhwgroup/cvw.git synced 2025-06-28 09:36:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Checking PMP TOR bound against length of access to fix Wally against the riscv-arch-test pmp64-TOR* tests. Still has known limitation in issue #1354, but passes tests, which are now reenabled

Browse source
This commit is contained in:
David Harris 2025-04-12 19:36:59 -07:00
parent 81a848246a
commit a1000c19ea
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/mmu/pmpadrdec.sv
View file

@ -33,6 +33,7 @@
module pmpadrdec import cvw::*; #(parameter cvw_t P) ( module pmpadrdec import cvw::*; #(parameter cvw_t P) (
input logic [P.PA_BITS-1:0] PhysicalAddress, input logic [P.PA_BITS-1:0] PhysicalAddress,
input logic [1:0] Size,
input logic [7:0] PMPCfg, input logic [7:0] PMPCfg,
input logic [P.PA_BITS-3:0] PMPAdr, input logic [P.PA_BITS-3:0] PMPAdr,
input logic FirstMatch, input logic FirstMatch,
@ -52,7 +53,7 @@ module pmpadrdec import cvw::*; #(parameter cvw_t P) (
logic PAltPMPAdr; logic PAltPMPAdr;
logic [P.PA_BITS-1:0] CurrentAdrFull; logic [P.PA_BITS-1:0] CurrentAdrFull;
logic [1:0] AdrMode; logic [1:0] AdrMode;
logic [P.PA_BITS-1:0] PMPTop1; logic [P.PA_BITS-1:0] PMPTop1, PMPTopTOR, PMPTopNaturallyAligned;
assign AdrMode = PMPCfg[4:3]; assign AdrMode = PMPCfg[4:3];
@ -83,10 +84,12 @@ module pmpadrdec import cvw::*; #(parameter cvw_t P) (
1'b0; 1'b0;
// Report top of region for first matching region // Report top of region for first matching region
assign PMPTop1 = {PMPAdr,2'b00} | NAMask; // top of the pmp region. All 1s in the lower bits. Used to check the address doesn't pass the top // PMP should match but fail if the size is too big (8-byte accesses spanning to TOR or NA4 region)
assign PMPTopTOR = {PMPAdr-1, 2'b11}; // TOR goes to (pmpaddr << 2) - 1
assign PMPTopNaturallyAligned = {PMPAdr,2'b00} | NAMask; // top of the pmp region for NA4 and NAPOT. All 1s in the lower bits. Used to check the address doesn't pass the top
assign PMPTop1 = (AdrMode == TOR) ? PMPTopTOR : PMPTopNaturallyAligned;
assign PMPTop = FirstMatch ? PMPTop1 : '0; // AND portion of distributed AND-OR mux (OR portion in pmpchhecker) assign PMPTop = FirstMatch ? PMPTop1 : '0; // AND portion of distributed AND-OR mux (OR portion in pmpchhecker)
// PMP should match but fail if the size is too big (8-byte accesses spanning to TOR or NA4 region)
assign L = PMPCfg[7]; assign L = PMPCfg[7];
assign X = PMPCfg[2]; assign X = PMPCfg[2];
assign W = PMPCfg[1]; assign W = PMPCfg[1];

1
src/mmu/pmpchecker.sv
View file

@ -66,6 +66,7 @@ module pmpchecker import cvw::*; #(parameter cvw_t P) (
if (P.PMP_ENTRIES > 0) begin: pmp // prevent complaints about array of no elements when PMP_ENTRIES = 0 if (P.PMP_ENTRIES > 0) begin: pmp // prevent complaints about array of no elements when PMP_ENTRIES = 0
pmpadrdec #(P) pmpadrdecs[P.PMP_ENTRIES-1:0]( pmpadrdec #(P) pmpadrdecs[P.PMP_ENTRIES-1:0](
.PhysicalAddress, .PhysicalAddress,
.Size,
.PMPCfg(PMPCFG_ARRAY_REGW), .PMPCfg(PMPCFG_ARRAY_REGW),
.PMPAdr(PMPADDR_ARRAY_REGW), .PMPAdr(PMPADDR_ARRAY_REGW),
.FirstMatch, .FirstMatch,

9
testbench/tests.vh
View file

@ -194,7 +194,6 @@ string arch32pmp[] = '{
"rv32i_m/pmp32/src/pmp-TOR-X.S" "rv32i_m/pmp32/src/pmp-TOR-X.S"
}; };
// Tests commented out pending riscv-arch-test issue #588
string arch64pmp[] = '{ string arch64pmp[] = '{
`RISCVARCHTEST, `RISCVARCHTEST,
"rv64i_m/pmp/src/pmp64-CSR-ALL-MODES.S", "rv64i_m/pmp/src/pmp64-CSR-ALL-MODES.S",
@ -203,10 +202,10 @@ string arch64pmp[] = '{
"rv64i_m/pmp/src/pmp64-NA4-U.S", "rv64i_m/pmp/src/pmp64-NA4-U.S",
"rv64i_m/pmp/src/pmp64-NAPOT-M.S", "rv64i_m/pmp/src/pmp64-NAPOT-M.S",
"rv64i_m/pmp/src/pmp64-NAPOT-S.S", "rv64i_m/pmp/src/pmp64-NAPOT-S.S",
"rv64i_m/pmp/src/pmp64-NAPOT-U.S" "rv64i_m/pmp/src/pmp64-NAPOT-U.S",
// "rv64i_m/pmp/src/pmp64-TOR-M.S", TODO: Reenable when Wally top of PMP region bug is fixed "rv64i_m/pmp/src/pmp64-TOR-M.S",
// "rv64i_m/pmp/src/pmp64-TOR-S.S", "rv64i_m/pmp/src/pmp64-TOR-S.S",
// "rv64i_m/pmp/src/pmp64-TOR-U.S" "rv64i_m/pmp/src/pmp64-TOR-U.S"
}; };
string arch32vm_sv32[] = '{ string arch32vm_sv32[] = '{