Merge branch 'main' of github.com:davidharrishmc/riscv-wally into main

fpga/generator/xlnx_ddr4.tcl

@@ -41,7 +41,7 @@ set_property -dict [list CONFIG.C0.ControllerType {DDR4_SDRAM} \
 			CONFIG.C0.DDR4_CLKOUT0_DIVIDE {6} \
 			CONFIG.Reference_Clock {Differential} \
 			CONFIG.ADDN_UI_CLKOUT1.INSERT_VIP {0} \
-			CONFIG.ADDN_UI_CLKOUT1_FREQ_HZ {35} \
+			CONFIG.ADDN_UI_CLKOUT1_FREQ_HZ {30} \
 			CONFIG.ADDN_UI_CLKOUT2.INSERT_VIP {0} \
 			CONFIG.ADDN_UI_CLKOUT2_FREQ_HZ {208} \
 			CONFIG.ADDN_UI_CLKOUT3.INSERT_VIP {0} \

pipelined/src/cache/cache.sv

@@ -51,6 +51,7 @@ module cache #(parameter LINELEN,  NUMLINES,  NUMWAYS, LOGWPL, WORDLEN, MUXINTER
    // lsu control
   input logic                 IgnoreRequestTLB,
   input logic                 IgnoreRequestTrapM, 
+  input logic                 TrapM,
   input logic                 Cacheable,
    // Bus fsm interface
   output logic                CacheFetchLine,
@@ -195,7 +196,7 @@ module cache #(parameter LINELEN,  NUMLINES,  NUMWAYS, LOGWPL, WORDLEN, MUXINTER
   assign CacheRW = Cacheable ? RW : 2'b00;
   assign CacheAtomic = Cacheable ? Atomic : 2'b00;
   cachefsm cachefsm(.clk, .reset, .CacheFetchLine, .CacheWriteLine, .CacheBusAck, 
-		.CacheRW, .CacheAtomic, .CPUBusy, .IgnoreRequestTLB, .IgnoreRequestTrapM,
+		.CacheRW, .CacheAtomic, .CPUBusy, .IgnoreRequestTLB, .IgnoreRequestTrapM, .TrapM,
  		.CacheHit, .VictimDirty, .CacheStall, .CacheCommitted, 
 		.CacheMiss, .CacheAccess, .SelAdr, 
 		.ClearValid, .ClearDirty, .SetDirty,

pipelined/src/cache/cachefsm.sv

@@ -32,49 +32,50 @@
 
 module cachefsm
   (input logic clk,
-   input logic       reset,
+   input logic 		 reset,
    // inputs from IEU
    input logic [1:0] CacheRW,
    input logic [1:0] CacheAtomic,
-   input logic       FlushCache,
+   input logic 		 FlushCache,
    // hazard inputs
-   input logic       CPUBusy,
+   input logic 		 CPUBusy,
    // interlock fsm
-   input logic       IgnoreRequestTLB,
+   input logic 		 IgnoreRequestTLB,
-   input logic       IgnoreRequestTrapM, 
+   input logic 		 IgnoreRequestTrapM,
+   input logic       TrapM,
    // Bus inputs
-   input logic       CacheBusAck,
+   input logic 		 CacheBusAck,
    // dcache internals
-   input logic       CacheHit,
+   input logic 		 CacheHit,
-   input logic       VictimDirty,
+   input logic 		 VictimDirty,
-   input logic       FlushAdrFlag,
+   input logic 		 FlushAdrFlag,
-   input logic       FlushWayFlag, 
+   input logic 		 FlushWayFlag, 
   
    // hazard outputs
-   output logic      CacheStall,
+   output logic 	 CacheStall,
    // counter outputs
-   output logic      CacheMiss,
+   output logic 	 CacheMiss,
-   output logic      CacheAccess,
+   output logic 	 CacheAccess,
    // Bus outputs
-   output logic      CacheCommitted,
+   output logic 	 CacheCommitted,
-   output logic      CacheWriteLine,
+   output logic 	 CacheWriteLine,
-   output logic      CacheFetchLine,
+   output logic 	 CacheFetchLine,
 
    // dcache internals
-   output logic      SelAdr,
+   output logic 	 SelAdr,
-   output logic      ClearValid,
+   output logic 	 ClearValid,
-   output logic      ClearDirty,
+   output logic 	 ClearDirty,
-   output logic      SetDirty,
+   output logic 	 SetDirty,
-   output logic      SetValid,
+   output logic 	 SetValid,
-   output logic      SelEvict,
+   output logic 	 SelEvict,
-   output logic      LRUWriteEn,
+   output logic 	 LRUWriteEn,
-   output logic      SelFlush,
+   output logic 	 SelFlush,
-   output logic      FlushAdrCntEn,
+   output logic 	 FlushAdrCntEn,
-   output logic      FlushWayCntEn, 
+   output logic 	 FlushWayCntEn, 
-   output logic      FlushAdrCntRst,
+   output logic 	 FlushAdrCntRst,
-   output logic      FlushWayCntRst,
+   output logic 	 FlushWayCntRst,
-   output logic      save,
+   output logic 	 save,
-   output logic      restore);
+   output logic 	 restore);
   
   logic               resetDelay;
   logic               AMO;
@@ -217,7 +218,7 @@ module cachefsm
                  (CurrState == STATE_MISS_WRITE_WORD & DoWrite & CPUBusy)) & ~`REPLAY;
 
   // **** can this be simplified?
-  assign SelAdr = (CurrState == STATE_READY & IgnoreRequestTLB) | // Ignore Request is needed on TLB miss.
+  assign SelAdr = (CurrState == STATE_READY & (IgnoreRequestTLB & ~TrapM)) | // Ignore Request is needed on TLB miss.
                   // use the raw requests as we don't want IgnoreRequestTrapM in the critical path
                   (CurrState == STATE_READY & ((AMO | CacheRW[0]) & CacheHit)) | // changes if store delay hazard removed
                   (CurrState == STATE_READY & (CacheRW[1] & CacheHit) & (CPUBusy & `REPLAY)) |

pipelined/src/ifu/ifu.sv

@@ -212,7 +212,7 @@ module ifu (
       cache #(.LINELEN(`ICACHE_LINELENINBITS),
               .NUMLINES(`ICACHE_WAYSIZEINBYTES*8/`ICACHE_LINELENINBITS),
               .NUMWAYS(`ICACHE_NUMWAYS), .LOGWPL(LOGWPL), .WORDLEN(32), .MUXINTERVAL(16), .DCACHE(0))
-      icache(.clk, .reset, .CPUBusy, .IgnoreRequestTLB(ITLBMissF), .IgnoreRequestTrapM('0),
+      icache(.clk, .reset, .CPUBusy, .IgnoreRequestTLB(ITLBMissF), .TrapM(TrapM), .IgnoreRequestTrapM('0),
              .CacheBusWriteData(ICacheBusWriteData), .CacheBusAck(ICacheBusAck),
              .CacheBusAdr(ICacheBusAdr), .CacheStall(ICacheStallF), 
              .CacheFetchLine(ICacheFetchLine),

pipelined/src/lsu/busfsm.sv

@@ -135,7 +135,7 @@ module busfsm #(parameter integer   WordCountThreshold,
 						   (BusCurrState == STATE_BUS_UNCACHED_WRITE) |
                            (BusCurrState == STATE_BUS_WRITE);
 
-  assign UnCachedLSUBusRead = (BusCurrState == STATE_BUS_READY & UnCachedAccess & LSURWM[1] & IgnoreRequest) |
+  assign UnCachedLSUBusRead = (BusCurrState == STATE_BUS_READY & UnCachedAccess & LSURWM[1] & ~IgnoreRequest) |
 							  (BusCurrState == STATE_BUS_UNCACHED_READ);
   assign LSUBusRead = UnCachedLSUBusRead | (BusCurrState == STATE_BUS_FETCH) | (BusCurrState == STATE_BUS_READY & DCacheFetchLine);
 

pipelined/src/lsu/lsu.sv

@@ -232,7 +232,7 @@ module lsu (
         .ByteMask(ByteMaskM), .WordCount,
         .FinalWriteData(FinalWriteDataM), .Cacheable(CacheableM),
         .CacheStall(DCacheStallM), .CacheMiss(DCacheMiss), .CacheAccess(DCacheAccess),
-        .IgnoreRequestTLB, .IgnoreRequestTrapM, .CacheCommitted(DCacheCommittedM), 
+        .IgnoreRequestTLB, .IgnoreRequestTrapM, .TrapM(1'b0), .CacheCommitted(DCacheCommittedM), 
         .CacheBusAdr(DCacheBusAdr), .ReadDataWord(ReadDataWordM), 
         .CacheBusWriteData(DCacheBusWriteData), .CacheFetchLine(DCacheFetchLine), 
         .CacheWriteLine(DCacheWriteLine), .CacheBusAck(DCacheBusAck), .InvalidateCacheM(1'b0));

pipelined/src/uncore/uartPC16550D.sv

@@ -143,7 +143,9 @@ module uartPC16550D(
       LSR <= #1 8'b01100000;
       MSR <= #1 4'b0;
       if (`FPGA) begin
-		DLL <= #1 8'd38;
+		//DLL <= #1 8'd38; // 35Mhz
+		//DLL <= #1 8'd11; // 10 Mhz
+		DLL <= #1 8'd33; // 30 Mhz
 		DLM <= #1 8'b0;
       end else begin
 		DLL <= #1 8'd1; // this cannot be zero with DLM also zer0.
@@ -161,7 +163,9 @@ module uartPC16550D(
 		   -----/\----- EXCLUDED -----/\----- */
 		  // *** BUG FIX ME for now for the divider to be 38.  Our clock is 35 Mhz.  35Mhz /(38 * 16) ~= 57600 baud, which is close enough to 57600 baud
 		  // freq /baud / 16 = div
-          3'b000: if (DLAB) DLL <= #1 8'd38; //else TXHR <= #1 Din; // TX handled in TX register/FIFO section
+          //3'b000: if (DLAB) DLL <= #1 8'd38; //else TXHR <= #1 Din; // TX handled in TX register/FIFO section
+		  //3'b000: if (DLAB) DLL <= #1 8'd11; //else TXHR <= #1 Din; // TX handled in
+		  3'b000: if (DLAB) DLL <= #1 8'd33; //else TXHR <= #1 Din; // TX handled in 		  
           3'b001: if (DLAB) DLM <= #1 8'b0; else IER <= #1 Din[3:0];
 
           3'b010: FCR <= #1 {Din[7:6], 2'b0, Din[3], 2'b0, Din[0]}; // Write only FIFO Control Register; 4:5 reserved and 2:1 self-clearing