zephyrproject-rtos · raffarost · Nov 7, 2024 · Nov 8, 2024 · Nov 8, 2024
diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c
@@ -170,6 +170,29 @@ static int uart_esp32_err_check(const struct device *dev)
 }
 
 #ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
+
+static uint32_t uart_esp32_get_standard_baud(uint32_t calc_baud)
+{
+	const uint32_t standard_bauds[] = {9600,  14400,  19200,  38400,  57600,
+					   74880, 115200, 230400, 460800, 921600};
+	int num_bauds = ARRAY_SIZE(standard_bauds);
+	uint32_t baud = calc_baud;
+
+	/* Find the standard baudrate within 0.1% range. If no close
+	 * value is found, input is returned.
+	 */
+	for (int i = 0; i < num_bauds; i++) {
+		float range = (float)abs(calc_baud - standard_bauds[i]) / standard_bauds[i];
+
+		if (range < 0.001f) {
+			baud = standard_bauds[i];
+			break;
+		}
+	}
+
+	return baud;
+}
+
 static int uart_esp32_config_get(const struct device *dev, struct uart_config *cfg)
 {
 	struct uart_esp32_data *data = dev->data;
@@ -179,11 +202,14 @@ static int uart_esp32_config_get(const struct device *dev, struct uart_config *c
 	uart_hw_flowcontrol_t hw_flow;
 	uart_sclk_t src_clk;
 	uint32_t sclk_freq;
+	uint32_t calc_baud;
 
 	uart_hal_get_sclk(&data->hal, &src_clk);
 	esp_clk_tree_src_get_freq_hz((soc_module_clk_t)src_clk,
 		ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &sclk_freq);
-	uart_hal_get_baudrate(&data->hal, &cfg->baudrate, sclk_freq);
+
+	uart_hal_get_baudrate(&data->hal, &calc_baud, sclk_freq);
+	cfg->baudrate = uart_esp32_get_standard_baud(calc_baud);
 
 	uart_hal_get_parity(&data->hal, &parity);
 	switch (parity) {

diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart_config.c b/tests/drivers/uart/uart_basic_api/src/test_uart_config.c
@@ -26,7 +26,7 @@
 
 #include "test_uart.h"
 const struct uart_config uart_cfg = {
-		.baudrate = 115200,
+		.baudrate = DT_PROP_OR(DT_CHOSEN(zephyr_console), current_speed, 115200),
 		.parity = UART_CFG_PARITY_NONE,
 		.stop_bits = UART_CFG_STOP_BITS_1,
 		.data_bits = UART_CFG_DATA_BITS_8,

diff --git a/tests/drivers/uart/uart_basic_api/src/test_uart_config_wide.c b/tests/drivers/uart/uart_basic_api/src/test_uart_config_wide.c
@@ -26,7 +26,7 @@
 
 #include "test_uart.h"
 const struct uart_config uart_cfg_wide = {
-		.baudrate = 115200,
+		.baudrate = DT_PROP_OR(DT_NODELABEL(dut), current_speed, 115200),
 		.parity = UART_CFG_PARITY_NONE,
 		.stop_bits = UART_CFG_STOP_BITS_1,
 		.data_bits = UART_CFG_DATA_BITS_9,

diff --git a/tests/drivers/uart/uart_elementary/Kconfig b/tests/drivers/uart/uart_elementary/Kconfig
@@ -8,4 +8,12 @@ config DUAL_UART_TEST
 config SETUP_MISMATCH_TEST
 	bool "Enable mismatched configuration in dual UART test"
 
+config UART_BAUDRATE_MISMATCH
+	int "UART baudrate for DUT_AUX to test mismatch case"
+	depends on SETUP_MISMATCH_TEST
+	default 9600
+	help
+	  UART baudrate for DUT_AUX that is intentionally different from DUT
+	  to test error detection.
+
 source "Kconfig.zephyr"
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32_procpu.conf b/tests/drivers/uart/uart_elementary/socs/esp32_procpu.conf
@@ -0,0 +1 @@
+CONFIG_DUAL_UART_TEST=y
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32_procpu.overlay b/tests/drivers/uart/uart_elementary/socs/esp32_procpu.overlay
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart1_test: uart1_test {
+		group1 {
+			pinmux = <UART1_TX_GPIO2>,
+				<UART1_RTS_GPIO4>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO3>,
+				<UART1_CTS_GPIO5>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+
+	uart2_test: uart2_test {
+		group1 {
+			pinmux = <UART2_TX_GPIO3>,
+				<UART1_RTS_GPIO5>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART2_RX_GPIO2>,
+				<UART1_CTS_GPIO4>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+};
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
+
+dut_aux: &uart2 {
+	status = "okay";
+	pinctrl-0 = <&uart2_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32c2.overlay b/tests/drivers/uart/uart_elementary/socs/esp32c2.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart1_test: uart1_test {
+		group1 {
+			pinmux = <UART1_TX_GPIO2>,
+				<UART1_RTS_GPIO3>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO2>,
+				<UART1_CTS_GPIO3>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+};
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_test>;
+	pinctrl-names = "default";
+	current-speed = <74880>;
+};
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32c3.overlay b/tests/drivers/uart/uart_elementary/socs/esp32c3.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart1_test: uart1_test {
+		group1 {
+			pinmux = <UART1_TX_GPIO2>,
+				<UART1_RTS_GPIO3>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO2>,
+				<UART1_CTS_GPIO3>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+};
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32c6.overlay b/tests/drivers/uart/uart_elementary/socs/esp32c6.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart1_test: uart1_test {
+		group1 {
+			pinmux = <UART1_TX_GPIO2>,
+				<UART1_RTS_GPIO3>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO2>,
+				<UART1_CTS_GPIO3>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+};
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32s2.overlay b/tests/drivers/uart/uart_elementary/socs/esp32s2.overlay
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart1_test: uart1_test {
+		group1 {
+			pinmux = <UART1_TX_GPIO2>,
+				<UART1_RTS_GPIO3>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO2>,
+				<UART1_CTS_GPIO3>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+};
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32s3_procpu.conf b/tests/drivers/uart/uart_elementary/socs/esp32s3_procpu.conf
@@ -0,0 +1 @@
+CONFIG_DUAL_UART_TEST=y
diff --git a/tests/drivers/uart/uart_elementary/socs/esp32s3_procpu.overlay b/tests/drivers/uart/uart_elementary/socs/esp32s3_procpu.overlay
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&pinctrl {
+	uart1_test: uart1_test {
+		group1 {
+			pinmux = <UART1_TX_GPIO2>,
+				<UART1_RTS_GPIO4>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART1_RX_GPIO3>,
+				<UART1_CTS_GPIO5>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+
+	uart2_test: uart2_test {
+		group1 {
+			pinmux = <UART2_TX_GPIO3>,
+				<UART1_RTS_GPIO5>;
+			input-enable;
+			output-high;
+		};
+		group2 {
+			pinmux = <UART2_RX_GPIO2>,
+				<UART1_CTS_GPIO4>;
+			output-enable;
+			bias-pull-up;
+		};
+	};
+};
+
+dut: &uart1 {
+	status = "okay";
+	pinctrl-0 = <&uart1_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
+
+dut_aux: &uart2 {
+	status = "okay";
+	pinctrl-0 = <&uart2_test>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+};
diff --git a/tests/drivers/uart/uart_elementary/src/main.c b/tests/drivers/uart/uart_elementary/src/main.c
@@ -30,6 +30,8 @@
 #define SLEEP_TIME_US 1000
 #define TEST_BUFFER_LEN 10
 
+#define UART_BAUDRATE DT_PROP_OR(UART_NODE, current_speed, 115200)
+
 static const struct device *const uart_dev = DEVICE_DT_GET(UART_NODE);
 
 const uint8_t test_pattern[TEST_BUFFER_LEN] = { 0x11, 0x12, 0x13, 0x14, 0x15,
@@ -135,7 +137,7 @@ ZTEST(uart_elementary, test_uart_proper_configuration)
 
 	int err;
 	struct uart_config test_expected_uart_config;
-	struct uart_config test_uart_config = { .baudrate = 115200,
+	struct uart_config test_uart_config = { .baudrate = UART_BAUDRATE,
 						.parity = UART_CFG_PARITY_NONE,
 						.stop_bits = UART_CFG_STOP_BITS_1,
 						.data_bits = UART_CFG_DATA_BITS_8,
@@ -176,7 +178,7 @@ ZTEST(uart_elementary, test_uart_improper_configuration)
 	Z_TEST_SKIP_IFDEF(CONFIG_DUAL_UART_TEST);
 
 	int err;
-	struct uart_config test_uart_config = { .baudrate = 115200,
+	struct uart_config test_uart_config = { .baudrate = UART_BAUDRATE,
 						.parity = 7,
 						.stop_bits = UART_CFG_STOP_BITS_1,
 						.data_bits = UART_CFG_DATA_BITS_8,
@@ -196,7 +198,7 @@ ZTEST(uart_elementary, test_uart_improper_configuration)
 ZTEST(uart_elementary, test_uart_basic_transmission)
 {
 	int err;
-	struct uart_config test_uart_config = { .baudrate = 115200,
+	struct uart_config test_uart_config = { .baudrate = UART_BAUDRATE,
 						.parity = UART_CFG_PARITY_ODD,
 						.stop_bits = UART_CFG_STOP_BITS_1,
 						.data_bits = UART_CFG_DATA_BITS_8,
@@ -233,14 +235,14 @@ ZTEST(uart_elementary, test_uart_basic_transmission)
 ZTEST(uart_elementary, test_uart_dual_port_transmission)
 {
 	int err;
-	struct uart_config test_uart_config = { .baudrate = 115200,
+	struct uart_config test_uart_config = { .baudrate = UART_BAUDRATE,
 						.parity = UART_CFG_PARITY_EVEN,
 						.stop_bits = UART_CFG_STOP_BITS_2,
 						.data_bits = UART_CFG_DATA_BITS_8,
 						.flow_ctrl = UART_CFG_FLOW_CTRL_NONE };
 
 #if defined(CONFIG_SETUP_MISMATCH_TEST)
-	struct uart_config test_uart_config_aux = { .baudrate = 9600,
+	struct uart_config test_uart_config_aux = { .baudrate = CONFIG_UART_BAUDRATE_MISMATCH,
 						    .parity = UART_CFG_PARITY_EVEN,
 						    .stop_bits = UART_CFG_STOP_BITS_2,
 						    .data_bits = UART_CFG_DATA_BITS_8,

diff --git a/tests/drivers/uart/uart_elementary/testcase.yaml b/tests/drivers/uart/uart_elementary/testcase.yaml
@@ -12,6 +12,12 @@ tests:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15dk/nrf54l15/cpuflpr
       - nrf5340dk/nrf5340/cpuapp
+      - esp32_devkitc_wrover/esp32/procpu
+      - esp8684_devkitm
+      - esp32c3_devkitm
+      - esp32c6_devkitc
+      - esp32s2_saola
+      - esp32s3_devkitm/esp32s3/procpu
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
   drivers.uart.uart_elementary_dual_nrf54h: