Commit 687a9553 authored by oharboe's avatar oharboe
Browse files

From Michael Bruck

- bugfix in server.c
- removed unused parameter from jtag_add_ir_scan et al. This
wasn't necessary in hindsight but anyway.
- arm11 source committed but not not in Makefile.am/target.c for now.

git-svn-id: svn://svn.berlios.de/openocd/trunk@341 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 4edcbe0a
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/*************************************************************************** /***************************************************************************
* Copyright (C) 2006 by Dominic Rath * * Copyright (C) 2006 by Dominic Rath *
* Dominic.Rath@gmx.de * * Dominic.Rath@gmx.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * * GNU General Public License for more details. *
* * * *
* 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, write to the * * along with this program; if not, write to the *
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include "virtex2.h" #include "virtex2.h"
#include "pld.h" #include "pld.h"
#include "xilinx_bit.h" #include "xilinx_bit.h"
#include "command.h" #include "command.h"
#include "log.h" #include "log.h"
#include "jtag.h" #include "jtag.h"
#include <stdlib.h> #include <stdlib.h>
int virtex2_register_commands(struct command_context_s *cmd_ctx); int virtex2_register_commands(struct command_context_s *cmd_ctx);
int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device); int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);
int virtex2_load(struct pld_device_s *pld_device, char *filename); int virtex2_load(struct pld_device_s *pld_device, char *filename);
pld_driver_t virtex2_pld = pld_driver_t virtex2_pld =
{ {
.name = "virtex2", .name = "virtex2",
.register_commands = virtex2_register_commands, .register_commands = virtex2_register_commands,
.pld_device_command = virtex2_pld_device_command, .pld_device_command = virtex2_pld_device_command,
.load = virtex2_load, .load = virtex2_load,
}; };
int virtex2_set_instr(int chain_pos, u32 new_instr) int virtex2_set_instr(int chain_pos, u32 new_instr)
{ {
jtag_device_t *device = jtag_get_device(chain_pos); jtag_device_t *device = jtag_get_device(chain_pos);
if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
{ {
scan_field_t field; scan_field_t field;
field.device = chain_pos; field.device = chain_pos;
field.num_bits = device->ir_length; field.num_bits = device->ir_length;
field.out_value = calloc(CEIL(field.num_bits, 8), 1); field.out_value = calloc(CEIL(field.num_bits, 8), 1);
buf_set_u32(field.out_value, 0, field.num_bits, new_instr); buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
field.out_mask = NULL; field.out_mask = NULL;
field.in_value = NULL; field.in_value = NULL;
field.in_check_value = NULL; field.in_check_value = NULL;
field.in_check_mask = NULL; field.in_check_mask = NULL;
field.in_handler = NULL; field.in_handler = NULL;
field.in_handler_priv = NULL; field.in_handler_priv = NULL;
jtag_add_ir_scan(1, &field, TAP_RTI, NULL); jtag_add_ir_scan(1, &field, TAP_RTI);
free(field.out_value); free(field.out_value);
} }
return ERROR_OK; return ERROR_OK;
} }
int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words) int virtex2_send_32(struct pld_device_s *pld_device, int num_words, u32 *words)
{ {
virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
scan_field_t scan_field; scan_field_t scan_field;
u8 *values; u8 *values;
int i; int i;
values = malloc(num_words * 4); values = malloc(num_words * 4);
scan_field.device = virtex2_info->chain_pos; scan_field.device = virtex2_info->chain_pos;
scan_field.num_bits = num_words * 32; scan_field.num_bits = num_words * 32;
scan_field.out_value = values; scan_field.out_value = values;
scan_field.out_mask = NULL; scan_field.out_mask = NULL;
scan_field.in_value = NULL; scan_field.in_value = NULL;
scan_field.in_check_value = NULL; scan_field.in_check_value = NULL;
scan_field.in_check_mask = NULL; scan_field.in_check_mask = NULL;
scan_field.in_handler = NULL; scan_field.in_handler = NULL;
scan_field.in_handler_priv = NULL; scan_field.in_handler_priv = NULL;
for (i = 0; i < num_words; i++) for (i = 0; i < num_words; i++)
buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32)); buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32));
virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */ virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */
jtag_add_dr_scan(1, &scan_field, TAP_PD, NULL); jtag_add_dr_scan(1, &scan_field, TAP_PD);
free(values); free(values);
return ERROR_OK; return ERROR_OK;
} }
int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field) int virtex2_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
{ {
u32 *dest = priv; u32 *dest = priv;
*dest = flip_u32(le_to_h_u32(in_buf), 32); *dest = flip_u32(le_to_h_u32(in_buf), 32);
return ERROR_OK; return ERROR_OK;
} }
int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words) int virtex2_receive_32(struct pld_device_s *pld_device, int num_words, u32 *words)
{ {
virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
scan_field_t scan_field; scan_field_t scan_field;
scan_field.device = virtex2_info->chain_pos; scan_field.device = virtex2_info->chain_pos;
scan_field.num_bits = 32; scan_field.num_bits = 32;
scan_field.out_value = NULL; scan_field.out_value = NULL;
scan_field.out_mask = NULL; scan_field.out_mask = NULL;
scan_field.in_value = NULL; scan_field.in_value = NULL;
scan_field.in_check_value = NULL; scan_field.in_check_value = NULL;
scan_field.in_check_mask = NULL; scan_field.in_check_mask = NULL;
scan_field.in_handler = virtex2_jtag_buf_to_u32; scan_field.in_handler = virtex2_jtag_buf_to_u32;
virtex2_set_instr(virtex2_info->chain_pos, 0x4); /* CFG_OUT */ virtex2_set_instr(virtex2_info->chain_pos, 0x4); /* CFG_OUT */
while (num_words--) while (num_words--)
{ {
scan_field.in_handler_priv = words++; scan_field.in_handler_priv = words++;
jtag_add_dr_scan(1, &scan_field, TAP_PD, NULL); jtag_add_dr_scan(1, &scan_field, TAP_PD);
} }
return ERROR_OK; return ERROR_OK;
} }
int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status) int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
{ {
u32 data[5]; u32 data[5];
jtag_add_statemove(TAP_TLR); jtag_add_statemove(TAP_TLR);
data[0] = 0xaa995566; /* synch word */ data[0] = 0xaa995566; /* synch word */
data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */ data[1] = 0x2800E001; /* Type 1, read, address 7, 1 word */
data[2] = 0x20000000; /* NOOP (Type 1, read, address 0, 0 words */ data[2] = 0x20000000; /* NOOP (Type 1, read, address 0, 0 words */
data[3] = 0x20000000; /* NOOP */ data[3] = 0x20000000; /* NOOP */
data[4] = 0x20000000; /* NOOP */ data[4] = 0x20000000; /* NOOP */
virtex2_send_32(pld_device, 5, data); virtex2_send_32(pld_device, 5, data);
virtex2_receive_32(pld_device, 1, status); virtex2_receive_32(pld_device, 1, status);
jtag_execute_queue(); jtag_execute_queue();
DEBUG("status: 0x%8.8x", *status); DEBUG("status: 0x%8.8x", *status);
return ERROR_OK; return ERROR_OK;
} }
int virtex2_load(struct pld_device_s *pld_device, char *filename) int virtex2_load(struct pld_device_s *pld_device, char *filename)
{ {
virtex2_pld_device_t *virtex2_info = pld_device->driver_priv; virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
xilinx_bit_file_t bit_file; xilinx_bit_file_t bit_file;
int retval; int retval;
int i; int i;
scan_field_t field; scan_field_t field;
field.device = virtex2_info->chain_pos; field.device = virtex2_info->chain_pos;
field.out_mask = NULL; field.out_mask = NULL;
field.in_value = NULL; field.in_value = NULL;
field.in_check_value = NULL; field.in_check_value = NULL;
field.in_check_mask = NULL; field.in_check_mask = NULL;
field.in_handler = NULL; field.in_handler = NULL;
field.in_handler_priv = NULL; field.in_handler_priv = NULL;
if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK) if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
return retval; return retval;
jtag_add_end_state(TAP_RTI); jtag_add_end_state(TAP_RTI);
virtex2_set_instr(virtex2_info->chain_pos, 0xb); /* JPROG_B */ virtex2_set_instr(virtex2_info->chain_pos, 0xb); /* JPROG_B */
jtag_execute_queue(); jtag_execute_queue();
jtag_add_sleep(1000); jtag_add_sleep(1000);
virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */ virtex2_set_instr(virtex2_info->chain_pos, 0x5); /* CFG_IN */
jtag_execute_queue(); jtag_execute_queue();
for (i = 0; i < bit_file.length; i++) for (i = 0; i < bit_file.length; i++)
bit_file.data[i] = flip_u32(bit_file.data[i], 8); bit_file.data[i] = flip_u32(bit_file.data[i], 8);
field.num_bits = bit_file.length * 8; field.num_bits = bit_file.length * 8;
field.out_value = bit_file.data; field.out_value = bit_file.data;
jtag_add_dr_scan(1, &field, TAP_PD, NULL); jtag_add_dr_scan(1, &field, TAP_PD);
jtag_execute_queue(); jtag_execute_queue();
jtag_add_statemove(TAP_TLR); jtag_add_statemove(TAP_TLR);
jtag_add_end_state(TAP_RTI); jtag_add_end_state(TAP_RTI);
virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */ virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */
jtag_add_runtest(13, TAP_RTI); jtag_add_runtest(13, TAP_RTI);
virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */ virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */
virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */ virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */
virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */ virtex2_set_instr(virtex2_info->chain_pos, 0xc); /* JSTART */
jtag_add_runtest(13, TAP_RTI); jtag_add_runtest(13, TAP_RTI);
virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */ virtex2_set_instr(virtex2_info->chain_pos, 0x3f); /* BYPASS */
jtag_execute_queue(); jtag_execute_queue();
return ERROR_OK; return ERROR_OK;
} }
int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
pld_device_t *device; pld_device_t *device;
virtex2_pld_device_t *virtex2_info; virtex2_pld_device_t *virtex2_info;
u32 status; u32 status;
if (argc < 1) if (argc < 1)
{ {
command_print(cmd_ctx, "usage: virtex2 read_stat <num>"); command_print(cmd_ctx, "usage: virtex2 read_stat <num>");
return ERROR_OK; return ERROR_OK;
} }
device = get_pld_device_by_num(strtoul(args[0], NULL, 0)); device = get_pld_device_by_num(strtoul(args[0], NULL, 0));
if (!device) if (!device)
{ {
command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]); command_print(cmd_ctx, "pld device '#%s' is out of bounds", args[0]);
return ERROR_OK; return ERROR_OK;
} }
virtex2_info = device->driver_priv; virtex2_info = device->driver_priv;
virtex2_read_stat(device, &status); virtex2_read_stat(device, &status);
command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status); command_print(cmd_ctx, "virtex2 status register: 0x%8.8x", status);
return ERROR_OK; return ERROR_OK;
} }
int virtex2_register_commands(struct command_context_s *cmd_ctx) int virtex2_register_commands(struct command_context_s *cmd_ctx)
{ {
command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands"); command_t *virtex2_cmd = register_command(cmd_ctx, NULL, "virtex2", NULL, COMMAND_ANY, "virtex2 specific commands");
register_command(cmd_ctx, virtex2_cmd, "read_stat", virtex2_handle_read_stat_command, COMMAND_EXEC, register_command(cmd_ctx, virtex2_cmd, "read_stat", virtex2_handle_read_stat_command, COMMAND_EXEC,
"read Virtex-II status register"); "read Virtex-II status register");
return ERROR_OK; return ERROR_OK;
} }
int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device) int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device)
{ {
virtex2_pld_device_t *virtex2_info; virtex2_pld_device_t *virtex2_info;
if (argc < 2) if (argc < 2)
{ {
WARNING("incomplete pld device 'virtex2' configuration"); WARNING("incomplete pld device 'virtex2' configuration");
return ERROR_PLD_DEVICE_INVALID; return ERROR_PLD_DEVICE_INVALID;
} }
virtex2_info = malloc(sizeof(virtex2_pld_device_t)); virtex2_info = malloc(sizeof(virtex2_pld_device_t));
pld_device->driver_priv = virtex2_info; pld_device->driver_priv = virtex2_info;
virtex2_info->chain_pos = strtoul(args[1], NULL, 0); virtex2_info->chain_pos = strtoul(args[1], NULL, 0);
return ERROR_OK; return ERROR_OK;
} }
This diff is collapsed.
/***************************************************************************
* Copyright (C) 2008 digenius technology GmbH. *
* *
* 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 2 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, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef ARM11_H
#define ARM11_H
#include "target.h"
#include "register.h"
#include "embeddedice.h"
#include "arm_jtag.h"
#define bool int
#define true 1
#define false 0
#define asizeof(x) (sizeof(x) / sizeof((x)[0]))
#define NEW(type, variable, items) \
type * variable = malloc(sizeof(type) * items)
#define ARM11_REGCACHE_MODEREGS 0
#define ARM11_REGCACHE_FREGS 0
#define ARM11_REGCACHE_COUNT (20 + \
23 * ARM11_REGCACHE_MODEREGS + \
9 * ARM11_REGCACHE_FREGS)
typedef struct arm11_register_history_s
{
u32 value;
u8 valid;
}arm11_register_history_t;
typedef struct arm11_common_s
{
target_t * target;
arm_jtag_t jtag_info;
/** \name Processor type detection */
/*@{*/
u32 device_id; /**< IDCODE readout */
u32 didr; /**< DIDR readout (debug capabilities) */
u8 implementor; /**< DIDR Implementor readout */
size_t brp; /**< Number of Breakpoint Register Pairs */
size_t wrp; /**< Number of Watchpoint Register Pairs */
/*@}*/
u32 last_dscr; /**< Last retrieved DSCR value;
* Can be used to detect changes */
u8 trst_active;
u8 halt_requested;
/** \name Shadow registers to save processor state */
/*@{*/
reg_t * reg_list; /**< target register list */
u32 reg_values[ARM11_REGCACHE_COUNT]; /**< data for registers */
/*@}*/
arm11_register_history_t
reg_history[ARM11_REGCACHE_COUNT]; /**< register state before last resume */
} arm11_common_t;
/**
* ARM11 DBGTAP instructions
*
* http://infocenter.arm.com/help/topic/com.arm.doc.ddi0301f/I1006229.html
*/
enum arm11_instructions
{
ARM11_EXTEST = 0x00,
ARM11_SCAN_N = 0x02,
ARM11_RESTART = 0x04,
ARM11_HALT = 0x08,
ARM11_INTEST = 0x0C,
ARM11_ITRSEL = 0x1D,
ARM11_IDCODE = 0x1E,
ARM11_BYPASS = 0x1F,
};
enum arm11_dscr
{
ARM11_DSCR_CORE_HALTED = 1 << 0,
ARM11_DSCR_CORE_RESTARTED = 1 << 1,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_MASK = 0x0F << 2,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_HALT = 0x00 << 2,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_BREAKPOINT = 0x01 << 2,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_WATCHPOINT = 0x02 << 2,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_BKPT_INSTRUCTION = 0x03 << 2,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_EDBGRQ = 0x04 << 2,
ARM11_DSCR_METHOD_OF_DEBUG_ENTRY_VECTOR_CATCH = 0x05 << 2,
ARM11_DSCR_STICKY_PRECISE_DATA_ABORT = 1 << 6,
ARM11_DSCR_STICKY_IMPRECISE_DATA_ABORT = 1 << 7,
ARM11_DSCR_EXECUTE_ARM_INSTRUCTION_ENABLE = 1 << 13,
ARM11_DSCR_MODE_SELECT = 1 << 14,
ARM11_DSCR_WDTR_FULL = 1 << 29,