jtag/drivers: OpenJTAG standard variant perf improvement

[openocd.git] / src / jtag / drivers / am335xgpio.c

diff --git a/src/jtag/drivers/am335xgpio.c b/src/jtag/drivers/am335xgpio.c
index 5b68b6d6f1c15e17aa7f85d86ac1db5340825873..cfe41c3be5a525d8fdd166fc9e313cffdf39082d 100644 (file)
--- a/src/jtag/drivers/am335xgpio.c
+++ b/src/jtag/drivers/am335xgpio.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2022 by Steve Marple, stevemarple@googlemail.com        *
@@ -86,9 +86,7 @@ static const struct adapter_gpio_config *adapter_gpio_config;
 
 static bool is_gpio_config_valid(const struct adapter_gpio_config *gpio_config)
 {
-       return gpio_config->chip_num >= 0
-               && gpio_config->chip_num < AM335XGPIO_NUM_GPIO_CHIPS
-               && gpio_config->gpio_num >= 0
+       return gpio_config->chip_num < AM335XGPIO_NUM_GPIO_CHIPS
                && gpio_config->gpio_num < AM335XGPIO_NUM_GPIO_PER_CHIP;
 }
 
@@ -184,7 +182,8 @@ static void initialize_gpio(enum adapter_gpio_config_index idx)
        }
 
        /* Direction for non push-pull is already set by set_gpio_value() */
-       if (adapter_gpio_config[idx].drive == ADAPTER_GPIO_DRIVE_MODE_PUSH_PULL)
+       if (adapter_gpio_config[idx].drive == ADAPTER_GPIO_DRIVE_MODE_PUSH_PULL
+               && adapter_gpio_config[idx].init_state != ADAPTER_GPIO_INIT_STATE_INPUT)
                AM335XGPIO_SET_OUTPUT(&adapter_gpio_config[idx]);
 }
 
@@ -248,10 +247,13 @@ static int am335xgpio_reset(int trst, int srst)
        if (is_gpio_config_valid(&adapter_gpio_config[ADAPTER_GPIO_IDX_TRST]))
                set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_TRST], trst);
 
-       LOG_DEBUG("am335xgpio_reset(%d, %d), trst_gpio: %d %d, srst_gpio: %d %d",
-               trst, srst,
-               adapter_gpio_config[ADAPTER_GPIO_IDX_TRST].chip_num, adapter_gpio_config[ADAPTER_GPIO_IDX_TRST].gpio_num,
-               adapter_gpio_config[ADAPTER_GPIO_IDX_SRST].chip_num, adapter_gpio_config[ADAPTER_GPIO_IDX_SRST].gpio_num);
+       LOG_DEBUG("trst %d gpio: %d %d, srst %d gpio: %d %d",
+               trst,
+               (int)adapter_gpio_config[ADAPTER_GPIO_IDX_TRST].chip_num,
+               (int)adapter_gpio_config[ADAPTER_GPIO_IDX_TRST].gpio_num,
+               srst,
+               (int)adapter_gpio_config[ADAPTER_GPIO_IDX_SRST].chip_num,
+               (int)adapter_gpio_config[ADAPTER_GPIO_IDX_SRST].gpio_num);
        return ERROR_OK;
 }
 
@@ -377,6 +379,13 @@ static bool am335xgpio_swd_mode_possible(void)
        return true;
 }
 
+static void am335xgpio_munmap(void)
+{
+       for (unsigned int i = 0; i < AM335XGPIO_NUM_GPIO_CHIPS && am335xgpio_gpio_chip_mmap_addr[i] != MAP_FAILED; ++i)
+               if (munmap((void *)am335xgpio_gpio_chip_mmap_addr[i], sysconf(_SC_PAGE_SIZE)) < 0)
+                       LOG_ERROR("Cannot unmap GPIO memory for chip %d: %s", i, strerror(errno));
+}
+
 static int am335xgpio_init(void)
 {
        LOG_INFO("AM335x GPIO JTAG/SWD bitbang driver");
@@ -410,10 +419,12 @@ static int am335xgpio_init(void)
 
                if (am335xgpio_gpio_chip_mmap_addr[i] == MAP_FAILED) {
                        LOG_ERROR("mmap: %s", strerror(errno));
+                       am335xgpio_munmap();
                        close(dev_mem_fd);
                        return ERROR_JTAG_INIT_FAILED;
                }
        }
+       close(dev_mem_fd);
 
        /* Configure JTAG/SWD signals. Default directions and initial states are handled
         * by adapter.c and "adapter gpio" command.
@@ -476,6 +487,8 @@ static int am335xgpio_quit(void)
        restore_gpio(ADAPTER_GPIO_IDX_SRST);
        restore_gpio(ADAPTER_GPIO_IDX_LED);
 
+       am335xgpio_munmap();
+
        return ERROR_OK;
 }