@@ -388,10 +388,12 @@ module axi_dw_upsizer #(
388388 // No need to upsize single-beat transactions.
389389 if (r_req_d.ar.len != '0 ) begin
390390 // Evaluate output burst length
391- automatic addr_t start_addr = aligned_addr (r_req_d.ar.addr, AxiMstPortMaxSize);
392- automatic addr_t end_addr = aligned_addr (beat_addr (r_req_d.ar.addr,
393- r_req_d.orig_ar_size, r_req_d.burst_len, r_req_d.ar.burst,
394- r_req_d.burst_len), AxiMstPortMaxSize);
391+ automatic addr_t start_addr;
392+ automatic addr_t end_addr;
393+ start_addr = aligned_addr (r_req_d.ar.addr, AxiMstPortMaxSize);
394+ end_addr = aligned_addr (beat_addr (r_req_d.ar.addr, r_req_d.orig_ar_size,
395+ r_req_d.burst_len, r_req_d.ar.burst, r_req_d.burst_len),
396+ AxiMstPortMaxSize);
395397 r_req_d.ar.len = (end_addr - start_addr) >> AxiMstPortMaxSize;
396398 r_req_d.ar.size = AxiMstPortMaxSize ;
397399 r_state_d = R_INCR_UPSIZE ;
@@ -446,10 +448,11 @@ module axi_dw_upsizer #(
446448 // No need to upsize single-beat transactions.
447449 if (r_req_d.ar.len != '0 ) begin
448450 // Evaluate output burst length
449- automatic addr_t start_addr = aligned_addr (r_req_d.ar.addr, AxiMstPortMaxSize);
450- automatic addr_t end_addr = aligned_addr (beat_addr (r_req_d.ar.addr,
451- r_req_d.orig_ar_size, r_req_d.burst_len, r_req_d.ar.burst,
452- r_req_d.burst_len), AxiMstPortMaxSize);
451+ automatic addr_t start_addr;
452+ automatic addr_t end_addr;
453+ start_addr = aligned_addr (r_req_d.ar.addr, AxiMstPortMaxSize);
454+ end_addr = aligned_addr (beat_addr (r_req_d.ar.addr, r_req_d.orig_ar_size,
455+ r_req_d.burst_len, r_req_d.ar.burst, r_req_d.burst_len), AxiMstPortMaxSize);
453456 r_req_d.ar.len = (end_addr - start_addr) >> AxiMstPortMaxSize;
454457 r_req_d.ar.size = AxiMstPortMaxSize ;
455458 r_state_d = R_INCR_UPSIZE ;
@@ -478,8 +481,10 @@ module axi_dw_upsizer #(
478481 // Request was accepted
479482 if (! r_req_q.ar_valid)
480483 if (mst_resp.r_valid && (idx_r_upsizer == t) && r_upsizer_valid) begin
481- automatic addr_t mst_port_offset = AxiMstPortStrbWidth == 1 ? '0 : r_req_q.ar.addr[idx_width (AxiMstPortStrbWidth)- 1 : 0 ];
482- automatic addr_t slv_port_offset = AxiSlvPortStrbWidth == 1 ? '0 : r_req_q.ar.addr[idx_width (AxiSlvPortStrbWidth)- 1 : 0 ];
484+ automatic addr_t mst_port_offset;
485+ automatic addr_t slv_port_offset;
486+ mst_port_offset = AxiMstPortStrbWidth == 1 ? '0 : r_req_q.ar.addr[idx_width (AxiMstPortStrbWidth)- 1 : 0 ];
487+ slv_port_offset = AxiSlvPortStrbWidth == 1 ? '0 : r_req_q.ar.addr[idx_width (AxiSlvPortStrbWidth)- 1 : 0 ];
483488
484489 // Valid output
485490 slv_r_valid_tran[t] = 1'b1 ;
@@ -600,8 +605,10 @@ module axi_dw_upsizer #(
600605 slv_resp_o.w_ready = ~ mst_req.w_valid || mst_resp.w_ready;
601606
602607 if (slv_req_i.w_valid && slv_resp_o.w_ready) begin
603- automatic addr_t mst_port_offset = AxiMstPortStrbWidth == 1 ? '0 : w_req_q.aw.addr[idx_width (AxiMstPortStrbWidth)- 1 : 0 ];
604- automatic addr_t slv_port_offset = AxiSlvPortStrbWidth == 1 ? '0 : w_req_q.aw.addr[idx_width (AxiSlvPortStrbWidth)- 1 : 0 ];
608+ automatic addr_t mst_port_offset;
609+ automatic addr_t slv_port_offset;
610+ mst_port_offset = AxiMstPortStrbWidth == 1 ? '0 : w_req_q.aw.addr[idx_width (AxiMstPortStrbWidth)- 1 : 0 ];
611+ slv_port_offset = AxiSlvPortStrbWidth == 1 ? '0 : w_req_q.aw.addr[idx_width (AxiSlvPortStrbWidth)- 1 : 0 ];
605612
606613 // Serialization
607614 for (int b = 0 ; b < AxiMstPortStrbWidth; b++ )
@@ -682,10 +689,11 @@ module axi_dw_upsizer #(
682689 // No need to upsize single-beat transactions.
683690 if (slv_req_i.aw.len != '0 ) begin
684691 // Evaluate output burst length
685- automatic addr_t start_addr = aligned_addr (slv_req_i.aw.addr, AxiMstPortMaxSize);
686- automatic addr_t end_addr = aligned_addr (beat_addr (slv_req_i.aw.addr,
687- slv_req_i.aw.size, slv_req_i.aw.len, slv_req_i.aw.burst, slv_req_i.aw.len),
688- AxiMstPortMaxSize);
692+ automatic addr_t start_addr;
693+ automatic addr_t end_addr;
694+ start_addr = aligned_addr (slv_req_i.aw.addr, AxiMstPortMaxSize);
695+ end_addr = aligned_addr (beat_addr (slv_req_i.aw.addr, slv_req_i.aw.size,
696+ slv_req_i.aw.len, slv_req_i.aw.burst, slv_req_i.aw.len), AxiMstPortMaxSize);
689697
690698 w_req_d.aw.len = (end_addr - start_addr) >> AxiMstPortMaxSize;
691699 w_req_d.aw.size = AxiMstPortMaxSize ;
0 commit comments