This is an automated email from Gerrit. C Pitt ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2793
-- gerrit commit 0cc039bac05f0d988ed0a88edd17324ba634d446 Author: Christoph Pittracher <[email protected]> Date: Wed Jun 3 15:11:15 2015 +0200 bcm2835gpio: use dedicated SWD gpio pins like sysfsgpio does. Change-Id: I02e780f958fad617e669406d3cbde65583779906 Signed-off-by: Christoph Pittracher <[email protected]> diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c index a470301..8be48aa 100644 --- a/src/jtag/drivers/bcm2835gpio.c +++ b/src/jtag/drivers/bcm2835gpio.c @@ -84,6 +84,10 @@ static int trst_gpio = -1; static int trst_gpio_mode; static int srst_gpio = -1; static int srst_gpio_mode; +static int swclk_gpio = -1; +static int swclk_gpio_mode; +static int swdio_gpio = -1; +static int swdio_gpio_mode; /* Transition delay coefficients */ static int speed_coeff = 113714; @@ -107,6 +111,20 @@ static void bcm2835gpio_write(int tck, int tms, int tdi) asm volatile (""); } +static void bcm2835gpio_swd_write(int tck, int tms, int tdi) +{ + uint32_t set = tck<<swclk_gpio | tdi<<swdio_gpio; + uint32_t clear = !tck<<swclk_gpio | !tdi<<swdio_gpio; + + GPIO_SET = set; + GPIO_CLR = clear; + + nanosleep(1); + + for (unsigned int i = 0; i < jtag_delay; i++) + asm volatile (""); +} + /* (1) assert or (0) deassert reset lines */ static void bcm2835gpio_reset(int trst, int srst) { @@ -130,14 +148,14 @@ static void bcm2835gpio_reset(int trst, int srst) static void bcm2835_swdio_drive(bool is_output) { if (is_output) - OUT_GPIO(tdi_gpio); + OUT_GPIO(swdio_gpio); else - INP_GPIO(tdi_gpio); + INP_GPIO(swdio_gpio); } static int bcm2835_swdio_read(void) { - return !!(GPIO_LEV & 1 << tdi_gpio); + return !!(GPIO_LEV & 1 << swdio_gpio); } static int bcm2835gpio_khz(int khz, int *jtag_speed) @@ -241,6 +259,40 @@ COMMAND_HANDLER(bcm2835gpio_handle_jtag_gpionum_trst) return ERROR_OK; } +COMMAND_HANDLER(bcm2835gpio_handle_swd_gpionums) +{ + if (CMD_ARGC == 2) { + COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swclk_gpio); + COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], swdio_gpio); + } else if (CMD_ARGC != 0) { + return ERROR_COMMAND_SYNTAX_ERROR; + } + + command_print(CMD_CTX, + "BCM2835 GPIO nums: swclk = %d, swdio = %d", + swclk_gpio, swdio_gpio); + + return ERROR_OK; +} + +COMMAND_HANDLER(bcm2835gpio_handle_swd_gpionum_swclk) +{ + if (CMD_ARGC == 1) + COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swclk_gpio); + + command_print(CMD_CTX, "BCM2835 num: swclk = %d", swclk_gpio); + return ERROR_OK; +} + +COMMAND_HANDLER(bcm2835gpio_handle_swd_gpionum_swdio) +{ + if (CMD_ARGC == 1) + COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], swdio_gpio); + + command_print(CMD_CTX, "BCM2835 num: swdio = %d", swdio_gpio); + return ERROR_OK; +} + COMMAND_HANDLER(bcm2835gpio_handle_speed_coeffs) { if (CMD_ARGC == 2) { @@ -283,6 +335,25 @@ static const struct command_registration bcm2835gpio_command_handlers[] = { .help = "gpio number for tdi.", }, { + .name = "bcm2835gpio_swd_nums", + .handler = &bcm2835gpio_handle_swd_gpionums, + .mode = COMMAND_CONFIG, + .help = "gpio numbers for swclk, swdio. (in that order)", + .usage = "(swclk swdio)* ", + }, + { + .name = "bcm2835gpio_swclk_num", + .handler = &bcm2835gpio_handle_swd_gpionum_swclk, + .mode = COMMAND_CONFIG, + .help = "gpio number for swclk.", + }, + { + .name = "bcm2835gpio_swdio_num", + .handler = &bcm2835gpio_handle_swd_gpionum_swdio, + .mode = COMMAND_CONFIG, + .help = "gpio number for swdio.", + }, + { .name = "bcm2835gpio_srst_num", .handler = &bcm2835gpio_handle_jtag_gpionum_srst, .mode = COMMAND_CONFIG, @@ -319,15 +390,49 @@ struct jtag_interface bcm2835gpio_interface = { .quit = bcm2835gpio_quit, }; +static bool bcm2835gpio_jtag_mode_possible(void) +{ + if (!is_gpio_valid(tck_gpio)) + return 0; + if (!is_gpio_valid(tms_gpio)) + return 0; + if (!is_gpio_valid(tdi_gpio)) + return 0; + if (!is_gpio_valid(tdo_gpio)) + return 0; + return 1; +} + +static bool bcm2835gpio_swd_mode_possible(void) +{ + if (!is_gpio_valid(swclk_gpio)) + return 0; + if (!is_gpio_valid(swdio_gpio)) + return 0; + return 1; +} + static int bcm2835gpio_init(void) { bitbang_interface = &bcm2835gpio_bitbang; - if (!is_gpio_valid(tdo_gpio) || !is_gpio_valid(tdi_gpio) || - !is_gpio_valid(tck_gpio) || !is_gpio_valid(tms_gpio) || - (trst_gpio != -1 && !is_gpio_valid(trst_gpio)) || - (srst_gpio != -1 && !is_gpio_valid(srst_gpio))) + LOG_INFO("BCM2835 GPIO JTAG/SWD bitbang driver"); + + if (bcm2835gpio_jtag_mode_possible()) { + if (bcm2835gpio_swd_mode_possible()) + LOG_INFO("JTAG and SWD modes enabled"); + else + LOG_INFO("JTAG only mode enabled (specify swclk and swdio gpio to add SWD mode)"); + if (!is_gpio_valid(trst_gpio) && !is_gpio_valid(srst_gpio)) { + LOG_ERROR("Require at least one of trst or srst gpios to be specified"); + return ERROR_JTAG_INIT_FAILED; + } + } else if (bcm2835gpio_swd_mode_possible()) { + LOG_INFO("SWD only mode enabled (specify tck, tms, tdi and tdo gpios to add JTAG mode)"); + } else { + LOG_ERROR("Require tck, tms, tdi and tdo gpios for JTAG mode and/or swclk and swdio gpio for SWD mode"); return ERROR_JTAG_INIT_FAILED; + } dev_mem_fd = open("/dev/mem", O_RDWR | O_SYNC); if (dev_mem_fd < 0) { @@ -361,18 +466,22 @@ static int bcm2835gpio_init(void) tdi_gpio_mode = MODE_GPIO(tdi_gpio); tck_gpio_mode = MODE_GPIO(tck_gpio); tms_gpio_mode = MODE_GPIO(tms_gpio); + swclk_gpio_mode = MODE_GPIO(swclk_gpio); + swdio_gpio_mode = MODE_GPIO(swdio_gpio); /* * Configure TDO as an input, and TDI, TCK, TMS, TRST, SRST * as outputs. Drive TDI and TCK low, and TMS/TRST/SRST high. */ INP_GPIO(tdo_gpio); - GPIO_CLR = 1<<tdi_gpio | 1<<tck_gpio; + GPIO_CLR = 1<<tdi_gpio | 1<<tck_gpio | 1<<swdio_gpio | 1<<swclk_gpio; GPIO_SET = 1<<tms_gpio; OUT_GPIO(tdi_gpio); OUT_GPIO(tck_gpio); OUT_GPIO(tms_gpio); + OUT_GPIO(swclk_gpio); + OUT_GPIO(swdio_gpio); if (trst_gpio != -1) { trst_gpio_mode = MODE_GPIO(trst_gpio); GPIO_SET = 1 << trst_gpio; @@ -388,8 +497,10 @@ static int bcm2835gpio_init(void) "tdo %d trst %d srst %d", tck_gpio_mode, tms_gpio_mode, tdi_gpio_mode, tdo_gpio_mode, trst_gpio_mode, srst_gpio_mode); - if (swd_mode) + if (swd_mode) { + bcm2835gpio_bitbang.write = bcm2835gpio_swd_write; bitbang_switch_to_swd(); + } return ERROR_OK; } @@ -400,6 +511,8 @@ static int bcm2835gpio_quit(void) SET_MODE_GPIO(tdi_gpio, tdi_gpio_mode); SET_MODE_GPIO(tck_gpio, tck_gpio_mode); SET_MODE_GPIO(tms_gpio, tms_gpio_mode); + SET_MODE_GPIO(swclk_gpio, swclk_gpio_mode); + SET_MODE_GPIO(swdio_gpio, swdio_gpio_mode); if (trst_gpio != -1) SET_MODE_GPIO(trst_gpio, trst_gpio_mode); if (srst_gpio != -1) -- ------------------------------------------------------------------------------ _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
