github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-23 05:17:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[rtl] Fix NAPOT address matching

Browse source 
- Generate correct masks for NAPOT range addresses covering the entire
  granule. When PMPGranularity > 0, then a NAPOT range can span the
  whole granule, which requires the next-lowest bit (i.e. highest bit
  that is not part of the granule) to be 0.
- Fixes #1178
This commit is contained in:
Michael Platzer 2020-11-06 16:19:24 +01:00 • committed by Tom Roberts
parent 1f3b462b94
commit 9b0d78cf97
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rtl/ibex_pmp.sv
View file

@ -55,8 +55,8 @@ module ibex_pmp #(
end
// Address mask for NA matching
for (genvar b = PMPGranularity+2; b < 34; b++) begin : g_bitmask
if (b == PMPGranularity+2) begin : g_bit0
// Always mask bit (G+2) for NAPOT
if (b == 2) begin : g_bit0
// Always mask bit 2 for NAPOT
assign region_addr_mask[r][b] = (csr_pmp_cfg_i[r].mode != PMP_MODE_NAPOT);
end else begin : g_others
// We will mask this bit if it is within the programmed granule
@ -65,7 +65,7 @@ module ibex_pmp #(
// | This bit pos is the top of the mask, all lower bits set
// thus mask = 1111 0000
assign region_addr_mask[r][b] = (csr_pmp_cfg_i[r].mode != PMP_MODE_NAPOT) |
~&csr_pmp_addr_i[r][b-1:PMPGranularity+2];
~&csr_pmp_addr_i[r][b-1:PMPGranularity+1];
end
end
end