Skip to content

Commit c443c7e

Browse files
committed
[englishbreakfast] Redo topgen to fix merge skew
alert_pkg changed to alert_handler_pkg after the CI run for the PR that added englishbreakfast's files. Signed-off-by: Alexander Williams <[email protected]>
1 parent 00318d0 commit c443c7e

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

hw/top_englishbreakfast/data/autogen/top_englishbreakfast.gen.hjson

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@
17481748
name: alert_dump
17491749
desc: Alert handler crash dump information.
17501750
struct: alert_crashdump
1751-
package: alert_pkg
1751+
package: alert_handler_pkg
17521752
type: uni
17531753
act: rcv
17541754
width: 1
@@ -9504,7 +9504,7 @@
95049504
name: alert_dump
95059505
desc: Alert handler crash dump information.
95069506
struct: alert_crashdump
9507-
package: alert_pkg
9507+
package: alert_handler_pkg
95089508
type: uni
95099509
act: rcv
95109510
width: 1

hw/top_englishbreakfast/ip_autogen/rstmgr/data/rstmgr.hjson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
type: "uni",
234234
name: "alert_dump",
235235
act: "rcv",
236-
package: "alert_pkg",
236+
package: "alert_handler_pkg",
237237
desc: '''
238238
Alert handler crash dump information.
239239
'''

hw/top_englishbreakfast/ip_autogen/rstmgr/doc/interfaces.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ Referring to the [Comportable guideline for peripheral device functionality](htt
2121

2222
## [Inter-Module Signals](https://opentitan.org/book/doc/contributing/hw/comportability/index.html#inter-signal-handling)
2323

24-
| Port Name | Package::Struct | Type | Act | Width | Description |
25-
|:------------|:---------------------------------|:--------|:------|--------:|:-----------------------------------------------------------------------------------------------------------------------------|
26-
| por_n | logic | uni | rcv | 2 | Root power on reset signals from ast. There is one root reset signal for each core power domain. |
27-
| pwr | pwr_rst | req_rsp | rsp | 1 | Reset request signals from power manager. Power manager can request for specific domains of the lc/sys reset tree to assert. |
28-
| resets | rstmgr_pkg::rstmgr_out | uni | req | 1 | Leaf resets fed to the system. |
29-
| rst_en | rstmgr_pkg::rstmgr_rst_en | uni | req | 1 | Low-power-group outputs used by alert handler. |
30-
| alert_dump | alert_pkg::alert_crashdump | uni | rcv | 1 | Alert handler crash dump information. |
31-
| cpu_dump | rv_core_ibex_pkg::cpu_crash_dump | uni | rcv | 1 | Main processing element crash dump information. |
32-
| sw_rst_req | prim_mubi_pkg::mubi4 | uni | req | 1 | Software requested system reset to pwrmgr. |
33-
| tl | tlul_pkg::tl | req_rsp | rsp | 1 | |
24+
| Port Name | Package::Struct | Type | Act | Width | Description |
25+
|:------------|:-----------------------------------|:--------|:------|--------:|:-----------------------------------------------------------------------------------------------------------------------------|
26+
| por_n | logic | uni | rcv | 2 | Root power on reset signals from ast. There is one root reset signal for each core power domain. |
27+
| pwr | pwr_rst | req_rsp | rsp | 1 | Reset request signals from power manager. Power manager can request for specific domains of the lc/sys reset tree to assert. |
28+
| resets | rstmgr_pkg::rstmgr_out | uni | req | 1 | Leaf resets fed to the system. |
29+
| rst_en | rstmgr_pkg::rstmgr_rst_en | uni | req | 1 | Low-power-group outputs used by alert handler. |
30+
| alert_dump | alert_handler_pkg::alert_crashdump | uni | rcv | 1 | Alert handler crash dump information. |
31+
| cpu_dump | rv_core_ibex_pkg::cpu_crash_dump | uni | rcv | 1 | Main processing element crash dump information. |
32+
| sw_rst_req | prim_mubi_pkg::mubi4 | uni | req | 1 | Software requested system reset to pwrmgr. |
33+
| tl | tlul_pkg::tl | req_rsp | rsp | 1 | |
3434

3535
## Security Alerts
3636

hw/top_englishbreakfast/ip_autogen/rstmgr/dv/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ All common types and methods defined at the package level can be found in
3232
`rstmgr_env_pkg`. Some of them in use are:
3333
```systemverilog
3434
typedef logic [NumSwResets-1:0] sw_rst_t;
35-
typedef logic [$bits(alert_pkg::alert_crashdump_t)-1:0] linearized_alert_dump_t;
35+
typedef logic [$bits(alert_handler_pkg::alert_crashdump_t)-1:0] linearized_alert_dump_t;
3636
typedef virtual pwrmgr_rstmgr_sva_if #(.CHECK_RSTREQS(0)) parameterized_pwrmgr_rstmgr_sva_vif;
3737
```
3838
The RSTMGR testbench instantiates (already handled in CIP base env) [tl_agent](../../../../dv/sv/tl_agent/README.md).

hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/rstmgr_env_pkg.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package rstmgr_env_pkg;
2121
import rstmgr_reg_pkg::NumHwResets;
2222
import rstmgr_reg_pkg::NumSwResets;
2323

24-
import alert_pkg::alert_crashdump_t;
24+
import alert_handler_pkg::alert_crashdump_t;
2525
import rv_core_ibex_pkg::cpu_crash_dump_t;
2626

2727
import sec_cm_pkg::*;

hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/rstmgr_if.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ interface rstmgr_if (
2424
rstmgr_pkg::rstmgr_cpu_t cpu_i;
2525

2626
// Interface to alert handler
27-
alert_pkg::alert_crashdump_t alert_dump_i;
27+
alert_handler_pkg::alert_crashdump_t alert_dump_i;
2828

2929
// Interface to cpu crash dump
3030
rv_core_ibex_pkg::cpu_crash_dump_t cpu_dump_i;

hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/seq_lib/rstmgr_sw_rst_reset_race_vseq.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class rstmgr_sw_rst_reset_race_vseq extends rstmgr_base_vseq;
2929
bit [NumSwResets-1:0] exp_ctrl_n;
3030
bit [NumSwResets-1:0] sw_rst_regwen = '1;
3131
int expected;
32-
alert_pkg::alert_crashdump_t bogus_alert_dump = '1;
32+
alert_handler_pkg::alert_crashdump_t bogus_alert_dump = '1;
3333
rv_core_ibex_pkg::cpu_crash_dump_t bogus_cpu_dump = '1;
3434
set_alert_and_cpu_info_for_capture(bogus_alert_dump, bogus_cpu_dump);
3535

hw/top_englishbreakfast/ip_autogen/rstmgr/rtl/rstmgr.sv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module rstmgr
4848
output mubi4_t sw_rst_req_o,
4949

5050
// Interface to alert handler
51-
input alert_pkg::alert_crashdump_t alert_dump_i,
51+
input alert_handler_pkg::alert_crashdump_t alert_dump_i,
5252

5353
// Interface to cpu crash dump
5454
input rv_core_ibex_pkg::cpu_crash_dump_t cpu_dump_i,
@@ -911,7 +911,7 @@ module rstmgr
911911
assign dump_capture_halt = rst_hw_req;
912912

913913
rstmgr_crash_info #(
914-
.CrashDumpWidth($bits(alert_pkg::alert_crashdump_t))
914+
.CrashDumpWidth($bits(alert_handler_pkg::alert_crashdump_t))
915915
) u_alert_info (
916916
.clk_i(clk_por_i),
917917
.rst_ni(rst_por_ni),

hw/top_englishbreakfast/rtl/autogen/top_englishbreakfast.sv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ module top_englishbreakfast #(
288288
logic intr_flash_ctrl_corr_err;
289289

290290
// Alert list
291-
prim_alert_pkg::alert_tx_t [alert_pkg::NAlerts-1:0] alert_tx;
292-
prim_alert_pkg::alert_rx_t [alert_pkg::NAlerts-1:0] alert_rx;
291+
prim_alert_pkg::alert_tx_t [alert_handler_pkg::NAlerts-1:0] alert_tx;
292+
prim_alert_pkg::alert_rx_t [alert_handler_pkg::NAlerts-1:0] alert_rx;
293293

294294

295295
// define inter-module signals
@@ -415,8 +415,8 @@ module top_englishbreakfast #(
415415
);
416416

417417
// Wire up alert handler LPGs
418-
prim_mubi_pkg::mubi4_t [alert_pkg::NLpg-1:0] lpg_cg_en;
419-
prim_mubi_pkg::mubi4_t [alert_pkg::NLpg-1:0] lpg_rst_en;
418+
prim_mubi_pkg::mubi4_t [alert_handler_pkg::NLpg-1:0] lpg_cg_en;
419+
prim_mubi_pkg::mubi4_t [alert_handler_pkg::NLpg-1:0] lpg_rst_en;
420420

421421

422422
// peri_lc_io_div4_0
@@ -874,7 +874,7 @@ module top_englishbreakfast #(
874874
.pwr_o(pwrmgr_aon_pwr_rst_rsp),
875875
.resets_o(rstmgr_aon_resets),
876876
.rst_en_o(rstmgr_aon_rst_en),
877-
.alert_dump_i(alert_pkg::ALERT_CRASHDUMP_DEFAULT),
877+
.alert_dump_i(alert_handler_pkg::ALERT_CRASHDUMP_DEFAULT),
878878
.cpu_dump_i(rv_core_ibex_crash_dump),
879879
.sw_rst_req_o(rstmgr_aon_sw_rst_req),
880880
.tl_i(rstmgr_aon_tl_req),

0 commit comments

Comments
 (0)