Commit b14c8503 authored by GuillemCabo's avatar GuillemCabo
Browse files

Merge remote-tracking branch 'origin/integration/SELENE-gc' into develop

parents 72d10dc3 21f06eae
......@@ -577,12 +577,25 @@ end
//spare bits on RDC_VECT
assign regs_o[BASE_RDC_VECT][REG_WIDTH-1:8] = '{default:0} ;
wire RDC_enable_int;
assign RDC_enable_int = regs_i[BASE_MCCU_CFG][6];
wire RDC_softrst;
assign RDC_softrst = regs_i[BASE_MCCU_CFG][7];
//register enable to solve Hazards
reg RDC_rstn;
always @(posedge clk_i, negedge rstn_i) begin: RDC_glitchless_rstn
if (!rstn_i) begin
RDC_rstn <= 0;
end else begin
RDC_rstn <= rstn_i && !regs_i[BASE_MCCU_CFG][7];
end
end
//register enable to solve Hazards
reg RDC_enable_int;
always @(posedge clk_i, negedge rstn_i) begin: RDC_glitchless_enable
if (!rstn_i) begin
RDC_enable_int <= 0;
end else begin
RDC_enable_int <= regs_i[BASE_MCCU_CFG][6];
end
end
RDC #(
// Width of data registers
......@@ -595,7 +608,7 @@ end
.CORE_EVENTS (RDC_N_EVENTS)
) inst_RDC(
.clk_i (clk_i),
.rstn_i (rstn_i && !RDC_softrst ), //active low
.rstn_i (RDC_rstn), //active low
.enable_i (RDC_enable_int),// Software map
.events_i (MCCU_events_int),
.events_weights_i (MCCU_events_weights_int),
......
......@@ -23,26 +23,25 @@
`endif
module pmu_ahb #
(
parameter haddr = 0,
parameter hmask = 0,
parameter integer haddr = 0,
parameter integer hmask = 0,
// Width of registers data bus
parameter integer REG_WIDTH = 32,
//haddr width
// Number of counters
parameter integer PMU_COUNTERS = 24,
// Number of SoC events
parameter integer N_SOC_EV = 32,
// Total amount of registers (use ahb_pmu_mem_map.ods)
parameter integer N_REGS = 47,
// -- Local parameters
//haddr width
localparam integer HADDR_WIDTH = 32,
//hdata width
//hdata width
localparam integer HDATA_WIDTH = 32,
//Required for MCCU interrupts
// -- PMU specific parameters
// Cores connected to MCCU
// Cores connected to MCCU
localparam MCCU_N_CORES = 4,
// Total amount of registers
parameter integer N_REGS = 43,
// Number of configuration registers
localparam PMU_CFG = 1,
// Number of counters
localparam PMU_COUNTERS = 24,
// Number of SoC events
localparam N_SOC_EV = 32
// Number of configuration registers
localparam PMU_CFG = 1
)
(
input wire rstn_i,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment