Skip to content

Commit 53d8b70

Browse files
songruosongruo
committed
fix(gpio): fix IO output enable control
oen_sel and oen_inv_sel fields from func_out_sel_cfg register
1 parent 1d6bcb8 commit 53d8b70

File tree

23 files changed

+79
-39
lines changed

23 files changed

+79
-39
lines changed

‎components/esp_driver_gpio/include/esp_private/gpio.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ esp_err_t gpio_sleep_pupd_config_unapply(gpio_num_t gpio_num);
5353
esp_err_t gpio_func_sel(gpio_num_t gpio_num, uint32_t func);
5454

5555
/**
56-
* @brief Enable output for an IO
56+
* @brief Enable output for an IO (as a simple GPIO output)
5757
*
5858
* @param gpio_num GPIO number
5959
*
@@ -126,13 +126,12 @@ esp_err_t gpio_iomux_input(gpio_num_t gpio_num, int func, uint32_t signal_idx);
126126
* @param gpio_num GPIO number of the pad.
127127
* @param func The index number of the IOMUX function to be selected for the pin.
128128
* One of the ``FUNC_X_*`` of specified pin (X) in ``soc/io_mux_reg.h``.
129-
* @param out_en_inv Whether the output enable control is inverted or not.
130129
*
131130
* @return
132131
* - ESP_OK Success
133132
* - ESP_ERR_INVALID_ARG GPIO number error
134133
*/
135-
esp_err_t gpio_iomux_output(gpio_num_t gpio_num, int func, bool out_en_inv);
134+
esp_err_t gpio_iomux_output(gpio_num_t gpio_num, int func);
136135

137136
#ifdef __cplusplus
138137
}

‎components/esp_driver_gpio/src/gpio.c‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ esp_err_t gpio_output_disable(gpio_num_t gpio_num)
207207
{
208208
GPIO_CHECK(GPIO_IS_VALID_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
209209
gpio_hal_output_disable(gpio_context.gpio_hal, gpio_num);
210-
gpio_hal_matrix_out_default(gpio_context.gpio_hal, gpio_num); // Ensure no other output signal is routed via GPIO matrix to this pin
210+
gpio_hal_set_output_enable_ctrl(gpio_context.gpio_hal, gpio_num, false, false); // so that output disable could take effect
211211
return ESP_OK;
212212
}
213213

@@ -836,15 +836,16 @@ esp_err_t gpio_iomux_input(gpio_num_t gpio_num, int func, uint32_t signal_idx)
836836
// Deprecated function
837837
void gpio_iomux_out(uint8_t gpio_num, int func, bool out_en_inv)
838838
{
839-
gpio_hal_iomux_out(gpio_context.gpio_hal, gpio_num, func, out_en_inv);
839+
(void)out_en_inv; // out_en_inv only takes effect when signal goes through gpio matrix to the IO
840+
gpio_hal_iomux_out(gpio_context.gpio_hal, gpio_num, func);
840841
}
841842

842-
esp_err_t gpio_iomux_output(gpio_num_t gpio_num, int func, bool out_en_inv)
843+
esp_err_t gpio_iomux_output(gpio_num_t gpio_num, int func)
843844
{
844845
GPIO_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), "GPIO number error", ESP_ERR_INVALID_ARG);
845846

846847
portENTER_CRITICAL(&gpio_context.gpio_spinlock);
847-
gpio_hal_iomux_out(gpio_context.gpio_hal, gpio_num, func, out_en_inv);
848+
gpio_hal_iomux_out(gpio_context.gpio_hal, gpio_num, func);
848849
portEXIT_CRITICAL(&gpio_context.gpio_spinlock);
849850

850851
return ESP_OK;
@@ -1094,11 +1095,18 @@ esp_err_t gpio_dump_io_configuration(FILE *out_stream, uint64_t io_bit_mask)
10941095
gpio_io_config_t io_config = {};
10951096
gpio_get_io_config(gpio_num, &io_config);
10961097

1098+
// When the IO is used as a simple GPIO output, oe signal can only be controlled by the oe register
1099+
// When the IO is not used as a simple GPIO output, oe signal could be controlled by the peripheral
1100+
const char *oe_str = io_config.oe ? "1" : "0";
1101+
if (io_config.sig_out != SIG_GPIO_OUT_IDX && io_config.oe_ctrl_by_periph) {
1102+
oe_str = "[periph_sig_ctrl]";
1103+
}
1104+
10971105
fprintf(out_stream, "IO[%"PRIu32"]%s -\n", gpio_num, esp_gpio_is_reserved(BIT64(gpio_num)) ? " **RESERVED**" : "");
10981106
fprintf(out_stream, " Pullup: %d, Pulldown: %d, DriveCap: %"PRIu32"\n", io_config.pu, io_config.pd, (uint32_t)io_config.drv);
1099-
fprintf(out_stream, " InputEn: %d, OutputEn: %d, OpenDrain: %d\n", io_config.ie, io_config.oe, io_config.od);
1107+
fprintf(out_stream, " InputEn: %d, OutputEn: %s%s, OpenDrain: %d\n", io_config.ie, oe_str, ((io_config.fun_sel == PIN_FUNC_GPIO) && (io_config.oe_inv)) ? " (inversed)" : "", io_config.od);
11001108
fprintf(out_stream, " FuncSel: %"PRIu32" (%s)\n", io_config.fun_sel, (io_config.fun_sel == PIN_FUNC_GPIO) ? "GPIO" : "IOMUX");
1101-
if (io_config.oe && io_config.fun_sel == PIN_FUNC_GPIO) {
1109+
if (io_config.fun_sel == PIN_FUNC_GPIO) {
11021110
fprintf(out_stream, " GPIO Matrix SigOut ID: %"PRIu32"%s\n", io_config.sig_out, (io_config.sig_out == SIG_GPIO_OUT_IDX) ? " (simple GPIO output)" : "");
11031111
}
11041112
if (io_config.ie && io_config.fun_sel == PIN_FUNC_GPIO) {

‎components/esp_driver_sdmmc/src/sdmmc_host.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ static void configure_pin_iomux(uint8_t gpio_num)
562562

563563
gpio_pulldown_dis(gpio_num);
564564
gpio_input_enable(gpio_num);
565-
gpio_iomux_output(gpio_num, SDMMC_LL_IOMUX_FUNC, false);
565+
gpio_iomux_output(gpio_num, SDMMC_LL_IOMUX_FUNC);
566566
gpio_set_drive_capability(gpio_num, 3);
567567
}
568568

‎components/esp_driver_spi/src/gpspi/spi_common.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ static void bus_iomux_pins_set_oct(spi_host_device_t host, const spi_bus_config_
445445
if (io_nums[i] > 0) {
446446
// In Octal mode use function channel 2
447447
gpio_iomux_input(io_nums[i], SPI2_FUNC_NUM_OCT, io_signals[i]);
448-
gpio_iomux_output(io_nums[i], SPI2_FUNC_NUM_OCT, false);
448+
gpio_iomux_output(io_nums[i], SPI2_FUNC_NUM_OCT);
449449
}
450450
}
451451
}
@@ -455,23 +455,23 @@ static void bus_iomux_pins_set_quad(spi_host_device_t host, const spi_bus_config
455455
{
456456
if (bus_config->mosi_io_num >= 0) {
457457
gpio_iomux_input(bus_config->mosi_io_num, spi_periph_signal[host].func, spi_periph_signal[host].spid_in);
458-
gpio_iomux_output(bus_config->mosi_io_num, spi_periph_signal[host].func, false);
458+
gpio_iomux_output(bus_config->mosi_io_num, spi_periph_signal[host].func);
459459
}
460460
if (bus_config->miso_io_num >= 0) {
461461
gpio_iomux_input(bus_config->miso_io_num, spi_periph_signal[host].func, spi_periph_signal[host].spiq_in);
462-
gpio_iomux_output(bus_config->miso_io_num, spi_periph_signal[host].func, false);
462+
gpio_iomux_output(bus_config->miso_io_num, spi_periph_signal[host].func);
463463
}
464464
if (bus_config->quadwp_io_num >= 0) {
465465
gpio_iomux_input(bus_config->quadwp_io_num, spi_periph_signal[host].func, spi_periph_signal[host].spiwp_in);
466-
gpio_iomux_output(bus_config->quadwp_io_num, spi_periph_signal[host].func, false);
466+
gpio_iomux_output(bus_config->quadwp_io_num, spi_periph_signal[host].func);
467467
}
468468
if (bus_config->quadhd_io_num >= 0) {
469469
gpio_iomux_input(bus_config->quadhd_io_num, spi_periph_signal[host].func, spi_periph_signal[host].spihd_in);
470-
gpio_iomux_output(bus_config->quadhd_io_num, spi_periph_signal[host].func, false);
470+
gpio_iomux_output(bus_config->quadhd_io_num, spi_periph_signal[host].func);
471471
}
472472
if (bus_config->sclk_io_num >= 0) {
473473
gpio_iomux_input(bus_config->sclk_io_num, spi_periph_signal[host].func, spi_periph_signal[host].spiclk_in);
474-
gpio_iomux_output(bus_config->sclk_io_num, spi_periph_signal[host].func, false);
474+
gpio_iomux_output(bus_config->sclk_io_num, spi_periph_signal[host].func);
475475
}
476476
}
477477

@@ -733,7 +733,7 @@ void spicommon_cs_initialize(spi_host_device_t host, int cs_io_num, int cs_num,
733733
if (!force_gpio_matrix && cs_io_num == spi_periph_signal[host].spics0_iomux_pin && cs_num == 0) {
734734
//The cs0s for all SPI peripherals map to pin mux source 1, so we use that instead of a define.
735735
gpio_iomux_input(cs_io_num, spi_periph_signal[host].func, spi_periph_signal[host].spics_in);
736-
gpio_iomux_output(cs_io_num, spi_periph_signal[host].func, false);
736+
gpio_iomux_output(cs_io_num, spi_periph_signal[host].func);
737737
} else {
738738
//Use GPIO matrix
739739
if (GPIO_IS_VALID_OUTPUT_GPIO(cs_io_num)) {

‎components/esp_driver_uart/src/uart.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ static bool uart_try_set_iomux_pin(uart_port_t uart_num, int io_num, uint32_t id
686686
if (upin->input) {
687687
gpio_iomux_input(io_num, upin->iomux_func, upin->signal);
688688
} else {
689-
gpio_iomux_output(io_num, upin->iomux_func, false);
689+
gpio_iomux_output(io_num, upin->iomux_func);
690690
}
691691
}
692692
#if (SOC_UART_LP_NUM >= 1) && (SOC_RTCIO_PIN_COUNT >= 1)

‎components/esp_eth/src/mac/esp_eth_mac_esp_gpio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static esp_err_t emac_esp_iomux_init(gpio_num_t gpio_num, const emac_iomux_info_
9090
if (is_input) {
9191
ESP_RETURN_ON_ERROR(gpio_iomux_input(iomux_info->gpio_num, iomux_info->func, signal_idx), TAG, "failed to set perip. input via IOMUX");
9292
} else {
93-
ESP_RETURN_ON_ERROR(gpio_iomux_output(iomux_info->gpio_num, iomux_info->func, false), TAG, "failed to set perip. output via IOMUX");
93+
ESP_RETURN_ON_ERROR(gpio_iomux_output(iomux_info->gpio_num, iomux_info->func), TAG, "failed to set perip. output via IOMUX");
9494
}
9595
ESP_RETURN_ON_ERROR(gpio_set_pull_mode(iomux_info->gpio_num, GPIO_FLOATING),
9696
TAG, "failed to set pull mode at GPIO %i", iomux_info->gpio_num);

‎components/esp_hw_support/esp_clock_output.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static esp_clock_output_mapping_t* clkout_mapping_alloc(clkout_channel_handle_t*
141141
allocated_mapping->ref_cnt++;
142142
if (allocated_mapping->ref_cnt == 1) {
143143
#if SOC_GPIO_CLOCKOUT_BY_IO_MUX
144-
gpio_iomux_output(gpio_num, CLKOUT_CHANNEL_TO_IOMUX_FUNC(allocated_mapping->clkout_channel_hdl->channel_id), false);
144+
gpio_iomux_output(gpio_num, CLKOUT_CHANNEL_TO_IOMUX_FUNC(allocated_mapping->clkout_channel_hdl->channel_id));
145145
#elif SOC_GPIO_CLOCKOUT_BY_GPIO_MATRIX
146146
gpio_set_pull_mode(gpio_num, GPIO_FLOATING);
147147
gpio_func_sel(gpio_num, PIN_FUNC_GPIO);

‎components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_esp_clock_output.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ TEST_CASE("GPIO output internal clock", "[gpio_output_clock][ignore]")
9999
#if CONFIG_IDF_TARGET_ESP32
100100
/* ESP32 clock out channel pin reuses UART TX/RX pin, restore its default
101101
configuration at the end of the test */
102-
gpio_iomux_output(U0RXD_GPIO_NUM, FUNC_U0RXD_U0RXD, false);
103-
gpio_iomux_output(U0TXD_GPIO_NUM, FUNC_U0TXD_U0TXD, false);
102+
gpio_iomux_output(U0RXD_GPIO_NUM, FUNC_U0RXD_U0RXD);
103+
gpio_iomux_output(U0TXD_GPIO_NUM, FUNC_U0TXD_U0TXD);
104104
#endif
105105
}
106106

‎components/hal/esp32/include/hal/gpio_ll.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ static inline void gpio_ll_get_io_config(gpio_dev_t *hw, uint32_t gpio_num, gpio
5858
io_config->pd = (iomux_reg_val & FUN_PD_M) >> FUN_PD_S;
5959
io_config->ie = (iomux_reg_val & FUN_IE_M) >> FUN_IE_S;
6060
io_config->oe = (((gpio_num < 32) ? hw->enable : hw->enable1.val) & bit_mask) >> bit_shift;
61+
io_config->oe_ctrl_by_periph = !(hw->func_out_sel_cfg[gpio_num].oen_sel);
62+
io_config->oe_inv = hw->func_out_sel_cfg[gpio_num].oen_inv_sel;
6163
io_config->od = hw->pin[gpio_num].pad_driver;
6264
io_config->drv = (gpio_drive_cap_t)((iomux_reg_val & FUN_DRV_M) >> FUN_DRV_S);
6365
io_config->fun_sel = (iomux_reg_val & MCU_SEL_M) >> MCU_SEL_S;
@@ -693,7 +695,7 @@ static inline void gpio_ll_set_input_signal_from(gpio_dev_t *hw, uint32_t signal
693695
*/
694696
static inline void gpio_ll_set_output_enable_ctrl(gpio_dev_t *hw, uint8_t gpio_num, bool ctrl_by_periph, bool oen_inv)
695697
{
696-
hw->func_out_sel_cfg[gpio_num].oen_inv_sel = oen_inv;
698+
hw->func_out_sel_cfg[gpio_num].oen_inv_sel = oen_inv; // control valid only when using gpio matrix to route signal to the IO
697699
hw->func_out_sel_cfg[gpio_num].oen_sel = !ctrl_by_periph;
698700
}
699701

‎components/hal/esp32c2/include/hal/gpio_ll.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ static inline void gpio_ll_get_io_config(gpio_dev_t *hw, uint32_t gpio_num, gpio
4848
io_config->pd = (iomux_reg_val & FUN_PD_M) >> FUN_PD_S;
4949
io_config->ie = (iomux_reg_val & FUN_IE_M) >> FUN_IE_S;
5050
io_config->oe = (hw->enable.val & bit_mask) >> gpio_num;
51+
io_config->oe_ctrl_by_periph = !(hw->func_out_sel_cfg[gpio_num].oen_sel);
52+
io_config->oe_inv = hw->func_out_sel_cfg[gpio_num].oen_inv_sel;
5153
io_config->od = hw->pin[gpio_num].pad_driver;
5254
io_config->drv = (gpio_drive_cap_t)((iomux_reg_val & FUN_DRV_M) >> FUN_DRV_S);
5355
io_config->fun_sel = (iomux_reg_val & MCU_SEL_M) >> MCU_SEL_S;
@@ -495,7 +497,7 @@ static inline void gpio_ll_set_input_signal_from(gpio_dev_t *hw, uint32_t signal
495497
*/
496498
static inline void gpio_ll_set_output_enable_ctrl(gpio_dev_t *hw, uint8_t gpio_num, bool ctrl_by_periph, bool oen_inv)
497499
{
498-
hw->func_out_sel_cfg[gpio_num].oen_inv_sel = oen_inv;
500+
hw->func_out_sel_cfg[gpio_num].oen_inv_sel = oen_inv; // control valid only when using gpio matrix to route signal to the IO
499501
hw->func_out_sel_cfg[gpio_num].oen_sel = !ctrl_by_periph;
500502
}
501503

0 commit comments

Comments
 (0)