Merge pull request #276 from LYWalker/master

Add ability to debug over Intel Virtual JTAG
This commit is contained in:
Dolu1990 2022-11-18 17:38:50 +01:00
parent e19e59b55c
commit 4ae7386904
3 changed files with 123 additions and 1 deletions

View File

@ -346,11 +346,13 @@ To connect OpenOCD (https://github.com/SpinalHDL/openocd_riscv) to the simulatio
```sh ```sh
src/openocd -f tcl/interface/jtag_tcp.cfg -c "set BRIEY_CPU0_YAML /home/spinalvm/Spinal/VexRiscv/cpu0.yaml" -f tcl/target/briey.cfg src/openocd -f tcl/interface/jtag_tcp.cfg -c "set BRIEY_CPU0_YAML /home/spinalvm/Spinal/VexRiscv/cpu0.yaml" -f tcl/target/briey.cfg
``` ```
To connect OpenOCD to Altera FPGAs (Intel VJTAG) see here: https://github.com/SpinalHDL/VexRiscv/tree/master/doc/vjtag
You can find multiple software examples and demos here: <https://github.com/SpinalHDL/VexRiscvSocSoftware/tree/master/projects/briey> You can find multiple software examples and demos here: <https://github.com/SpinalHDL/VexRiscvSocSoftware/tree/master/projects/briey>
You can find some FPGA projects which instantiate the Briey SoC here (DE1-SoC, DE0-Nano): https://drive.google.com/drive/folders/0B-CqLXDTaMbKZGdJZlZ5THAxRTQ?usp=sharing You can find some FPGA projects which instantiate the Briey SoC here (DE1-SoC, DE0-Nano): https://drive.google.com/drive/folders/0B-CqLXDTaMbKZGdJZlZ5THAxRTQ?usp=sharing
Here are some measurements of Briey SoC timings and area: Here are some measurements of Briey SoC timings and area:
``` ```

106
doc/vjtag/README.md Normal file
View File

@ -0,0 +1,106 @@
# Intel VJTAG
*By Levi Walker (@LYWalker)*
Intel VJTAG allows JTAG communication with the FPGA fabric of Altera devices through the standard USB cable using the onboard USB-Blaster. This avoids the needs to breakout the JTAG signals to the GPIO and use a dedicated external debugger.
## How to use VJTAG with Briey
In Briey.scala remove the following lines (note: line numbers may differ, depending on edits):
```
[185] val jtag = slave(Jtag())
...
[466] val tcpJtag = JtagTcp(
[467] jtag = dut.io.jtag,
[468] jtagClkPeriod = jtagClkPeriod
[469] )
```
Then VJAG can be added in two ways.
### Method 1
Replace the following line in Briey.scala:
```
[311] io.jtag <> plugin.io.bus.fromJtag()
```
with
```
[311] plugin.io.bus.fromVJtag()
```
### Method 2
Replace the following line in Briey.scala:
```
[311] io.jtag <> plugin.io.bus.fromJtag()
```
with
```
[311] val tap = new sld_virtual_jtag(2)
[312] val jtagCtrl = tap.toJtagTapInstructionCtrl()
[313] jtagCtrl <> plugin.io.bus.fromJtagInstructionCtrl(ClockDomain(tap.io.tck),0)
```
And add
```
import spinal.lib.blackbox.altera.sld_virtual_jtag
```
to the imports at the top of the file.
This uses the existing JtagInstructionCtrl architecture and communicates using DR headers.
## Using OpenOCD
First, clone and setup openocd with the steps as provided by https://github.com/SpinalHDL/openocd_riscv
Then in tcl/target/Briey.cfg set `_USE_VJTAG` to 1:
```
[3] set _USE_VJTAG 1
```
Then if you used Method 1 above uncomment line 25:
```
[25] vexriscv jtagMapping 0 1 0 0 0 0
```
If you used Method 2 uncomment line 27:
```
[27] vexriscv jtagMapping 0 0 0 1 2 2
```
If the board uses USB-Blaster2 then run OpenOCD in shell using:
```
openocd -c "set CPU0_YAML ../VexRiscv/cpu0.yaml" \
-f tcl/interface/altera-usb-blaster2.cfg \
-f tcl/interface/soc_init.cfg
```
Note: you may need to edit `tcl/interface/altera-usb-blaster2.cfg` with your quartus path.
If using an older board using USB-Blaster run using:
```
openocd -c "set CPU0_YAML ../VexRiscv/cpu0.yaml" -f tcl/interface/altera-usb-blaster.cfg -f tcl/interface/Briey.cfg
```
On success it should look something like:
```
Open On-Chip Debugger 0.11.0+dev-02588-gb10abb4b1 (2022-11-07-13:38)
Licensed under GNU GPL v2
For bug reports, read
http://openocd.org/doc/doxygen/bugs.html
../../Verilog/cpu0.yaml
Info : only one transport option; autoselect 'jtag'
DEPRECATED! use 'adapter speed' not 'adapter_khz'
DEPRECATED! use 'adapter srst delay' not 'adapter_nsrst_delay'
Info : set servers polling period to 50ms
Info : usb blaster interface using libftdi
Info : This adapter doesn't support configurable speed
Info : JTAG tap: fpgasoc.fpga.tap tap/device found: 0x020f20dd (mfg: 0x06e (Altera), part: 0x20f2, ver: 0x0)
[fpga_spinal.cpu0] Target successfully examined.
Info : starting gdb server for fpga_spinal.cpu0 on 3333
Info : Listening on port 3333 for gdb connections
requesting target halt and executing a soft reset
Info : Listening on port 6666 for tcl connections
Info : Listening on port 4444 for telnet connections
```
From this point on attach a gdb connection and debug the board as usual.
*NOTE: You may need to add your boards FPGA ID to line [21] of Briey.cfg, simply append it to the other expected ids using: `-expected-id <your id>`. The IDs for the DE1-SoC and DE0 have already been added.*

View File

@ -1,7 +1,7 @@
package vexriscv.plugin package vexriscv.plugin
import spinal.lib.com.jtag.{Jtag, JtagTapInstructionCtrl} import spinal.lib.com.jtag.{Jtag, JtagTapInstructionCtrl}
import spinal.lib.system.debugger.{JtagBridge, JtagBridgeNoTap, SystemDebugger, SystemDebuggerConfig, SystemDebuggerMemBus} import spinal.lib.system.debugger.{JtagBridge, JtagBridgeNoTap, VJtagBridge, SystemDebugger, SystemDebuggerConfig, SystemDebuggerMemBus}
import vexriscv.plugin.IntAluPlugin.{ALU_CTRL, AluCtrlEnum} import vexriscv.plugin.IntAluPlugin.{ALU_CTRL, AluCtrlEnum}
import vexriscv._ import vexriscv._
import vexriscv.ip._ import vexriscv.ip._
@ -164,6 +164,20 @@ case class DebugExtensionBus() extends Bundle with IMasterSlave{
debugger.io.remote <> jtagBridge.io.remote debugger.io.remote <> jtagBridge.io.remote
debugger.io.mem <> this.from(debugger.io.mem.c) debugger.io.mem <> this.from(debugger.io.mem.c)
} }
def fromVJtag() : Unit = {
val jtagConfig = SystemDebuggerConfig(
memAddressWidth = 32,
memDataWidth = 32,
remoteCmdWidth = 1
)
val jtagBridge = new VJtagBridge(jtagConfig)
val debugger = new SystemDebugger(jtagConfig)
debugger.io.remote <> jtagBridge.io.remote
debugger.io.mem <> this.from(debugger.io.mem.c)
}
} }
case class DebugExtensionIo() extends Bundle with IMasterSlave{ case class DebugExtensionIo() extends Bundle with IMasterSlave{