From 3cbbcc834f004683405154f268bccf925cc2864c Mon Sep 17 00:00:00 2001 From: Moritz Scherer Date: Fri, 14 Feb 2025 15:48:40 +0100 Subject: [PATCH] hw: Fix DMA XBAR rules --- hw/snitch_cluster/src/snitch_cluster.sv | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/snitch_cluster/src/snitch_cluster.sv b/hw/snitch_cluster/src/snitch_cluster.sv index b5840d401..9d3990df6 100644 --- a/hw/snitch_cluster/src/snitch_cluster.sv +++ b/hw/snitch_cluster/src/snitch_cluster.sv @@ -591,12 +591,12 @@ module snitch_cluster xbar_rule_t [DmaXbarCfg.NoAddrRules-1:0] enabled_dma_xbar_rule; assign dma_xbar_rules = '{ - '{idx: TCDMDMA, start_addr: tcdm_start_address, end_addr: tcdm_end_address}, - '{idx: ZeroMemory, start_addr: zero_mem_start_address, end_addr: zero_mem_end_address}, - '{idx: BootRom, start_addr: bootrom_start_address, end_addr: bootrom_end_address}, - '{idx: TCDMDMA, start_addr: TCDMAliasStart, end_addr: TCDMAliasEnd}, + '{idx: BootRom, start_addr: BootRomAliasStart, end_addr: BootRomAliasEnd}, '{idx: ZeroMemory, start_addr: ZeroMemAliasStart, end_addr: ZeroMemAliasEnd}, - '{idx: BootRom, start_addr: BootRomAliasStart, end_addr: BootRomAliasEnd} + '{idx: TCDMDMA, start_addr: TCDMAliasStart, end_addr: TCDMAliasEnd}, + '{idx: BootRom, start_addr: bootrom_start_address, end_addr: bootrom_end_address}, + '{idx: ZeroMemory, start_addr: zero_mem_start_address, end_addr: zero_mem_end_address}, + '{idx: TCDMDMA, start_addr: tcdm_start_address, end_addr: tcdm_end_address}, }; always_comb begin @@ -605,11 +605,11 @@ module snitch_cluster enabled_dma_xbar_rule[i] = dma_xbar_rules[1]; i++; // ZeroMemory if (IntBootromEnable) enabled_dma_xbar_rule[i] = dma_xbar_rules[2]; i++; // Bootrom if (AliasRegionEnable) begin - enabled_dma_xbar_rule[i] = dma_xbar_rules[3]; i++; // TCDM Alias - enabled_dma_xbar_rule[i] = dma_xbar_rules[4]; i++; // ZeroMemory Alias - if (IntBootromEnable) enabled_dma_xbar_rule[i] = dma_xbar_rules[5]; // Bootrom Alias + enabled_dma_xbar_rule[i] = dma_xbar_rules[3]; i++; // TCDM Alias + enabled_dma_xbar_rule[i] = dma_xbar_rules[4]; i++; // ZeroMemory Alias + if (IntBootromEnable) enabled_dma_xbar_rule[i] = dma_xbar_rules[5]; // Bootrom Alias end - end + end // always_comb localparam bit [DmaXbarCfg.NoSlvPorts-1:0] DMAEnableDefaultMstPort = '1; axi_xbar #(