From f17d405369a8d3c6d2c0eb345e8df18bb90deabb Mon Sep 17 00:00:00 2001
From: RuigeLee <wut.ruigeli@gmail.com>
Date: Fri, 20 Oct 2023 15:49:24 +0800
Subject: [PATCH] =?UTF-8?q?Rx=20DMA=20=E4=BC=A0=E8=BE=93=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/scala/Switch/RxBuff.scala    |  4 ++-
 src/main/scala/Switch/SwitchMux.scala | 39 ++++++++++++---------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/main/scala/Switch/RxBuff.scala b/src/main/scala/Switch/RxBuff.scala
index 2471f73..3374121 100644
--- a/src/main/scala/Switch/RxBuff.scala
+++ b/src/main/scala/Switch/RxBuff.scala
@@ -107,6 +107,8 @@ trait RxBuffEnq{ this: RxBuffBase =>
       } .otherwise{
         assert(false.B, "Assert Failed, Rx Under Run")
       }
+    }.elsewhen( recCnt === 5.U ){
+      recCnt := 6.U
     }
   }
 
@@ -117,7 +119,7 @@ trait RxBuffDeq{ this: RxBuffBase =>
   when( io.deq.header.fire ){
     when( isDeqPi ) { hValid(0) := false.B }
     when( isDeqPo ) { hValid(1) := false.B }
-  } .elsewhen( recCnt === 5.U ){
+  } .elsewhen( io.enq.data.fire & recCnt === 5.U ){
     when( isEnqPi ) { hValid(0) := true.B }
     when( isEnqPo ) { hValid(1) := true.B }
   }
diff --git a/src/main/scala/Switch/SwitchMux.scala b/src/main/scala/Switch/SwitchMux.scala
index 4d0dbdb..93e9d45 100644
--- a/src/main/scala/Switch/SwitchMux.scala
+++ b/src/main/scala/Switch/SwitchMux.scala
@@ -52,7 +52,7 @@ class SwitchMux(edgeOut: TLEdgeOut)(implicit p: Parameters) extends SwitchModule
     ))
 
 
-    def ptr = 0x8002000
+    def ptr = "h80002000".U
     def txLength       = 8.U
     def PerPacketCrcEn = true.B
     def PerPacketPad   = true.B
@@ -62,7 +62,7 @@ class SwitchMux(edgeOut: TLEdgeOut)(implicit p: Parameters) extends SwitchModule
 
 
 
-  rxBuff.io.deq.ctrl.ready := stateCur === stateRx
+  rxBuff.io.deq.ctrl.ready := stateCur === stateRx & io.dmaMst.D.fire & isLastD
 
 
   val txReqValid = RegInit(false.B)
@@ -94,17 +94,19 @@ class SwitchMux(edgeOut: TLEdgeOut)(implicit p: Parameters) extends SwitchModule
   val dmaAddress = Reg( UInt(32.W) )
 
   when( stateCur === stateIdle && stateNxt =/= stateIdle ){
-    dmaAddress := ptr.U
+    dmaAddress := ptr
   } .elsewhen( io.dmaMst.A.fire ){
     dmaAddress := dmaAddress + 4.U
   }
 
-  rxBuff.io.deq.data.ready := io.dmaMst.A.ready & stateCur === stateRx
+  rxBuff.io.deq.data.ready := io.dmaMst.A.fire & (stateCur === stateRx)
+  assert( ~(rxBuff.io.deq.data.ready & ~rxBuff.io.deq.data.valid) )
+
   rxBuff.io.deq.header.ready := ~io.triTx && ~txReqValid
 
-  when( io.dmaMst.A.fire & stateCur === stateTx ){
+  when( io.dmaMst.A.fire ){
     dmaTxAValid := false.B
-  } .elsewhen( txBuff.io.enq.req.fire | (io.dmaMst.D.fire & isLastD & stateCur === stateTx & dmaAddress >= (ptr.U + txLength)) ){
+  } .elsewhen( txBuff.io.enq.req.fire | (stateCur === stateTx & io.dmaMst.D.fire & isLastD & dmaAddress < (ptr + txLength)) ){
     dmaTxAValid := true.B
     dmaTxABits :=
       edgeOut.Get(
@@ -112,31 +114,24 @@ class SwitchMux(edgeOut: TLEdgeOut)(implicit p: Parameters) extends SwitchModule
         toAddress = dmaAddress >> 2 << 2,
         lgSize = log2Ceil(32/8).U,
       )._2
-  }
-
-
-  io.dmaMst.A.valid :=
-    Mux1H(Seq(
-      ( stateCur === stateRx ) -> rxBuff.io.deq.data.valid,
-      ( stateCur === stateTx ) -> dmaTxAValid,
-    ))
-
-  when( stateCur === stateRx ){
-    io.dmaMst.A.bits := 
+  } .elsewhen( rxBuff.io.deq.header.fire | (stateCur === stateRx & io.dmaMst.D.fire & isLastD & rxBuff.io.deq.data.valid ) ) {
+    dmaTxAValid := true.B
+    dmaTxABits :=
       edgeOut.Put(
         fromSource = 0.U,
         toAddress = dmaAddress >> 2 << 2,
         lgSize = log2Ceil(32/8).U,
         data = rxBuff.io.deq.data.bits,
         mask = "b1111".U,
-      )._2    
-  } .elsewhen( stateCur === stateTx ){
-    io.dmaMst.A.bits := dmaTxABits
-  } .otherwise{
-    io.dmaMst.A.bits := DontCare
+      )._2
   }
 
 
+  io.dmaMst.A.valid := dmaTxAValid
+  io.dmaMst.A.bits := dmaTxABits
+
+
+
   txBuff.io.enq.data.valid := io.dmaMst.D.valid & stateCur === stateTx
   txBuff.io.enq.data.bits  := io.dmaMst.D.bits.data