add quick wishbone jtag test

diff --git a/src/soc/debug/dmi2jtag.py b/src/soc/debug/dmi2jtag.py
index 119aaf9860ff0f52e93f8fd2945cd7333c1a9962..24aa9d7956a75e590791730f6c593f2da2370b5d 100644 (file)
--- a/src/soc/debug/dmi2jtag.py
+++ b/src/soc/debug/dmi2jtag.py
@@ -8,6 +8,9 @@ from nmigen.cli import rtlil
 from c4m.nmigen.jtag.tap import TAP, IOType
 from soc.debug.dmi import  DMIInterface, DBGCore
 
+from nmigen_soc.wishbone.sram import SRAM
+from nmigen import Memory, Signal, Module
+
 from nmigen.back.pysim import Simulator, Delay, Settle, Tick
 from nmutil.util import wrap
 
@@ -152,7 +155,6 @@ def tms_data_getset(dut, tms, d_len, d_in=0):
         yield dut.bus.tdi.eq(tdi)
         yield dut.bus.tck.eq(0)
         yield
-    yield dut.bus.tdi.eq(0)
     yield dut.bus.tms.eq(0)
 
     return res
@@ -232,72 +234,105 @@ def dmi_sim(dut):
 # JTAG-ircodes for accessing DMI
 DMI_ADDR = 5
 DMI_READ = 6
-DMI_WRITE = 7
+DMI_WRRD = 7
+
+# JTAG-ircodes for accessing Wishbone
+WB_ADDR = 8
+WB_READ = 9
+WB_WRRD = 10
+
 
 def jtag_sim(dut):
 
-    if True:
-        # read idcode
-        yield from jtag_set_reset(dut)
-        idcode = yield from jtag_read_write_reg(dut, 0b1, 32)
-        print ("idcode", hex(idcode))
-        assert idcode == 0x18ff
+    ####### JTAGy stuff (IDCODE) ######
+
+    # read idcode
+    yield from jtag_set_reset(dut)
+    idcode = yield from jtag_read_write_reg(dut, 0b1, 32)
+    print ("idcode", hex(idcode))
+    assert idcode == 0x18ff
+
+    ####### JTAG to DMI ######
 
     # write DMI address
-    yield from jtag_read_write_reg(dut, 0b101, 8, DBGCore.CTRL)
+    yield from jtag_read_write_reg(dut, DMI_ADDR, 8, DBGCore.CTRL)
 
     # read DMI CTRL register
-    status = yield from jtag_read_write_reg(dut, 0b110, 64)
+    status = yield from jtag_read_write_reg(dut, DMI_READ, 64)
     print ("dmi ctrl status", hex(status))
     assert status == 4
 
     # write DMI address
-    yield from jtag_read_write_reg(dut, 0b101, 8, 0)
+    yield from jtag_read_write_reg(dut, DMI_ADDR, 8, 0)
 
     # write DMI CTRL register
-    status = yield from jtag_read_write_reg(dut, 0b111, 64, 0b101)
+    status = yield from jtag_read_write_reg(dut, DMI_WRRD, 64, 0b101)
     print ("dmi ctrl status", hex(status))
     assert status == 4 # returned old value (nice! cool feature!)
 
     # write DMI address
-    yield from jtag_read_write_reg(dut, 0b101, 8, DBGCore.CTRL)
+    yield from jtag_read_write_reg(dut, DMI_ADDR, 8, DBGCore.CTRL)
 
     # read DMI CTRL register
-    status = yield from jtag_read_write_reg(dut, 0b110, 64)
+    status = yield from jtag_read_write_reg(dut, DMI_READ, 64)
     print ("dmi ctrl status", hex(status))
     assert status == 5
 
     # write DMI MSR address
-    yield from jtag_read_write_reg(dut, 0b101, 8, DBGCore.MSR)
+    yield from jtag_read_write_reg(dut, DMI_ADDR, 8, DBGCore.MSR)
 
     # read DMI MSR register
-    msr = yield from jtag_read_write_reg(dut, 0b110, 64)
+    msr = yield from jtag_read_write_reg(dut, DMI_READ, 64)
     print ("dmi msr", hex(msr))
     assert msr == 0xdeadbeef
 
-    yield
+    ####### JTAG to Wishbone ######
+
+    # write Wishbone address
+    yield from jtag_read_write_reg(dut, WB_ADDR, 16, 0x18)
+
+    # write/read wishbone data
+    data = yield from jtag_read_write_reg(dut, WB_WRRD, 16, 0xfeef)
+    print ("wb write", hex(data))
+
+    # write Wishbone address
+    yield from jtag_read_write_reg(dut, WB_ADDR, 16, 0x18)
+
+    # write/read wishbone data
+    data = yield from jtag_read_write_reg(dut, WB_READ, 16, 0)
+    print ("wb read", hex(data))
+
+    ####### done - tell dmi_sim to stop (otherwise it won't) ########
 
     global stop
     stop = True
 
+
 if __name__ == '__main__':
     dut = DMITAP(ir_width=4)
     iotypes = (IOType.In, IOType.Out, IOType.TriOut, IOType.InTriOut)
     ios = [dut.add_io(iotype=iotype) for iotype in iotypes]
     dut.sr = dut.add_shiftreg(ircode=4, length=3) # test loopback register
-    dut.dmi = dut.add_dmi(ircodes=[DMI_ADDR, DMI_READ, DMI_WRITE])
+
+    # create and connect wishbone SRAM (a quick way to do WB test)
+    dut.wb = dut.add_wishbone(ircodes=[WB_ADDR, WB_READ, WB_WRRD],
+                               address_width=16, data_width=16)
+    memory = Memory(width=16, depth=16)
+    sram = SRAM(memory=memory, bus=dut.wb)
+
+    # create DMI2JTAG (goes through to dmi_sim())
+    dut.dmi = dut.add_dmi(ircodes=[DMI_ADDR, DMI_READ, DMI_WRRD])
 
     m = Module()
     m.submodules.ast = dut
+    m.submodules.sram = sram
     m.d.comb += dut.sr.i.eq(dut.sr.o) # loopback
 
     sim = Simulator(m)
     sim.add_clock(1e-6, domain="sync")      # standard clock
 
-    sim.add_sync_process(wrap(jtag_sim(dut)))
-    sim.add_sync_process(wrap(dmi_sim(dut)))
+    sim.add_sync_process(wrap(jtag_sim(dut))) # actual jtag tester
+    sim.add_sync_process(wrap(dmi_sim(dut)))  # handles (pretends to be) DMI
 
     with sim.write_vcd("dmi2jtag_test.vcd"):
         sim.run()
-
-