summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitor Soares <vitor.soares@toradex.com>2025-11-07 14:57:11 +0000
committerKhem Raj <raj.khem@gmail.com>2025-11-07 09:33:11 -0800
commite982d3a96c0894cdccb0344288a999c7edafd9ac (patch)
tree8a3e887a682e954e6b7de2b670f33f2bcfdca4b9
parent6025c3c73ac15179c242402967b90a86e019a55a (diff)
downloadmeta-openembedded-e982d3a96c0894cdccb0344288a999c7edafd9ac.tar.gz
linux-serial-test: remove upstreamed patches and bump SRCREV
Remove patches that have been integrated upstream: - Serial setup handling respecting user intent - POSIX-compliant termios baud rate configuration - Type safety and error handling improvements $ git --no-pager log --oneline 1a81f3c7be08..e3461097252e e3461097252e Merge pull request #61 from MaxKrummenacher/master 988deaad893b Merge pull request #69 from ivitro/fix/termios-use-cfset-speed 03aae5517cda Merge pull request #68 from ivitro/fix-serial-setup-handling e124c19e97e9 Fix -Wstringop-overflow warning in process_write_data 363f569a531f Use cfsetispeed/cfsetospeed for baud configuration 9012c3366433 Fix serial setup handling to respect user intent 8a8aba302529 linux-serial-test.c: fix potential hang in while loop 8a5709984363 linux-serial-test.c: fix returned error code Signed-off-by: Vitor Soares <vitor.soares@toradex.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-test/linux-serial-test/files/0001-Fix-serial-setup-handling-to-respect-user-intent.patch133
-rw-r--r--meta-oe/recipes-test/linux-serial-test/files/0001-linux-serial-test.c-fix-returned-error-code.patch62
-rw-r--r--meta-oe/recipes-test/linux-serial-test/files/0002-linux-serial-test.c-fix-potential-hang-in-while-loop.patch60
-rw-r--r--meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb8
4 files changed, 2 insertions, 261 deletions
diff --git a/meta-oe/recipes-test/linux-serial-test/files/0001-Fix-serial-setup-handling-to-respect-user-intent.patch b/meta-oe/recipes-test/linux-serial-test/files/0001-Fix-serial-setup-handling-to-respect-user-intent.patch
deleted file mode 100644
index 2360d1ee0c..0000000000
--- a/meta-oe/recipes-test/linux-serial-test/files/0001-Fix-serial-setup-handling-to-respect-user-intent.patch
+++ /dev/null
@@ -1,133 +0,0 @@
1From 8d4f9a1a77f59eb3ed79267f58fac949835aebfc Mon Sep 17 00:00:00 2001
2From: Vitor Soares <vitor.soares@toradex.com>
3Date: Thu, 30 Oct 2025 14:52:57 +0000
4Subject: [PATCH] Fix serial setup handling to respect user intent
5
6Commit 77320571e63c ("Check if rs485 is already configured on the port")
7attempted to respect RS485 settings already configured on the port (e.g.
8via Device Tree). However, it unintentionally ignored user input,
9causing issues such as:
10- Inability to change delay settings
11- Failure to explicitly disable RS485
12- Broken UART loopback and RTS/CTS flow-control tests when RS485 was
13pre-enabled
14
15The original intent was valid for existing configurations (bare -q), but
16the tool should prioritize user intent, especially in testing scenarios.
17
18This update restores predictable, user-driven behavior:
19- RS485 can be explicitly enabled, disabled, or reconfigured
20- Current configurations are respected when appropriate
21
22Upstream-Status: Submitted [https://github.com/cbrake/linux-serial-test/pull/68]
23Fixes: 77320571e63c ("Check if rs485 is already configured on the port")
24Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
25---
26 linux-serial-test.c | 48 ++++++++++++++++++++++++++++-----------------
27 1 file changed, 30 insertions(+), 18 deletions(-)
28
29diff --git a/linux-serial-test.c b/linux-serial-test.c
30index 294f53882570..119bf58e663d 100644
31--- a/linux-serial-test.c
32+++ b/linux-serial-test.c
33@@ -60,6 +60,7 @@ int _cl_no_tx_param = 0;
34 int _cl_rx_delay = 0;
35 int _cl_tx_delay = 0;
36 int _cl_tx_bytes = 0;
37+int _cl_rs485 = 0;
38 int _cl_rs485_after_delay = -1;
39 int _cl_rs485_before_delay = 0;
40 int _cl_rs485_rts_after_send = 0;
41@@ -315,7 +316,9 @@ static void display_help(void)
42 " -q, --rs485 Enable RS485 direction control on port, and set delay from when TX is\n"
43 " finished and RS485 driver enable is de-asserted. Delay is specified in\n"
44 " bit times. To optionally specify a delay from when the driver is enabled\n"
45- " to start of TX use 'after_delay.before_delay' (-q 1.1)\n"
46+ " to start of TX use 'after_delay.before_delay' (-q 1.1). If no value is\n"
47+ " given, delay defaults to 0. Existing RS485 configuration is respected if\n"
48+ " already enabled.\n"
49 " -Q, --rs485_rts Deassert RTS on send, assert after send. Omitting -Q inverts this logic.\n"
50 " -m, --no-modem Do not clobber against any modem lines.\n"
51 " -o, --tx-time Number of seconds to transmit for (defaults to 0, meaning no limit)\n"
52@@ -335,7 +338,7 @@ static void process_options(int argc, char * argv[])
53 {
54 for (;;) {
55 int option_index = 0;
56- static const char *short_options = "hb:p:d:D:TRsSy:z:cBertq:Qml:a:w:o:i:P:kKAI:O:W:Znf";
57+ static const char *short_options = "hb:p:d:D:TRsSy:z:cBertq::Qml:a:w:o:i:P:kKAI:O:W:Znf";
58 static const struct option long_options[] = {
59 {"help", no_argument, 0, 0},
60 {"baud", required_argument, 0, 'b'},
61@@ -359,7 +362,7 @@ static void process_options(int argc, char * argv[])
62 {"rx-delay", required_argument, 0, 'l'},
63 {"tx-delay", required_argument, 0, 'a'},
64 {"tx-bytes", required_argument, 0, 'w'},
65- {"rs485", required_argument, 0, 'q'},
66+ {"rs485", optional_argument, 0, 'q'},
67 {"rs485_rts", no_argument, 0, 'Q'},
68 {"no-modem", no_argument, 0, 'm'},
69 {"tx-time", required_argument, 0, 'o'},
70@@ -467,8 +470,12 @@ static void process_options(int argc, char * argv[])
71 }
72 case 'q': {
73 char *endptr;
74- _cl_rs485_after_delay = strtol(optarg, &endptr, 0);
75- _cl_rs485_before_delay = strtol(endptr+1, &endptr, 0);
76+ _cl_rs485 = 1;
77+
78+ if (optarg) {
79+ _cl_rs485_after_delay = strtol(optarg, &endptr, 0);
80+ _cl_rs485_before_delay = strtol(endptr+1, &endptr, 0);
81+ }
82 break;
83 }
84 case 'Q':
85@@ -707,15 +714,20 @@ static void setup_serial_port(int baud)
86
87 /* enable/disable rs485 direction control, first check if RS485 is supported */
88 if(ioctl(_fd, TIOCGRS485, &rs485) < 0) {
89- if (_cl_rs485_after_delay >= 0) {
90+ if (_cl_rs485) {
91 /* error could be because hardware is missing rs485 support so only print when actually trying to activate it */
92 perror("Error getting RS-485 mode");
93 }
94 } else {
95- if (rs485.flags & SER_RS485_ENABLED) {
96- printf("RS485 already enabled on port, ignoring delays if set\n");
97- } else {
98- if (_cl_rs485_after_delay >= 0) {
99+ if (_cl_rs485) {
100+ /* Skip reconfiguration if already enabled with default delays */
101+ if ((_cl_rs485_after_delay < 0) && (rs485.flags & SER_RS485_ENABLED)) {
102+ printf("RS485 already enabled on port with default settings\n");
103+ } else {
104+ /* Default to 0 if not specified */
105+ if (_cl_rs485_after_delay < 0) {
106+ _cl_rs485_after_delay = 0;
107+ }
108 /* enable RS485 */
109 rs485.flags |= SER_RS485_ENABLED | SER_RS485_RX_DURING_TX |
110 (_cl_rs485_rts_after_send ? SER_RS485_RTS_AFTER_SEND : SER_RS485_RTS_ON_SEND);
111@@ -725,14 +737,14 @@ static void setup_serial_port(int baud)
112 if(ioctl(_fd, TIOCSRS485, &rs485) < 0) {
113 perror("Error setting RS-485 mode");
114 }
115- } else {
116- /* disable RS485 */
117- rs485.flags &= ~(SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND);
118- rs485.delay_rts_after_send = 0;
119- rs485.delay_rts_before_send = 0;
120- if(ioctl(_fd, TIOCSRS485, &rs485) < 0) {
121- perror("Error setting RS-232 mode");
122- }
123+ }
124+ } else {
125+ /* disable RS485 */
126+ rs485.flags &= ~(SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND);
127+ rs485.delay_rts_after_send = 0;
128+ rs485.delay_rts_before_send = 0;
129+ if(ioctl(_fd, TIOCSRS485, &rs485) < 0) {
130+ perror("Error setting RS-232 mode");
131 }
132 }
133 }
diff --git a/meta-oe/recipes-test/linux-serial-test/files/0001-linux-serial-test.c-fix-returned-error-code.patch b/meta-oe/recipes-test/linux-serial-test/files/0001-linux-serial-test.c-fix-returned-error-code.patch
deleted file mode 100644
index 91fdcf07ad..0000000000
--- a/meta-oe/recipes-test/linux-serial-test/files/0001-linux-serial-test.c-fix-returned-error-code.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 1add8f3d228368665c3abd452640b91a86f41976 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Mon, 4 Aug 2025 14:57:22 +0200
4Subject: [PATCH 1/2] linux-serial-test.c: fix returned error code
5
6_cl_no_rx/_cl_no_rx are true in two cases, first when the relevant
7command line paramter is set and second when a rx or tx time is set
8and that time expired.
9
10This fixes the second case in a loopback test. With the change the
11application now correctly returns 125 if the number of written and
12read chars differ.
13
14E.g. `./linux-serial-test -o2 -i3 -b 115200 -p /dev/ttyS1 ; echo $?`
15returns now 0 with a loopback and 125 without, before it returned 0
16with or without a loopback.
17
18Upstream-Status: Submitted [https://github.com/cbrake/linux-serial-test/pull/61/]
19Fixes: 4e57f58c58ae ("compute error count valid when no_tx or no_rx")
20Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
21Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
22---
23 linux-serial-test.c | 6 +++++-
24 1 file changed, 5 insertions(+), 1 deletion(-)
25
26diff --git a/linux-serial-test.c b/linux-serial-test.c
27index d8f66c16c72f..c2c8882d601b 100644
28--- a/linux-serial-test.c
29+++ b/linux-serial-test.c
30@@ -55,6 +55,8 @@ int _cl_loopback = 0;
31 int _cl_dump_err = 0;
32 int _cl_no_rx = 0;
33 int _cl_no_tx = 0;
34+int _cl_no_rx_param = 0;
35+int _cl_no_tx_param = 0;
36 int _cl_rx_delay = 0;
37 int _cl_tx_delay = 0;
38 int _cl_tx_bytes = 0;
39@@ -442,9 +444,11 @@ static void process_options(int argc, char * argv[])
40 break;
41 case 'r':
42 _cl_no_rx = 1;
43+ _cl_no_rx_param = 1;
44 break;
45 case 't':
46 _cl_no_tx = 1;
47+ _cl_no_tx_param = 1;
48 break;
49 case 'l': {
50 char *endptr;
51@@ -745,7 +749,7 @@ static int diff_s(const struct timespec *t1, const struct timespec *t2)
52 static int compute_error_count(void)
53 {
54 long long int result;
55- if (_cl_no_rx == 1 || _cl_no_tx == 1)
56+ if (_cl_no_rx_param == 1 || _cl_no_tx_param == 1)
57 result = _error_count;
58 else
59 result = llabs(_write_count - _read_count) + _error_count;
60--
612.43.0
62
diff --git a/meta-oe/recipes-test/linux-serial-test/files/0002-linux-serial-test.c-fix-potential-hang-in-while-loop.patch b/meta-oe/recipes-test/linux-serial-test/files/0002-linux-serial-test.c-fix-potential-hang-in-while-loop.patch
deleted file mode 100644
index f0b7f65a60..0000000000
--- a/meta-oe/recipes-test/linux-serial-test/files/0002-linux-serial-test.c-fix-potential-hang-in-while-loop.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 9cf6c1d80c2f159dbb69967fbe934bf6de73c9e8 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Tue, 5 Aug 2025 09:35:06 +0200
4Subject: [PATCH 2/2] linux-serial-test.c: fix potential hang in while loop
5
6process_read_data() assumes that we can always wait for reception
7of 1024 chars. However that is not true if one sets the number of
8chars with the '-w' cmdline parameter or chars are lost. Maybe there
9are other reasons.
10
11Replace the magic number of 1024 by calculating the number of expected
12chars from _cl_tx_bytes.
13
14Brake a possible infinite while loop by adding a timeout to the loop
15calculated from the expected chars times chartime.
16
17Upstream-Status: Submitted [https://github.com/cbrake/linux-serial-test/pull/61/]
18Fixes: 7fd1057f8a95 ("Add loop to read all data in rcv buffer")
19Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
20Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
21---
22 linux-serial-test.c | 14 ++++++++++++--
23 1 file changed, 12 insertions(+), 2 deletions(-)
24
25diff --git a/linux-serial-test.c b/linux-serial-test.c
26index c2c8882d601b..294f53882570 100644
27--- a/linux-serial-test.c
28+++ b/linux-serial-test.c
29@@ -543,8 +543,13 @@ static unsigned char next_count_value(unsigned char c)
30 static void process_read_data(void)
31 {
32 unsigned char rb[1024];
33+ int loopcounter = 0;
34 int actual_read_count = 0;
35- while (actual_read_count < 1024) {
36+ int expected_read_count = _cl_tx_bytes == 0 ? 1024 : _cl_tx_bytes;
37+ /* time for one char at current baudrate in us */
38+ int chartime = 1000000 * (8 + _cl_parity + 1 + _cl_2_stop_bit) / _cl_baud;
39+
40+ while (actual_read_count < expected_read_count) {
41 int c = read(_fd, &rb, sizeof(rb));
42 if (c > 0) {
43 if (_cl_rx_dump) {
44@@ -577,7 +582,12 @@ static void process_read_data(void)
45 if (errno != EAGAIN) {
46 perror("read failed");
47 }
48- continue; // Retry the read
49+
50+ if (loopcounter++ < expected_read_count) {
51+ usleep(chartime);
52+ continue; // Retry the read
53+ }
54+ break;
55 } else {
56 break;
57 }
58--
592.43.0
60
diff --git a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb
index 78fd9d3b1c..6e3df371b1 100644
--- a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb
+++ b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb
@@ -3,13 +3,9 @@ HOMEPAGE = "https://github.com/cbrake/linux-serial-test"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=544799d0b492f119fa04641d1b8868ed" 4LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=544799d0b492f119fa04641d1b8868ed"
5 5
6SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=master \ 6SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=master"
7 file://0001-linux-serial-test.c-fix-returned-error-code.patch \
8 file://0002-linux-serial-test.c-fix-potential-hang-in-while-loop.patch \
9 file://0001-Fix-serial-setup-handling-to-respect-user-intent.patch \
10"
11PV = "0+git" 7PV = "0+git"
12SRCREV = "1a81f3c7be086ee01a9be8589a606426276c86d5" 8SRCREV = "e3461097252e51fc527839884e77449cfd976701"
13 9
14# Upstream repo does not tag 10# Upstream repo does not tag
15UPSTREAM_CHECK_COMMITS = "1" 11UPSTREAM_CHECK_COMMITS = "1"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-20 18:38:57 +0000