sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

detour jtag primitives.

This commit is contained in:
Uwe Bonnes 2020-04-16 19:38:32 +02:00
parent e34a27f72c
commit 9969c984f3
15 changed files with 203 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -32,6 +32,8 @@ SRC = \
gdb_packet.c \ gdb_packet.c \
hex_utils.c \ hex_utils.c \
jtag_devs.c \ jtag_devs.c \
jtag_scan.c \
jtagtap.c \
lmi.c \ lmi.c \
lpc_common.c \ lpc_common.c \
lpc11xx.c \ lpc11xx.c \
@ -72,12 +74,6 @@ ifdef NO_OWN_LL
SRC += jtagtap_generic.c swdptap_generic.c SRC += jtagtap_generic.c swdptap_generic.c
endif endif
ifndef OWN_HL
SRC += jtag_scan.c jtagtap.c
else
CFLAGS += -DOWN_HL
endif
ifdef PC_HOSTED ifdef PC_HOSTED
CFLAGS += -DPC_HOSTED=1 CFLAGS += -DPC_HOSTED=1
else else

30
src/include/jtagtap.h
View File

@ -21,13 +21,12 @@
#ifndef __JTAGTAP_H #ifndef __JTAGTAP_H
#define __JTAGTAP_H #define __JTAGTAP_H
typedef struct jtag_proc_s {
/* Note: Signal names are as for the device under test. */ /* Note: Signal names are as for the device under test. */
int jtagtap_init(void); void (*jtagtap_reset)(void);
void jtagtap_reset(void); uint8_t (*jtagtap_next)(const uint8_t TMS, const uint8_t TDI);
uint8_t jtagtap_next(const uint8_t TMS, const uint8_t TDI);
/* tap_next executes one state transision in the JTAG TAP state machine: /* tap_next executes one state transision in the JTAG TAP state machine:
* - Ensure TCK is low * - Ensure TCK is low
* - Assert the values of TMS and TDI * - Assert the values of TMS and TDI
@ -36,30 +35,39 @@ uint8_t jtagtap_next(const uint8_t TMS, const uint8_t TDI);
* - Release TCK. * - Release TCK.
*/ */
void jtagtap_tms_seq(uint32_t MS, int ticks); void (*jtagtap_tms_seq)(uint32_t MS, int ticks);
void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks); void (*jtagtap_tdi_tdo_seq)
void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks); (uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks);
/* Shift out a sequence on MS and DI, capture data to DO. /* Shift out a sequence on MS and DI, capture data to DO.
* - This is not endian safe: First byte will always be first shifted out. * - This is not endian safe: First byte will always be first shifted out.
* - DO may be NULL to ignore captured data. * - DO may be NULL to ignore captured data.
* - DO may be point to the same address as DI. * - DO may be point to the same address as DI.
*/ */
void (*jtagtap_tdi_seq)
(const uint8_t final_tms, const uint8_t *DI, int ticks);
} jtag_proc_t;
extern jtag_proc_t jtag_proc;
/* generic soft reset: 1, 1, 1, 1, 1, 0 */ /* generic soft reset: 1, 1, 1, 1, 1, 0 */
#define jtagtap_soft_reset() \ #define jtagtap_soft_reset() \
jtagtap_tms_seq(0x1F, 6) jtag_proc.jtagtap_tms_seq(0x1F, 6)
/* Goto Shift-IR: 1, 1, 0, 0 */ /* Goto Shift-IR: 1, 1, 0, 0 */
#define jtagtap_shift_ir() \ #define jtagtap_shift_ir() \
jtagtap_tms_seq(0x03, 4) jtag_proc.jtagtap_tms_seq(0x03, 4)
/* Goto Shift-DR: 1, 0, 0 */ /* Goto Shift-DR: 1, 0, 0 */
#define jtagtap_shift_dr() \ #define jtagtap_shift_dr() \
jtagtap_tms_seq(0x01, 3) jtag_proc.jtagtap_tms_seq(0x01, 3)
/* Goto Run-test/Idle: 1, 1, 0 */ /* Goto Run-test/Idle: 1, 1, 0 */
#define jtagtap_return_idle() \ #define jtagtap_return_idle() \
jtagtap_tms_seq(0x01, 2) jtag_proc.jtagtap_tms_seq(0x01, 2)
# if PC_HOSTED == 1
int platform_jtagtap_init(void);
# else
int jtagtap_init(void);
# endif
#endif #endif

31
src/platforms/common/jtagtap.c
View File

@ -26,10 +26,26 @@
#include "jtagtap.h" #include "jtagtap.h"
#include "gdb_packet.h" #include "gdb_packet.h"
int jtagtap_init(void) jtag_proc_t jtag_proc;
static void jtagtap_reset(void);
static void jtagtap_tms_seq(uint32_t MS, int ticks);
static void jtagtap_tdi_tdo_seq(
uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks);
static void jtagtap_tdi_seq(
const uint8_t final_tms, const uint8_t *DI, int ticks);
static uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI);
int jtagtap_init()
{ {
TMS_SET_MODE(); TMS_SET_MODE();
jtag_proc.jtagtap_reset = jtagtap_reset;
jtag_proc.jtagtap_next =jtagtap_next;
jtag_proc.jtagtap_tms_seq = jtagtap_tms_seq;
jtag_proc.jtagtap_tdi_tdo_seq = jtagtap_tdi_tdo_seq;
jtag_proc.jtagtap_tdi_seq = jtagtap_tdi_seq;
/* Go to JTAG mode for SWJ-DP */ /* Go to JTAG mode for SWJ-DP */
for(int i = 0; i <= 50; i++) jtagtap_next(1, 0); /* Reset SW-DP */ for(int i = 0; i <= 50; i++) jtagtap_next(1, 0); /* Reset SW-DP */
jtagtap_tms_seq(0xE73C, 16); /* SWD to JTAG sequence */ jtagtap_tms_seq(0xE73C, 16); /* SWD to JTAG sequence */
@ -38,7 +54,7 @@ int jtagtap_init(void)
return 0; return 0;
} }
void jtagtap_reset(void) static void jtagtap_reset(void)
{ {
#ifdef TRST_PORT #ifdef TRST_PORT
if (platform_hwversion() == 0) { if (platform_hwversion() == 0) {
@ -51,7 +67,7 @@ void jtagtap_reset(void)
jtagtap_soft_reset(); jtagtap_soft_reset();
} }
inline uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI) static uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI)
{ {
uint16_t ret; uint16_t ret;
@ -66,7 +82,7 @@ inline uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI)
return ret != 0; return ret != 0;
} }
void jtagtap_tms_seq(uint32_t MS, int ticks) static void jtagtap_tms_seq(uint32_t MS, int ticks)
{ {
gpio_set_val(TDI_PORT, TDI_PIN, 1); gpio_set_val(TDI_PORT, TDI_PIN, 1);
int data = MS & 1; int data = MS & 1;
@ -80,8 +96,8 @@ void jtagtap_tms_seq(uint32_t MS, int ticks)
} }
} }
void static void jtagtap_tdi_tdo_seq(
jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks) uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks)
{ {
uint8_t index = 1; uint8_t index = 1;
gpio_set_val(TMS_PORT, TMS_PIN, 0); gpio_set_val(TMS_PORT, TMS_PIN, 0);
@ -111,8 +127,7 @@ jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int
gpio_clear(TCK_PORT, TCK_PIN); gpio_clear(TCK_PORT, TCK_PIN);
} }
void static void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks)
jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks)
{ {
uint8_t index = 1; uint8_t index = 1;
while(ticks--) { while(ticks--) {

30
src/platforms/libftdi/jtagtap.c
View File

@ -33,7 +33,17 @@
#include "general.h" #include "general.h"
#include "jtagtap.h" #include "jtagtap.h"
int jtagtap_init(void) jtag_proc_t jtag_proc;
static void jtagtap_reset(void);
static void jtagtap_tms_seq(uint32_t MS, int ticks);
static void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms,
const uint8_t *DI, int ticks);
static void jtagtap_tdi_seq(
const uint8_t final_tms, const uint8_t *DI, int ticks);
static uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI);
int platform_jtagtap_init(void)
{ {
assert(ftdic != NULL); assert(ftdic != NULL);
int err = ftdi_usb_purge_buffers(ftdic); int err = ftdi_usb_purge_buffers(ftdic);
@ -65,6 +75,12 @@ int jtagtap_init(void)
platform_buffer_write(ftdi_init, 9); platform_buffer_write(ftdi_init, 9);
platform_buffer_flush(); platform_buffer_flush();
jtag_proc.jtagtap_reset = jtagtap_reset;
jtag_proc.jtagtap_next =jtagtap_next;
jtag_proc.jtagtap_tms_seq = jtagtap_tms_seq;
jtag_proc.jtagtap_tdi_tdo_seq = jtagtap_tdi_tdo_seq;
jtag_proc.jtagtap_tdi_seq = jtagtap_tdi_seq;
/* Go to JTAG mode for SWJ-DP */ /* Go to JTAG mode for SWJ-DP */
for (int i = 0; i <= 50; i++) for (int i = 0; i <= 50; i++)
jtagtap_next(1, 0); /* Reset SW-DP */ jtagtap_next(1, 0); /* Reset SW-DP */
@ -79,8 +95,7 @@ void jtagtap_reset(void)
jtagtap_soft_reset(); jtagtap_soft_reset();
} }
void static void jtagtap_tms_seq(uint32_t MS, int ticks)
jtagtap_tms_seq(uint32_t MS, int ticks)
{ {
uint8_t tmp[3] = {MPSSE_WRITE_TMS | MPSSE_LSB | MPSSE_BITMODE| MPSSE_READ_NEG, 0, 0}; uint8_t tmp[3] = {MPSSE_WRITE_TMS | MPSSE_LSB | MPSSE_BITMODE| MPSSE_READ_NEG, 0, 0};
while(ticks >= 0) { while(ticks >= 0) {
@ -92,8 +107,8 @@ jtagtap_tms_seq(uint32_t MS, int ticks)
} }
} }
void static void jtagtap_tdi_tdo_seq(
jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks) uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks)
{ {
int rsize, rticks; int rsize, rticks;
@ -157,12 +172,13 @@ jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int
} }
} }
void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks) static void jtagtap_tdi_seq(
const uint8_t final_tms, const uint8_t *DI, int ticks)
{ {
return jtagtap_tdi_tdo_seq(NULL, final_tms, DI, ticks); return jtagtap_tdi_tdo_seq(NULL, final_tms, DI, ticks);
} }
uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI) static uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI)
{ {
uint8_t ret; uint8_t ret;
uint8_t tmp[3] = {MPSSE_WRITE_TMS | MPSSE_DO_READ | MPSSE_LSB | MPSSE_BITMODE | MPSSE_WRITE_NEG, 0, 0}; uint8_t tmp[3] = {MPSSE_WRITE_TMS | MPSSE_DO_READ | MPSSE_LSB | MPSSE_BITMODE | MPSSE_WRITE_NEG, 0, 0};

5
src/platforms/libftdi/platform.c
View File

@ -191,6 +191,11 @@ int platform_jtag_scan(const uint8_t *lrlens)
return jtag_scan(lrlens); return jtag_scan(lrlens);
} }
int platform_jtag_dp_init()
{
return 0;
}
void platform_init(int argc, char **argv) void platform_init(int argc, char **argv)
{ {
BMP_CL_OPTIONS_t cl_opts = {0}; BMP_CL_OPTIONS_t cl_opts = {0};

33
src/platforms/pc-hosted/jtagtap.c
View File

@ -35,9 +35,17 @@
#include "remote.h" #include "remote.h"
#include "jtagtap.h" #include "jtagtap.h"
/* See remote.c/.h for protocol information */ jtag_proc_t jtag_proc;
int jtagtap_init(void) static void jtagtap_reset(void);
static void jtagtap_tms_seq(uint32_t MS, int ticks);
static void jtagtap_tdi_tdo_seq(
uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks);
static void jtagtap_tdi_seq(
const uint8_t final_tms, const uint8_t *DI, int ticks);
static uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI);
int platform_jtagtap_init(void)
{ {
uint8_t construct[PLATFORM_MAX_MSG_SIZE]; uint8_t construct[PLATFORM_MAX_MSG_SIZE];
int s; int s;
@ -52,10 +60,18 @@ int jtagtap_init(void)
exit(-1); exit(-1);
} }
jtag_proc.jtagtap_reset = jtagtap_reset;
jtag_proc.jtagtap_next =jtagtap_next;
jtag_proc.jtagtap_tms_seq = jtagtap_tms_seq;
jtag_proc.jtagtap_tdi_tdo_seq = jtagtap_tdi_tdo_seq;
jtag_proc.jtagtap_tdi_seq = jtagtap_tdi_seq;
return 0; return 0;
} }
void jtagtap_reset(void) /* See remote.c/.h for protocol information */
static void jtagtap_reset(void)
{ {
uint8_t construct[PLATFORM_MAX_MSG_SIZE]; uint8_t construct[PLATFORM_MAX_MSG_SIZE];
int s; int s;
@ -71,7 +87,7 @@ void jtagtap_reset(void)
} }
} }
void jtagtap_tms_seq(uint32_t MS, int ticks) static void jtagtap_tms_seq(uint32_t MS, int ticks)
{ {
uint8_t construct[PLATFORM_MAX_MSG_SIZE]; uint8_t construct[PLATFORM_MAX_MSG_SIZE];
@ -88,7 +104,8 @@ void jtagtap_tms_seq(uint32_t MS, int ticks)
} }
} }
void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks) static void jtagtap_tdi_tdo_seq(
uint8_t *DO, const uint8_t final_tms, const uint8_t *DI, int ticks)
{ {
uint8_t construct[PLATFORM_MAX_MSG_SIZE]; uint8_t construct[PLATFORM_MAX_MSG_SIZE];
int s; int s;
@ -116,14 +133,14 @@ void jtagtap_tdi_tdo_seq(uint8_t *DO, const uint8_t final_tms, const uint8_t *DI
} }
} }
void jtagtap_tdi_seq(const uint8_t final_tms, const uint8_t *DI, int ticks) static void jtagtap_tdi_seq(
const uint8_t final_tms, const uint8_t *DI, int ticks)
{ {
return jtagtap_tdi_tdo_seq(NULL, final_tms, DI, ticks); return jtagtap_tdi_tdo_seq(NULL, final_tms, DI, ticks);
} }
uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI) static uint8_t jtagtap_next(uint8_t dTMS, uint8_t dTDI)
{ {
uint8_t construct[PLATFORM_MAX_MSG_SIZE]; uint8_t construct[PLATFORM_MAX_MSG_SIZE];

5
src/platforms/pc-hosted/platform.c
View File

@ -44,6 +44,11 @@ int platform_jtag_scan(const uint8_t *lrlens)
return jtag_scan(lrlens); return jtag_scan(lrlens);
} }
int platform_jtag_dp_init()
{
return 0;
}
void platform_init(int argc, char **argv) void platform_init(int argc, char **argv)
{ {
cl_opts.opt_idstring = "Blackmagic Debug Probe Remote"; cl_opts.opt_idstring = "Blackmagic Debug Probe Remote";

73
src/platforms/pc-stlinkv2/adiv5_jtagdp.c
View File

@ -1,73 +0,0 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2019 Uwe Bonnes(bon@elektron.ikp.physik.tu-darmstadt.de)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* This file implements a subset of JTAG-DP specific functions of the
* ARM Debug Interface v5 Architecure Specification, ARM doc IHI0031A
* used in BMP.
*/
#include "general.h"
#include "target.h"
#include "adiv5.h"
#include "stlinkv2.h"
#include "jtag_devs.h"
struct jtag_dev_s jtag_devs[JTAG_MAX_DEVS+1];
int jtag_dev_count;
int jtag_scan_stlinkv2(const uint8_t *irlens)
{
uint32_t idcodes[JTAG_MAX_DEVS+1];
(void) *irlens;
target_list_free();
jtag_dev_count = 0;
memset(&jtag_devs, 0, sizeof(jtag_devs));
if (stlink_enter_debug_jtag())
return 0;
jtag_dev_count = stlink_read_idcodes(idcodes);
/* Check for known devices and handle accordingly */
for(int i = 0; i < jtag_dev_count; i++)
jtag_devs[i].idcode = idcodes[i];
for(int i = 0; i < jtag_dev_count; i++)
for(int j = 0; dev_descr[j].idcode; j++)
if((jtag_devs[i].idcode & dev_descr[j].idmask) ==
dev_descr[j].idcode) {
if(dev_descr[j].handler)
dev_descr[j].handler(&jtag_devs[i]);
break;
}
return jtag_dev_count;
}
void adiv5_jtag_dp_handler(jtag_dev_t *dev)
{
ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp));
dp->dev = dev;
dp->idcode = dev->idcode;
dp->dp_read = stlink_dp_read;
dp->error = stlink_dp_error;
dp->low_access = stlink_dp_low_access;
dp->abort = stlink_dp_abort;
adiv5_dp_init(dp);
}

6
src/platforms/pc-stlinkv2/platform.c
View File

@ -48,6 +48,7 @@ int platform_swdptap_init(void)
} }
swd_proc_t swd_proc; swd_proc_t swd_proc;
jtag_proc_t jtag_proc;
static int adiv5_swdp_scan_stlinkv2(void) static int adiv5_swdp_scan_stlinkv2(void)
{ {
@ -107,3 +108,8 @@ int platform_buffer_read(uint8_t *data, int size)
(void) data; (void) data;
return size; return size;
} }
int platform_jtagtap_init(void)
{
return 0;
}

43
src/platforms/pc-stlinkv2/stlinkv2.c
View File

@ -29,6 +29,8 @@
#include "adiv5.h" #include "adiv5.h"
#include "stlinkv2.h" #include "stlinkv2.h"
#include "exception.h" #include "exception.h"
#include "jtag_devs.h"
#include "target.h"
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
@ -1383,3 +1385,44 @@ uint32_t adiv5_ap_read(ADIv5_AP_t *ap, uint16_t addr)
stlink_read_dp_register(ap->apsel, addr, &ret); stlink_read_dp_register(ap->apsel, addr, &ret);
return ret; return ret;
} }
struct jtag_dev_s jtag_devs[JTAG_MAX_DEVS+1];
int jtag_dev_count;
jtag_proc_t jtag_proc;
int jtag_scan_stlinkv2(const uint8_t *irlens)
{
uint32_t idcodes[JTAG_MAX_DEVS+1];
(void) *irlens;
target_list_free();
jtag_dev_count = 0;
memset(&jtag_devs, 0, sizeof(jtag_devs));
if (stlink_enter_debug_jtag())
return 0;
jtag_dev_count = stlink_read_idcodes(idcodes);
/* Check for known devices and handle accordingly */
for(int i = 0; i < jtag_dev_count; i++)
jtag_devs[i].idcode = idcodes[i];
for(int i = 0; i < jtag_dev_count; i++)
for(int j = 0; dev_descr[j].idcode; j++)
if((jtag_devs[i].idcode & dev_descr[j].idmask) ==
dev_descr[j].idcode) {
if(dev_descr[j].handler)
dev_descr[j].handler(&jtag_devs[i]);
break;
}
return jtag_dev_count;
}
int platform_jtag_dp_init(ADIv5_DP_t *dp)
{
dp->dp_read = stlink_dp_read;
dp->error = stlink_dp_error;
dp->low_access = stlink_dp_low_access;
dp->abort = stlink_dp_abort;
return true;
}

8
src/remote.c
View File

@ -159,7 +159,7 @@ void remotePacketProcessJTAG(uint8_t i, char *packet)
break; break;
case REMOTE_RESET: /* = reset ================================= */ case REMOTE_RESET: /* = reset ================================= */
jtagtap_reset(); jtag_proc.jtagtap_reset();
_respond(REMOTE_RESP_OK, 0); _respond(REMOTE_RESP_OK, 0);
break; break;
@ -170,7 +170,7 @@ void remotePacketProcessJTAG(uint8_t i, char *packet)
if (i<4) { if (i<4) {
_respond(REMOTE_RESP_ERR,REMOTE_ERROR_WRONGLEN); _respond(REMOTE_RESP_ERR,REMOTE_ERROR_WRONGLEN);
} else { } else {
jtagtap_tms_seq( MS, ticks); jtag_proc.jtagtap_tms_seq( MS, ticks);
_respond(REMOTE_RESP_OK, 0); _respond(REMOTE_RESP_OK, 0);
} }
break; break;
@ -183,7 +183,7 @@ void remotePacketProcessJTAG(uint8_t i, char *packet)
} else { } else {
ticks=remotehston(2,&packet[2]); ticks=remotehston(2,&packet[2]);
DI=remotehston(-1,&packet[4]); DI=remotehston(-1,&packet[4]);
jtagtap_tdi_tdo_seq((void *)&DO, (packet[1]==REMOTE_TDITDO_TMS), (void *)&DI, ticks); jtag_proc.jtagtap_tdi_tdo_seq((void *)&DO, (packet[1]==REMOTE_TDITDO_TMS), (void *)&DI, ticks);
/* Mask extra bits on return value... */ /* Mask extra bits on return value... */
DO &= (1LL << (ticks + 1)) - 1; DO &= (1LL << (ticks + 1)) - 1;
@ -196,7 +196,7 @@ void remotePacketProcessJTAG(uint8_t i, char *packet)
if (i!=4) { if (i!=4) {
_respond(REMOTE_RESP_ERR,REMOTE_ERROR_WRONGLEN); _respond(REMOTE_RESP_ERR,REMOTE_ERROR_WRONGLEN);
} else { } else {
uint32_t dat=jtagtap_next( (packet[2]=='1'), (packet[3]=='1')); uint32_t dat=jtag_proc.jtagtap_next( (packet[2]=='1'), (packet[3]=='1'));
_respond(REMOTE_RESP_OK,dat); _respond(REMOTE_RESP_OK,dat);
} }
break; break;

6
src/target/adiv5.h
View File

@ -142,10 +142,15 @@ typedef struct ADIv5_DP_s {
uint16_t addr, uint32_t value); uint16_t addr, uint32_t value);
void (*abort)(struct ADIv5_DP_s *dp, uint32_t abort); void (*abort)(struct ADIv5_DP_s *dp, uint32_t abort);
#if PC_HOSTED == 1
jtag_dev_t *dev;
uint8_t fault;
#else
union { union {
jtag_dev_t *dev; jtag_dev_t *dev;
uint8_t fault; uint8_t fault;
}; };
#endif
} ADIv5_DP_t; } ADIv5_DP_t;
static inline uint32_t adiv5_dp_read(ADIv5_DP_t *dp, uint16_t addr) static inline uint32_t adiv5_dp_read(ADIv5_DP_t *dp, uint16_t addr)
@ -191,6 +196,7 @@ void adiv5_ap_write(ADIv5_AP_t *ap, uint16_t addr, uint32_t value);
uint32_t adiv5_ap_read(ADIv5_AP_t *ap, uint16_t addr); uint32_t adiv5_ap_read(ADIv5_AP_t *ap, uint16_t addr);
void adiv5_jtag_dp_handler(jtag_dev_t *dev); void adiv5_jtag_dp_handler(jtag_dev_t *dev);
int platform_jtag_dp_init(ADIv5_DP_t *dp);
void adiv5_mem_read(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len); void adiv5_mem_read(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len);
void adiv5_mem_write(ADIv5_AP_t *ap, uint32_t dest, const void *src, size_t len); void adiv5_mem_write(ADIv5_AP_t *ap, uint32_t dest, const void *src, size_t len);

23
src/target/adiv5_jtagdp.c
View File

@ -55,13 +55,13 @@ void adiv5_jtag_dp_handler(jtag_dev_t *dev)
} }
dp->dev = dev; dp->dev = dev;
dp->idcode = dev->idcode; if ((PC_HOSTED == 0 ) || (!platform_jtag_dp_init(dp))) {
dp->idcode = dev->idcode;
dp->dp_read = adiv5_jtagdp_read; dp->dp_read = adiv5_jtagdp_read;
dp->error = adiv5_jtagdp_error; dp->error = adiv5_jtagdp_error;
dp->low_access = adiv5_jtagdp_low_access; dp->low_access = adiv5_jtagdp_low_access;
dp->abort = adiv5_jtagdp_abort; dp->abort = adiv5_jtagdp_abort;
}
adiv5_dp_init(dp); adiv5_dp_init(dp);
} }
@ -90,11 +90,12 @@ static uint32_t adiv5_jtagdp_low_access(ADIv5_DP_t *dp, uint8_t RnW,
request = ((uint64_t)value << 3) | ((addr >> 1) & 0x06) | (RnW?1:0); request = ((uint64_t)value << 3) | ((addr >> 1) & 0x06) | (RnW?1:0);
jtag_dev_write_ir(dp->dev, APnDP ? IR_APACC : IR_DPACC); jtag_dev_write_ir(&jtag_proc, dp->dev, APnDP ? IR_APACC : IR_DPACC);
platform_timeout_set(&timeout, 2000); platform_timeout_set(&timeout, 2000);
do { do {
jtag_dev_shift_dr(dp->dev, (uint8_t*)&response, (uint8_t*)&request, 35); jtag_dev_shift_dr(&jtag_proc, dp->dev, (uint8_t*)&response,
(uint8_t*)&request, 35);
ack = response & 0x07; ack = response & 0x07;
} while(!platform_timeout_is_expired(&timeout) && (ack == JTAGDP_ACK_WAIT)); } while(!platform_timeout_is_expired(&timeout) && (ack == JTAGDP_ACK_WAIT));
@ -110,6 +111,6 @@ static uint32_t adiv5_jtagdp_low_access(ADIv5_DP_t *dp, uint8_t RnW,
static void adiv5_jtagdp_abort(ADIv5_DP_t *dp, uint32_t abort) static void adiv5_jtagdp_abort(ADIv5_DP_t *dp, uint32_t abort)
{ {
uint64_t request = (uint64_t)abort << 3; uint64_t request = (uint64_t)abort << 3;
jtag_dev_write_ir(dp->dev, IR_ABORT); jtag_dev_write_ir(&jtag_proc, dp->dev, IR_ABORT);
jtag_dev_shift_dr(dp->dev, NULL, (const uint8_t*)&request, 35); jtag_dev_shift_dr(&jtag_proc, dp->dev, NULL, (const uint8_t*)&request, 35);
} }

47
src/target/jtag_scan.c
View File

@ -67,8 +67,15 @@ int jtag_scan(const uint8_t *irlens)
* in SW-DP mode. * in SW-DP mode.
*/ */
DEBUG("Resetting TAP\n"); DEBUG("Resetting TAP\n");
#if PC_HOSTED == 1
if (platform_jtagtap_init()) {
DEBUG("JTAG not available\n");
return 0;
}
#else
jtagtap_init(); jtagtap_init();
jtagtap_reset(); #endif
jtag_proc.jtagtap_reset();
if (irlens) { if (irlens) {
DEBUG("Given list of IR lengths, skipping probe\n"); DEBUG("Given list of IR lengths, skipping probe\n");
@ -80,7 +87,7 @@ int jtag_scan(const uint8_t *irlens)
uint32_t irout; uint32_t irout;
if(*irlens == 0) if(*irlens == 0)
break; break;
jtagtap_tdi_tdo_seq((uint8_t*)&irout, 0, ones, *irlens); jtag_proc.jtagtap_tdi_tdo_seq((uint8_t*)&irout, 0, ones, *irlens);
if (!(irout & 1)) { if (!(irout & 1)) {
DEBUG("check failed: IR[0] != 1\n"); DEBUG("check failed: IR[0] != 1\n");
return -1; return -1;
@ -97,7 +104,7 @@ int jtag_scan(const uint8_t *irlens)
jtagtap_shift_ir(); jtagtap_shift_ir();
DEBUG("Scanning out IRs\n"); DEBUG("Scanning out IRs\n");
if(!jtagtap_next(0, 1)) { if(!jtag_proc.jtagtap_next(0, 1)) {
DEBUG("jtag_scan: Sanity check failed: IR[0] shifted out as 0\n"); DEBUG("jtag_scan: Sanity check failed: IR[0] shifted out as 0\n");
jtag_dev_count = -1; jtag_dev_count = -1;
return -1; /* must be 1 */ return -1; /* must be 1 */
@ -105,7 +112,7 @@ int jtag_scan(const uint8_t *irlens)
jtag_devs[0].ir_len = 1; j = 1; jtag_devs[0].ir_len = 1; j = 1;
while((jtag_dev_count <= JTAG_MAX_DEVS) && while((jtag_dev_count <= JTAG_MAX_DEVS) &&
(jtag_devs[jtag_dev_count].ir_len <= JTAG_MAX_IR_LEN)) { (jtag_devs[jtag_dev_count].ir_len <= JTAG_MAX_IR_LEN)) {
if(jtagtap_next(0, 1)) { if(jtag_proc.jtagtap_next(0, 1)) {
if(jtag_devs[jtag_dev_count].ir_len == 1) break; if(jtag_devs[jtag_dev_count].ir_len == 1) break;
jtag_devs[++jtag_dev_count].ir_len = 1; jtag_devs[++jtag_dev_count].ir_len = 1;
jtag_devs[jtag_dev_count].ir_prescan = j; jtag_devs[jtag_dev_count].ir_prescan = j;
@ -126,7 +133,7 @@ int jtag_scan(const uint8_t *irlens)
} }
DEBUG("Return to Run-Test/Idle\n"); DEBUG("Return to Run-Test/Idle\n");
jtagtap_next(1, 1); jtag_proc.jtagtap_next(1, 1);
jtagtap_return_idle(); jtagtap_return_idle();
/* All devices should be in BYPASS now */ /* All devices should be in BYPASS now */
@ -134,7 +141,7 @@ int jtag_scan(const uint8_t *irlens)
/* Count device on chain */ /* Count device on chain */
DEBUG("Change state to Shift-DR\n"); DEBUG("Change state to Shift-DR\n");
jtagtap_shift_dr(); jtagtap_shift_dr();
for(i = 0; (jtagtap_next(0, 1) == 0) && (i <= jtag_dev_count); i++) for(i = 0; (jtag_proc.jtagtap_next(0, 1) == 0) && (i <= jtag_dev_count); i++)
jtag_devs[i].dr_postscan = jtag_dev_count - i - 1; jtag_devs[i].dr_postscan = jtag_dev_count - i - 1;
if(i != jtag_dev_count) { if(i != jtag_dev_count) {
@ -145,7 +152,7 @@ int jtag_scan(const uint8_t *irlens)
} }
DEBUG("Return to Run-Test/Idle\n"); DEBUG("Return to Run-Test/Idle\n");
jtagtap_next(1, 1); jtag_proc.jtagtap_next(1, 1);
jtagtap_return_idle(); jtagtap_return_idle();
if(!jtag_dev_count) { if(!jtag_dev_count) {
return 0; return 0;
@ -157,17 +164,17 @@ int jtag_scan(const uint8_t *irlens)
jtag_devs[i].ir_len; jtag_devs[i].ir_len;
/* Reset jtagtap: should take all devs to IDCODE */ /* Reset jtagtap: should take all devs to IDCODE */
jtagtap_reset(); jtag_proc.jtagtap_reset();
jtagtap_shift_dr(); jtagtap_shift_dr();
for(i = 0; i < jtag_dev_count; i++) { for(i = 0; i < jtag_dev_count; i++) {
if(!jtagtap_next(0, 1)) continue; if(!jtag_proc.jtagtap_next(0, 1)) continue;
jtag_devs[i].idcode = 1; jtag_devs[i].idcode = 1;
for(j = 2; j; j <<= 1) for(j = 2; j; j <<= 1)
if(jtagtap_next(0, 1)) jtag_devs[i].idcode |= j; if(jtag_proc.jtagtap_next(0, 1)) jtag_devs[i].idcode |= j;
} }
DEBUG("Return to Run-Test/Idle\n"); DEBUG("Return to Run-Test/Idle\n");
jtagtap_next(1, 1); jtag_proc.jtagtap_next(1, 1);
jtagtap_return_idle(); jtagtap_return_idle();
/* Check for known devices and handle accordingly */ /* Check for known devices and handle accordingly */
@ -187,7 +194,7 @@ int jtag_scan(const uint8_t *irlens)
return jtag_dev_count; return jtag_dev_count;
} }
void jtag_dev_write_ir(jtag_dev_t *d, uint32_t ir) void jtag_dev_write_ir(jtag_proc_t *jp, jtag_dev_t *d, uint32_t ir)
{ {
if(ir == d->current_ir) return; if(ir == d->current_ir) return;
for(int i = 0; i < jtag_dev_count; i++) for(int i = 0; i < jtag_dev_count; i++)
@ -195,21 +202,21 @@ void jtag_dev_write_ir(jtag_dev_t *d, uint32_t ir)
d->current_ir = ir; d->current_ir = ir;
jtagtap_shift_ir(); jtagtap_shift_ir();
jtagtap_tdi_seq(0, ones, d->ir_prescan); jp->jtagtap_tdi_seq(0, ones, d->ir_prescan);
jtagtap_tdi_seq(d->ir_postscan?0:1, (void*)&ir, d->ir_len); jp->jtagtap_tdi_seq(d->ir_postscan?0:1, (void*)&ir, d->ir_len);
jtagtap_tdi_seq(1, ones, d->ir_postscan); jp->jtagtap_tdi_seq(1, ones, d->ir_postscan);
jtagtap_return_idle(); jtagtap_return_idle();
} }
void jtag_dev_shift_dr(jtag_dev_t *d, uint8_t *dout, const uint8_t *din, int ticks) void jtag_dev_shift_dr(jtag_proc_t *jp, jtag_dev_t *d, uint8_t *dout, const uint8_t *din, int ticks)
{ {
jtagtap_shift_dr(); jtagtap_shift_dr();
jtagtap_tdi_seq(0, ones, d->dr_prescan); jp->jtagtap_tdi_seq(0, ones, d->dr_prescan);
if(dout) if(dout)
jtagtap_tdi_tdo_seq((void*)dout, d->dr_postscan?0:1, (void*)din, ticks); jp->jtagtap_tdi_tdo_seq((void*)dout, d->dr_postscan?0:1, (void*)din, ticks);
else else
jtagtap_tdi_seq(d->dr_postscan?0:1, (void*)din, ticks); jp->jtagtap_tdi_seq(d->dr_postscan?0:1, (void*)din, ticks);
jtagtap_tdi_seq(1, ones, d->dr_postscan); jp->jtagtap_tdi_seq(1, ones, d->dr_postscan);
jtagtap_return_idle(); jtagtap_return_idle();
} }

10
src/target/jtag_scan.h
View File

@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <jtagtap.h>
#ifndef __JTAG_SCAN_H #ifndef __JTAG_SCAN_H
#define __JTAG_SCAN_H #define __JTAG_SCAN_H
@ -25,7 +26,6 @@
#define JTAG_MAX_IR_LEN 16 #define JTAG_MAX_IR_LEN 16
typedef struct jtag_dev_s { typedef struct jtag_dev_s {
#if !defined(JTAG_HL)
union { union {
uint8_t dev; uint8_t dev;
uint8_t dr_prescan; uint8_t dr_prescan;
@ -35,20 +35,16 @@ typedef struct jtag_dev_s {
uint8_t ir_len; uint8_t ir_len;
uint8_t ir_prescan; uint8_t ir_prescan;
uint8_t ir_postscan; uint8_t ir_postscan;
#endif
uint32_t idcode; uint32_t idcode;
const char *descr; const char *descr;
#if !defined(JTAG_HL)
uint32_t current_ir; uint32_t current_ir;
#endif
} jtag_dev_t; } jtag_dev_t;
extern struct jtag_dev_s jtag_devs[JTAG_MAX_DEVS+1]; extern struct jtag_dev_s jtag_devs[JTAG_MAX_DEVS+1];
extern int jtag_dev_count; extern int jtag_dev_count;
void jtag_dev_write_ir(jtag_dev_t *dev, uint32_t ir); void jtag_dev_write_ir(jtag_proc_t *jp, jtag_dev_t *dev, uint32_t ir);
void jtag_dev_shift_dr(jtag_dev_t *dev, uint8_t *dout, const uint8_t *din, int ticks); void jtag_dev_shift_dr(jtag_proc_t *jp, jtag_dev_t *dev, uint8_t *dout, const uint8_t *din, int ticks);
#endif #endif