riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Merge pull request #1263 from freechipsproject/sim_jtag_reset

Browse Source 
SimJTAG: make the reset/init connectivity more flexible.
This commit is contained in:
Megan Wachs 2018-03-06 11:28:51 -08:00 committed by GitHub
commit f00e9576e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/devices/debug/Periphery.scala
View File

@ -47,7 +47,8 @@ trait HasPeripheryDebugBundle {
} }
debug.systemjtag.foreach { sj => debug.systemjtag.foreach { sj =>
//val jtag = Module(new JTAGVPI(tckHalfPeriod = tckHalfPeriod, cmdDelay = cmdDelay)).connect(sj.jtag, sj.reset, r, out) //val jtag = Module(new JTAGVPI(tckHalfPeriod = tckHalfPeriod, cmdDelay = cmdDelay)).connect(sj.jtag, sj.reset, r, out)
val jtag = Module(new SimJTAG(tickDelay=3)).connect(sj.jtag, sj.reset, c, r, out) val jtag = Module(new SimJTAG(tickDelay=3)).connect(sj.jtag, c, r, ~r, out)
sj.reset := r
sj.mfr_id := p(JtagDTMKey).idcodeManufId.U(11.W) sj.mfr_id := p(JtagDTMKey).idcodeManufId.U(11.W)
} }
debug.psd.foreach { _ <> psd } debug.psd.foreach { _ <> psd }
@ -120,15 +121,14 @@ class SimJTAG(tickDelay: Int = 50) extends BlackBox(Map("TICK_DELAY" -> IntParam
val exit = UInt(OUTPUT, 32) val exit = UInt(OUTPUT, 32)
} }
def connect(dutio: JTAGIO, jtag_reset: Bool, tbclock: Clock, tbreset: Bool, tbsuccess: Bool) = { def connect(dutio: JTAGIO, tbclock: Clock, tbreset: Bool, init_done: Bool, tbsuccess: Bool) = {
dutio <> io.jtag dutio <> io.jtag
jtag_reset := tbreset
io.clock := tbclock io.clock := tbclock
io.reset := tbreset io.reset := tbreset
io.enable := PlusArg("jtag_rbb_enable", 0, "Enable SimJTAG for JTAG Connections. Simulation will pause until connection is made.") io.enable := PlusArg("jtag_rbb_enable", 0, "Enable SimJTAG for JTAG Connections. Simulation will pause until connection is made.")
io.init_done := ~tbreset io.init_done := init_done
// Success is determined by the gdbserver // Success is determined by the gdbserver
// which is controlling this simulation. // which is controlling this simulation.
@ -149,11 +149,10 @@ class JTAGVPI(tckHalfPeriod: Int = 2, cmdDelay: Int = 2)(implicit val p: Paramet
val init_done = Bool(INPUT) val init_done = Bool(INPUT)
} }
def connect(dutio: JTAGIO, jtag_reset: Bool, tbreset: Bool, tbsuccess: Bool) = { def connect(dutio: JTAGIO, tbreset: Bool, tbsuccess: Bool) = {
dutio <> io.jtag dutio <> io.jtag
dutio.TRSTn.foreach{ _:= false.B} dutio.TRSTn.foreach{ _:= false.B}
jtag_reset := tbreset
io.enable := ~tbreset io.enable := ~tbreset
io.init_done := ~tbreset io.init_done := ~tbreset

8
vsrc/SimJTAG.v
View File

@ -48,6 +48,8 @@ module SimJTAG #(
bit __jtag_TDI; bit __jtag_TDI;
bit __jtag_TRSTn; bit __jtag_TRSTn;
int __exit; int __exit;
reg init_done_sticky;
assign #0.1 jtag_TCK = __jtag_TCK; assign #0.1 jtag_TCK = __jtag_TCK;
assign #0.1 jtag_TMS = __jtag_TMS; assign #0.1 jtag_TMS = __jtag_TMS;
@ -61,8 +63,10 @@ module SimJTAG #(
if (reset || r_reset) begin if (reset || r_reset) begin
__exit = 0; __exit = 0;
tickCounterReg <= TICK_DELAY; tickCounterReg <= TICK_DELAY;
init_done_sticky <= 1'b0;
end else begin end else begin
if (enable && init_done) begin init_done_sticky <= init_done | init_done_sticky;
if (enable && init_done_sticky) begin
tickCounterReg <= tickCounterNxt; tickCounterReg <= tickCounterNxt;
if (tickCounterReg == 0) begin if (tickCounterReg == 0) begin
__exit = jtag_tick( __exit = jtag_tick(
@ -72,7 +76,7 @@ module SimJTAG #(
__jtag_TRSTn, __jtag_TRSTn,
__jtag_TDO); __jtag_TDO);
end end
end // if (enable && init_done) end // if (enable && init_done_sticky)
end // else: !if(reset || r_reset) end // else: !if(reset || r_reset)
end // always @ (posedge clock) end // always @ (posedge clock)