Skip to content

Commit 89986df

Browse files
Fix linting (#3120)
- Tie off unassigned signals - Fix partial signal assignments - Add missing default in non-unique case statement Co-authored-by: JeanRochCoulon <jean-roch.coulon@thalesgroup.com>
1 parent 18ff3ad commit 89986df

8 files changed

Lines changed: 32 additions & 5 deletions

File tree

core/cache_subsystem/cache_ctrl.sv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ module cache_ctrl
128128
req_port_o.data_rvalid = 1'b0;
129129
req_port_o.data_rdata = '0;
130130
req_port_o.data_rid = mem_req_q.id;
131+
req_port_o.data_ruser = '0;
131132
miss_req_o = '0;
132133
mshr_addr_o = '0;
133134
// Memory array communication

core/cva6.sv

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,13 @@ module cva6
820820
assign wt_valid_ex_id[ACC_WB] = acc_valid_ex_id;
821821
end else begin
822822
assign cvxif_req = '0;
823+
assign x_compressed_ready = '0;
824+
assign x_compressed_resp = '0;
825+
assign x_issue_ready = '0;
826+
assign x_issue_resp = '0;
827+
assign x_register_ready = '0;
828+
assign x_result_valid = '0;
829+
assign x_result = '0;
823830
end
824831

825832
if (CVA6Cfg.CvxifEn && CVA6Cfg.EnableAccelerator) begin : gen_err_xif_and_acc
@@ -1477,7 +1484,8 @@ module cva6
14771484
.noc_req_o (noc_req_o),
14781485
.noc_resp_i(noc_resp_i)
14791486
);
1480-
assign inval_ready = 1'b1;
1487+
assign inval_ready = 1'b1;
1488+
assign miss_vld_bits = '0;
14811489
end else begin : gen_cache_wb
14821490
std_cache_subsystem #(
14831491
// note: this only works with one cacheable region
@@ -1530,6 +1538,7 @@ module cva6
15301538
);
15311539
assign dcache_commit_wbuffer_not_ni = 1'b1;
15321540
assign inval_ready = 1'b1;
1541+
assign miss_vld_bits = '0;
15331542
end
15341543

15351544
// ----------------

core/cva6_mmu/cva6_ptw.sv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ module cva6_ptw
157157
assign req_port_o.data_wdata = '0;
158158
// we only issue one single request at a time
159159
assign req_port_o.data_id = '0;
160+
// user field not used
161+
assign req_port_o.data_wuser = '0;
160162

161163
// -----------
162164
// TLB Update
@@ -541,6 +543,7 @@ module cva6_ptw
541543
pte.ppn, vaddr_lvl[HYP_EXT*2][ptw_lvl_q[0]], (CVA6Cfg.PtLevels)'(0)
542544
};
543545
end
546+
default: ;
544547
endcase
545548
end else ptw_pptr_n = {pte.ppn, vaddr_lvl[0][ptw_lvl_q[0]], (CVA6Cfg.PtLevels)'(0)};
546549

core/cva6_mmu/cva6_shared_tlb.sv

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,11 @@ module cva6_shared_tlb #(
201201
endgenerate
202202

203203
if (CVA6Cfg.RVH) //THIS UPDATES THE EXTRA BITS OF VPN IN SV39x4
204-
assign vpn_d[CVA6Cfg.PtLevels][(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)-1:0] = ((|v_st_enbl[1][HYP_EXT:0]) && itlb_access_i && ~itlb_hit_i && ~dtlb_access_i) ? //
205-
itlb_vaddr_i[CVA6Cfg.VpnLen-1:CVA6Cfg.VpnLen-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)] : //
204+
assign vpn_d[CVA6Cfg.PtLevels] = ((|v_st_enbl[1][HYP_EXT:0]) && itlb_access_i && ~itlb_hit_i && ~dtlb_access_i) ? //
205+
{{(((CVA6Cfg.VpnLen/CVA6Cfg.PtLevels)-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels))){1'b0}}, itlb_vaddr_i[CVA6Cfg.VpnLen-1:CVA6Cfg.VpnLen-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)]} : //
206206
(((|v_st_enbl[0][HYP_EXT:0]) && dtlb_access_i && ~dtlb_hit_i) ? //
207-
dtlb_vaddr_i[CVA6Cfg.VpnLen-1: CVA6Cfg.VpnLen-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)] : vpn_q[CVA6Cfg.PtLevels][(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)-1:0]);
207+
{{(((CVA6Cfg.VpnLen/CVA6Cfg.PtLevels)-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels))){1'b0}}, dtlb_vaddr_i[CVA6Cfg.VpnLen-1: CVA6Cfg.VpnLen-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)]} : //
208+
{{(((CVA6Cfg.VpnLen/CVA6Cfg.PtLevels)-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels))){1'b0}}, vpn_q[CVA6Cfg.PtLevels][(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)-1:0]});
208209

209210
///////////////////////////////////////////////////////
210211
// tag comparison, hit generation
@@ -411,7 +412,10 @@ module cva6_shared_tlb #(
411412
end
412413
if (CVA6Cfg.RVH) begin : gen_shared_tag_hyp
413414
//THIS UPDATES THE EXTRA BITS OF VPN IN SV39x4
414-
assign shared_tag_wr.vpn[CVA6Cfg.PtLevels][(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)-1:0] = shared_tlb_update_i.vpn[CVA6Cfg.VpnLen-1: CVA6Cfg.VpnLen-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)];
415+
assign shared_tag_wr.vpn[CVA6Cfg.PtLevels] = {
416+
{(((CVA6Cfg.VpnLen / CVA6Cfg.PtLevels) - (CVA6Cfg.VpnLen % CVA6Cfg.PtLevels))) {1'b0}},
417+
shared_tlb_update_i.vpn[CVA6Cfg.VpnLen-1:CVA6Cfg.VpnLen-(CVA6Cfg.VpnLen%CVA6Cfg.PtLevels)]
418+
};
415419
end
416420
endgenerate
417421

@@ -503,6 +507,8 @@ module cva6_shared_tlb #(
503507
);
504508
assign pte[i][a] = pte_cva6_t'(pte_rd_data[i][a]);
505509
end
510+
end else begin
511+
assign shared_tag_rd[i] = '0;
506512
end
507513
end
508514
endmodule

core/ex_stage.sv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,8 @@ module ex_stage
636636
assign x_exception_o = '0;
637637
assign x_result_o = '0;
638638
assign x_valid_o = '0;
639+
assign x_we_o = '0;
640+
assign x_rd_o = '0;
639641
end
640642

641643
if (CVA6Cfg.RVS) begin

core/load_store_unit.sv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ module load_store_unit
353353
assign dcache_req_ports_o[0].data_be = '1;
354354
assign dcache_req_ports_o[0].data_size = 2'b11;
355355
assign dcache_req_ports_o[0].data_we = 1'b0;
356+
assign dcache_req_ports_o[0].data_wuser = '0;
356357
assign dcache_req_ports_o[0].kill_req = '0;
357358
assign dcache_req_ports_o[0].tag_valid = 1'b0;
358359

core/load_unit.sv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ module load_unit
209209
CVA6Cfg.DCACHE_INDEX_WIDTH];
210210
// request id = index of the load buffer's entry
211211
assign req_port_o.data_id = ldbuf_windex;
212+
// user field not used
213+
assign req_port_o.data_wuser = '0;
212214
// directly forward exception fields (valid bit is set below)
213215
assign ex_o.cause = ex_i.cause;
214216
assign ex_o.tval = ex_i.tval;

core/multiplier.sv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ module multiplier
144144
clmulr_q <= clmulr_d;
145145
end
146146
end
147+
end else begin
148+
assign clmul_q = '0;
149+
assign clmulr_q = '0;
147150
end
148151
// -----------------------
149152
// Output pipeline register

0 commit comments

Comments
 (0)