From c54fd048af0368c1da9d8c64f5a307996f0fed45 Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Tue, 17 Nov 2026 15:46:42 +0000 Subject: [PATCH 1/7] [top_chip] Add debug enable top-level input This just adds it to the top and doesn't yet disable the debug module with it. Signed-off-by: Marno van der Maas --- hw/top_chip/dv/tb/tb.sv | 4 +++- hw/top_chip/dv/verilator/top_chip_verilator.sv | 4 +++- hw/top_chip/rtl/chip_mocha_genesys2.sv | 5 ++++- hw/top_chip/rtl/top_chip_system.sv | 7 +++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/hw/top_chip/dv/tb/tb.sv b/hw/top_chip/dv/tb/tb.sv index 58aa718f1..7be0a719c 100644 --- a/hw/top_chip/dv/tb/tb.sv +++ b/hw/top_chip/dv/tb/tb.sv @@ -212,7 +212,9 @@ module tb; .dm_jtag_tms (1'b0 ), .dm_jtag_tdi (1'b0 ), .dm_jtag_tdo ( ), - .dm_jtag_trst_n (1'b0 ) + .dm_jtag_trst_n (1'b0 ), + // Testing control. + .debug_en_i (1'b1 ) ); // Assignment to the GPIO pads. If dut_gpio_en_o[i] is disabled, then let the gpio_pad[i] float so diff --git a/hw/top_chip/dv/verilator/top_chip_verilator.sv b/hw/top_chip/dv/verilator/top_chip_verilator.sv index b0710ea2a..60e9bddea 100644 --- a/hw/top_chip/dv/verilator/top_chip_verilator.sv +++ b/hw/top_chip/dv/verilator/top_chip_verilator.sv @@ -123,7 +123,9 @@ module top_chip_verilator ( .dm_jtag_tms (jtag_tms), .dm_jtag_tdi (jtag_tdi), .dm_jtag_tdo (jtag_tdo), - .dm_jtag_trst_n (jtag_trst_n) + .dm_jtag_trst_n (jtag_trst_n), + + .debug_en_i (1'b1) ); // No support for dual or quad SPI in loopback mode right now. diff --git a/hw/top_chip/rtl/chip_mocha_genesys2.sv b/hw/top_chip/rtl/chip_mocha_genesys2.sv index 96e683581..eb833112c 100644 --- a/hw/top_chip/rtl/chip_mocha_genesys2.sv +++ b/hw/top_chip/rtl/chip_mocha_genesys2.sv @@ -331,7 +331,10 @@ module chip_mocha_genesys2 #( .dm_jtag_tms (jtag_tms), .dm_jtag_tdi (jtag_tdi), .dm_jtag_tdo (jtag_tdo), - .dm_jtag_trst_n (jtag_trst_n & rst_n_sync_assert_50m) + .dm_jtag_trst_n (jtag_trst_n & rst_n_sync_assert_50m), + + // Testing control + .debug_en_i (1'b1) ); // GPIO tri-state output drivers diff --git a/hw/top_chip/rtl/top_chip_system.sv b/hw/top_chip/rtl/top_chip_system.sv index 984da567e..fc1840e44 100644 --- a/hw/top_chip/rtl/top_chip_system.sv +++ b/hw/top_chip/rtl/top_chip_system.sv @@ -81,7 +81,10 @@ module top_chip_system #( input logic dm_jtag_tms, input logic dm_jtag_tdi, output logic dm_jtag_tdo, - input logic dm_jtag_trst_n + input logic dm_jtag_trst_n, + + // Testing controls + input logic debug_en_i ); // Local parameters. @@ -1138,7 +1141,7 @@ module top_chip_system #( .low_power_o ( ), // Low power not yet supported. .rom_ctrl_i (rom_ctrl_pwrmgr_data), .lc_dft_en_i (lc_ctrl_pkg::Off), - .lc_hw_debug_en_i (lc_ctrl_pkg::On), + .lc_hw_debug_en_i (debug_en_i ? lc_ctrl_pkg::On : lc_ctrl_pkg::Off), .sw_rst_req_i (rstmgr_sw_rst_req), .tl_i (tl_pwrmgr_h2d), .tl_o (tl_pwrmgr_d2h), From d80238ce4074f8d30b079c393a3f2b14980de75f Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Tue, 17 Nov 2026 16:14:49 +0000 Subject: [PATCH 2/7] [top_chip] Add dedicated debug module wrapper This is in preparation of properly tieing off the debug module when it is disabled. Signed-off-by: Marno van der Maas --- hw/top_chip/rtl/riscv_debug_module.sv | 191 ++++++++++++++++++++++++++ hw/top_chip/rtl/top_chip_system.sv | 176 +++--------------------- hw/top_chip/top_chip_system.core | 1 + 3 files changed, 212 insertions(+), 156 deletions(-) create mode 100644 hw/top_chip/rtl/riscv_debug_module.sv diff --git a/hw/top_chip/rtl/riscv_debug_module.sv b/hw/top_chip/rtl/riscv_debug_module.sv new file mode 100644 index 000000000..57c581eca --- /dev/null +++ b/hw/top_chip/rtl/riscv_debug_module.sv @@ -0,0 +1,191 @@ +// Copyright lowRISC and contributors (COSMIC project). +// Licensed under the Apache License, Version 2.0, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 + +module riscv_debug_module #( + parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty, + parameter int unsigned XLen = 64 +) ( + // Clock and reset. + input logic clk_i, + input logic rst_ni, + + // Debug module JTAG signals. + input logic tck_i, + input logic tms_i, + input logic td_i, + output logic td_o, + output logic td_en_o, + input logic trst_ni, + + // Memory ports. + output top_pkg::axi_req_t axi_host_req_o, + input top_pkg::axi_resp_t axi_host_resp_i, + input top_pkg::axi_dev_req_t axi_device_req_i, + output top_pkg::axi_dev_resp_t axi_device_resp_o, + + // Non-debug module reset. + output logic ndmreset_req_o, + input logic ndmreset_ack_i, + + // Request to processor core. + output logic debug_req_o +); + // JTAG to DMI signals + logic debug_req_valid; + logic debug_req_ready; + dm::dmi_req_t debug_req; + logic debug_resp_valid; + logic debug_resp_ready; + dm::dmi_resp_t debug_resp; + + // Debug module host interface signals + logic dm_host_req; + logic [XLen-1:0] dm_host_addr; + logic dm_host_we; + logic [XLen-1:0] dm_host_wdata; + logic [XLen/8-1:0] dm_host_be; + logic dm_host_gnt; + logic dm_host_r_valid; + logic [XLen-1:0] dm_host_r_rdata; + + // Debug module device interface signals + logic dm_device_req; + logic dm_device_we; + logic [XLen-1:0] dm_device_addr; + logic [XLen/8-1:0] dm_device_be; + logic [XLen-1:0] dm_device_wdata; + logic dm_device_rvalid; + logic [XLen-1:0] dm_device_rdata; + + // JTAG to DMI bridge + dmi_jtag #( + .IdcodeValue(jtag_id_pkg::RV_DM_JTAG_IDCODE) + ) u_dmi_jtag ( + .clk_i (clk_i), + .rst_ni (rst_ni), + .testmode_i (1'b0), + .test_rst_ni (1'b1), + .dmi_rst_no ( ), + .dmi_req_valid_o (debug_req_valid), + .dmi_req_ready_i (debug_req_ready), + .dmi_req_o (debug_req), + .dmi_resp_valid_i (debug_resp_valid), + .dmi_resp_ready_o (debug_resp_ready), + .dmi_resp_i (debug_resp), + .tck_i (tck_i), + .tms_i (tms_i), + .trst_ni (trst_ni), + .td_i (td_i), + .td_o (td_o), + .tdo_oe_o (td_en_o) + ); + + // Debug Module AXI Adapter + axi_adapter #( + .CVA6Cfg ( CVA6Cfg ), + .DATA_WIDTH ( XLen ), + .axi_req_t ( top_pkg::axi_req_t ), + .axi_rsp_t ( top_pkg::axi_resp_t ) + ) u_dm_host_axi_adapter ( + .clk_i (clk_i), + .rst_ni (rst_ni), + .req_i (dm_host_req), + .type_i (ariane_pkg::SINGLE_REQ), + .amo_i (ariane_pkg::AMO_NONE), + .gnt_o (dm_host_gnt), + .addr_i (dm_host_addr), + .we_i (dm_host_we), + .wdata_i (dm_host_wdata), + .be_i (dm_host_be), + .size_i (2'b11), // XLEN=64 + .id_i ('0), + .valid_o (dm_host_r_valid), + .rdata_o (dm_host_r_rdata), + .id_o ( ), + .critical_word_o ( ), + .critical_word_valid_o ( ), + .axi_req_o (axi_host_req_o), + .axi_resp_i (axi_host_resp_i) + ); + + // Debug Module AXI Adapter + axi_to_mem #( + .axi_req_t ( top_pkg::axi_dev_req_t ), + .axi_resp_t ( top_pkg::axi_dev_resp_t ), + .AddrWidth ( top_pkg::AxiAddrWidth ), + .DataWidth ( top_pkg::AxiDataWidth ), + .IdWidth ( top_pkg::AxiDevIdWidth ), + .NumBanks ( 1 ) + ) u_dm_device_axi_to_mem ( + .clk_i (clk_i), + .rst_ni (rst_ni), + + // AXI interface. + .busy_o ( ), + .axi_req_i (axi_device_req_i), + .axi_resp_o (axi_device_resp_o), + + // Memory interface. + .mem_req_o (dm_device_req), + .mem_gnt_i (1'b1), + .mem_addr_o (dm_device_addr), + .mem_wdata_o (dm_device_wdata), + .mem_strb_o (dm_device_be), + .mem_atop_o ( ), // Atomics not used + .mem_we_o (dm_device_we), + .mem_rvalid_i (dm_device_rvalid), + .mem_rdata_i (dm_device_rdata) + ); + + always_ff @(posedge clk_i or negedge rst_ni) begin + if (!rst_ni) begin + dm_device_rvalid <= 1'b0; + end else begin + dm_device_rvalid <= dm_device_req; // Generate rvalid strobes even for writes + end + end + + // Instantiate Debug Module + dm_top #( + .NrHarts ( 1 ), + .BusWidth ( XLen ), + .DmBaseAddress ( top_pkg::DebugMemBase32 ), + .SelectableHarts ( 1'b1 ), + .ReadByteEnable ( 1 ) + ) u_dm_top ( + .clk_i (clk_i), + .rst_ni (rst_ni), + .next_dm_addr_i ('0), // Single debug module; end of the DMI chain. + .testmode_i (1'b0), + .ndmreset_o (ndmreset_req_o), + .ndmreset_ack_i (ndmreset_ack_i), + .dmactive_o ( ), // active debug session + .debug_req_o (debug_req_o), + .unavailable_i (1'b0), + .hartinfo_i ({ariane_pkg::DebugHartInfo}), + .slave_req_i (dm_device_req), + .slave_we_i (dm_device_we), + .slave_addr_i (dm_device_addr), + .slave_be_i (dm_device_be), + .slave_wdata_i (dm_device_wdata), + .slave_rdata_o (dm_device_rdata), + .master_req_o (dm_host_req), + .master_add_o (dm_host_addr), + .master_we_o (dm_host_we), + .master_wdata_o (dm_host_wdata), + .master_be_o (dm_host_be), + .master_gnt_i (dm_host_gnt), + .master_r_valid_i (dm_host_r_valid), + .master_r_err_i ('0), + .master_r_other_err_i ('0), + .master_r_rdata_i (dm_host_r_rdata), + .dmi_rst_ni (rst_ni), + .dmi_req_valid_i (debug_req_valid), + .dmi_req_ready_o (debug_req_ready), + .dmi_req_i (debug_req), + .dmi_resp_valid_o (debug_resp_valid), + .dmi_resp_ready_i (debug_resp_ready), + .dmi_resp_o (debug_resp) + ); +endmodule diff --git a/hw/top_chip/rtl/top_chip_system.sv b/hw/top_chip/rtl/top_chip_system.sv index fc1840e44..d81b87360 100644 --- a/hw/top_chip/rtl/top_chip_system.sv +++ b/hw/top_chip/rtl/top_chip_system.sv @@ -320,33 +320,6 @@ module top_chip_system #( logic pwrmgr_strap_en; lc_ctrl_pkg::lc_tx_t pwrmgr_fetch_en; - // Debug module host interface signals - logic dm_host_req; - logic [CVA6Cfg.XLEN-1:0] dm_host_addr; - logic dm_host_we; - logic [CVA6Cfg.XLEN-1:0] dm_host_wdata; - logic [CVA6Cfg.XLEN/8-1:0] dm_host_be; - logic dm_host_gnt; - logic dm_host_r_valid; - logic [CVA6Cfg.XLEN-1:0] dm_host_r_rdata; - - // Debug module device interface signals - logic dm_device_req; - logic dm_device_we; - logic [CVA6Cfg.XLEN-1:0] dm_device_addr; - logic [CVA6Cfg.XLEN/8-1:0] dm_device_be; - logic [CVA6Cfg.XLEN-1:0] dm_device_wdata; - logic dm_device_rvalid; - logic [CVA6Cfg.XLEN-1:0] dm_device_rdata; - - // JTAG to DMI signals - logic debug_req_valid; - logic debug_req_ready; - dm::dmi_req_t debug_req; - logic debug_resp_valid; - logic debug_resp_ready; - dm::dmi_resp_t debug_resp; - // Non-debug-module reset request logic ndmreset_req; @@ -404,135 +377,26 @@ module top_chip_system #( .noc_resp_i (xbar_host_resp[top_pkg::CVA6]) ); - // JTAG to DMI bridge - dmi_jtag #( - .IdcodeValue(jtag_id_pkg::RV_DM_JTAG_IDCODE) - ) u_dmi_jtag ( - .clk_i (clkmgr_clocks.clk_main_infra), - .rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), - .testmode_i (1'b0), - .test_rst_ni (1'b1), - .dmi_rst_no ( ), - .dmi_req_valid_o (debug_req_valid), - .dmi_req_ready_i (debug_req_ready), - .dmi_req_o (debug_req), - .dmi_resp_valid_i (debug_resp_valid), - .dmi_resp_ready_o (debug_resp_ready), - .dmi_resp_i (debug_resp), - .tck_i (dm_jtag_tck), - .tms_i (dm_jtag_tms), - .trst_ni (dm_jtag_trst_n), - .td_i (dm_jtag_tdi), - .td_o (dm_jtag_tdo), - .tdo_oe_o ( ) - ); - - // Debug Module AXI Adapter - axi_adapter #( - .CVA6Cfg ( CVA6Cfg ), - .DATA_WIDTH ( CVA6Cfg.XLEN ), - .axi_req_t ( top_pkg::axi_req_t ), - .axi_rsp_t ( top_pkg::axi_resp_t ) - ) u_dm_host_axi_adapter ( - .clk_i (clkmgr_clocks.clk_main_infra), - .rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), - .req_i (dm_host_req), - .type_i (ariane_pkg::SINGLE_REQ), - .amo_i (ariane_pkg::AMO_NONE), - .gnt_o (dm_host_gnt), - .addr_i (dm_host_addr), - .we_i (dm_host_we), - .wdata_i (dm_host_wdata), - .be_i (dm_host_be), - .size_i (2'b11), // XLEN=64 - .id_i ('0), - .valid_o (dm_host_r_valid), - .rdata_o (dm_host_r_rdata), - .id_o ( ), - .critical_word_o ( ), - .critical_word_valid_o ( ), - .axi_req_o (xbar_host_req[top_pkg::DM_HOST]), - .axi_resp_i (xbar_host_resp[top_pkg::DM_HOST]) - ); - - // Debug Module AXI Adapter - axi_to_mem #( - .axi_req_t ( top_pkg::axi_dev_req_t ), - .axi_resp_t ( top_pkg::axi_dev_resp_t ), - .AddrWidth ( top_pkg::AxiAddrWidth ), - .DataWidth ( top_pkg::AxiDataWidth ), - .IdWidth ( top_pkg::AxiDevIdWidth ), - .NumBanks ( 1 ) - ) u_dm_device_axi_to_mem ( - .clk_i (clkmgr_clocks.clk_main_infra), - .rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), - - // AXI interface. - .busy_o ( ), - .axi_req_i (xbar_device_req[top_pkg::DM_DEV]), - .axi_resp_o (xbar_device_resp[top_pkg::DM_DEV]), - - // Memory interface. - .mem_req_o (dm_device_req), - .mem_gnt_i (1'b1), - .mem_addr_o (dm_device_addr), - .mem_wdata_o (dm_device_wdata), - .mem_strb_o (dm_device_be), - .mem_atop_o ( ), // Atomics not used - .mem_we_o (dm_device_we), - .mem_rvalid_i (dm_device_rvalid), - .mem_rdata_i (dm_device_rdata) - ); - - always_ff @(posedge clkmgr_clocks.clk_main_infra or negedge rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]) begin - if (!rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]) begin - dm_device_rvalid <= 1'b0; - end else begin - dm_device_rvalid <= dm_device_req; // Generate rvalid strobes even for writes - end - end - - // Instantiate Debug Module - dm_top #( - .NrHarts ( 1 ), - .BusWidth ( CVA6Cfg.XLEN ), - .DmBaseAddress ( top_pkg::DebugMemBase32 ), - .SelectableHarts ( 1'b1 ), - .ReadByteEnable ( 1 ) - ) u_dm_top ( - .clk_i (clkmgr_clocks.clk_main_infra), - .rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), - .next_dm_addr_i ('0), // Single debug module; end of the DMI chain. - .testmode_i (1'b0), - .ndmreset_o (ndmreset_req), - .ndmreset_ack_i (!rom_mem_isolate), - .dmactive_o ( ), // active debug session - .debug_req_o (debug_req_irq), - .unavailable_i (1'b0), - .hartinfo_i ({ariane_pkg::DebugHartInfo}), - .slave_req_i (dm_device_req), - .slave_we_i (dm_device_we), - .slave_addr_i (dm_device_addr), - .slave_be_i (dm_device_be), - .slave_wdata_i (dm_device_wdata), - .slave_rdata_o (dm_device_rdata), - .master_req_o (dm_host_req), - .master_add_o (dm_host_addr), - .master_we_o (dm_host_we), - .master_wdata_o (dm_host_wdata), - .master_be_o (dm_host_be), - .master_gnt_i (dm_host_gnt), - .master_r_valid_i (dm_host_r_valid), - .master_r_err_i ('0), - .master_r_other_err_i ('0), - .master_r_rdata_i (dm_host_r_rdata), - .dmi_rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), - .dmi_req_valid_i (debug_req_valid), - .dmi_req_ready_o (debug_req_ready), - .dmi_req_i (debug_req), - .dmi_resp_valid_o (debug_resp_valid), - .dmi_resp_ready_i (debug_resp_ready), - .dmi_resp_o (debug_resp) + // RISC-V debug module + riscv_debug_module #( + .CVA6Cfg ( CVA6Cfg ), + .XLen ( CVA6Cfg.XLEN ) + ) u_riscv_debug_module ( + .clk_i (clkmgr_clocks.clk_main_infra), + .rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), + .tck_i (dm_jtag_tck), + .tms_i (dm_jtag_tms), + .td_i (dm_jtag_tdi), + .td_o (dm_jtag_tdo), + .td_en_o ( ), + .trst_ni (dm_jtag_trst_n), + .axi_host_req_o (xbar_host_req[top_pkg::DM_HOST]), + .axi_host_resp_i (xbar_host_resp[top_pkg::DM_HOST]), + .axi_device_req_i (xbar_device_req[top_pkg::DM_DEV]), + .axi_device_resp_o (xbar_device_resp[top_pkg::DM_DEV]), + .ndmreset_req_o (ndmreset_req), + .ndmreset_ack_i (!rom_mem_isolate), + .debug_req_o (debug_req_irq) ); // AXI SRAM diff --git a/hw/top_chip/top_chip_system.core b/hw/top_chip/top_chip_system.core index be36cab28..0bf22b54c 100644 --- a/hw/top_chip/top_chip_system.core +++ b/hw/top_chip/top_chip_system.core @@ -36,6 +36,7 @@ filesets: - cosmic:pulp:axi_riscv_atomics files: - rtl/mem_downsizer.sv + - rtl/riscv_debug_module.sv - rtl/top_chip_system.sv file_type: systemVerilogSource From 36f7813840719c9e62a65bf634dbe12749d8fee6 Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Tue, 17 Nov 2026 16:55:44 +0000 Subject: [PATCH 3/7] [debug] Tie off debug module using enable signal This connects the debug enable to the new debug module top and masks all the inputs to known values. Signed-off-by: Marno van der Maas --- hw/top_chip/rtl/riscv_debug_module.sv | 31 +++++++++++++++++++++------ hw/top_chip/rtl/top_chip_system.sv | 1 + 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/hw/top_chip/rtl/riscv_debug_module.sv b/hw/top_chip/rtl/riscv_debug_module.sv index 57c581eca..b47ef45d1 100644 --- a/hw/top_chip/rtl/riscv_debug_module.sv +++ b/hw/top_chip/rtl/riscv_debug_module.sv @@ -6,9 +6,10 @@ module riscv_debug_module #( parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty, parameter int unsigned XLen = 64 ) ( - // Clock and reset. + // Clock, reset and enable. input logic clk_i, input logic rst_ni, + input logic debug_en_i, // Debug module JTAG signals. input logic tck_i, @@ -31,6 +32,14 @@ module riscv_debug_module #( // Request to processor core. output logic debug_req_o ); + // Masked inputs + logic tms_masked; + logic tdi_masked; + logic trst_masked_n; + top_pkg::axi_resp_t axi_host_resp_masked; + top_pkg::axi_dev_req_t axi_device_req_masked; + logic ndmreset_ack_masked; + // JTAG to DMI signals logic debug_req_valid; logic debug_req_ready; @@ -58,6 +67,14 @@ module riscv_debug_module #( logic dm_device_rvalid; logic [XLen-1:0] dm_device_rdata; + // Hold all inputs when debug module is disabled + assign tms_masked = debug_en_i ? tms_i : 1'b0; + assign tdi_masked = debug_en_i ? td_i : 1'b0; + assign trst_masked_n = debug_en_i ? trst_ni : 1'b0; + assign axi_host_resp_masked = debug_en_i ? axi_host_resp_i : '0; + assign axi_device_req_masked = debug_en_i ? axi_device_req_i : '0; + assign ndmreset_ack_masked = debug_en_i ? ndmreset_ack_i : 1'b0; + // JTAG to DMI bridge dmi_jtag #( .IdcodeValue(jtag_id_pkg::RV_DM_JTAG_IDCODE) @@ -74,9 +91,9 @@ module riscv_debug_module #( .dmi_resp_ready_o (debug_resp_ready), .dmi_resp_i (debug_resp), .tck_i (tck_i), - .tms_i (tms_i), - .trst_ni (trst_ni), - .td_i (td_i), + .tms_i (tms_masked), + .trst_ni (trst_masked_n), + .td_i (tdi_masked), .td_o (td_o), .tdo_oe_o (td_en_o) ); @@ -106,7 +123,7 @@ module riscv_debug_module #( .critical_word_o ( ), .critical_word_valid_o ( ), .axi_req_o (axi_host_req_o), - .axi_resp_i (axi_host_resp_i) + .axi_resp_i (axi_host_resp_masked) ); // Debug Module AXI Adapter @@ -123,7 +140,7 @@ module riscv_debug_module #( // AXI interface. .busy_o ( ), - .axi_req_i (axi_device_req_i), + .axi_req_i (axi_device_req_masked), .axi_resp_o (axi_device_resp_o), // Memory interface. @@ -159,7 +176,7 @@ module riscv_debug_module #( .next_dm_addr_i ('0), // Single debug module; end of the DMI chain. .testmode_i (1'b0), .ndmreset_o (ndmreset_req_o), - .ndmreset_ack_i (ndmreset_ack_i), + .ndmreset_ack_i (ndmreset_ack_masked), .dmactive_o ( ), // active debug session .debug_req_o (debug_req_o), .unavailable_i (1'b0), diff --git a/hw/top_chip/rtl/top_chip_system.sv b/hw/top_chip/rtl/top_chip_system.sv index d81b87360..d9c9b2a4e 100644 --- a/hw/top_chip/rtl/top_chip_system.sv +++ b/hw/top_chip/rtl/top_chip_system.sv @@ -384,6 +384,7 @@ module top_chip_system #( ) u_riscv_debug_module ( .clk_i (clkmgr_clocks.clk_main_infra), .rst_ni (rstmgr_resets.rst_debug_n[rstmgr_pkg::DomainMainSel]), + .debug_en_i (debug_en_i), .tck_i (dm_jtag_tck), .tms_i (dm_jtag_tms), .td_i (dm_jtag_tdi), From 48f6bab09bc0c0433ccb0c8357db6c19f8a79a81 Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Tue, 17 Nov 2026 17:31:18 +0000 Subject: [PATCH 4/7] [debug] Add disable assertions If debug is disabled since last reset then all output should be stable and known values. Signed-off-by: Marno van der Maas --- hw/top_chip/rtl/riscv_debug_module.sv | 48 +++++++++++++++++++++++++++ hw/top_chip/top_chip_system.core | 1 + 2 files changed, 49 insertions(+) diff --git a/hw/top_chip/rtl/riscv_debug_module.sv b/hw/top_chip/rtl/riscv_debug_module.sv index b47ef45d1..68fec64d3 100644 --- a/hw/top_chip/rtl/riscv_debug_module.sv +++ b/hw/top_chip/rtl/riscv_debug_module.sv @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0, see LICENSE for details. // SPDX-License-Identifier: Apache-2.0 +`include "prim_assert.sv" + module riscv_debug_module #( parameter config_pkg::cva6_cfg_t CVA6Cfg = config_pkg::cva6_cfg_empty, parameter int unsigned XLen = 64 @@ -205,4 +207,50 @@ module riscv_debug_module #( .dmi_resp_ready_i (debug_resp_ready), .dmi_resp_o (debug_resp) ); + + //////////////// + // Assertions // + //////////////// + +`ifdef INC_ASSERT + logic disabled_since_reset_q; + logic disabled_since_reset_d; + + assign disabled_since_reset_d = disabled_since_reset_q & ~debug_en_i; + + always_ff @(posedge clk_i or negedge rst_ni) begin + if (!rst_ni) begin + disabled_since_reset_q <= ~debug_en_i; + end else begin + disabled_since_reset_q <= disabled_since_reset_d; + end + end + + // Some of these asserts start with ##1 to avoid samples being taken during + // reset. + `ASSERT(TdoDisable_A, ##1 disabled_since_reset_d |-> ($stable(td_o) && td_o == 1'b0)) + `ASSERT(TdenoDisable_A, ##1 disabled_since_reset_d |-> ($stable(td_en_o) && td_en_o == 1'b0)) + `ASSERT(AxiHostDisable_A, disabled_since_reset_d |-> ( + $stable(axi_host_req_o) && + axi_host_req_o.aw_valid == 1'b0 && + axi_host_req_o.w_valid == 1'b0 && + axi_host_req_o.ar_valid == 1'b0 && + axi_host_req_o.b_ready == 1'b0 && + axi_host_req_o.r_ready == 1'b0 + )) + `ASSERT(AxiDeviceDisable_A, ##1 disabled_since_reset_d |-> ( + $stable(axi_device_resp_o) && + axi_device_resp_o.aw_ready == 1'b0 && + axi_device_resp_o.w_ready == 1'b0 && + axi_device_resp_o.ar_ready == 1'b0 && + axi_device_resp_o.b_valid == 1'b0 && + axi_device_resp_o.r_valid == 1'b0 + )) + `ASSERT(NdmResetDisable_A, disabled_since_reset_d |-> ( + $stable(ndmreset_req_o) && ndmreset_req_o == 1'b0 + )) + `ASSERT(DebugReqDisable_A, disabled_since_reset_d |-> ( + $stable(debug_req_o) && debug_req_o == 1'b0 + )) +`endif endmodule diff --git a/hw/top_chip/top_chip_system.core b/hw/top_chip/top_chip_system.core index 0bf22b54c..14109ddb0 100644 --- a/hw/top_chip/top_chip_system.core +++ b/hw/top_chip/top_chip_system.core @@ -23,6 +23,7 @@ filesets: - lowrisc:mocha_ip:rstmgr - lowrisc:mocha_ip:rv_plic - lowrisc:mocha:axi_sram + - lowrisc:prim:assert - lowrisc:prim:onehot - lowrisc:tlul:adapter_host - lowrisc:tlul:adapter_reg From 9e3ed43a69e1f63b5d42b5ee261d8879da6ae552 Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Wed, 18 Nov 2026 08:13:48 +0000 Subject: [PATCH 5/7] [dv] Add formal testbench for debug disable Signed-off-by: Marno van der Maas --- .../riscv_debug_module_fpv.core | 29 ++++++++++ .../tb/riscv_debug_module_tb.sv | 55 +++++++++++++++++++ hw/top_chip/formal/top_chip_fpv_ip_cfgs.hjson | 10 ++++ hw/top_chip/riscv_debug_module.core | 25 +++++++++ hw/top_chip/top_chip_system.core | 3 +- 5 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 hw/top_chip/formal/riscv_debug_module/riscv_debug_module_fpv.core create mode 100644 hw/top_chip/formal/riscv_debug_module/tb/riscv_debug_module_tb.sv create mode 100644 hw/top_chip/riscv_debug_module.core diff --git a/hw/top_chip/formal/riscv_debug_module/riscv_debug_module_fpv.core b/hw/top_chip/formal/riscv_debug_module/riscv_debug_module_fpv.core new file mode 100644 index 000000000..bfc056d58 --- /dev/null +++ b/hw/top_chip/formal/riscv_debug_module/riscv_debug_module_fpv.core @@ -0,0 +1,29 @@ +CAPI=2: +# Copyright lowRISC and contributors (COSMIC project). +# Licensed under the Apache License, Version 2.0, see LICENSE for details. +# SPDX-License-Identifier: Apache-2.0 + +name: "lowrisc:mocha:riscv_debug_module_fpv:0.1" +description: "Formal flow for the RISC-V debug module tie-off" + +filesets: + files_formal: + depend: + - lowrisc:prim:all + - lowrisc:mocha:riscv_debug_module + files: + - tb/riscv_debug_module_tb.sv + file_type: systemVerilogSource + +targets: + default: &default_target + default_tool: icarus + filesets: + - files_formal + toplevel: riscv_debug_module_tb + + formal: + <<: *default_target + + lint: + <<: *default_target diff --git a/hw/top_chip/formal/riscv_debug_module/tb/riscv_debug_module_tb.sv b/hw/top_chip/formal/riscv_debug_module/tb/riscv_debug_module_tb.sv new file mode 100644 index 000000000..a2d540cf1 --- /dev/null +++ b/hw/top_chip/formal/riscv_debug_module/tb/riscv_debug_module_tb.sv @@ -0,0 +1,55 @@ +// Copyright lowRISC and contributors (COSMIC project). +// Licensed under the Apache License, Version 2.0, see LICENSE for details. +// SPDX-License-Identifier: Apache-2.0 +// +// Formal verification testbench for riscv_debug_module. + +module riscv_debug_module_tb ( + input logic clk_i, + input logic rst_ni, + input logic debug_en_i, + + input logic tms_i, + input logic td_i, + output logic td_o, + output logic td_en_o, + input logic trst_ni, + + output top_pkg::axi_req_t axi_host_req_o, + input top_pkg::axi_resp_t axi_host_resp_i, + input top_pkg::axi_dev_req_t axi_device_req_i, + output top_pkg::axi_dev_resp_t axi_device_resp_o, + + output logic ndmreset_req_o, + input logic ndmreset_ack_i, + + output logic debug_req_o +); + + localparam config_pkg::cva6_cfg_t CVA6Cfg = + build_config_pkg::build_config(cva6_config_pkg::cva6_cfg); + + riscv_debug_module #( + .CVA6Cfg ( CVA6Cfg ), + .XLen ( CVA6Cfg.XLEN ) + ) dut ( + .clk_i, + .rst_ni, + .debug_en_i, + // Clocking the JTAG side from clk_i avoids needing a second clock in the generic FPV setup. + .tck_i (clk_i), + .tms_i, + .td_i, + .td_o, + .td_en_o, + .trst_ni, + .axi_host_req_o, + .axi_host_resp_i, + .axi_device_req_i, + .axi_device_resp_o, + .ndmreset_req_o, + .ndmreset_ack_i, + .debug_req_o + ); + +endmodule : riscv_debug_module_tb diff --git a/hw/top_chip/formal/top_chip_fpv_ip_cfgs.hjson b/hw/top_chip/formal/top_chip_fpv_ip_cfgs.hjson index bedcf9b0c..ff19bd1eb 100644 --- a/hw/top_chip/formal/top_chip_fpv_ip_cfgs.hjson +++ b/hw/top_chip/formal/top_chip_fpv_ip_cfgs.hjson @@ -29,5 +29,15 @@ exp_fail_hjson: "{proj_root}/hw/top_chip/ip_autogen/rv_plic/fpv/rv_plic_expected_failure.hjson" after_load: ["{proj_root}/hw/top_chip/ip_autogen/rv_plic/fpv/tb/coverage.tcl"] } + { + name: riscv_debug_module_fpv + dut: riscv_debug_module_tb + fusesoc_core: lowrisc:mocha:riscv_debug_module_fpv + import_cfgs: ["{proj_root}/hw/vendor/lowrisc_ip/formal/tools/dvsim/common_fpv_cfg.hjson"] + rel_path: "hw/top_chip/formal/riscv_debug_module/{sub_flow}/{tool}" + // Only prove the debug-disable tie-off assertions. + task: "Disable_A" + cov: false + } ] } diff --git a/hw/top_chip/riscv_debug_module.core b/hw/top_chip/riscv_debug_module.core new file mode 100644 index 000000000..746875374 --- /dev/null +++ b/hw/top_chip/riscv_debug_module.core @@ -0,0 +1,25 @@ +CAPI=2: +# Copyright lowRISC and contributors (COSMIC project). +# Licensed under the Apache License, Version 2.0, see LICENSE for details. +# SPDX-License-Identifier: Apache-2.0 + +name: "lowrisc:mocha:riscv_debug_module" +description: "RISC-V debug module and JTAG DTM for Mocha" + +filesets: + files_rtl: + depend: + - lowrisc:prim:assert + - lowrisc:mocha_constants:top_pkg + - lowrisc:mocha_constants:jtag_id_pkg + - pulp-platform.org::axi + - pulp-platform.org::riscv_dbg + - cosmic::cva6cheri + files: + - rtl/riscv_debug_module.sv + file_type: systemVerilogSource + +targets: + default: + filesets: + - files_rtl diff --git a/hw/top_chip/top_chip_system.core b/hw/top_chip/top_chip_system.core index 14109ddb0..6c237beb6 100644 --- a/hw/top_chip/top_chip_system.core +++ b/hw/top_chip/top_chip_system.core @@ -23,7 +23,7 @@ filesets: - lowrisc:mocha_ip:rstmgr - lowrisc:mocha_ip:rv_plic - lowrisc:mocha:axi_sram - - lowrisc:prim:assert + - lowrisc:mocha:riscv_debug_module - lowrisc:prim:onehot - lowrisc:tlul:adapter_host - lowrisc:tlul:adapter_reg @@ -37,7 +37,6 @@ filesets: - cosmic:pulp:axi_riscv_atomics files: - rtl/mem_downsizer.sv - - rtl/riscv_debug_module.sv - rtl/top_chip_system.sv file_type: systemVerilogSource From e39524af5b5483dedc1cbf95d674bae32bc2746d Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Wed, 18 Nov 2026 10:39:04 +0000 Subject: [PATCH 6/7] [tool] Downgrade Jasper to workaround EPF117 error Signed-off-by: Marno van der Maas --- tool_data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool_data.json b/tool_data.json index 2dcf82f12..5cff9042d 100644 --- a/tool_data.json +++ b/tool_data.json @@ -10,7 +10,7 @@ { "name": "Jasper", "vendor": "Cadence", - "version": "2025.09p002", + "version": "2024.06", "comment": "Formal verification." }, { From 1f1d56ca38405ea0b2d1dd017997050249da6c8f Mon Sep 17 00:00:00 2001 From: Marno van der Maas Date: Wed, 18 Nov 2026 11:24:20 +0000 Subject: [PATCH 7/7] [doc] Say debug enable only changes when in reset Signed-off-by: Marno van der Maas --- doc/ref/arch.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/ref/arch.md b/doc/ref/arch.md index a1434a54d..2184dd3cd 100644 --- a/doc/ref/arch.md +++ b/doc/ref/arch.md @@ -97,7 +97,8 @@ The Mocha top will need a few top-level inputs. Some of these are listed here: - Clock outputs from PLLs. - Rollback counter backed by OTP. -- Debug and design for test enable pins. +- Debug enable pin which should only be changed when holding Mocha in reset. +- Design for test pin. - True random noise source to drive the entropy source. - AXI subordinate port to connect to the mailbox.