Skip to content

Commit 166f7ed

Browse files
KolosKoblasz-Semifymartin-velay
authored andcommitted
[rstmgr, vendoring] Fixed template files commited
* These modifications will enable to run block level simulations on rstmgr while using correct reset signals and domains in the UVM tb. Signed-off-by: Kolos Koblasz <kolos.koblasz@semify-eda.com>
1 parent 45d89d6 commit 166f7ed

4 files changed

Lines changed: 19 additions & 15 deletions

File tree

hw/vendor/lowrisc_ip/ip_templates/rstmgr/dv/env/rstmgr_if.sv.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ elif "io" in all_clks:
1313
else:
1414
assert 0, "No preferred clock available"
1515

16-
preferred_rst_n = f"rst_lc_{preferred_domain}_n"
16+
preferred_rst_n = f"rst_{preferred_domain}_n"
1717
%>\
1818

1919
interface rstmgr_if (

hw/vendor/lowrisc_ip/ip_templates/rstmgr/dv/env/seq_lib/rstmgr_reset_vseq.sv.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ class rstmgr_reset_vseq extends rstmgr_base_vseq;
127127
expected_cpu_enable = 0;
128128

129129
cfg.clk_rst_vif.wait_clks(8);
130-
// Wait till rst_lc_n is inactive for non-aon.
131-
`DV_WAIT(cfg.rstmgr_vif.resets_o.rst_lc_n[1])
130+
// Wait till rst_io_n is inactive for non-aon.
131+
`DV_WAIT(cfg.rstmgr_vif.resets_o.rst_io_n[1])
132132

133133
check_reset_info(get_reset_code(start_reset, 0), {reset_name[start_reset], " reset"});
134134
check_alert_info_after_reset(expected_alert_dump, expected_alert_enable);
@@ -184,7 +184,7 @@ class rstmgr_reset_vseq extends rstmgr_base_vseq;
184184
reset_done();
185185

186186
cfg.${preferred_clk_rst_vif}.wait_clks(8);
187-
wait(cfg.rstmgr_vif.resets_o.rst_lc_n[1]);
187+
wait(cfg.rstmgr_vif.resets_o.rst_io_n[1]);
188188
check_reset_info(expected_reset_info_code);
189189
check_alert_info_after_reset(.alert_dump(expected_alert_dump),
190190
.enable(expected_alert_enable));

hw/vendor/lowrisc_ip/ip_templates/rstmgr/dv/sva/rstmgr_cascading_sva_if.sv.tpl

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,21 @@ interface rstmgr_cascading_sva_if (
183183
resets_o.rst_por_${clk + "_" if clk != "main" else ""}n[rstmgr_pkg::DomainAonSel], SyncCycles, clk_${clk}_i)
184184
% endfor
185185

186-
// Controlled by rst_lc_src_n.
187-
`CASCADED_ASSERTS(CascadeLcToLcAon, rst_lc_src_n[rstmgr_pkg::DomainAonSel],
188-
resets_o.rst_lc_aon_n[rstmgr_pkg::DomainAonSel], SysCycles, clk_aon_i)
189-
`CASCADED_ASSERTS(CascadeLcToLc, rst_lc_src_n[rstmgr_pkg::DomainMainSel],
190-
resets_o.rst_lc_n[rstmgr_pkg::DomainMainSel], SysCycles, clk_main_i)
191-
192186
// Controlled by rst_sys_src_n.
193-
`CASCADED_ASSERTS(CascadeSysToSys, rst_sys_src_n[rstmgr_pkg::DomainMainSel],
194-
resets_o.rst_sys_n[rstmgr_pkg::DomainMainSel], PeriCycles, clk_main_i)
195-
`CASCADED_ASSERTS(CascadeLcToLcShadowed, rst_lc_src_n[rstmgr_pkg::DomainMainSel],
196-
resets_o.rst_lc_shadowed_n[rstmgr_pkg::DomainMainSel], SysCycles, clk_main_i)
187+
`CASCADED_ASSERTS(CascadeSysToMain_A, rst_sys_src_n[rstmgr_pkg::DomainMainSel],
188+
resets_o.rst_main_n[rstmgr_pkg::DomainMainSel], PeriCycles, clk_main_i)
189+
190+
`CASCADED_ASSERTS(CascadeSysToIO_A, rst_sys_src_n[rstmgr_pkg::DomainMainSel],
191+
resets_o.rst_io_n[rstmgr_pkg::DomainMainSel], PeriCycles, clk_io_i)
192+
193+
`CASCADED_ASSERTS(CascadeSysToSPIHost_A, rst_sys_src_n[rstmgr_pkg::DomainMainSel],
194+
resets_o.rst_spi_host_n[rstmgr_pkg::DomainMainSel], PeriCycles, clk_io_i)
195+
196+
`CASCADED_ASSERTS(CascadeSysToSPIDevice_A, rst_sys_src_n[rstmgr_pkg::DomainMainSel],
197+
resets_o.rst_spi_device_n[rstmgr_pkg::DomainMainSel], PeriCycles, clk_io_i)
198+
199+
`CASCADED_ASSERTS(CascadeSysToI2C_A, rst_sys_src_n[rstmgr_pkg::DomainMainSel],
200+
resets_o.rst_i2c_n[rstmgr_pkg::DomainMainSel], PeriCycles, clk_io_i)
197201

198202
`undef FALL_ASSERT
199203
`undef RISE_ASSERTS

hw/vendor/lowrisc_ip/ip_templates/rstmgr/dv/tb.sv.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ elif "io" in all_clks:
1212
else:
1313
assert 0, "No preferred clock available"
1414

15-
preferred_rst_n = f"rst_lc_{preferred_domain}_n"
15+
preferred_rst_n = f"rst_{preferred_domain}_n"
1616
preferred_por_n = f"rst_por_{preferred_domain}_n"
1717
%>\
1818
module tb;

0 commit comments

Comments
 (0)