Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

first merge of ahb fix

Browse Source
This commit is contained in:
bbracker 2021-03-05 14:24:22 -05:00
parent 464c1de03d
commit 62dd9e3075
7 changed files with 86 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
wally-pipelined/regression/wally-peripherals.do
View File

@ -39,70 +39,4 @@ vopt +acc work.testbench -o workopt
vsim workopt vsim workopt
view wave view wave
do wally-peripherals-signals.do
-- display input and output signals as hexidecimal values
# Diplays All Signals recursively
add wave /testbench/clk
add wave /testbench/reset
add wave -divider
add wave /testbench/dut/hart/ebu/IReadF
add wave /testbench/dut/hart/DataStall
add wave /testbench/dut/hart/InstrStall
add wave /testbench/dut/hart/StallF
add wave /testbench/dut/hart/StallD
add wave /testbench/dut/hart/FlushD
add wave /testbench/dut/hart/FlushE
add wave /testbench/dut/hart/FlushM
add wave /testbench/dut/hart/FlushW
add wave -divider
add wave -hex /testbench/dut/hart/ifu/PCF
add wave -hex /testbench/dut/hart/ifu/InstrF
add wave /testbench/InstrFName
#add wave -hex /testbench/dut/hart/ifu/PCD
add wave -hex /testbench/dut/hart/ifu/InstrD
add wave /testbench/InstrDName
add wave -divider
#add wave -hex /testbench/dut/hart/ifu/PCE
#add wave -hex /testbench/dut/hart/ifu/InstrE
add wave /testbench/InstrEName
add wave -hex /testbench/dut/hart/ieu/dp/SrcAE
add wave -hex /testbench/dut/hart/ieu/dp/SrcBE
add wave -hex /testbench/dut/hart/ieu/dp/ALUResultE
add wave /testbench/dut/hart/ieu/dp/PCSrcE
add wave -divider
#add wave -hex /testbench/dut/hart/ifu/PCM
#add wave -hex /testbench/dut/hart/ifu/InstrM
add wave /testbench/InstrMName
add wave /testbench/dut/uncore/dtim/memwrite
add wave -hex /testbench/dut/uncore/HADDR
add wave -hex /testbench/dut/uncore/HWDATA
add wave -divider
add wave -hex /testbench/dut/hart/ifu/PCW
add wave /testbench/InstrWName
add wave /testbench/dut/hart/ieu/dp/RegWriteW
add wave -hex /testbench/dut/hart/ieu/dp/ResultW
add wave -hex /testbench/dut/hart/ieu/dp/RdW
add wave -divider
add wave -hex /testbench/dut/uncore/uart/u/*
add wave -divider
#add ww
add wave -hex -r /testbench/*
-- Set Wave Output Items
TreeUpdate [SetDefaultTree]
WaveRestoreZoom {0 ps} {100 ps}
configure wave -namecolwidth 250
configure wave -valuecolwidth 120
configure wave -justifyvalue left
configure wave -signalnamewidth 0
configure wave -snapdistance 10
configure wave -datasetprefix 0
configure wave -rowmargin 4
configure wave -childrowmargin 2
set DefaultRadix hexadecimal
-- Run the Simulation
run 5000
#run -all
#quit

9
wally-pipelined/src/uncore/clint.sv
View File

@ -28,8 +28,9 @@
module clint ( module clint (
input logic HCLK, HRESETn, input logic HCLK, HRESETn,
input logic [1:0] MemRWclint, input logic HSELCLINT,
input logic [15:0] HADDR, input logic [15:0] HADDR,
input logic HWRITE,
input logic [`XLEN-1:0] HWDATA, input logic [`XLEN-1:0] HWDATA,
output logic [`XLEN-1:0] HREADCLINT, output logic [`XLEN-1:0] HREADCLINT,
output logic HRESPCLINT, HREADYCLINT, output logic HRESPCLINT, HREADYCLINT,
@ -41,8 +42,8 @@ module clint (
logic [15:0] entry; logic [15:0] entry;
logic memread, memwrite; logic memread, memwrite;
assign memread = MemRWclint[1]; assign memread = HSELCLINT & ~HWRITE;
assign memwrite = MemRWclint[0]; assign memwrite = HSELCLINT & HWRITE;
assign HRESPCLINT = 0; // OK assign HRESPCLINT = 0; // OK
// assign HREADYCLINT = 1; // Respond immediately // assign HREADYCLINT = 1; // Respond immediately
always_ff @(posedge HCLK) // delay response always_ff @(posedge HCLK) // delay response

47
wally-pipelined/src/uncore/dtim.sv
View File

@ -27,22 +27,28 @@
module dtim #(parameter BASE=0, RANGE = 65535) ( module dtim #(parameter BASE=0, RANGE = 65535) (
input logic HCLK, HRESETn, input logic HCLK, HRESETn,
input logic [1:0] MemRWtim,
input logic [31:0] HADDR,
input logic [`XLEN-1:0] HWDATA,
input logic HSELTim, input logic HSELTim,
input logic [31:0] HADDR,
input logic HWRITE,
input logic [`XLEN-1:0] HWDATA,
output logic [`XLEN-1:0] HREADTim, output logic [`XLEN-1:0] HREADTim,
output logic HRESPTim, HREADYTim output logic HRESPTim, HREADYTim
); );
logic [`XLEN-1:0] RAM[BASE>>(1+`XLEN/32):(RANGE+BASE)>>1+(`XLEN/32)]; logic [`XLEN-1:0] RAM[BASE>>(1+`XLEN/32):(RANGE+BASE)>>1+(`XLEN/32)];
logic [31:0] HWADDR; logic [31:0] HWADDR, A;
logic [`XLEN-1:0] HREADTim0; logic [`XLEN-1:0] HREADTim0;
// logic [`XLEN-1:0] write; // logic [`XLEN-1:0] write;
logic [15:0] entry; logic [15:0] entry;
logic memread, memwrite; logic memread, memwrite;
logic [3:0] busycount; logic [3:0] busycount;
always_ff @(posedge HCLK) begin
memread <= HSELTim & ~ HWRITE;
memwrite <= HSELTim & HWRITE;
A <= HADDR;
end
// busy FSM to extend READY signal // busy FSM to extend READY signal
always_ff @(posedge HCLK, negedge HRESETn) always_ff @(posedge HCLK, negedge HRESETn)
@ -61,41 +67,20 @@ module dtim #(parameter BASE=0, RANGE = 65535) (
end end
end end
/* always_ff @(posedge HCLK, negedge HRESETn)
if (~HRESETn) begin
HREADYTim <= 0;
end else begin
HREADYTim <= HSELTim; // always respond one cycle later
end */
assign memread = MemRWtim[1];
assign memwrite = MemRWtim[0];
// always_ff @(posedge HCLK)
// memwrite <= MemRWtim[0]; // delay memwrite to write phase
assign HRESPTim = 0; // OK assign HRESPTim = 0; // OK
// assign HREADYTim = 1; // Respond immediately; *** extend this
// Model memory read and write // Model memory read and write
generate generate
if (`XLEN == 64) begin if (`XLEN == 64) begin
// always_ff @(negedge HCLK)
// if (memwrite) RAM[HWADDR[31:3]] <= HWDATA;
always_ff @(posedge HCLK) begin always_ff @(posedge HCLK) begin
//if (memwrite) RAM[HADDR[31:3]] <= HWDATA; HWADDR <= A;
HWADDR <= HADDR; HREADTim0 <= RAM[A[31:3]];
HREADTim0 <= RAM[HADDR[31:3]];
if (memwrite && HREADYTim) RAM[HWADDR[31:3]] <= HWDATA; if (memwrite && HREADYTim) RAM[HWADDR[31:3]] <= HWDATA;
end end
end else begin end else begin
// always_ff @(negedge HCLK)
// if (memwrite) RAM[HWADDR[31:2]] <= HWDATA;
always_ff @(posedge HCLK) begin always_ff @(posedge HCLK) begin
//if (memwrite) RAM[HADDR[31:2]] <= HWDATA; HWADDR <= A;
HWADDR <= HADDR; HREADTim0 <= RAM[A[31:2]];
HREADTim0 <= RAM[HADDR[31:2]];
if (memwrite && HREADYTim) RAM[HWADDR[31:2]] <= HWDATA; if (memwrite && HREADYTim) RAM[HWADDR[31:2]] <= HWDATA;
end end
end end

7
wally-pipelined/src/uncore/gpio.sv
View File

@ -29,9 +29,10 @@
module gpio ( module gpio (
input logic HCLK, HRESETn, input logic HCLK, HRESETn,
input logic [1:0] MemRWgpio, input logic HSELGPIO,
input logic [7:0] HADDR, input logic [7:0] HADDR,
input logic [`XLEN-1:0] HWDATA, input logic [`XLEN-1:0] HWDATA,
input logic HWRITE,
output logic [`XLEN-1:0] HREADGPIO, output logic [`XLEN-1:0] HREADGPIO,
output logic HRESPGPIO, HREADYGPIO, output logic HRESPGPIO, HREADYGPIO,
input logic [31:0] GPIOPinsIn, input logic [31:0] GPIOPinsIn,
@ -42,8 +43,8 @@ module gpio (
logic [7:0] entry; logic [7:0] entry;
logic memread, memwrite; logic memread, memwrite;
assign memread = MemRWgpio[1]; assign memread = HSELGPIO & ~HWRITE;
assign memwrite = MemRWgpio[0]; assign memwrite = HSELGPIO & HWRITE;
assign HRESPGPIO = 0; // OK assign HRESPGPIO = 0; // OK
always_ff @(posedge HCLK) // delay response to data cycle always_ff @(posedge HCLK) // delay response to data cycle
HREADYGPIO <= memread | memwrite; HREADYGPIO <= memread | memwrite;

49
wally-pipelined/src/uncore/uart.sv
View File

@ -29,8 +29,9 @@
module uart ( module uart (
input logic HCLK, HRESETn, input logic HCLK, HRESETn,
input logic [1:0] MemRWuart, input logic HSELUART,
input logic [2:0] HADDR, input logic [2:0] HADDR,
input logic HWRITE,
input logic [`XLEN-1:0] HWDATA, input logic [`XLEN-1:0] HWDATA,
output logic [`XLEN-1:0] HREADUART, output logic [`XLEN-1:0] HREADUART,
output logic HRESPUART, HREADYUART, output logic HRESPUART, HREADYUART,
@ -44,37 +45,37 @@ module uart (
logic [7:0] Din, Dout; logic [7:0] Din, Dout;
// rename processor interface signals to match PC16550D and provide one-byte interface // rename processor interface signals to match PC16550D and provide one-byte interface
assign MEMRb = ~MemRWuart[1]; always_ff @(posedge HCLK) begin
assign MEMWb = ~MemRWuart[0]; MEMRb <= ~(HSELUART & ~HWRITE);
assign A = HADDR[2:0]; MEMWb <= ~(HSELUART & HWRITE);
A <= HADDR[2:0];
end
assign HRESPUART = 0; // OK assign HRESPUART = 0; // OK
//assign HREADYUART = 1; // Respond immediately assign HREADYUART = 1; // should idle high during address phase and respond high when done; will need to be modified if UART ever needs more than 1 cycle to do something
always_ff @(posedge HCLK) // delay response to data cycle
HREADYUART <= ~MEMRb | ~MEMWb;
generate generate
if (`XLEN == 64) begin if (`XLEN == 64) begin
always @(posedge HCLK) begin always_comb begin
HREADUART = {Dout, Dout, Dout, Dout, Dout, Dout, Dout, Dout}; HREADUART = {Dout, Dout, Dout, Dout, Dout, Dout, Dout, Dout};
case (HADDR) case (A)
3'b000: Din <= HWDATA[7:0]; 3'b000: Din = HWDATA[7:0];
3'b001: Din <= HWDATA[15:8]; 3'b001: Din = HWDATA[15:8];
3'b010: Din <= HWDATA[23:16]; 3'b010: Din = HWDATA[23:16];
3'b011: Din <= HWDATA[31:24]; 3'b011: Din = HWDATA[31:24];
3'b100: Din <= HWDATA[39:32]; 3'b100: Din = HWDATA[39:32];
3'b101: Din <= HWDATA[47:40]; 3'b101: Din = HWDATA[47:40];
3'b110: Din <= HWDATA[55:48]; 3'b110: Din = HWDATA[55:48];
3'b111: Din <= HWDATA[63:56]; 3'b111: Din = HWDATA[63:56];
endcase endcase
end end
end else begin // 32-bit end else begin // 32-bit
always @(posedge HCLK) begin always_comb begin
HREADUART = {Dout, Dout, Dout, Dout}; HREADUART = {Dout, Dout, Dout, Dout};
case (HADDR[1:0]) case (A[1:0])
2'b00: Din <= HWDATA[7:0]; 2'b00: Din = HWDATA[7:0];
2'b01: Din <= HWDATA[15:8]; 2'b01: Din = HWDATA[15:8];
2'b10: Din <= HWDATA[23:16]; 2'b10: Din = HWDATA[23:16];
2'b11: Din <= HWDATA[31:24]; 2'b11: Din = HWDATA[31:24];
endcase endcase
end end
end end

2
wally-pipelined/src/uncore/uartPC16550D.sv
View File

@ -376,7 +376,7 @@ module uartPC16550D(
TXHR <= Din; TXHR <= Din;
txhrfull <= 1; txhrfull <= 1;
end end
$display("UART transmits: %c",Din); // for testbench $write("%c",Din); // for testbench
end end
if (txstate == UART_IDLE) begin // move data into tx shift register if available if (txstate == UART_IDLE) begin // move data into tx shift register if available
if (fifoenabled) begin if (fifoenabled) begin

63
wally-pipelined/src/uncore/uncore.sv
View File

@ -2,7 +2,7 @@
// uncore.sv // uncore.sv
// //
// Written: David_Harris@hmc.edu 9 January 2021 // Written: David_Harris@hmc.edu 9 January 2021
// Modified: // Modified: Ben Bracker 6 Mar 2021 to better fit AMBA 3 AHB-Lite spec
// //
// Purpose: System-on-Chip components outside the core (hart) // Purpose: System-on-Chip components outside the core (hart)
// Memories, peripherals, external bus control // Memories, peripherals, external bus control
@ -59,14 +59,14 @@ module uncore (
logic [`XLEN-1:0] HWDATA; logic [`XLEN-1:0] HWDATA;
logic [`XLEN-1:0] HREADTim, HREADCLINT, HREADGPIO, HREADUART; logic [`XLEN-1:0] HREADTim, HREADCLINT, HREADGPIO, HREADUART;
logic HSELTim, HSELCLINT, HSELGPIO, PreHSELUART, HSELUART; logic HSELTim, HSELCLINT, HSELGPIO, PreHSELUART, HSELUART;
logic HSELTimD, HSELCLINTD, HSELGPIOD, HSELUARTD;
logic HRESPTim, HRESPCLINT, HRESPGPIO, HRESPUART; logic HRESPTim, HRESPCLINT, HRESPGPIO, HRESPUART;
logic HREADYTim, HREADYCLINT, HREADYGPIO, HREADYUART; logic HREADYTim, HREADYCLINT, HREADYGPIO, HREADYUART;
logic [1:0] MemRW;
logic [1:0] MemRWtim, MemRWclint, MemRWgpio, MemRWuart;
`ifdef BOOTTIMBASE `ifdef BOOTTIMBASE
logic [`XLEN-1:0] HREADBootTim; logic [`XLEN-1:0] HREADBootTim;
logic HSELBootTim, HRESPBootTim, HREADYBootTim; logic HSELBootTim, HSELBootTimD, HRESPBootTim, HREADYBootTim;
logic [1:0] MemRWboottim; logic [1:0] MemRWboottim;
`endif `endif
logic UARTIntr;// *** will need to tie INTR to an interrupt handler logic UARTIntr;// *** will need to tie INTR to an interrupt handler
@ -95,13 +95,6 @@ module uncore (
assign MemRWgpio = MemRW & {2{HSELGPIO}}; assign MemRWgpio = MemRW & {2{HSELGPIO}};
`endif `endif
assign MemRWuart = MemRW & {2{HSELUART}}; assign MemRWuart = MemRW & {2{HSELUART}};
/* always_ff @(posedge HCLK) begin
HADDRD <= HADDR;
MemRWtim <= MemRW & {2{HSELTim}};
MemRWclint <= MemRW & {2{HSELCLINT}};
MemRWgpio <= MemRW & {2{HSELGPIO}};
MemRWuart <= MemRW & {2{HSELUART}};
end */
// subword accesses: converts HWDATAIN to HWDATA // subword accesses: converts HWDATAIN to HWDATA
subwordwrite sww(.*); subwordwrite sww(.*);
@ -120,45 +113,57 @@ module uncore (
`endif `endif
uart uart(.HADDR(HADDR[2:0]), .TXRDYb(), .RXRDYb(), .INTR(UARTIntr), .SIN(UARTSin), .SOUT(UARTSout), uart uart(.HADDR(HADDR[2:0]), .TXRDYb(), .RXRDYb(), .INTR(UARTIntr), .SIN(UARTSin), .SOUT(UARTSout),
.DSRb(1'b1), .DCDb(1'b1), .CTSb(1'b0), .RIb(1'b1), .DSRb(1'b1), .DCDb(1'b1), .CTSb(1'b0), .RIb(1'b1),
.RTSb(), .DTRb(), .OUT1b(), .OUT2b(), .*); .RTSb(), .DTRb(), .OUT1b(), .OUT2b(), .*);
// mux could also include external memory // mux could also include external memory
// AHB Read Multiplexer // AHB Read Multiplexer
assign HRDATA = ({`XLEN{HSELTim}} & HREADTim) | ({`XLEN{HSELCLINT}} & HREADCLINT) | assign HRDATA = ({`XLEN{HSELTimD}} & HREADTim) | ({`XLEN{HSELCLINTD}} & HREADCLINT) |
`ifdef GPIOBASE `ifdef GPIOBASE
({`XLEN{HSELGPIO}} & HREADGPIO) | ({`XLEN{HSELGPIOD}} & HREADGPIO) |
`endif `endif
`ifdef BOOTTIMBASE `ifdef BOOTTIMBASE
({`XLEN{HSELBootTim}} & HREADBootTim) | ({`XLEN{HSELBootTimD}} & HREADBootTim) |
`endif `endif
({`XLEN{HSELUART}} & HREADUART); ({`XLEN{HSELUARTD}} & HREADUART);
assign HRESP = HSELTim & HRESPTim | HSELCLINT & HRESPCLINT | assign HRESP = HSELTimD & HRESPTim | HSELCLINTD & HRESPCLINT |
`ifdef GPIOBASE `ifdef GPIOBASE
HSELGPIO & HRESPGPIO | HSELGPIOD & HRESPGPIO |
`endif `endif
`ifdef BOOTTIMBASE `ifdef BOOTTIMBASE
HSELBootTim & HRESPBootTim | HSELBootTimD & HRESPBootTim |
`endif `endif
HSELUART & HRESPUART; HSELUARTD & HRESPUART;
assign HREADY = HSELTim & HREADYTim | HSELCLINT & HREADYCLINT | assign HREADY = HSELTimD & HREADYTim | HSELCLINTD & HREADYCLINT |
`ifdef GPIOBASE `ifdef GPIOBASE
HSELGPIO & HREADYGPIO | HSELGPIOD & HREADYGPIO |
`endif `endif
`ifdef BOOTTIMBASE `ifdef BOOTTIMBASE
HSELBootTim & HREADYBootTim | HSELBootTimD & HREADYBootTim |
`endif `endif
HSELUART & HREADYUART; HSELUARTD & HREADYUART;
// Faults // Faults
assign DataAccessFaultM = ~(HSELTim | HSELCLINT | assign DataAccessFaultM = ~(HSELTimD | HSELCLINTD |
`ifdef GPIOBASE `ifdef GPIOBASE
HSELGPIO | HSELGPIOD |
`endif `endif
`ifdef BOOTTIMBASE `ifdef BOOTTIMBASE
HSELBootTim | HSELBootTimD |
`endif `endif
HSELUART); HSELUARTD);
// Synchronized Address Decoder (figure 4-2 in spec)
always_ff @(posedge HCLK) begin
HSELTimD <= HSELTim;
HSELCLINTD <= HSELCLINT;
`ifdef GPIOBASE
HSELGPIOD <= HSELGPIO;
`endif
HSELUARTD <= HSELUART;
`ifdef BOOTTIMBASE
HSELBootTimD <= HSELBootTim;
`endif
end
endmodule endmodule