1
0
mirror of https://github.com/olofk/serv.git synced 2026-01-15 15:56:04 +00:00
olofk.serv/servant/servant.v
Olof Kindgren 40000cbeb9 Fix IRQ
This contains a lot of fixes as IRQ support was broken on both
RTL and zephyr side

* Interrupts are now synced to instruction lifetimes
* Interrupts are disabled on traps and mie is pushed to mpie
* Zephyr applications regenerated from rewritten Zephyr port
* Timer is 32-bit to avoid wrapping around too often
* MEPC was not read properly from CSR storage
2019-11-19 11:06:50 +01:00

202 lines
4.9 KiB
Verilog

`default_nettype none
module servant
(
input wire wb_clk,
input wire wb_rst,
output wire q);
parameter memfile = "zephyr_hello.hex";
parameter memsize = 8192;
wire timer_irq;
wire [31:0] wb_cpu_ibus_adr;
wire wb_cpu_ibus_cyc;
wire [31:0] wb_cpu_ibus_rdt;
wire wb_cpu_ibus_ack;
wire [31:0] wb_cpu_dbus_adr;
wire [31:0] wb_cpu_dbus_dat;
wire [3:0] wb_cpu_dbus_sel;
wire wb_cpu_dbus_we;
wire wb_cpu_dbus_cyc;
wire [31:0] wb_cpu_dbus_rdt;
wire wb_cpu_dbus_ack;
wire [31:0] wb_dmux_mem_adr;
wire [31:0] wb_dmux_mem_dat;
wire [3:0] wb_dmux_mem_sel;
wire wb_dmux_mem_we;
wire wb_dmux_mem_cyc;
wire [31:0] wb_dmux_mem_rdt;
wire wb_dmux_mem_ack;
wire [31:0] wb_mem_adr;
wire [31:0] wb_mem_dat;
wire [3:0] wb_mem_sel;
wire wb_mem_we;
wire wb_mem_cyc;
wire [31:0] wb_mem_rdt;
wire wb_mem_ack;
wire wb_gpio_dat;
wire wb_gpio_we;
wire wb_gpio_cyc;
wire wb_gpio_rdt;
wire [31:0] wb_timer_dat;
wire wb_timer_we;
wire wb_timer_cyc;
wire [31:0] wb_timer_rdt;
servant_arbiter servant_arbiter
(
.i_wb_cpu_dbus_adr (wb_dmux_mem_adr),
.i_wb_cpu_dbus_dat (wb_dmux_mem_dat),
.i_wb_cpu_dbus_sel (wb_dmux_mem_sel),
.i_wb_cpu_dbus_we (wb_dmux_mem_we ),
.i_wb_cpu_dbus_cyc (wb_dmux_mem_cyc),
.o_wb_cpu_dbus_rdt (wb_dmux_mem_rdt),
.o_wb_cpu_dbus_ack (wb_dmux_mem_ack),
.i_wb_cpu_ibus_adr (wb_cpu_ibus_adr),
.i_wb_cpu_ibus_cyc (wb_cpu_ibus_cyc),
.o_wb_cpu_ibus_rdt (wb_cpu_ibus_rdt),
.o_wb_cpu_ibus_ack (wb_cpu_ibus_ack),
.o_wb_cpu_adr (wb_mem_adr),
.o_wb_cpu_dat (wb_mem_dat),
.o_wb_cpu_sel (wb_mem_sel),
.o_wb_cpu_we (wb_mem_we ),
.o_wb_cpu_cyc (wb_mem_cyc),
.i_wb_cpu_rdt (wb_mem_rdt),
.i_wb_cpu_ack (wb_mem_ack));
`ifdef VERILATOR
parameter sim = 1;
`else
parameter sim = 0;
`endif
servant_mux #(sim) servant_mux
(
.i_clk (wb_clk),
.i_rst (wb_rst),
.i_wb_cpu_adr (wb_cpu_dbus_adr),
.i_wb_cpu_dat (wb_cpu_dbus_dat),
.i_wb_cpu_sel (wb_cpu_dbus_sel),
.i_wb_cpu_we (wb_cpu_dbus_we),
.i_wb_cpu_cyc (wb_cpu_dbus_cyc),
.o_wb_cpu_rdt (wb_cpu_dbus_rdt),
.o_wb_cpu_ack (wb_cpu_dbus_ack),
.o_wb_mem_adr (wb_dmux_mem_adr),
.o_wb_mem_dat (wb_dmux_mem_dat),
.o_wb_mem_sel (wb_dmux_mem_sel),
.o_wb_mem_we (wb_dmux_mem_we),
.o_wb_mem_cyc (wb_dmux_mem_cyc),
.i_wb_mem_rdt (wb_dmux_mem_rdt),
.o_wb_gpio_dat (wb_gpio_dat),
.o_wb_gpio_we (wb_gpio_we),
.o_wb_gpio_cyc (wb_gpio_cyc),
.i_wb_gpio_rdt (wb_gpio_rdt),
.o_wb_timer_dat (wb_timer_dat),
.o_wb_timer_we (wb_timer_we),
.o_wb_timer_cyc (wb_timer_cyc),
.i_wb_timer_rdt (wb_timer_rdt));
`ifndef SYNTHESIS
//synthesis translate_off
reg [1023:0] firmware_file;
initial
/* verilator lint_off WIDTH */
if ($value$plusargs("firmware=%s", firmware_file)) begin
$display("Loading RAM from %0s", firmware_file);
$readmemh(firmware_file, ram.mem);
end
/* verilator lint_on WIDTH */
//synthesis translate_on
`endif
servant_ram
#(
`ifndef VERILATOR
.memfile (memfile),
`endif
.depth (memsize))
ram
(// Wishbone interface
.i_wb_clk (wb_clk),
.i_wb_adr (wb_mem_adr[$clog2(memsize)-1:0]),
.i_wb_cyc (wb_mem_cyc),
.i_wb_we (wb_mem_we) ,
.i_wb_sel (wb_mem_sel),
.i_wb_dat (wb_mem_dat),
.o_wb_rdt (wb_mem_rdt),
.o_wb_ack (wb_mem_ack));
servant_timer
#(.WIDTH (32))
timer
(.i_clk (wb_clk),
.i_rst (wb_rst),
.o_irq (timer_irq),
.i_wb_cyc (wb_timer_cyc),
.i_wb_we (wb_timer_we) ,
.i_wb_dat (wb_timer_dat),
.o_wb_dat (wb_timer_rdt));
servant_gpio gpio
(.i_wb_clk (wb_clk),
.i_wb_dat (wb_gpio_dat),
.i_wb_we (wb_gpio_we),
.i_wb_cyc (wb_gpio_cyc),
.o_wb_rdt (wb_gpio_rdt),
.o_gpio (q));
serv_top
#(.RESET_PC (32'h0000_0000))
cpu
(
.clk (wb_clk),
.i_rst (wb_rst),
.i_timer_irq (timer_irq),
`ifdef RISCV_FORMAL
.rvfi_valid (),
.rvfi_order (),
.rvfi_insn (),
.rvfi_trap (),
.rvfi_halt (),
.rvfi_intr (),
.rvfi_mode (),
.rvfi_ixl (),
.rvfi_rs1_addr (),
.rvfi_rs2_addr (),
.rvfi_rs1_rdata (),
.rvfi_rs2_rdata (),
.rvfi_rd_addr (),
.rvfi_rd_wdata (),
.rvfi_pc_rdata (),
.rvfi_pc_wdata (),
.rvfi_mem_addr (),
.rvfi_mem_rmask (),
.rvfi_mem_wmask (),
.rvfi_mem_rdata (),
.rvfi_mem_wdata (),
`endif
.o_ibus_adr (wb_cpu_ibus_adr),
.o_ibus_cyc (wb_cpu_ibus_cyc),
.i_ibus_rdt (wb_cpu_ibus_rdt),
.i_ibus_ack (wb_cpu_ibus_ack),
.o_dbus_adr (wb_cpu_dbus_adr),
.o_dbus_dat (wb_cpu_dbus_dat),
.o_dbus_sel (wb_cpu_dbus_sel),
.o_dbus_we (wb_cpu_dbus_we),
.o_dbus_cyc (wb_cpu_dbus_cyc),
.i_dbus_rdt (wb_cpu_dbus_rdt),
.i_dbus_ack (wb_cpu_dbus_ack));
endmodule