-
Notifications
You must be signed in to change notification settings - Fork 682
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pmp/extracted pmp master #2528
Open
OlivierBetschi
wants to merge
21
commits into
openhwgroup:master
Choose a base branch
from
boschglobal:pmp/extracted_pmp_master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Pmp/extracted pmp master #2528
OlivierBetschi
wants to merge
21
commits into
openhwgroup:master
from
boschglobal:pmp/extracted_pmp_master
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: core/cva6_mmu/cva6_mmu.sv
…o avoid raise condition in simulation
OlivierBetschi
requested review from
JeanRochCoulon and
zarubaf
as code owners
October 4, 2024 11:41
core/load_store_unit.sv
Outdated
Comment on lines
306
to
309
assign mmu_exception = pmp_exception; | ||
assign icache_areq_o = pmp_icache_areq_o; | ||
assign translation_valid = pmp_translation_valid; | ||
assign mmu_paddr = pmp_paddr; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[verible-verilog-format] reported by reviewdog 🐶
Suggested change
assign mmu_exception = pmp_exception; | |
assign icache_areq_o = pmp_icache_areq_o; | |
assign translation_valid = pmp_translation_valid; | |
assign mmu_paddr = pmp_paddr; | |
assign mmu_exception = pmp_exception; | |
assign icache_areq_o = pmp_icache_areq_o; | |
assign translation_valid = pmp_translation_valid; | |
assign mmu_paddr = pmp_paddr; |
core/load_store_unit.sv
Outdated
Comment on lines
333
to
364
.CVA6Cfg (CVA6Cfg), | ||
.icache_areq_t(icache_areq_t), | ||
.icache_arsp_t(icache_arsp_t), | ||
.exception_t (exception_t) | ||
) i_pmp_data_if ( | ||
.clk_i (clk_i), | ||
.rst_ni (rst_ni), | ||
.enable_translation_i (enable_translation_i), | ||
.enable_g_translation_i(enable_g_translation_i), | ||
.en_ld_st_translation_i(en_ld_st_translation_i), | ||
.en_ld_st_g_translation_i(en_ld_st_g_translation_i), | ||
.icache_areq_i (icache_areq_i), | ||
.icache_areq_o (pmp_icache_areq_o), | ||
.misaligned_ex_i (misaligned_exception), | ||
.lsu_req_i (translation_req), | ||
.lsu_vaddr_i (mmu_vaddr), | ||
.lsu_tinst_i(mmu_tinst), | ||
.lsu_is_store_i (st_translation_req), | ||
.lsu_valid_o (pmp_translation_valid), | ||
.lsu_paddr_o (pmp_paddr), | ||
.lsu_exception_o (pmp_exception), | ||
.priv_lvl_i (priv_lvl_i), | ||
.v_i (v_i), | ||
.ld_st_priv_lvl_i (ld_st_priv_lvl_i), | ||
.ld_st_v_i (ld_st_v_i), | ||
.pmpcfg_i (pmpcfg_i), | ||
.pmpaddr_i (pmpaddr_i), | ||
.data_allow_o (pmp_data_allow), | ||
.instr_allow_o (pmp_instr_allow), | ||
.match_any_execute_region_o (match_any_execute_region), | ||
.misaligned_ex_o (pmp_misaligned_ex) | ||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[verible-verilog-format] reported by reviewdog 🐶
Suggested change
.CVA6Cfg (CVA6Cfg), | |
.icache_areq_t(icache_areq_t), | |
.icache_arsp_t(icache_arsp_t), | |
.exception_t (exception_t) | |
) i_pmp_data_if ( | |
.clk_i (clk_i), | |
.rst_ni (rst_ni), | |
.enable_translation_i (enable_translation_i), | |
.enable_g_translation_i(enable_g_translation_i), | |
.en_ld_st_translation_i(en_ld_st_translation_i), | |
.en_ld_st_g_translation_i(en_ld_st_g_translation_i), | |
.icache_areq_i (icache_areq_i), | |
.icache_areq_o (pmp_icache_areq_o), | |
.misaligned_ex_i (misaligned_exception), | |
.lsu_req_i (translation_req), | |
.lsu_vaddr_i (mmu_vaddr), | |
.lsu_tinst_i(mmu_tinst), | |
.lsu_is_store_i (st_translation_req), | |
.lsu_valid_o (pmp_translation_valid), | |
.lsu_paddr_o (pmp_paddr), | |
.lsu_exception_o (pmp_exception), | |
.priv_lvl_i (priv_lvl_i), | |
.v_i (v_i), | |
.ld_st_priv_lvl_i (ld_st_priv_lvl_i), | |
.ld_st_v_i (ld_st_v_i), | |
.pmpcfg_i (pmpcfg_i), | |
.pmpaddr_i (pmpaddr_i), | |
.data_allow_o (pmp_data_allow), | |
.instr_allow_o (pmp_instr_allow), | |
.match_any_execute_region_o (match_any_execute_region), | |
.misaligned_ex_o (pmp_misaligned_ex) | |
); | |
.CVA6Cfg (CVA6Cfg), | |
.icache_areq_t(icache_areq_t), | |
.icache_arsp_t(icache_arsp_t), | |
.exception_t (exception_t) | |
) i_pmp_data_if ( | |
.clk_i (clk_i), | |
.rst_ni (rst_ni), | |
.enable_translation_i (enable_translation_i), | |
.enable_g_translation_i (enable_g_translation_i), | |
.en_ld_st_translation_i (en_ld_st_translation_i), | |
.en_ld_st_g_translation_i (en_ld_st_g_translation_i), | |
.icache_areq_i (icache_areq_i), | |
.icache_areq_o (pmp_icache_areq_o), | |
.misaligned_ex_i (misaligned_exception), | |
.lsu_req_i (translation_req), | |
.lsu_vaddr_i (mmu_vaddr), | |
.lsu_tinst_i (mmu_tinst), | |
.lsu_is_store_i (st_translation_req), | |
.lsu_valid_o (pmp_translation_valid), | |
.lsu_paddr_o (pmp_paddr), | |
.lsu_exception_o (pmp_exception), | |
.priv_lvl_i (priv_lvl_i), | |
.v_i (v_i), | |
.ld_st_priv_lvl_i (ld_st_priv_lvl_i), | |
.ld_st_v_i (ld_st_v_i), | |
.pmpcfg_i (pmpcfg_i), | |
.pmpaddr_i (pmpaddr_i), | |
.data_allow_o (pmp_data_allow), | |
.instr_allow_o (pmp_instr_allow), | |
.match_any_execute_region_o(match_any_execute_region), | |
.misaligned_ex_o (pmp_misaligned_ex) | |
); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extraction of the PMP outside of the MMU. Replacement of PR2476