joppe/fpga_modem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New slave checker and updated gpio and gpio_banks

Browse Source
This commit is contained in:
Joppe Blondel
2026-03-02 13:48:30 +01:00
parent a6a5c6ea3f
commit 628972ccaa
13 changed files with 334 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cores/system/mcu/rtl/mcu_peripherals.v
View File

@@ -99,7 +99,8 @@ module mcu_peripherals (
.i_wb_dat(gpio_wbs_dat_w), .i_wb_dat(gpio_wbs_dat_w),
.i_wb_adr(gpio_wbs_adr), .i_wb_adr(gpio_wbs_adr),
.i_wb_we(gpio_wbs_we), .i_wb_we(gpio_wbs_we),
.i_wb_stb(gpio_wbs_stb & gpio_wbs_cyc), .i_wb_stb(gpio_wbs_stb),
.i_wb_cyc(gpio_wbs_cyc),
.i_wb_sel(gpio_wbs_sel), .i_wb_sel(gpio_wbs_sel),
.o_wb_rdt(gpio_wbs_dat_r), .o_wb_rdt(gpio_wbs_dat_r),
.o_wb_ack(gpio_wbs_ack), .o_wb_ack(gpio_wbs_ack),
@@ -110,9 +111,7 @@ module mcu_peripherals (
assign wbs_dat_r[0*32 +: 32] = gpio_wbs_dat_r; assign wbs_dat_r[0*32 +: 32] = gpio_wbs_dat_r;
assign wbs_ack[0] = gpio_wbs_ack; assign wbs_ack[0] = gpio_wbs_ack;
wb_countdown_timer #( wb_countdown_timer timer (
.address(TIMER_BASE_ADDR)
) timer (
.i_clk(i_clk), .i_clk(i_clk),
.i_rst(i_rst), .i_rst(i_rst),
.o_irq(o_timer_irq), .o_irq(o_timer_irq),

274
cores/wb/formal_checker/formal/formal_wb_slave_checker.v
View File

@@ -1,101 +1,219 @@
`timescale 1ns/1ps // formal_wb_slave_checker.v
//
// Wishbone Classic slave-side protocol checker (plain Verilog).
// Use when your DUT is a *slave* and the bus/master is the environment.
module formal_wb_slave_checker #( module formal_wb_slave_checker #(
parameter combinatorial_ack = 0, parameter OPT_USE_ERR = 0,
parameter expect_wait_state = 0 parameter OPT_USE_RTY = 0,
// If 1: require slave to only assert responses when STB=1 (stricter profile).
// If 0: allow "ghost" responses with STB=0; termination still only counts when STB=1.
parameter OPT_STRICT_RESP_WITH_STB = 0,
// If 1: require termination signals to be pulses (1 cycle).
// If 0: allow them to be held.
parameter OPT_PULSE_RESP = 1,
// If 1: during reset require master to hold CYC/STB low (assumption; common convention).
parameter OPT_STRICT_RESET = 1,
// If 1: assert read data stable while ACK is held (useful if you allow ACK-hold).
parameter OPT_ASSERT_RDATA_STABLE_DURING_ACK = 1,
// Optional widths
parameter AW = 32,
parameter DW = 32,
parameter SW = 4
) ( ) (
input wire i_clk, input wire i_clk,
input wire i_rst, input wire i_rst,
input wire i_wb_rst, input wire i_wb_rst,
input wire [31:0] i_wb_adr,
input wire [31:0] i_wb_dat, // Master -> slave
input wire [3:0] i_wb_sel,
input wire i_wb_we,
input wire i_wb_stb,
input wire i_wb_cyc, input wire i_wb_cyc,
input wire [31:0] o_wb_rdt, input wire i_wb_stb,
input wire o_wb_ack input wire i_wb_we,
input wire [AW-1:0] i_wb_adr,
input wire [DW-1:0] i_wb_dat,
input wire [SW-1:0] i_wb_sel,
// Slave -> master
input wire o_wb_ack,
input wire o_wb_err,
input wire o_wb_rty,
input wire [DW-1:0] o_wb_rdt
); );
`ifdef FORMAL
// -----------------------------
// Reset combine
// -----------------------------
wire rst_any;
assign rst_any = i_rst | i_wb_rst;
// -----------------------------
// Formal infrastructure
// -----------------------------
reg f_past_valid; reg f_past_valid;
initial f_past_valid = 1'b0; initial f_past_valid = 1'b0;
always @(posedge i_clk)
always @(posedge i_clk) begin
f_past_valid <= 1'b1; f_past_valid <= 1'b1;
// A1: Reset forces cyc=0, stb=0 wire f_resp_any;
if (i_rst) begin assign f_resp_any = o_wb_ack
A1: assume(!i_wb_cyc); | (OPT_USE_ERR ? o_wb_err : 1'b0)
A2: assume(!i_wb_stb); | (OPT_USE_RTY ? o_wb_rty : 1'b0);
end
// A3: std->cyc, stb never high without cyc // Real termination only counts when STB=1
if(i_wb_stb) wire f_terminate;
A3: assume(i_wb_cyc); assign f_terminate = i_wb_cyc && i_wb_stb && f_resp_any;
// A4-A9: once a request starts, hold it stable until the slave responds // -----------------------------
if(f_past_valid && $past(i_wb_cyc && i_wb_stb && !o_wb_ack)) begin // Outstanding request tracking (Classic)
A4: assume(i_wb_cyc); // -----------------------------
A5: assume(i_wb_stb); reg f_pending;
A6: assume(i_wb_adr == $past(i_wb_adr)); initial f_pending = 1'b0;
A7: assume(i_wb_dat == $past(i_wb_dat));
A8: assume(i_wb_sel == $past(i_wb_sel));
A9: assume(i_wb_we == $past(i_wb_we));
end
// R1: ACK must correspond to either a same-cycle or previous-cycle request always @(posedge i_clk or posedge rst_any) begin
if(o_wb_ack) if (rst_any) begin
R1: assert( f_pending <= 1'b0;
(i_wb_cyc && i_wb_stb) || end else if (!i_wb_cyc) begin
(f_past_valid && $past(i_wb_cyc && i_wb_stb)) f_pending <= 1'b0;
);
// R2: !CYC->!ACK : no ghost acks
if(!i_wb_cyc)
R2: assert(!o_wb_ack);
// R3: Reset must leave the slave initialized on the following cycle
if(f_past_valid && $past(i_rst || i_wb_rst))
R3: assert(!o_wb_ack);
// R4: once STB has been dropped for a full cycle, ACK must be low
if(
f_past_valid &&
!$past(i_wb_stb) &&
!i_wb_stb
)
R4: assert(!o_wb_ack);
// C1: A request occurs at all
C1: cover(f_past_valid && !i_rst && !i_wb_rst && i_wb_cyc && i_wb_stb);
// C2-C3: A request with write and with read occur
C2: cover(f_past_valid && !i_rst && !i_wb_rst && i_wb_cyc && i_wb_stb && i_wb_we);
C3: cover(f_past_valid && !i_rst && !i_wb_rst && i_wb_cyc && i_wb_stb && !i_wb_we);
// C4: ACK happens during a request (basic progress)
C4: cover(f_past_valid && !i_rst && !i_wb_rst && i_wb_cyc && i_wb_stb && o_wb_ack);
// C5-C7: Exercise the expected ACK timing style for this slave.
if (combinatorial_ack) begin
C5: cover(f_past_valid && !i_rst && !i_wb_rst &&
(i_wb_cyc && i_wb_stb) && o_wb_ack);
end else begin end else begin
C6: cover(f_past_valid && !i_rst && !i_wb_rst && if (!f_pending && i_wb_stb)
$past(i_wb_cyc && i_wb_stb) && o_wb_ack); f_pending <= 1'b1;
// C7: Optional wait-state behavior for slaves that intentionally stall. if (f_terminate)
if (expect_wait_state) f_pending <= 1'b0;
C7: cover(f_past_valid && !i_rst && !i_wb_rst && end
$past(i_wb_cyc && i_wb_stb && !o_wb_ack) &&
(i_wb_cyc && i_wb_stb && !o_wb_ack));
end end
// C8: Master ends a cycle (CYC drops) after at least one request // -----------------------------
C8: cover(f_past_valid && !i_rst && !i_wb_rst && // Reset rules (recommended)
$past(i_wb_cyc && i_wb_stb) && !i_wb_cyc); // -----------------------------
always @(posedge i_clk) if (f_past_valid) begin
if (rst_any) begin
// R00: Monitor pending state must be cleared during reset
R00: assert(f_pending == 1'b0);
if (OPT_STRICT_RESET) begin
// A00: During reset, assume the master is not attempting a bus cycle
A00: assume(!i_wb_cyc);
// A01: During reset, assume the master is not strobing
A01: assume(!i_wb_stb);
end end
wire unused = &{1'b0, o_wb_rdt}; // R01: Slave should not respond during reset (prevents silly traces)
R01: assert(!o_wb_ack);
if (OPT_USE_ERR) R02: assert(!o_wb_err);
if (OPT_USE_RTY) R03: assert(!o_wb_rty);
end
end
// -----------------------------
// Master/environment assumptions (Classic rules)
// -----------------------------
always @(posedge i_clk) if (f_past_valid && !rst_any) begin
// A10: STB must imply CYC
if (i_wb_stb) begin
A10: assume(i_wb_cyc);
end
// A11: While pending and not terminated, master holds CYC asserted
if ($past(f_pending) && !$past(f_terminate)) begin
A11: assume(i_wb_cyc);
end
// A12: While pending and not terminated, master holds STB asserted
if ($past(f_pending) && !$past(f_terminate)) begin
A12: assume(i_wb_stb);
end
// A13: Address stable while pending and not terminated
if ($past(f_pending) && !$past(f_terminate)) begin
A13: assume(i_wb_adr == $past(i_wb_adr));
end
// A14: WE stable while pending and not terminated
if ($past(f_pending) && !$past(f_terminate)) begin
A14: assume(i_wb_we == $past(i_wb_we));
end
// A15: SEL stable while pending and not terminated
if ($past(f_pending) && !$past(f_terminate)) begin
A15: assume(i_wb_sel == $past(i_wb_sel));
end
// A16: Write data stable while pending and not terminated
if ($past(f_pending) && !$past(f_terminate)) begin
A16: assume(i_wb_dat == $past(i_wb_dat));
end
end
// -----------------------------
// Slave/DUT assertions (response sanity)
// -----------------------------
always @(posedge i_clk) if (f_past_valid && !rst_any) begin
// R10: Any response must occur only during an active cycle
if (f_resp_any) begin
R10: assert(i_wb_cyc);
end
// R11: Optional strict profile: response only when STB=1
if (OPT_STRICT_RESP_WITH_STB && f_resp_any) begin
R11: assert(i_wb_stb);
end
// R12-R14: Mutual exclusion of termination signals (recommended)
if (o_wb_ack) begin
if (OPT_USE_ERR) R12s1: assert(!o_wb_err);
if (OPT_USE_RTY) R12s2: assert(!o_wb_rty);
end
if (OPT_USE_ERR && o_wb_err) begin
R13s1: assert(!o_wb_ack);
if (OPT_USE_RTY) R13s2: assert(!o_wb_rty);
end
if (OPT_USE_RTY && o_wb_rty) begin
R14s1: assert(!o_wb_ack);
if (OPT_USE_ERR) R14s2: assert(!o_wb_err);
end
// R15-R17: Optional pulse-only responses
if (OPT_PULSE_RESP) begin
if ($past(o_wb_ack)) begin
R15: assert(!o_wb_ack);
end
if (OPT_USE_ERR && $past(o_wb_err)) begin
R16: assert(!o_wb_err);
end
if (OPT_USE_RTY && $past(o_wb_rty)) begin
R17: assert(!o_wb_rty);
end
end
// R18: A real termination (STB && response) should only happen when a request is pending.
if (i_wb_stb && f_resp_any) begin
R18: assert(f_pending || $past(f_pending));
end
// R19: Optional read-data stability while ACK is held (only relevant if ACK can be held)
if (OPT_ASSERT_RDATA_STABLE_DURING_ACK) begin
if (o_wb_ack && !i_wb_we && $past(o_wb_ack)) begin
R19: assert(o_wb_rdt == $past(o_wb_rdt));
end
end
// R20: If no cycle, no responses (strong sanity rule)
if (!i_wb_cyc) begin
R20: assert(!f_resp_any);
end
end
// -----------------------------
// Coverage: exercise the slave (useful witness traces)
// -----------------------------
// TODO
`endif
endmodule endmodule

28
cores/wb/wb_gpio/formal/formal_wb_gpio.v
View File

@@ -1,35 +1,29 @@
`timescale 1ns/1ps `timescale 1ns/1ps
module formal_wb_gpio #( module formal_wb_gpio;
parameter [31:0] address = 32'h00000000
);
(* gclk *) reg i_wb_clk; (* gclk *) reg i_wb_clk;
(* anyseq *) reg i_rst;
(* anyseq *) reg i_wb_rst; (* anyseq *) reg i_wb_rst;
(* anyseq *) reg [31:0] i_wb_adr; (* anyseq *) reg [31:0] i_wb_adr;
(* anyseq *) reg [31:0] i_wb_dat; (* anyseq *) reg [31:0] i_wb_dat;
(* anyseq *) reg [3:0] i_wb_sel; (* anyseq *) reg [3:0] i_wb_sel;
(* anyseq *) reg i_wb_we; (* anyseq *) reg i_wb_we;
(* anyseq *) reg i_wb_stb; (* anyseq *) reg i_wb_stb;
(* anyseq *) reg i_wb_cyc;
(* anyseq *) reg [31:0] i_gpio; (* anyseq *) reg [31:0] i_gpio;
wire [31:0] o_wb_rdt; wire [31:0] o_wb_rdt;
wire o_wb_ack; wire o_wb_ack;
wire [31:0] o_gpio; wire [31:0] o_gpio;
wire i_wb_cyc;
reg f_past_valid; reg f_past_valid;
assign i_wb_cyc = i_wb_stb || o_wb_ack; wb_gpio dut (
.i_clk(i_wb_clk),
wb_gpio #( .i_rst(i_wb_rst),
.address(address)
) dut (
.i_wb_clk(i_wb_clk),
.i_wb_rst(i_wb_rst),
.i_wb_adr(i_wb_adr), .i_wb_adr(i_wb_adr),
.i_wb_dat(i_wb_dat), .i_wb_dat(i_wb_dat),
.i_wb_sel(i_wb_sel), .i_wb_sel(i_wb_sel),
.i_wb_we(i_wb_we), .i_wb_we(i_wb_we),
.i_wb_stb(i_wb_stb), .i_wb_stb(i_wb_stb),
.i_wb_cyc(i_wb_cyc),
.i_gpio(i_gpio), .i_gpio(i_gpio),
.o_wb_rdt(o_wb_rdt), .o_wb_rdt(o_wb_rdt),
.o_wb_ack(o_wb_ack), .o_wb_ack(o_wb_ack),
@@ -38,7 +32,7 @@ module formal_wb_gpio #(
formal_wb_slave_checker wb_checker ( formal_wb_slave_checker wb_checker (
.i_clk(i_wb_clk), .i_clk(i_wb_clk),
.i_rst(i_rst), .i_rst(i_wb_rst),
.i_wb_rst(i_wb_rst), .i_wb_rst(i_wb_rst),
.i_wb_adr(i_wb_adr), .i_wb_adr(i_wb_adr),
.i_wb_dat(i_wb_dat), .i_wb_dat(i_wb_dat),
@@ -56,9 +50,13 @@ module formal_wb_gpio #(
f_past_valid <= 1'b1; f_past_valid <= 1'b1;
// R1: reads return the sampled GPIO input on the following cycle // R1: reads return the sampled GPIO input on the following cycle
if (f_past_valid && !$past(i_wb_rst) && !i_wb_rst && $past(i_wb_stb) && !$past(i_wb_we)) begin if(f_past_valid &&
!i_wb_rst && $past(!i_wb_rst) &&
o_wb_ack &&
$past(i_wb_sel)==4'hf && i_wb_sel==4'hf &&
$past(i_wb_cyc & i_wb_stb & !i_wb_we) &&
(i_wb_cyc & i_wb_stb & !i_wb_we))
assert(o_wb_rdt == $past(i_gpio)); assert(o_wb_rdt == $past(i_gpio));
end
// R2: reset clears the output register and read data register // R2: reset clears the output register and read data register
if (f_past_valid && $past(i_wb_rst)) begin if (f_past_valid && $past(i_wb_rst)) begin

75
cores/wb/wb_gpio/rtl/wb_gpio.v
View File

@@ -1,55 +1,52 @@
module wb_gpio #( module wb_gpio (
parameter address = 32'h00000000 input wire i_clk,
)( input wire i_rst,
input wire i_wb_clk,
input wire i_wb_rst, // optional; tie low if unused input wire [31:0] i_wb_adr,
input wire [31:0] i_wb_adr, // optional; can ignore for single-reg
input wire [31:0] i_wb_dat, input wire [31:0] i_wb_dat,
output reg [31:0] o_wb_rdt,
input wire [3:0] i_wb_sel, input wire [3:0] i_wb_sel,
input wire i_wb_we, input wire i_wb_we,
input wire i_wb_cyc,
input wire i_wb_stb, input wire i_wb_stb,
input wire [31:0] i_gpio, output wire o_wb_ack,
output reg [31:0] o_wb_rdt, input wire [31:0] i_gpio,
output reg o_wb_ack, output wire [31:0] o_gpio
output reg [31:0] o_gpio
); );
initial o_gpio <= 32'h00000000; // Registers
initial o_wb_rdt <= 32'h00000000; reg [31:0] gpo;
wire [31:0] gpi;
assign o_gpio = gpo;
assign gpi = i_gpio;
wire addr_check; reg wb_ack = 0;
assign addr_check = (i_wb_adr == address); assign o_wb_ack = wb_ack & i_wb_cyc & i_wb_stb;
// One-cycle ACK pulse per request (works even if stb stays high) always @(posedge i_clk) begin
initial o_wb_ack <= 1'b0; if(i_rst) begin
always @(posedge i_wb_clk) begin gpo <= 0;
if (i_wb_rst) begin wb_ack <= 0;
o_wb_ack <= 1'b0; o_wb_rdt <= 0;
end else begin end else begin
o_wb_ack <= i_wb_stb & ~o_wb_ack; // pulse while stb asserted // Ack generation
end wb_ack <= i_wb_cyc & i_wb_stb & !wb_ack;
end
// Read data (combinational or registered; registered here) // Read cycle
always @(posedge i_wb_clk) begin if(i_wb_cyc && i_wb_stb && !i_wb_we) begin
if (i_wb_rst) begin if(i_wb_sel[0]) o_wb_rdt[7:0] <= gpi[7:0];
o_wb_rdt <= 32'h0; if(i_wb_sel[1]) o_wb_rdt[15:8] <= gpi[15:8];
end else if (i_wb_stb && !i_wb_we) begin if(i_wb_sel[2]) o_wb_rdt[23:16] <= gpi[23:16];
o_wb_rdt <= i_gpio; if(i_wb_sel[3]) o_wb_rdt[31:24] <= gpi[31:24];
end end
// write cycle
if(i_wb_cyc && i_wb_stb && i_wb_we) begin
if(i_wb_sel[0]) gpo[7:0] <= i_wb_dat[7:0];
if(i_wb_sel[1]) gpo[15:8] <= i_wb_dat[15:8];
if(i_wb_sel[2]) gpo[23:16] <= i_wb_dat[23:16];
if(i_wb_sel[3]) gpo[31:24] <= i_wb_dat[31:24];
end end
// Write latch (update on the acknowledged cycle)
always @(posedge i_wb_clk) begin
if (i_wb_rst) begin
o_gpio <= 32'h0;
end else if (i_wb_stb && i_wb_we && addr_check && (i_wb_stb & ~o_wb_ack)) begin
// Apply byte enables (so sb works if the master uses sel)
if (i_wb_sel[0]) o_gpio[7:0] <= i_wb_dat[7:0];
if (i_wb_sel[1]) o_gpio[15:8] <= i_wb_dat[15:8];
if (i_wb_sel[2]) o_gpio[23:16] <= i_wb_dat[23:16];
if (i_wb_sel[3]) o_gpio[31:24] <= i_wb_dat[31:24];
end end
end end

10
cores/wb/wb_gpio/wb_gpio.core
View File

@@ -25,8 +25,6 @@ targets:
filesets: filesets:
- rtl - rtl
toplevel: wb_gpio toplevel: wb_gpio
parameters:
- address
formal: formal:
default_tool: symbiyosys default_tool: symbiyosys
@@ -35,11 +33,3 @@ targets:
- formal_rtl - formal_rtl
- formal_cfg - formal_cfg
toplevel: formal_wb_gpio toplevel: formal_wb_gpio
parameters:
- address
parameters:
address:
datatype: int
description: Wishbone address matched by this peripheral
paramtype: vlogparam

21
cores/wb/wb_gpio_banks/formal/formal_wb_gpio_banks.v
View File

@@ -1,31 +1,28 @@
`timescale 1ns/1ps `timescale 1ns/1ps
module formal_wb_gpio_banks #( module formal_wb_gpio_banks #(
parameter integer NUM_BANKS = 2, parameter integer num_banks = 2,
parameter [31:0] BASE_ADDR = 32'h00000000
); );
(* gclk *) reg i_wb_clk; (* gclk *) reg i_clk;
(* anyseq *) reg i_rst; (* anyseq *) reg i_rst;
(* anyseq *) reg i_wb_rst;
(* anyseq *) reg [31:0] i_wb_adr; (* anyseq *) reg [31:0] i_wb_adr;
(* anyseq *) reg [31:0] i_wb_dat; (* anyseq *) reg [31:0] i_wb_dat;
(* anyseq *) reg [3:0] i_wb_sel; (* anyseq *) reg [3:0] i_wb_sel;
(* anyseq *) reg i_wb_we; (* anyseq *) reg i_wb_we;
(* anyseq *) reg i_wb_stb; (* anyseq *) reg i_wb_stb;
(* anyseq *) reg [NUM_BANKS*32-1:0] i_gpio; (* anyseq *) reg [num_banks*32-1:0] i_gpio;
wire [31:0] o_wb_rdt; wire [31:0] o_wb_rdt;
wire o_wb_ack; wire o_wb_ack;
wire [NUM_BANKS*32-1:0] o_gpio; wire [num_banks*32-1:0] o_gpio;
wire i_wb_cyc; wire i_wb_cyc;
assign i_wb_cyc = i_wb_stb || o_wb_ack; assign i_wb_cyc = i_wb_stb || o_wb_ack;
wb_gpio_banks #( wb_gpio_banks #(
.NUM_BANKS(NUM_BANKS), .num_banks(num_banks)
.BASE_ADDR(BASE_ADDR)
) dut ( ) dut (
.i_wb_clk(i_wb_clk), .i_clk(i_clk),
.i_wb_rst(i_wb_rst), .i_rst(i_rst),
.i_wb_adr(i_wb_adr), .i_wb_adr(i_wb_adr),
.i_wb_dat(i_wb_dat), .i_wb_dat(i_wb_dat),
.i_wb_sel(i_wb_sel), .i_wb_sel(i_wb_sel),
@@ -38,9 +35,9 @@ module formal_wb_gpio_banks #(
); );
formal_wb_slave_checker wb_checker ( formal_wb_slave_checker wb_checker (
.i_clk(i_wb_clk), .i_clk(i_clk),
.i_rst(i_rst), .i_rst(i_rst),
.i_wb_rst(i_wb_rst), .i_wb_rst(i_rst),
.i_wb_adr(i_wb_adr), .i_wb_adr(i_wb_adr),
.i_wb_dat(i_wb_dat), .i_wb_dat(i_wb_dat),
.i_wb_sel(i_wb_sel), .i_wb_sel(i_wb_sel),

2
cores/wb/wb_gpio_banks/formal/wb_gpio_banks.sby
View File

@@ -16,8 +16,10 @@ cover: smtbmc yices
prove: abc pdr prove: abc pdr
[script] [script]
read -formal clog2.vh
{{"-formal"|gen_reads}} {{"-formal"|gen_reads}}
prep -top {{top_level}} prep -top {{top_level}}
[files] [files]
src/joppeb_util_clog2_1.0/clog2.vh
{{files}} {{files}}

64
cores/wb/wb_gpio_banks/rtl/wb_gpio_banks.v
View File

@@ -1,48 +1,46 @@
`default_nettype none `include "clog2.vh"
module wb_gpio_banks #( module wb_gpio_banks #(
parameter integer NUM_BANKS = 4, parameter num_banks = 4
parameter [31:0] BASE_ADDR = 32'h8000_0000
)( )(
input wire i_wb_clk, input wire i_clk,
input wire i_wb_rst, input wire i_rst,
input wire [31:0] i_wb_adr, input wire [31:0] i_wb_adr,
input wire [31:0] i_wb_dat, input wire [31:0] i_wb_dat,
output reg [31:0] o_wb_rdt,
input wire [3:0] i_wb_sel, input wire [3:0] i_wb_sel,
input wire i_wb_we, input wire i_wb_we,
input wire i_wb_cyc,
input wire i_wb_stb, input wire i_wb_stb,
input wire [NUM_BANKS*32-1:0] i_gpio, output wire o_wb_ack,
output reg [31:0] o_wb_rdt,
output reg o_wb_ack,
output wire [NUM_BANKS*32-1:0] o_gpio
);
wire [NUM_BANKS-1:0] bank_sel; input wire [num_banks*32-1:0] i_gpio,
wire [NUM_BANKS-1:0] bank_stb; output wire [num_banks*32-1:0] o_gpio
wire [NUM_BANKS*32-1:0] bank_rdt; );
wire [NUM_BANKS-1:0] bank_ack; localparam sw = `CLOG2(num_banks);
wire [num_banks-1:0] bank_sel;
wire [num_banks-1:0] bank_ack;
wire [num_banks*32-1:0] bank_rdt;
genvar gi; genvar gi;
generate generate
for (gi = 0; gi < NUM_BANKS; gi = gi + 1) begin : gen_gpio for(gi=0; gi<num_banks; gi=gi+1) begin : gen_gpio
localparam [31:0] BANK_ADDR = BASE_ADDR + (gi * 4); localparam [2+sw-1:0] addr = gi*4;
assign bank_sel[gi] = (i_wb_adr[2+sw-1:0] == addr);
assign bank_sel[gi] = (i_wb_adr == BANK_ADDR); wb_gpio u_gpio(
assign bank_stb[gi] = i_wb_stb & bank_sel[gi]; .i_clk(i_clk),
.i_rst(i_rst),
wb_gpio #(
.address(BANK_ADDR)
) u_gpio (
.i_wb_clk(i_wb_clk),
.i_wb_rst(i_wb_rst),
.i_wb_adr(i_wb_adr), .i_wb_adr(i_wb_adr),
.i_wb_dat(i_wb_dat), .i_wb_dat(i_wb_dat),
.i_wb_sel(i_wb_sel), .i_wb_cyc(i_wb_cyc & bank_sel[gi]),
.i_wb_stb(i_wb_stb & bank_sel[gi]),
.i_wb_we(i_wb_we), .i_wb_we(i_wb_we),
.i_wb_stb(bank_stb[gi]), .i_wb_sel(i_wb_sel),
.i_gpio(i_gpio[gi*32 +: 32]),
.o_wb_rdt(bank_rdt[gi*32 +: 32]),
.o_wb_ack(bank_ack[gi]), .o_wb_ack(bank_ack[gi]),
.o_wb_rdt(bank_rdt[gi*32 +: 32]),
.i_gpio(i_gpio[gi*32 +: 32]),
.o_gpio(o_gpio[gi*32 +: 32]) .o_gpio(o_gpio[gi*32 +: 32])
); );
end end
@@ -50,14 +48,14 @@ module wb_gpio_banks #(
integer bi; integer bi;
always @* begin always @* begin
o_wb_rdt = 32'h0000_0000; o_wb_rdt = 0;
o_wb_ack = 1'b0; o_wb_ack = 0;
for (bi = 0; bi < NUM_BANKS; bi = bi + 1) begin for(bi=0; bi<num_banks; bi=bi+1) begin
if(bank_sel[bi]) begin if(bank_sel[bi]) begin
o_wb_rdt = bank_rdt[bi*32 +: 32]; o_wb_rdt = bank_rdt[bi*32 +: 32];
o_wb_ack = bank_ack[bi]; o_wb_ack = bank_ack[bi];
end end
end end
end end;
endmodule endmodule

1
cores/wb/wb_gpio_banks/wb_gpio_banks.core
View File

@@ -7,6 +7,7 @@ filesets:
rtl: rtl:
depend: depend:
- joppeb:wb:wb_gpio - joppeb:wb:wb_gpio
- joppeb:util:clog2
files: files:
- rtl/wb_gpio_banks.v - rtl/wb_gpio_banks.v
file_type: verilogSource file_type: verilogSource

2
cores/wb/wb_mem32/rtl/wb_mem32.v
View File

@@ -27,7 +27,7 @@ module wb_mem32 #(
wire [mem_aw-1:0] wb_word_adr = i_wb_adr[mem_aw+1:2]; wire [mem_aw-1:0] wb_word_adr = i_wb_adr[mem_aw+1:2];
assign o_wb_rdt = wb_rdt_r; assign o_wb_rdt = wb_rdt_r;
assign o_wb_ack = wb_ack_r; assign o_wb_ack = wb_ack_r & i_wb_cyc & i_wb_stb;
always @(posedge i_clk) begin always @(posedge i_clk) begin
if (i_rst || i_wb_rst) begin if (i_rst || i_wb_rst) begin

4
cores/wb/wb_timer/formal/formal_wb_timer.v
View File

@@ -31,9 +31,7 @@ module formal_wb_timer;
.o_wb_ack(o_wb_ack) .o_wb_ack(o_wb_ack)
); );
formal_wb_slave_checker #( formal_wb_slave_checker wb_checker (
.combinatorial_ack(0),
) wb_checker (
.i_clk(i_clk), .i_clk(i_clk),
.i_rst(i_rst), .i_rst(i_rst),
.i_wb_rst(i_wb_rst), .i_wb_rst(i_wb_rst),

6
cores/wb/wb_timer/rtl/wb_timer.v
View File

@@ -1,8 +1,6 @@
`timescale 1ns/1ps `timescale 1ns/1ps
module wb_countdown_timer #( module wb_countdown_timer (
parameter address = 32'h00000000 // Base address of peripheral
)(
input wire i_clk, input wire i_clk,
input wire i_rst, input wire i_rst,
output wire o_irq, output wire o_irq,
@@ -26,7 +24,7 @@ module wb_countdown_timer #(
reg counter_started = 0; reg counter_started = 0;
reg counter_running = 0; reg counter_running = 0;
reg prev_counter_running = 0; reg prev_counter_running = 0;
assign o_wb_ack = wb_ack; assign o_wb_ack = wb_ack & i_wb_cyc & i_wb_stb; // Make sure the ack only happend during a cycle
assign o_irq = irq_fired; assign o_irq = irq_fired;

7
cores/wb/wb_timer/wb_timer.core
View File

@@ -28,8 +28,6 @@ targets:
filesets: filesets:
- rtl - rtl
toplevel: wb_countdown_timer toplevel: wb_countdown_timer
parameters:
- address
sim: sim:
default_tool: icarus default_tool: icarus
filesets: filesets:
@@ -44,14 +42,9 @@ targets:
- formal_cfg - formal_cfg
toplevel: formal_wb_timer toplevel: formal_wb_timer
parameters: parameters:
- address
- FORMAL=true - FORMAL=true
parameters: parameters:
address:
datatype: int
description: Base address of register set
paramtype: vlogparam
FORMAL: FORMAL:
datatype: bool datatype: bool
description: Enable in-module formal-only logic description: Enable in-module formal-only logic