interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

XScale: initial PXA3xx support 

[dbrownell@users.sourceforge.net: user's guide; variant param is optional]

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
Marek Vasut 2009-11-29 12:53:06 +01:00 committed by David Brownell
parent 73ec6d9b89
commit 17b7600a59
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/openocd.texi
View File

@ -3117,6 +3117,7 @@ There are several variants defined:
@code{pxa27x} ... instruction register length is 7 bits @code{pxa27x} ... instruction register length is 7 bits
@item @code{pxa250}, @code{pxa255}, @item @code{pxa250}, @code{pxa255},
@code{pxa26x} ... instruction register length is 5 bits @code{pxa26x} ... instruction register length is 5 bits
@item @code{pxa3xx} ... instruction register length is 11 bits
@end itemize @end itemize
@end itemize @end itemize
@end deffn @end deffn

43
src/target/xscale.c
View File

@ -191,7 +191,8 @@ static int xscale_read_dcsr(struct target *target)
uint8_t field2_check_mask = 0x1; uint8_t field2_check_mask = 0x1;
jtag_set_end_state(TAP_DRPAUSE); jtag_set_end_state(TAP_DRPAUSE);
xscale_jtag_set_instr(target->tap, XSCALE_SELDCSR); xscale_jtag_set_instr(target->tap,
XSCALE_SELDCSR << xscale->xscale_variant);
buf_set_u32(&field0, 1, 1, xscale->hold_rst); buf_set_u32(&field0, 1, 1, xscale->hold_rst);
buf_set_u32(&field0, 2, 1, xscale->external_debug_break); buf_set_u32(&field0, 2, 1, xscale->external_debug_break);
@ -256,6 +257,7 @@ static int xscale_receive(struct target *target, uint32_t *buffer, int num_words
if (num_words == 0) if (num_words == 0)
return ERROR_INVALID_ARGUMENTS; return ERROR_INVALID_ARGUMENTS;
struct xscale_common *xscale = target_to_xscale(target);
int retval = ERROR_OK; int retval = ERROR_OK;
tap_state_t path[3]; tap_state_t path[3];
struct scan_field fields[3]; struct scan_field fields[3];
@ -289,7 +291,8 @@ static int xscale_receive(struct target *target, uint32_t *buffer, int num_words
fields[2].check_mask = &field2_check_mask; fields[2].check_mask = &field2_check_mask;
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_DBGTX); xscale_jtag_set_instr(target->tap,
XSCALE_DBGTX << xscale->xscale_variant);
jtag_add_runtest(1, jtag_get_end_state()); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */ jtag_add_runtest(1, jtag_get_end_state()); /* ensures that we're in the TAP_IDLE state as the above could be a no-op */
/* repeat until all words have been collected */ /* repeat until all words have been collected */
@ -371,7 +374,8 @@ static int xscale_read_tx(struct target *target, int consume)
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_DBGTX); xscale_jtag_set_instr(target->tap,
XSCALE_DBGTX << xscale->xscale_variant);
path[0] = TAP_DRSELECT; path[0] = TAP_DRSELECT;
path[1] = TAP_DRCAPTURE; path[1] = TAP_DRCAPTURE;
@ -469,7 +473,8 @@ static int xscale_write_rx(struct target *target)
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_DBGRX); xscale_jtag_set_instr(target->tap,
XSCALE_DBGRX << xscale->xscale_variant);
memset(&fields, 0, sizeof fields); memset(&fields, 0, sizeof fields);
@ -541,6 +546,7 @@ static int xscale_write_rx(struct target *target)
/* send count elements of size byte to the debug handler */ /* send count elements of size byte to the debug handler */
static int xscale_send(struct target *target, uint8_t *buffer, int count, int size) static int xscale_send(struct target *target, uint8_t *buffer, int count, int size)
{ {
struct xscale_common *xscale = target_to_xscale(target);
uint32_t t[3]; uint32_t t[3];
int bits[3]; int bits[3];
int retval; int retval;
@ -548,7 +554,8 @@ static int xscale_send(struct target *target, uint8_t *buffer, int count, int si
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_DBGRX); xscale_jtag_set_instr(target->tap,
XSCALE_DBGRX << xscale->xscale_variant);
bits[0]=3; bits[0]=3;
t[0]=0; t[0]=0;
@ -629,7 +636,8 @@ static int xscale_write_dcsr(struct target *target, int hold_rst, int ext_dbg_br
xscale->external_debug_break = ext_dbg_brk; xscale->external_debug_break = ext_dbg_brk;
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_SELDCSR); xscale_jtag_set_instr(target->tap,
XSCALE_SELDCSR << xscale->xscale_variant);
buf_set_u32(&field0, 1, 1, xscale->hold_rst); buf_set_u32(&field0, 1, 1, xscale->hold_rst);
buf_set_u32(&field0, 2, 1, xscale->external_debug_break); buf_set_u32(&field0, 2, 1, xscale->external_debug_break);
@ -683,6 +691,7 @@ static unsigned int parity (unsigned int v)
static int xscale_load_ic(struct target *target, uint32_t va, uint32_t buffer[8]) static int xscale_load_ic(struct target *target, uint32_t va, uint32_t buffer[8])
{ {
struct xscale_common *xscale = target_to_xscale(target);
uint8_t packet[4]; uint8_t packet[4];
uint8_t cmd; uint8_t cmd;
int word; int word;
@ -692,7 +701,8 @@ static int xscale_load_ic(struct target *target, uint32_t va, uint32_t buffer[8]
/* LDIC into IR */ /* LDIC into IR */
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_LDIC); xscale_jtag_set_instr(target->tap,
XSCALE_LDIC << xscale->xscale_variant);
/* CMD is b011 to load a cacheline into the Mini ICache. /* CMD is b011 to load a cacheline into the Mini ICache.
* Loading into the main ICache is deprecated, and unused. * Loading into the main ICache is deprecated, and unused.
@ -738,12 +748,14 @@ static int xscale_load_ic(struct target *target, uint32_t va, uint32_t buffer[8]
static int xscale_invalidate_ic_line(struct target *target, uint32_t va) static int xscale_invalidate_ic_line(struct target *target, uint32_t va)
{ {
struct xscale_common *xscale = target_to_xscale(target);
uint8_t packet[4]; uint8_t packet[4];
uint8_t cmd; uint8_t cmd;
struct scan_field fields[2]; struct scan_field fields[2];
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_LDIC); xscale_jtag_set_instr(target->tap,
XSCALE_LDIC << xscale->xscale_variant);
/* CMD for invalidate IC line b000, bits [6:4] b000 */ /* CMD for invalidate IC line b000, bits [6:4] b000 */
buf_set_u32(&cmd, 0, 6, 0x0); buf_set_u32(&cmd, 0, 6, 0x0);
@ -1479,7 +1491,8 @@ static int xscale_assert_reset(struct target *target)
* end up in T-L-R, which would reset JTAG * end up in T-L-R, which would reset JTAG
*/ */
jtag_set_end_state(TAP_IDLE); jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_SELDCSR); xscale_jtag_set_instr(target->tap,
XSCALE_SELDCSR << xscale->xscale_variant);
/* set Hold reset, Halt mode and Trap Reset */ /* set Hold reset, Halt mode and Trap Reset */
buf_set_u32(xscale->reg_cache->reg_list[XSCALE_DCSR].value, 30, 1, 0x1); buf_set_u32(xscale->reg_cache->reg_list[XSCALE_DCSR].value, 30, 1, 0x1);
@ -2876,10 +2889,10 @@ static int xscale_init_arch_info(struct target *target,
armv4_5 = &xscale->armv4_5_common; armv4_5 = &xscale->armv4_5_common;
/* store architecture specfic data (none so far) */ /* store architecture specfic data */
xscale->common_magic = XSCALE_COMMON_MAGIC; xscale->common_magic = XSCALE_COMMON_MAGIC;
/* we don't really *need* variant info ... */ /* we don't really *need* a variant param ... */
if (variant) { if (variant) {
int ir_length = 0; int ir_length = 0;
@ -2892,6 +2905,8 @@ static int xscale_init_arch_info(struct target *target,
|| strcmp(variant, "ixp45x") == 0 || strcmp(variant, "ixp45x") == 0
|| strcmp(variant, "ixp46x") == 0) || strcmp(variant, "ixp46x") == 0)
ir_length = 7; ir_length = 7;
else if (strcmp(variant, "pxa3xx") == 0)
ir_length = 11;
else else
LOG_WARNING("%s: unrecognized variant %s", LOG_WARNING("%s: unrecognized variant %s",
tap->dotted_name, variant); tap->dotted_name, variant);
@ -2903,6 +2918,12 @@ static int xscale_init_arch_info(struct target *target,
} }
} }
/* PXA3xx shifts the JTAG instructions */
if (tap->ir_length == 11)
xscale->xscale_variant = XSCALE_PXA3XX;
else
xscale->xscale_variant = XSCALE_IXP4XX_PXA2XX;
/* the debug handler isn't installed (and thus not running) at this time */ /* the debug handler isn't installed (and thus not running) at this time */
xscale->handler_address = 0xfe000800; xscale->handler_address = 0xfe000800;

7
src/target/xscale.h
View File

@ -37,6 +37,10 @@
#define XSCALE_LDIC 0x07 #define XSCALE_LDIC 0x07
#define XSCALE_SELDCSR 0x09 #define XSCALE_SELDCSR 0x09
/* Possible CPU types */
#define XSCALE_IXP4XX_PXA2XX 0x0
#define XSCALE_PXA3XX 0x4
enum xscale_debug_reason enum xscale_debug_reason
{ {
XSCALE_DBG_REASON_GENERIC, XSCALE_DBG_REASON_GENERIC,
@ -129,6 +133,9 @@ struct xscale_common
uint32_t cp15_control_reg; uint32_t cp15_control_reg;
int fast_memory_access; int fast_memory_access;
/* CPU variant */
int xscale_variant;
}; };
static inline struct xscale_common * static inline struct xscale_common *