zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

axi_intr_monitor: Slightly modify counter start points 

Start the counter_to_interrupt_cnt counter when the counter_to_interrupt
value is written to the register map. This gives applications better
control over when the counter starts counting.

Also start the counter_from_interrupt on the rising edge of the interrupt
signal to avoid bogus values.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
main
Lars-Peter Clausen 2016-12-02 17:54:18 +01:00
parent 334ce5ddc0
commit 753f4bd06e
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/axi_intr_monitor/axi_intr_monitor.v
View File

@ -90,6 +90,8 @@ reg [31:0] counter_interrupt_handling = 'd0;
reg [31:0] min_interrupt_handling = 'd0;
reg [31:0] max_interrupt_handling = 'd0;
reg interrupt_d1 = 'd0;
reg arm_counter = 'd0;
reg counter_active = 'd0;
//------------------------------------------------------------------------------
//----------- Wires Declarations -----------------------------------------------
@ -115,15 +117,26 @@ always @(negedge s_axi_aresetn or posedge s_axi_aclk) begin
min_interrupt_handling <= 'd0;
max_interrupt_handling <= 'd0;
interrupt_d1 <= 0;
counter_active <= 1'b0;
end else begin
interrupt_d1 <= irq;
if (irq == 1'b1) begin
if (arm_counter == 1'b1) begin
counter_to_interrupt_cnt <= counter_to_interrupt;
counter_active <= 1'b1;
end else if (counter_to_interrupt_cnt > 0) begin
counter_to_interrupt_cnt <= counter_to_interrupt_cnt - 1;
end else begin
counter_active <= 1'b0;
end
if (irq == 1'b0 && interrupt_d1 == 1'b1) begin
if (irq == 1'b1 && interrupt_d1 == 1'b0) begin
counter_from_interrupt <= 32'h0;
end else begin
counter_from_interrupt <= counter_from_interrupt + 1;
end
if (irq == 1'b0 && interrupt_d1 == 1'b1) begin
counter_interrupt_handling <= counter_from_interrupt;
if (min_interrupt_handling > counter_from_interrupt) begin
min_interrupt_handling <= counter_from_interrupt;
@ -131,8 +144,6 @@ always @(negedge s_axi_aresetn or posedge s_axi_aclk) begin
if (max_interrupt_handling < counter_from_interrupt) begin
max_interrupt_handling <= counter_from_interrupt;
end
end else begin
counter_from_interrupt <= counter_from_interrupt + 1;
end
end
end
@ -144,8 +155,10 @@ always @(negedge s_axi_aresetn or posedge s_axi_aclk) begin
control <= 'd0;
interrupt <= 'd0;
counter_to_interrupt <= 'd0;
arm_counter <= 'd0;
end else begin
up_wack <= up_wreq_s;
arm_counter <= 1'b0;
if ((up_wreq_s == 1'b1) && (up_waddr_s[3:0] == 4'h1)) begin
scratch <= up_wdata_s;
end
@ -157,12 +170,13 @@ always @(negedge s_axi_aresetn or posedge s_axi_aclk) begin
end else if ((up_wreq_s == 1'b1) && (up_waddr_s[3:0] == 4'h3)) begin
interrupt <= interrupt & ~up_wdata_s[0];
end else begin
if (counter_to_interrupt_cnt == 32'h0) begin
if (counter_to_interrupt_cnt == 32'h0 && counter_active == 1'b1) begin
interrupt <= 1'b1;
end
end
if ((up_wreq_s == 1'b1) && (up_waddr_s[3:0] == 4'h4)) begin
counter_to_interrupt <= up_wdata_s;
arm_counter <= 1'b1;
end
end
end