X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetb.c;h=99710700ec4eaabbe924f3a0bb7e2bd3541fb25a;hb=36df240cea04990e8c18aa0b90bd63374f22dbd3;hp=3ad73977533e859c0acd5703f0c4c20fcb26dec6;hpb=42ef503d37b18d907da16d26e99167566d5aabd1;p=openocd.git diff --git a/src/target/etb.c b/src/target/etb.c index 3ad7397753..99710700ec 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -21,8 +21,10 @@ #include "config.h" #endif -#include "armv4_5.h" +#include "arm.h" +#include "etm.h" #include "etb.h" +#include "register.h" static char* etb_reg_list[] = @@ -38,11 +40,9 @@ static char* etb_reg_list[] = "ETB_control", }; -static int etb_reg_arch_type = -1; +static int etb_get_reg(struct reg *reg); -static int etb_get_reg(reg_t *reg); - -static int etb_set_instr(etb_t *etb, uint32_t new_instr) +static int etb_set_instr(struct etb *etb, uint32_t new_instr) { struct jtag_tap *tap; @@ -52,16 +52,15 @@ static int etb_set_instr(etb_t *etb, uint32_t new_instr) if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr) { - scan_field_t field; + struct scan_field field; - field.tap = tap; field.num_bits = tap->ir_length; - field.out_value = calloc(CEIL(field.num_bits, 8), 1); + field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1); buf_set_u32(field.out_value, 0, field.num_bits, new_instr); field.in_value = NULL; - jtag_add_ir_scan(1, &field, jtag_get_end_state()); + jtag_add_ir_scan(tap, &field, jtag_get_end_state()); free(field.out_value); } @@ -69,22 +68,21 @@ static int etb_set_instr(etb_t *etb, uint32_t new_instr) return ERROR_OK; } -static int etb_scann(etb_t *etb, uint32_t new_scan_chain) +static int etb_scann(struct etb *etb, uint32_t new_scan_chain) { if (etb->cur_scan_chain != new_scan_chain) { - scan_field_t field; + struct scan_field field; - field.tap = etb->tap; field.num_bits = 5; - field.out_value = calloc(CEIL(field.num_bits, 8), 1); + field.out_value = calloc(DIV_ROUND_UP(field.num_bits, 8), 1); buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain); field.in_value = NULL; /* select INTEST instruction */ etb_set_instr(etb, 0x2); - jtag_add_dr_scan(1, &field, jtag_get_end_state()); + jtag_add_dr_scan(etb->tap, 1, &field, jtag_get_end_state()); etb->cur_scan_chain = new_scan_chain; @@ -94,15 +92,15 @@ static int etb_scann(etb_t *etb, uint32_t new_scan_chain) return ERROR_OK; } -static int etb_read_reg_w_check(reg_t *, uint8_t *, uint8_t *); -static int etb_set_reg_w_exec(reg_t *, uint8_t *); +static int etb_read_reg_w_check(struct reg *, uint8_t *, uint8_t *); +static int etb_set_reg_w_exec(struct reg *, uint8_t *); -static int etb_read_reg(reg_t *reg) +static int etb_read_reg(struct reg *reg) { return etb_read_reg_w_check(reg, NULL, NULL); } -static int etb_get_reg(reg_t *reg) +static int etb_get_reg(struct reg *reg) { int retval; @@ -121,21 +119,22 @@ static int etb_get_reg(reg_t *reg) return ERROR_OK; } -reg_cache_t* etb_build_reg_cache(etb_t *etb) +static const struct reg_arch_type etb_reg_type = { + .get = etb_get_reg, + .set = etb_set_reg_w_exec, +}; + +struct reg_cache* etb_build_reg_cache(struct etb *etb) { - reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t)); - reg_t *reg_list = NULL; - etb_reg_t *arch_info = NULL; + struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache)); + struct reg *reg_list = NULL; + struct etb_reg *arch_info = NULL; int num_regs = 9; int i; - /* register a register arch-type for etm registers only once */ - if (etb_reg_arch_type == -1) - etb_reg_arch_type = register_reg_arch_type(etb_get_reg, etb_set_reg_w_exec); - /* the actual registers are kept in two arrays */ - reg_list = calloc(num_regs, sizeof(reg_t)); - arch_info = calloc(num_regs, sizeof(etb_reg_t)); + reg_list = calloc(num_regs, sizeof(struct reg)); + arch_info = calloc(num_regs, sizeof(struct etb_reg)); /* fill in values for the reg cache */ reg_cache->name = "etb registers"; @@ -150,11 +149,9 @@ reg_cache_t* etb_build_reg_cache(etb_t *etb) reg_list[i].size = 32; reg_list[i].dirty = 0; reg_list[i].valid = 0; - reg_list[i].bitfield_desc = NULL; - reg_list[i].num_bitfields = 0; reg_list[i].value = calloc(1, 4); reg_list[i].arch_info = &arch_info[i]; - reg_list[i].arch_type = etb_reg_arch_type; + reg_list[i].type = &etb_reg_type; reg_list[i].size = 32; arch_info[i].addr = i; arch_info[i].etb = etb; @@ -171,33 +168,30 @@ static void etb_getbuf(jtag_callback_data_t arg) } -static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames) +static int etb_read_ram(struct etb *etb, uint32_t *data, int num_frames) { - scan_field_t fields[3]; + struct scan_field fields[3]; int i; jtag_set_end_state(TAP_IDLE); etb_scann(etb, 0x0); etb_set_instr(etb, 0xc); - fields[0].tap = etb->tap; fields[0].num_bits = 32; fields[0].out_value = NULL; fields[0].in_value = NULL; - fields[1].tap = etb->tap; fields[1].num_bits = 7; fields[1].out_value = malloc(1); buf_set_u32(fields[1].out_value, 0, 7, 4); fields[1].in_value = NULL; - fields[2].tap = etb->tap; fields[2].num_bits = 1; fields[2].out_value = malloc(1); buf_set_u32(fields[2].out_value, 0, 1, 0); fields[2].in_value = NULL; - jtag_add_dr_scan(3, fields, jtag_get_end_state()); + jtag_add_dr_scan(etb->tap, 3, fields, TAP_IDLE); for (i = 0; i < num_frames; i++) { @@ -211,7 +205,7 @@ static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames) buf_set_u32(fields[1].out_value, 0, 7, 0); fields[0].in_value = (uint8_t *)(data + i); - jtag_add_dr_scan(3, fields, jtag_get_end_state()); + jtag_add_dr_scan(etb->tap, 3, fields, TAP_IDLE); jtag_add_callback(etb_getbuf, (jtag_callback_data_t)(data + i)); } @@ -224,12 +218,12 @@ static int etb_read_ram(etb_t *etb, uint32_t *data, int num_frames) return ERROR_OK; } -static int etb_read_reg_w_check(reg_t *reg, +static int etb_read_reg_w_check(struct reg *reg, uint8_t* check_value, uint8_t* check_mask) { - etb_reg_t *etb_reg = reg->arch_info; + struct etb_reg *etb_reg = reg->arch_info; uint8_t reg_addr = etb_reg->addr & 0x7f; - scan_field_t fields[3]; + struct scan_field fields[3]; LOG_DEBUG("%i", (int)(etb_reg->addr)); @@ -237,14 +231,12 @@ static int etb_read_reg_w_check(reg_t *reg, etb_scann(etb_reg->etb, 0x0); etb_set_instr(etb_reg->etb, 0xc); - fields[0].tap = etb_reg->etb->tap; fields[0].num_bits = 32; fields[0].out_value = reg->value; fields[0].in_value = NULL; fields[0].check_value = NULL; fields[0].check_mask = NULL; - fields[1].tap = etb_reg->etb->tap; fields[1].num_bits = 7; fields[1].out_value = malloc(1); buf_set_u32(fields[1].out_value, 0, 7, reg_addr); @@ -252,7 +244,6 @@ static int etb_read_reg_w_check(reg_t *reg, fields[1].check_value = NULL; fields[1].check_mask = NULL; - fields[2].tap = etb_reg->etb->tap; fields[2].num_bits = 1; fields[2].out_value = malloc(1); buf_set_u32(fields[2].out_value, 0, 1, 0); @@ -260,7 +251,7 @@ static int etb_read_reg_w_check(reg_t *reg, fields[2].check_value = NULL; fields[2].check_mask = NULL; - jtag_add_dr_scan(3, fields, jtag_get_end_state()); + jtag_add_dr_scan(etb_reg->etb->tap, 3, fields, TAP_IDLE); /* read the identification register in the second run, to make sure we * don't read the ETB data register twice, skipping every second entry @@ -270,7 +261,7 @@ static int etb_read_reg_w_check(reg_t *reg, fields[0].check_value = check_value; fields[0].check_mask = check_mask; - jtag_add_dr_scan_check(3, fields, jtag_get_end_state()); + jtag_add_dr_scan_check(etb_reg->etb->tap, 3, fields, TAP_IDLE); free(fields[1].out_value); free(fields[2].out_value); @@ -278,9 +269,9 @@ static int etb_read_reg_w_check(reg_t *reg, return ERROR_OK; } -static int etb_write_reg(reg_t *, uint32_t); +static int etb_write_reg(struct reg *, uint32_t); -static int etb_set_reg(reg_t *reg, uint32_t value) +static int etb_set_reg(struct reg *reg, uint32_t value) { int retval; @@ -297,7 +288,7 @@ static int etb_set_reg(reg_t *reg, uint32_t value) return ERROR_OK; } -static int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf) +static int etb_set_reg_w_exec(struct reg *reg, uint8_t *buf) { int retval; @@ -311,11 +302,11 @@ static int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf) return ERROR_OK; } -static int etb_write_reg(reg_t *reg, uint32_t value) +static int etb_write_reg(struct reg *reg, uint32_t value) { - etb_reg_t *etb_reg = reg->arch_info; + struct etb_reg *etb_reg = reg->arch_info; uint8_t reg_addr = etb_reg->addr & 0x7f; - scan_field_t fields[3]; + struct scan_field fields[3]; LOG_DEBUG("%i: 0x%8.8" PRIx32 "", (int)(etb_reg->addr), value); @@ -323,19 +314,16 @@ static int etb_write_reg(reg_t *reg, uint32_t value) etb_scann(etb_reg->etb, 0x0); etb_set_instr(etb_reg->etb, 0xc); - fields[0].tap = etb_reg->etb->tap; fields[0].num_bits = 32; fields[0].out_value = malloc(4); buf_set_u32(fields[0].out_value, 0, 32, value); fields[0].in_value = NULL; - fields[1].tap = etb_reg->etb->tap; fields[1].num_bits = 7; fields[1].out_value = malloc(1); buf_set_u32(fields[1].out_value, 0, 7, reg_addr); fields[1].in_value = NULL; - fields[2].tap = etb_reg->etb->tap; fields[2].num_bits = 1; fields[2].out_value = malloc(1); buf_set_u32(fields[2].out_value, 0, 1, 1); @@ -351,40 +339,40 @@ static int etb_write_reg(reg_t *reg, uint32_t value) COMMAND_HANDLER(handle_etb_config_command) { - target_t *target; + struct target *target; struct jtag_tap *tap; struct arm *arm; - if (argc != 2) + if (CMD_ARGC != 2) { return ERROR_COMMAND_SYNTAX_ERROR; } - target = get_target(args[0]); + target = get_target(CMD_ARGV[0]); if (!target) { - LOG_ERROR("ETB: target '%s' not defined", args[0]); + LOG_ERROR("ETB: target '%s' not defined", CMD_ARGV[0]); return ERROR_FAIL; } arm = target_to_arm(target); if (!is_arm(arm)) { - command_print(cmd_ctx, "ETB: '%s' isn't an ARM", args[0]); + command_print(CMD_CTX, "ETB: '%s' isn't an ARM", CMD_ARGV[0]); return ERROR_FAIL; } - tap = jtag_tap_by_string(args[1]); + tap = jtag_tap_by_string(CMD_ARGV[1]); if (tap == NULL) { - command_print(cmd_ctx, "ETB: TAP %s does not exist", args[1]); + command_print(CMD_CTX, "ETB: TAP %s does not exist", CMD_ARGV[1]); return ERROR_FAIL; } if (arm->etm) { - etb_t *etb = malloc(sizeof(etb_t)); + struct etb *etb = malloc(sizeof(struct etb)); arm->etm->capture_driver_priv = etb; @@ -403,21 +391,83 @@ COMMAND_HANDLER(handle_etb_config_command) return ERROR_OK; } -static int etb_register_commands(struct command_context_s *cmd_ctx) +COMMAND_HANDLER(handle_etb_trigger_percent_command) { - command_t *etb_cmd = register_command(cmd_ctx, NULL, "etb", - NULL, COMMAND_ANY, "Embedded Trace Buffer"); + struct target *target; + struct arm *arm; + struct etm_context *etm; + struct etb *etb; - register_command(cmd_ctx, etb_cmd, "config", - handle_etb_config_command, COMMAND_CONFIG, - NULL); + target = get_current_target(CMD_CTX); + arm = target_to_arm(target); + if (!is_arm(arm)) + { + command_print(CMD_CTX, "ETB: current target isn't an ARM"); + return ERROR_FAIL; + } + + etm = arm->etm; + if (!etm) { + command_print(CMD_CTX, "ETB: target has no ETM configured"); + return ERROR_FAIL; + } + if (etm->capture_driver != &etb_capture_driver) { + command_print(CMD_CTX, "ETB: target not using ETB"); + return ERROR_FAIL; + } + etb = arm->etm->capture_driver_priv; + + if (CMD_ARGC > 0) { + uint32_t new_value; + + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], new_value); + if ((new_value < 2) || (new_value > 100)) + command_print(CMD_CTX, + "valid percentages are 2%% to 100%%"); + else + etb->trigger_percent = (unsigned) new_value; + } + + command_print(CMD_CTX, "%d percent of tracebuffer fills after trigger", + etb->trigger_percent); return ERROR_OK; } -static int etb_init(etm_context_t *etm_ctx) +static const struct command_registration etb_config_command_handlers[] = { + { + /* NOTE: with ADIv5, ETBs are accessed using DAP operations, + * possibly over SWD, not through separate TAPs... + */ + .name = "config", + .handler = handle_etb_config_command, + .mode = COMMAND_CONFIG, + .help = "Associate ETB with target and JTAG TAP.", + .usage = "target tap", + }, + { + .name = "trigger_percent", + .handler = handle_etb_trigger_percent_command, + .mode = COMMAND_EXEC, + .help = "Set percent of trace buffer to be filled " + "after the trigger occurs (2..100).", + .usage = "[percent]", + }, + COMMAND_REGISTRATION_DONE +}; +static const struct command_registration etb_command_handlers[] = { + { + .name = "etb", + .mode = COMMAND_ANY, + .help = "Emebdded Trace Buffer command group", + .chain = etb_config_command_handlers, + }, + COMMAND_REGISTRATION_DONE +}; + +static int etb_init(struct etm_context *etm_ctx) { - etb_t *etb = etm_ctx->capture_driver_priv; + struct etb *etb = etm_ctx->capture_driver_priv; etb->etm_ctx = etm_ctx; @@ -429,14 +479,16 @@ static int etb_init(etm_context_t *etm_ctx) etb->ram_depth = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_DEPTH].value, 0, 32); etb->ram_width = buf_get_u32(etb->reg_cache->reg_list[ETB_RAM_WIDTH].value, 0, 32); + etb->trigger_percent = 50; + return ERROR_OK; } -static trace_status_t etb_status(etm_context_t *etm_ctx) +static trace_status_t etb_status(struct etm_context *etm_ctx) { - etb_t *etb = etm_ctx->capture_driver_priv; - reg_t *control = &etb->reg_cache->reg_list[ETB_CTRL]; - reg_t *status = &etb->reg_cache->reg_list[ETB_STATUS]; + struct etb *etb = etm_ctx->capture_driver_priv; + struct reg *control = &etb->reg_cache->reg_list[ETB_CTRL]; + struct reg *status = &etb->reg_cache->reg_list[ETB_STATUS]; trace_status_t retval = 0; int etb_timeout = 100; @@ -484,9 +536,9 @@ static trace_status_t etb_status(etm_context_t *etm_ctx) return retval; } -static int etb_read_trace(etm_context_t *etm_ctx) +static int etb_read_trace(struct etm_context *etm_ctx) { - etb_t *etb = etm_ctx->capture_driver_priv; + struct etb *etb = etm_ctx->capture_driver_priv; int first_frame = 0; int num_frames = etb->ram_depth; uint32_t *trace_data = NULL; @@ -520,18 +572,18 @@ static int etb_read_trace(etm_context_t *etm_ctx) free(etm_ctx->trace_data); } - if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT) + if ((etm_ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT) etm_ctx->trace_depth = num_frames * 3; - else if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) + else if ((etm_ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) etm_ctx->trace_depth = num_frames * 2; else etm_ctx->trace_depth = num_frames; - etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth); + etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth); for (i = 0, j = 0; i < num_frames; i++) { - if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT) + if ((etm_ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_4BIT) { /* trace word j */ etm_ctx->trace_data[j].pipestat = trace_data[i] & 0x7; @@ -577,7 +629,7 @@ static int etb_read_trace(etm_context_t *etm_ctx) j += 3; } - else if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) + else if ((etm_ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) { /* trace word j */ etm_ctx->trace_data[j].pipestat = trace_data[i] & 0x7; @@ -634,15 +686,15 @@ static int etb_read_trace(etm_context_t *etm_ctx) return ERROR_OK; } -static int etb_start_capture(etm_context_t *etm_ctx) +static int etb_start_capture(struct etm_context *etm_ctx) { - etb_t *etb = etm_ctx->capture_driver_priv; + struct etb *etb = etm_ctx->capture_driver_priv; uint32_t etb_ctrl_value = 0x1; uint32_t trigger_count; - if ((etm_ctx->portmode & ETM_PORT_MODE_MASK) == ETM_PORT_DEMUXED) + if ((etm_ctx->control & ETM_PORT_MODE_MASK) == ETM_PORT_DEMUXED) { - if ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) != ETM_PORT_8BIT) + if ((etm_ctx->control & ETM_PORT_WIDTH_MASK) != ETM_PORT_8BIT) { LOG_ERROR("ETB can't run in demultiplexed mode with a 4 or 16 bit port"); return ERROR_ETM_PORTMODE_NOT_SUPPORTED; @@ -650,12 +702,12 @@ static int etb_start_capture(etm_context_t *etm_ctx) etb_ctrl_value |= 0x2; } - if ((etm_ctx->portmode & ETM_PORT_MODE_MASK) == ETM_PORT_MUXED) { + if ((etm_ctx->control & ETM_PORT_MODE_MASK) == ETM_PORT_MUXED) { LOG_ERROR("ETB: can't run in multiplexed mode"); return ERROR_ETM_PORTMODE_NOT_SUPPORTED; } - trigger_count = (etb->ram_depth * etm_ctx->trigger_percent) / 100; + trigger_count = (etb->ram_depth * etb->trigger_percent) / 100; etb_write_reg(&etb->reg_cache->reg_list[ETB_TRIGGER_COUNTER], trigger_count); etb_write_reg(&etb->reg_cache->reg_list[ETB_RAM_WRITE_POINTER], 0x0); @@ -668,10 +720,10 @@ static int etb_start_capture(etm_context_t *etm_ctx) return ERROR_OK; } -static int etb_stop_capture(etm_context_t *etm_ctx) +static int etb_stop_capture(struct etm_context *etm_ctx) { - etb_t *etb = etm_ctx->capture_driver_priv; - reg_t *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL]; + struct etb *etb = etm_ctx->capture_driver_priv; + struct reg *etb_ctrl_reg = &etb->reg_cache->reg_list[ETB_CTRL]; etb_write_reg(etb_ctrl_reg, 0x0); jtag_execute_queue(); @@ -682,10 +734,10 @@ static int etb_stop_capture(etm_context_t *etm_ctx) return ERROR_OK; } -etm_capture_driver_t etb_capture_driver = +struct etm_capture_driver etb_capture_driver = { .name = "etb", - .register_commands = etb_register_commands, + .commands = etb_command_handlers, .init = etb_init, .status = etb_status, .start_capture = etb_start_capture,