[chip, darjeeling] Read unused signals

Signed-off-by: Robert Schilling <[email protected]>
lowRISC · Nov 25, 2024 · 7cf6843 · 7cf6843
1 parent 3181d97
commit 7cf6843
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 49 deletions.
diff --git a/hw/top_darjeeling/rtl/autogen/chip_darjeeling_asic.sv b/hw/top_darjeeling/rtl/autogen/chip_darjeeling_asic.sv
@@ -1209,8 +1209,10 @@ module chip_darjeeling_asic #(
   logic unused_usb_ram_2p_cfg;
   assign unused_usb_ram_2p_cfg = ^{ast_ram_2p_fcfg.marg_en_a,
                                    ast_ram_2p_fcfg.marg_a,
+                                   ast_ram_2p_fcfg.test_a,
                                    ast_ram_2p_fcfg.marg_en_b,
-                                   ast_ram_2p_fcfg.marg_b};
+                                   ast_ram_2p_fcfg.marg_b,
+                                   ast_ram_2p_fcfg.test_b};
 
   // this maps as follows:
   // assign spi_ram_2p_cfg = {10'h000, ram_2p_cfg_i.a_ram_lcfg, ram_2p_cfg_i.b_ram_lcfg};
@@ -1577,7 +1579,8 @@ module chip_darjeeling_asic #(
     // No error detection is enabled inside SRAM.
     // Bus ECC is checked at the consumer side.
     .rerror_o (),
-    .cfg_i    (ram_1p_cfg)
+    .cfg_i    (ram_1p_cfg),
+    .alert_o()
   );
 
 
@@ -1601,7 +1604,6 @@ module chip_darjeeling_asic #(
     manual_in_otp_ext_volt
   };
 
-
   soc_proxy_pkg::soc_alert_req_t [soc_proxy_pkg::NumFatalExternalAlerts-1:0] soc_fatal_alert_req;
   soc_proxy_pkg::soc_alert_req_t [soc_proxy_pkg::NumRecovExternalAlerts-1:0] soc_recov_alert_req;
   assign soc_fatal_alert_req =

diff --git a/hw/top_darjeeling/rtl/autogen/chip_darjeeling_cw310.sv b/hw/top_darjeeling/rtl/autogen/chip_darjeeling_cw310.sv
@@ -1049,8 +1049,10 @@ module chip_darjeeling_cw310 #(
   logic unused_usb_ram_2p_cfg;
   assign unused_usb_ram_2p_cfg = ^{ast_ram_2p_fcfg.marg_en_a,
                                    ast_ram_2p_fcfg.marg_a,
+                                   ast_ram_2p_fcfg.test_a,
                                    ast_ram_2p_fcfg.marg_en_b,
-                                   ast_ram_2p_fcfg.marg_b};
+                                   ast_ram_2p_fcfg.marg_b,
+                                   ast_ram_2p_fcfg.test_b};
 
   // this maps as follows:
   // assign spi_ram_2p_cfg = {10'h000, ram_2p_cfg_i.a_ram_lcfg, ram_2p_cfg_i.b_ram_lcfg};
@@ -1436,7 +1438,8 @@ module chip_darjeeling_cw310 #(
     // No error detection is enabled inside SRAM.
     // Bus ECC is checked at the consumer side.
     .rerror_o (),
-    .cfg_i    (ram_1p_cfg)
+    .cfg_i    (ram_1p_cfg),
+    .alert_o()
   );
 
 

diff --git a/hw/top_darjeeling/templates/chiplevel.sv.tpl b/hw/top_darjeeling/templates/chiplevel.sv.tpl
@@ -536,8 +536,10 @@ module chip_${top["name"]}_${target["name"]} #(
   logic unused_usb_ram_2p_cfg;
   assign unused_usb_ram_2p_cfg = ^{ast_ram_2p_fcfg.marg_en_a,
                                    ast_ram_2p_fcfg.marg_a,
+                                   ast_ram_2p_fcfg.test_a,
                                    ast_ram_2p_fcfg.marg_en_b,
-                                   ast_ram_2p_fcfg.marg_b};
+                                   ast_ram_2p_fcfg.marg_b,
+                                   ast_ram_2p_fcfg.test_b};
 
   // this maps as follows:
   // assign spi_ram_2p_cfg = {10'h000, ram_2p_cfg_i.a_ram_lcfg, ram_2p_cfg_i.b_ram_lcfg};
@@ -961,7 +963,8 @@ module chip_${top["name"]}_${target["name"]} #(
     // No error detection is enabled inside SRAM.
     // Bus ECC is checked at the consumer side.
     .rerror_o (),
-    .cfg_i    (ram_1p_cfg)
+    .cfg_i    (ram_1p_cfg),
+    .alert_o()
   );
 
 ###################################################################
@@ -989,48 +992,6 @@ module chip_${top["name"]}_${target["name"]} #(
     manual_in_otp_ext_volt
   };
 
-% if "usbdev" in {module["type"] for module in top["module"]}:
-  ///////////////////////////////
-  // Differential USB Receiver //
-  ///////////////////////////////
-
-  // TODO: generalize this USB mux code and align with other tops.
-
-  // Connect the D+ pad
-  // Note that we use two pads in parallel for the D+ channel to meet electrical specifications.
-  assign dio_in[DioUsbdevUsbDp] = manual_in_usb_p;
-  assign manual_out_usb_p = dio_out[DioUsbdevUsbDp];
-  assign manual_oe_usb_p = dio_oe[DioUsbdevUsbDp];
-  assign manual_attr_usb_p = dio_attr[DioUsbdevUsbDp];
-
-  // Connect the D- pads
-  // Note that we use two pads in parallel for the D- channel to meet electrical specifications.
-  assign dio_in[DioUsbdevUsbDn] = manual_in_usb_n;
-  assign manual_out_usb_n = dio_out[DioUsbdevUsbDn];
-  assign manual_oe_usb_n = dio_oe[DioUsbdevUsbDn];
-  assign manual_attr_usb_n = dio_attr[DioUsbdevUsbDn];
-
-  logic usb_rx_d;
-
-  // Pullups and differential receiver enable
-  logic usb_dp_pullup_en, usb_dn_pullup_en;
-  logic usb_rx_enable;
-
-  prim_usb_diff_rx #(
-    .CalibW(ast_pkg::UsbCalibWidth)
-  ) u_prim_usb_diff_rx (
-    .input_pi          ( USB_P                 ),
-    .input_ni          ( USB_N                 ),
-    .input_en_i        ( usb_rx_enable         ),
-    .core_pok_h_i      ( ast_pwst_h.aon_pok    ),
-    .pullup_p_en_i     ( usb_dp_pullup_en      ),
-    .pullup_n_en_i     ( usb_dn_pullup_en      ),
-    .calibration_i     ( usb_io_pu_cal         ),
-    .usb_diff_rx_obs_o ( usb_diff_rx_obs       ),
-    .input_o           ( usb_rx_d              )
-  );
-% endif
-
   soc_proxy_pkg::soc_alert_req_t [soc_proxy_pkg::NumFatalExternalAlerts-1:0] soc_fatal_alert_req;
   soc_proxy_pkg::soc_alert_req_t [soc_proxy_pkg::NumRecovExternalAlerts-1:0] soc_recov_alert_req;
   assign soc_fatal_alert_req =