ruige/eb001
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 信号同步时钟域错误

Browse Source
This commit is contained in:
RuigeLee
2023-10-08 15:30:08 +08:00
parent 92a6f6b5c3
commit a331599ad4
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/mac/MAC.scala
View File

@@ -239,7 +239,7 @@ val TxStartFrmOut = Wire(Bool())
val TxEndFrmOut = Wire(Bool()) val TxEndFrmOut = Wire(Bool())
val ReceivedPauseFrm = Wire(Bool()) val ReceivedPauseFrm = Wire(Bool())
val ControlFrmAddressOK = Wire(Bool()) val ControlFrmAddressOK = Wire(Bool())
val RxStatusWriteLatched_sync2 = Wire(Bool()) val RxStatusWriteLatchedSync = Wire(Bool())
val LateCollision = Wire(Bool()) val LateCollision = Wire(Bool())
val DeferIndication = Wire(Bool()) val DeferIndication = Wire(Bool())
val LateCollLatched = Wire(Bool()) val LateCollLatched = Wire(Bool())
@@ -305,7 +305,7 @@ dontTouch(TxStartFrmOut )
dontTouch(TxEndFrmOut ) dontTouch(TxEndFrmOut )
dontTouch(ReceivedPauseFrm ) dontTouch(ReceivedPauseFrm )
dontTouch(ControlFrmAddressOK ) dontTouch(ControlFrmAddressOK )
dontTouch(RxStatusWriteLatched_sync2 ) dontTouch(RxStatusWriteLatchedSync )
dontTouch(LateCollision ) dontTouch(LateCollision )
dontTouch(DeferIndication ) dontTouch(DeferIndication )
dontTouch(LateCollLatched ) dontTouch(LateCollLatched )
@@ -463,7 +463,7 @@ maccontrol.io.RxFlow := r_RxFlow
maccontrol.io.DlyCrcEn := r_DlyCrcEn maccontrol.io.DlyCrcEn := r_DlyCrcEn
maccontrol.io.TxPauseTV := r_TxPauseTV maccontrol.io.TxPauseTV := r_TxPauseTV
maccontrol.io.MAC := r_MAC maccontrol.io.MAC := r_MAC
maccontrol.io.RxStatusWriteLatched_sync2 := RxStatusWriteLatched_sync2 maccontrol.io.RxStatusWriteLatched_sync2 := RxStatusWriteLatchedSync
maccontrol.io.r_PassAll := r_PassAll maccontrol.io.r_PassAll := r_PassAll
TxDataOut := maccontrol.io.TxDataOut TxDataOut := maccontrol.io.TxDataOut
@@ -728,7 +728,6 @@ val rxethmac = withClockAndReset(io.mrx_clk_pad_i.asClock, io.asyncReset)( Modul
PerPacketPad := wishbone.io.PerPacketPad PerPacketPad := wishbone.io.PerPacketPad
wishbone.io.MRxClk := io.mrx_clk_pad_i wishbone.io.MRxClk := io.mrx_clk_pad_i
RxStatusWriteLatched_sync2 := wishbone.io.RxStatusWriteLatched_sync2
wishbone.io.r_TxEn := r_TxEn wishbone.io.r_TxEn := r_TxEn
wishbone.io.r_RxEn := r_RxEn wishbone.io.r_RxEn := r_RxEn
@@ -894,6 +893,11 @@ val rxethmac = withClockAndReset(io.mrx_clk_pad_i.asClock, io.asyncReset)( Modul
val SyncRxStartFrmSync = ShiftRegister(macTileLinkRX.io.LatchedRxStartFrm, 2, false.B, true.B) val SyncRxStartFrmSync = ShiftRegister(macTileLinkRX.io.LatchedRxStartFrm, 2, false.B, true.B)
wishbone.io.SyncRxStartFrmSync := SyncRxStartFrmSync wishbone.io.SyncRxStartFrmSync := SyncRxStartFrmSync
wishbone.io.RxStatusWriteLatchedSyncb = ShiftRegister(RxStatusWriteLatchedSync, 2, false.B, true.B)
wishbone.io.LatchedRxLength_rxclk := macTileLinkRX.io.LatchedRxLength wishbone.io.LatchedRxLength_rxclk := macTileLinkRX.io.LatchedRxLength
wishbone.io.RxStatusInLatched_rxclk := macTileLinkRX.io.RxStatusInLatched wishbone.io.RxStatusInLatched_rxclk := macTileLinkRX.io.RxStatusInLatched
@@ -905,6 +909,7 @@ val rxethmac = withClockAndReset(io.mrx_clk_pad_i.asClock, io.asyncReset)( Modul
withClockAndReset( io.mrx_clk_pad_i.asClock, io.asyncReset ) { withClockAndReset( io.mrx_clk_pad_i.asClock, io.asyncReset ) {
RxStatusWriteLatchedSync := ShiftRegister(wishbone.io.RxStatusWriteLatched, 2, false.B, true.B)
macTileLinkRX.io.ShiftEndedSyncb := ShiftRegister( ShiftEndedSync, 2, false.B, true.B) macTileLinkRX.io.ShiftEndedSyncb := ShiftRegister( ShiftEndedSync, 2, false.B, true.B)
macTileLinkRX.io.RxAbortSyncb := ShiftRegister( RxAbortSync, 2, false.B, true.B ) macTileLinkRX.io.RxAbortSyncb := ShiftRegister( RxAbortSync, 2, false.B, true.B )
macTileLinkRX.io.Busy_IRQ_syncb := ShiftRegister( Busy_IRQ_sync, 2, false.B, true.B ) macTileLinkRX.io.Busy_IRQ_syncb := ShiftRegister( Busy_IRQ_sync, 2, false.B, true.B )

10
src/main/scala/mac/MacTilelink.scala
View File

@@ -60,7 +60,6 @@ abstract class MacTileLinkBase(edgeIn: TLEdgeIn, edgeOut: TLEdgeOut) extends Mod
// Rx // Rx
val MRxClk = Input(Bool()) // Receive clock (from PHY) val MRxClk = Input(Bool()) // Receive clock (from PHY)
val RxStatusWriteLatched_sync2 = Output(Bool())
//Register //Register
val r_TxEn = Input(Bool()) // Transmit enable val r_TxEn = Input(Bool()) // Transmit enable
@@ -106,6 +105,8 @@ abstract class MacTileLinkBase(edgeIn: TLEdgeIn, edgeOut: TLEdgeOut) extends Mod
val RxReady = Output(Bool()) val RxReady = Output(Bool())
val RxStatusIn = Output(UInt(9.W)) val RxStatusIn = Output(UInt(9.W))
val RxStatusWriteLatched = Output(Bool())
val RxStatusWriteLatchedSyncb = Input(Bool())
} }
@@ -293,10 +294,9 @@ abstract class MacTileLinkBase(edgeIn: TLEdgeIn, edgeOut: TLEdgeOut) extends Mod
val RxStatusWriteLatched = RegInit(false.B) val RxStatusWriteLatched = RegInit(false.B); io.RxStatusWriteLatched := RxStatusWriteLatched
val RxStatusWriteLatched_syncb = ShiftRegister(io.RxStatusWriteLatched_sync2, 2, false.B, true.B)
io.RxStatusWriteLatched_sync2 := ShiftRegister(RxStatusWriteLatched, 2, false.B, true.B)
@@ -908,7 +908,7 @@ abstract class MacTileLinkBase(edgeIn: TLEdgeIn, edgeOut: TLEdgeOut) extends Mod
// Latching and synchronizing RxStatusWrite signal. This signal is used for clearing the ReceivedPauseFrm signal // Latching and synchronizing RxStatusWrite signal. This signal is used for clearing the ReceivedPauseFrm signal
when(RxStatusWriteLatched_syncb){ when(io.RxStatusWriteLatchedSyncb){
RxStatusWriteLatched := false.B RxStatusWriteLatched := false.B
} .elsewhen(RxStatusWrite){ } .elsewhen(RxStatusWrite){
RxStatusWriteLatched := true.B RxStatusWriteLatched := true.B