linux-user: Add missing termios baud rates

Add several missing baud rates and inputs baud rates in cflag_tbl.

Add these missing definitions in termbits.h:

- TARGET_BOTHER for alpha, hppa, ppc, sh4, sparc
- TARGET_IBSHIFT for hppa, mips, ppc, sh4, sparc
- Missing standard baud rates for hppa

These are required for the glibc test tst-termios-linux.

Link: https://lore.kernel.org/qemu-devel/20251203-linux-user-higher-baud-rates-v2-1-e45b35224437@iscas.ac.cn
Signed-off-by: Vivian Wang <wangruikang@iscas.ac.cn>
Reviewed-by: Helge Deller <deller@gmx.de>

diff --git a/linux-user/alpha/termbits.h b/linux-user/alpha/termbits.h
index b7be23ea13b6bb47cf6bd182c8522c493fde659d..50cff34f3cc5fe603a8f0d7ff6f101bb834e3f0e 100644 (file)
--- a/linux-user/alpha/termbits.h
+++ b/linux-user/alpha/termbits.h
@@ -149,6 +149,7 @@ struct target_ktermios {
 #define TARGET_B3000000  00034
 #define TARGET_B3500000  00035
 #define TARGET_B4000000  00036
+#define TARGET_BOTHER    00037
 
 #define TARGET_CSIZE   00001400
 #define   TARGET_CS5   00000000

diff --git a/linux-user/generic/termbits.h b/linux-user/generic/termbits.h
index 6675e0d1abab1ef259ae049bf82301957de4dee2..6cc5995981416aa751f6f10a4dd72f91c3f41dcf 100644 (file)
--- a/linux-user/generic/termbits.h
+++ b/linux-user/generic/termbits.h
@@ -157,7 +157,7 @@ struct target_ktermios {
 #define  TARGET_B3000000  0010015
 #define  TARGET_B3500000  0010016
 #define  TARGET_B4000000  0010017
-#define TARGET_CIBAUD     002003600000  /* input baud rate (not used) */
+#define TARGET_CIBAUD     002003600000  /* input baud rate */
 #define TARGET_CMSPAR     010000000000  /* mark or space (stick) parity */
 #define TARGET_CRTSCTS    020000000000  /* flow control */
 

diff --git a/linux-user/hppa/termbits.h b/linux-user/hppa/termbits.h
index 645f17bf63b6d6d3d13585899baff87e7bc987ef..9d1d1a1d1277a28f9050fe2fcca148c1568afa82 100644 (file)
--- a/linux-user/hppa/termbits.h
+++ b/linux-user/hppa/termbits.h
@@ -123,14 +123,28 @@ struct target_ktermios {
 #define TARGET_HUPCL   0002000
 #define TARGET_CLOCAL  0004000
 #define TARGET_CBAUDEX 0010000
+#define  TARGET_BOTHER  0010000
 #define  TARGET_B57600  0010001
 #define  TARGET_B115200 0010002
 #define  TARGET_B230400 0010003
 #define  TARGET_B460800 0010004
-#define TARGET_CIBAUD    002003600000  /* input baud rate (not used) */
+#define  TARGET_B500000 0010005
+#define  TARGET_B576000 0010006
+#define  TARGET_B921600 0010007
+#define  TARGET_B1000000 0010010
+#define  TARGET_B1152000 0010011
+#define  TARGET_B1500000 0010012
+#define  TARGET_B2000000 0010013
+#define  TARGET_B2500000 0010014
+#define  TARGET_B3000000 0010015
+#define  TARGET_B3500000 0010016
+#define  TARGET_B4000000 0010017
+#define TARGET_CIBAUD    002003600000  /* input baud rate */
 #define TARGET_CMSPAR    010000000000  /* mark or space (stick) parity */
 #define TARGET_CRTSCTS   020000000000  /* flow control */
 
+#define TARGET_IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define TARGET_ISIG    0000001
 #define TARGET_ICANON  0000002

diff --git a/linux-user/mips/termbits.h b/linux-user/mips/termbits.h
index 27610f7c4d58f705752dc2ed3043a2cccf755921..56b17441ee2edae452873155fb58d8bbff679d11 100644 (file)
--- a/linux-user/mips/termbits.h
+++ b/linux-user/mips/termbits.h
@@ -139,10 +139,12 @@ struct target_ktermios {
 #define  TARGET_B3000000 0010015
 #define  TARGET_B3500000 0010016
 #define  TARGET_B4000000 0010017
-#define TARGET_CIBAUD    002003600000  /* input baud rate (not used) */
+#define TARGET_CIBAUD    002003600000  /* input baud rate */
 #define TARGET_CMSPAR    010000000000  /* mark or space (stick) parity */
 #define TARGET_CRTSCTS   020000000000  /* flow control */
 
+#define TARGET_IBSHIFT   16            /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define TARGET_ISIG    0000001
 #define TARGET_ICANON  0000002

diff --git a/linux-user/ppc/termbits.h b/linux-user/ppc/termbits.h
index eb226e099980b3e6731b05e75e757ab4c85ad9a8..71b398c83af87844d80471d314d328007fa3c0a4 100644 (file)
--- a/linux-user/ppc/termbits.h
+++ b/linux-user/ppc/termbits.h
@@ -129,6 +129,7 @@ struct target_termios {
 #define TARGET_B3000000  00034
 #define TARGET_B3500000  00035
 #define TARGET_B4000000  00036
+#define TARGET_BOTHER    00037
 
 #define TARGET_CSIZE   00001400
 #define   TARGET_CS5   00000000

diff --git a/linux-user/sh4/termbits.h b/linux-user/sh4/termbits.h
index cab6b1299e2848e2d7f4a8138f712bee33ef3247..861f861f6d5d2eec309e1e654d036bce0c48c5ec 100644 (file)
--- a/linux-user/sh4/termbits.h
+++ b/linux-user/sh4/termbits.h
@@ -142,6 +142,7 @@ struct target_ktermios {
 #define TARGET_HUPCL   0002000
 #define TARGET_CLOCAL  0004000
 #define TARGET_CBAUDEX 0010000
+#define TARGET_BOTHER 0010000
 #define TARGET_B57600 0010001
 #define TARGET_B115200 0010002
 #define TARGET_B230400 0010003
@@ -157,10 +158,12 @@ struct target_ktermios {
 #define TARGET_B3000000 0010015
 #define TARGET_B3500000 0010016
 #define TARGET_B4000000 0010017
-#define TARGET_CIBAUD    002003600000 /* input baud rate (not used) */
+#define TARGET_CIBAUD    002003600000 /* input baud rate */
 #define TARGET_CMSPAR    010000000000 /* mark or space (stick) parity */
 #define TARGET_CRTSCTS   020000000000 /* flow control */
 
+#define TARGET_IBSHIFT   16           /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define TARGET_ISIG     0000001
 #define TARGET_ICANON   0000002

diff --git a/linux-user/sparc/termbits.h b/linux-user/sparc/termbits.h
index 588d7e8dcd5c921221756c018c1db18f7374de0c..f64ea87d97a1ec0ce589fd6c0c9821b87631943e 100644 (file)
--- a/linux-user/sparc/termbits.h
+++ b/linux-user/sparc/termbits.h
@@ -150,6 +150,7 @@ struct target_ktermios {
 #define TARGET_HUPCL     0x00000400
 #define TARGET_CLOCAL    0x00000800
 #define TARGET_CBAUDEX   0x00001000
+#define  TARGET_BOTHER   0x00001000
 /* We'll never see these speeds with the Zilogs, but for completeness... */
 #define  TARGET_B57600   0x00001001
 #define  TARGET_B115200  0x00001002
@@ -176,10 +177,12 @@ struct target_ktermios {
 #define B3000000  0x00001011
 #define B3500000  0x00001012
 #define B4000000  0x00001013  */
-#define TARGET_CIBAUD    0x100f0000  /* input baud rate (not used) */
+#define TARGET_CIBAUD    0x100f0000  /* input baud rate */
 #define TARGET_CMSPAR    0x40000000  /* mark or space (stick) parity */
 #define TARGET_CRTSCTS   0x80000000  /* flow control */
 
+#define TARGET_IBSHIFT   16          /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define TARGET_ISIG    0x00000001
 #define TARGET_ICANON  0x00000002

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d80d3ded7bee582ffdca3a6930ee8a624bd57b0c..9443eb3a172c97ee0934e39bf430f439dd7737a6 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5762,27 +5762,70 @@ static const bitmask_transtbl oflag_tbl[] = {
        { TARGET_FFDLY, TARGET_FF1, FFDLY, FF1 },
 };
 
+#if defined(TARGET_CIBAUD) && defined(CIBAUD)
+
+# define BAUD_TRANSTBL(baud) \
+    { TARGET_CBAUD, TARGET_##baud, CBAUD, baud }, \
+    { TARGET_CIBAUD, TARGET_##baud << TARGET_IBSHIFT, CIBAUD, baud << IBSHIFT },
+
+#else
+
+/* Alpha in particular does not have CIBAUD/IBSHIFT */
+
+# define BAUD_TRANSTBL(baud) \
+    { TARGET_CBAUD, TARGET_##baud, CBAUD, baud },
+
+#endif
+
 static const bitmask_transtbl cflag_tbl[] = {
-       { TARGET_CBAUD, TARGET_B0, CBAUD, B0 },
-       { TARGET_CBAUD, TARGET_B50, CBAUD, B50 },
-       { TARGET_CBAUD, TARGET_B75, CBAUD, B75 },
-       { TARGET_CBAUD, TARGET_B110, CBAUD, B110 },
-       { TARGET_CBAUD, TARGET_B134, CBAUD, B134 },
-       { TARGET_CBAUD, TARGET_B150, CBAUD, B150 },
-       { TARGET_CBAUD, TARGET_B200, CBAUD, B200 },
-       { TARGET_CBAUD, TARGET_B300, CBAUD, B300 },
-       { TARGET_CBAUD, TARGET_B600, CBAUD, B600 },
-       { TARGET_CBAUD, TARGET_B1200, CBAUD, B1200 },
-       { TARGET_CBAUD, TARGET_B1800, CBAUD, B1800 },
-       { TARGET_CBAUD, TARGET_B2400, CBAUD, B2400 },
-       { TARGET_CBAUD, TARGET_B4800, CBAUD, B4800 },
-       { TARGET_CBAUD, TARGET_B9600, CBAUD, B9600 },
-       { TARGET_CBAUD, TARGET_B19200, CBAUD, B19200 },
-       { TARGET_CBAUD, TARGET_B38400, CBAUD, B38400 },
-       { TARGET_CBAUD, TARGET_B57600, CBAUD, B57600 },
-       { TARGET_CBAUD, TARGET_B115200, CBAUD, B115200 },
-       { TARGET_CBAUD, TARGET_B230400, CBAUD, B230400 },
-       { TARGET_CBAUD, TARGET_B460800, CBAUD, B460800 },
+       BAUD_TRANSTBL(B0)
+       BAUD_TRANSTBL(B50)
+       BAUD_TRANSTBL(B75)
+       BAUD_TRANSTBL(B110)
+       BAUD_TRANSTBL(B134)
+       BAUD_TRANSTBL(B150)
+       BAUD_TRANSTBL(B200)
+       BAUD_TRANSTBL(B300)
+       BAUD_TRANSTBL(B600)
+       BAUD_TRANSTBL(B1200)
+       BAUD_TRANSTBL(B1800)
+       BAUD_TRANSTBL(B2400)
+       BAUD_TRANSTBL(B4800)
+       BAUD_TRANSTBL(B9600)
+       BAUD_TRANSTBL(B19200)
+       BAUD_TRANSTBL(B38400)
+       BAUD_TRANSTBL(B57600)
+       BAUD_TRANSTBL(B115200)
+       BAUD_TRANSTBL(B230400)
+       BAUD_TRANSTBL(B460800)
+       BAUD_TRANSTBL(B500000)
+       BAUD_TRANSTBL(B576000)
+       BAUD_TRANSTBL(B921600)
+       BAUD_TRANSTBL(B1000000)
+       BAUD_TRANSTBL(B1152000)
+       BAUD_TRANSTBL(B1500000)
+       BAUD_TRANSTBL(B2000000)
+
+       BAUD_TRANSTBL(BOTHER)
+
+       /* SPARC in particular is missing these higher baud rates */
+
+#if defined(TARGET_B2500000) && defined(B2500000)
+       BAUD_TRANSTBL(B2500000)
+#endif
+
+#if defined(TARGET_B3000000) && defined(B3000000)
+       BAUD_TRANSTBL(B3000000)
+#endif
+
+#if defined(TARGET_B3500000) && defined(B3500000)
+       BAUD_TRANSTBL(B3500000)
+#endif
+
+#if defined(TARGET_B4000000) && defined(B4000000)
+       BAUD_TRANSTBL(B4000000)
+#endif
+
        { TARGET_CSIZE, TARGET_CS5, CSIZE, CS5 },
        { TARGET_CSIZE, TARGET_CS6, CSIZE, CS6 },
        { TARGET_CSIZE, TARGET_CS7, CSIZE, CS7 },