Remove flash ctrl ipgen - #31043
Remove flash ctrl ipgen#31043
Conversation
c606509 to
f1b144b
Compare
|
rerunning CI after the merge of #30913 |
f1b144b to
c2bf18d
Compare
rswarbrick
left a comment
There was a problem hiding this comment.
I'm a big fan of this diff :-)
|
The "unauthorized changes" check dies because the list of files is too long! However, the changes here are just deleting files that aren't used: no unexpected risk to the design. Please consider this an appropriately reasoned "CHANGE AUTHORIZED: this commit" comment. |
andreaskurth
left a comment
There was a problem hiding this comment.
Thanks @gautschimi for this cleanup, LGTM overall!
Only minor comments from me; nothing that blocks the removal itself.
Two comments that don't attach to the diff:
hw/ip/prim/README.md still uses flash_ctrl in two FuseSoC examples that this PR invalidates. Line 187 shows "lowrisc:virtual_ip:flash_ctrl_prim_reg_top": "lowrisc:earlgrey_ip:flash_ctrl_prim_reg_top" as a mapping in hw/top_earlgrey/top_earlgrey.core, and line 292 lists lowrisc:earlgrey_ip:flash_ctrl_prim_reg_top (plus prim_tech:flash / prim_generic:flash) in the hw/top_earlgrey/chip_earlgrey_asic.core example. Neither line is in the real file any more, and the core itself is gone after this PR. Could the examples be re-synced with the current files? For line 292 that just means dropping the flash entries. For line 187, the surviving Earl Grey virtual_ip pair would be lowrisc:virtual_ip:otp_ctrl_top_specific_pkg -> lowrisc:earlgrey_ip:otp_ctrl_top_specific_pkg:1.0, though note that no .core file has a virtual_ip mapping any more, so one of the virtual_constants mappings that really is in top_earlgrey.core might be the more accurate example.
hw/top_earlgrey/dv/cov/chip_cover_reg_top.cfg:33 still carries +node tb.dut.top_earlgrey.earlgrey_pd_main.u_flash_ctrl *tl_* for an instance that no longer exists. Would you mind dropping it as part of this cleanup?
| $ cd opentitan/ | ||
| $ ./util/prepare_dvsim_z01x.sh | ||
| $ dvsim hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_fi_sim_cfg.hjson \ | ||
| $ dvsim hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_fi_sim_cfg.hjson \ |
There was a problem hiding this comment.
Does the FI flow actually work against the Englishbreakfast config? hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_fi_sim_cfg.hjson:10 sets fi_core: "lowrisc:earlgrey_dv:flash_ctrl_fi_sim:0.1" (the core this PR deletes) while its fusesoc_core (from flash_ctrl_base_fi_sim_cfg.hjson) is lowrisc:englishbreakfast_dv:flash_ctrl_fi_sim:0.1.
Or should we just use hw/ip/sram_ctrl/dv/sram_ctrl_base_fi_sim_cfg.hjson instead in that README?
Cc @nasahlpa
There was a problem hiding this comment.
lowrisc:englishbreakfast_dv:flash_ctrl_fi_sim:0.1 also exists. I updated to point to that one.
There was a problem hiding this comment.
ok I had to update the flash_ctrl template for this. Would be good if you can double check @nasahlpa
There was a problem hiding this comment.
As I have never tested it on EB, I'd suggest to switch to the SRAM controller instead.
There was a problem hiding this comment.
ok changed back to sram ctrl. are you ok with this @nasahlpa ?
c2bf18d to
7ed2e96
Compare
this is fixed. but otp_ctrl_top_specific was never mapped I think. Leaving this out and just dropping the flash example. The rram_macro will need to be a virtual module, I will add that one to the README once it is ready. #31074
this is fixed |
03adff8 to
7496e5d
Compare
andreaskurth
left a comment
There was a problem hiding this comment.
Thanks @gautschimi, everything from the last round LGTM. A small comment on this round, below
Since EarlGrey is using rram_ctrl, the flash_ctrl sources are no longer used. Signed-off-by: Michael Gautschi <mgautschi@lowrisc.org>
7496e5d to
daf4b4d
Compare
|
CHANGE AUTHORIZED: BLOCKFILE Removing CHANGE AUTHORIZED: hw/top_earlgrey/ip_autogen/flash_ctrl/rtl/flash_ctrl.sv Files deleted because removed from Earlgrey. |
|
CHANGE AUTHORIZED: BLOCKFILE Removing hw/top_earlgrey/ip_autogen/flash_ctrl/data/flash_ctrl.hjson. CHANGE AUTHORIZED: hw/top_earlgrey/ip_autogen/flash_ctrl/rtl/flash_ctrl.sv Files deleted because removed from Earlgrey. |
1 similar comment
|
CHANGE AUTHORIZED: BLOCKFILE Removing hw/top_earlgrey/ip_autogen/flash_ctrl/data/flash_ctrl.hjson. CHANGE AUTHORIZED: hw/top_earlgrey/ip_autogen/flash_ctrl/rtl/flash_ctrl.sv Files deleted because removed from Earlgrey. |
This PR removes the
flash_ctrlipgen files.Needs #30913 to be merged first - done
closes #31029