All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Marek Behún" <marek.behun@nic.cz>
To: Stefan Roese <sr@denx.de>
Cc: u-boot@lists.denx.de, pali@kernel.org,
	"Chris Packham" <judge.packham@gmail.com>,
	"Baruch Siach" <baruch@tkos.co.il>,
	"Dennis Gilmore" <dgilmore@redhat.com>,
	"Mario Six" <mario.six@gdsys.cc>,
	"Jon Nettleton" <jon@solid-run.com>,
	"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH u-boot-marvell 26/29] tools: kwboot: Allow any baudrate on Linux
Date: Wed, 25 Aug 2021 15:46:31 +0200	[thread overview]
Message-ID: <20210825134634.3959-27-marek.behun@nic.cz> (raw)
In-Reply-To: <20210825134634.3959-1-marek.behun@nic.cz>

From: Pali Rohár <pali@kernel.org>

The A38x platform supports more baudrates than just those defined by the
Bn constants, and some of them are higher than the highest Bn baudrate
(the highest is 4 MBd while A38x support 5.15 MBd).

On Linux, add support for arbitrary baudrates. (Since there is no
standard POSIX API to specify arbitrary baudrate for a tty device, this
change is Linux-specific.)

We need to use raw TCGETS2/TCSETS2 or TCGETS/TCSETS ioctls with the
BOTHER flag in struct termios2/termios, defined in Linux headers
<asm/ioctls.h> and <asm/termbits.h>. Since these headers conflict with
glibc's header file <termios.h>, it is not possible to use libc's
termios functions and we need to reimplement them via ioctl() calls.

Note that the Bnnn constants from <termios.h> need not be compatible
with Bnnn constants from <asm/termbits.h>.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ termios macros rewritten to static inline functions (for type control)
  and moved to tools/termios.h ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c        |  16 +++-
 tools/termios_linux.h | 170 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 tools/termios_linux.h

diff --git a/tools/kwboot.c b/tools/kwboot.c
index dbe59833eb..f60cfd130e 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -23,10 +23,15 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdint.h>
-#include <termios.h>
 #include <time.h>
 #include <sys/stat.h>
 
+#ifdef __linux__
+#include "termios_linux.h"
+#else
+#include <termios.h>
+#endif
+
 /*
  * Marvell BootROM UART Sensing
  */
@@ -553,7 +558,11 @@ kwboot_tty_baudrate_to_speed(int baudrate)
 		return B50;
 #endif
 	default:
+#ifdef BOTHER
+		return BOTHER;
+#else
 		return B0;
+#endif
 	}
 }
 
@@ -574,6 +583,11 @@ kwboot_tty_change_baudrate(int fd, int baudrate)
 		return -1;
 	}
 
+#ifdef BOTHER
+	if (speed == BOTHER)
+		tio.c_ospeed = tio.c_ispeed = baudrate;
+#endif
+
 	rc = cfsetospeed(&tio, speed);
 	if (rc)
 		return rc;
diff --git a/tools/termios_linux.h b/tools/termios_linux.h
new file mode 100644
index 0000000000..1c4223afa7
--- /dev/null
+++ b/tools/termios_linux.h
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * termios fuctions to support arbitrary baudrates (on Linux)
+ *
+ * Copyright (c) 2021 Pali Rohár <pali@kernel.org>
+ * Copyright (c) 2021 Marek Behún <marek.behun@nic.cz>
+ */
+
+#ifndef _TERMIOS_LINUX_H_
+#define _TERMIOS_LINUX_H_
+
+/*
+ * We need to use raw TCGETS2/TCSETS2 or TCGETS/TCSETS ioctls with the BOTHER
+ * flag in struct termios2/termios, defined in Linux headers <asm/ioctls.h> and
+ * <asm/termbits.h>. Since these headers conflict with glibc's header file
+ * <termios.h>, it is not possible to use libc's termios functions and we need
+ * to reimplement them via ioctl() calls.
+ *
+ * An arbitrary baudrate is supported when the macro BOTHER is defined. The
+ * baudrate value itself is then stored into the c_ospeed and c_ispeed members.
+ * If ioctls TCGETS2/TCSETS2 are defined and supported then these fields are
+ * present in struct termios2, otherwise these fields are present in struct
+ * termios.
+ *
+ * Note that the Bnnn constants from <termios.h> need not be compatible with Bnnn
+ * constants from <asm/termbits.h>.
+ */
+
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <asm/ioctls.h>
+#include <asm/termbits.h>
+
+#if defined(BOTHER) && defined(TCGETS2)
+#define termios termios2
+#endif
+
+static inline int tcgetattr(int fd, struct termios *t)
+{
+#if defined(BOTHER) && defined(TCGETS2)
+	return ioctl(fd, TCGETS2, t);
+#else
+	return ioctl(fd, TCGETS, t);
+#endif
+}
+
+static inline int tcsetattr(int fd, int a, const struct termios *t)
+{
+	int cmd;
+
+	switch (a) {
+#if defined(BOTHER) && defined(TCGETS2)
+	case TCSANOW:
+		cmd = TCSETS2;
+		break;
+	case TCSADRAIN:
+		cmd = TCSETSW2;
+		break;
+	case TCSAFLUSH:
+		cmd = TCSETSF2;
+		break;
+#else
+	case TCSANOW:
+		cmd = TCSETS;
+		break;
+	case TCSADRAIN:
+		cmd = TCSETSW;
+		break;
+	case TCSAFLUSH:
+		cmd = TCSETSF;
+		break;
+#endif
+	default:
+		errno = EINVAL;
+		return -1;
+	}
+
+	return ioctl(fd, cmd, t);
+}
+
+static inline int tcdrain(int fd)
+{
+	return ioctl(fd, TCSBRK, 1);
+}
+
+static inline int tcflush(int fd, int q)
+{
+	return ioctl(fd, TCFLSH, q);
+}
+
+static inline int tcsendbreak(int fd, int d)
+{
+	return ioctl(fd, TCSBRK, d);
+}
+
+static inline int tcflow(int fd, int a)
+{
+	return ioctl(fd, TCXONC, a);
+}
+
+static inline pid_t tcgetsid(int fd)
+{
+	pid_t sid;
+
+	if (ioctl(fd, TIOCGSID, &sid) < 0)
+		return (pid_t)-1;
+
+	return sid;
+}
+
+static inline speed_t cfgetospeed(const struct termios *t)
+{
+	return t->c_cflag & CBAUD;
+}
+
+static inline int cfsetospeed(struct termios *t, speed_t s)
+{
+	t->c_cflag &= ~CBAUD;
+	t->c_cflag |= s;
+
+	return 0;
+}
+
+#ifdef IBSHIFT
+static inline speed_t cfgetispeed(const struct termios *t)
+{
+	return (t->c_cflag >> IBSHIFT) & CBAUD;
+}
+
+static inline int cfsetispeed(struct termios *t, speed_t s)
+{
+	t->c_cflag &= ~(CBAUD << IBSHIFT);
+	t->c_cflag |= s << IBSHIFT;
+
+	return 0;
+}
+#else /* !IBSHIFT */
+static inline speed_t cfgetispeed(const struct termios *t)
+{
+	return cfgetospeed(t);
+}
+
+static inline int cfsetispeed(struct termios *t, speed_t s)
+{
+	return cfsetospeed(t, s);
+}
+#endif /* !IBSHIFT */
+
+static inline int cfsetspeed(struct termios *t, speed_t s)
+{
+	cfsetospeed(t, s);
+#ifdef IBSHIFT
+	cfsetispeed(t, s);
+#endif
+
+	return 0;
+}
+
+static void cfmakeraw(struct termios *t)
+{
+	t->c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR |
+			ICRNL | IXON);
+	t->c_oflag &= ~OPOST;
+	t->c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+	t->c_cflag &= ~(CSIZE | PARENB);
+	t->c_cflag |= CS8;
+}
+
+#endif /* _TERMIOS_LINUX_H_ */
-- 
2.31.1


  parent reply	other threads:[~2021-08-25 13:52 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-25 13:46 [PATCH u-boot-marvell 00/29] kwboot higher baudrate Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 01/29] tools: kwbimage: Fix printf format warning Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 02/29] tools: kwboot: Fix buffer overflow in kwboot_terminal() Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 03/29] tools: kwboot: Make the quit sequence buffer const Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 04/29] tools: kwboot: Refactor and fix writing buffer Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 05/29] tools: kwboot: Print version information header Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 06/29] tools: kwboot: Fix kwboot_xm_sendblock() function when kwboot_tty_recv() fails Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 07/29] tools: kwboot: Fix return type of kwboot_xm_makeblock() function Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 08/29] tools: kwboot: Fix comparison of integers with different size Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 09/29] tools: kwboot: Fix printing progress Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 10/29] tools: kwboot: Print newline on error when progress was not completed Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 11/29] tools: kwboot: Split sending image into header and data stages Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 12/29] tools: kwboot: Use a function to check whether received byte is a Xmodem reply Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 13/29] tools: kwboot: Allow non-xmodem text output from BootROM only in a specific case Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 14/29] tools: kwboot: Print new line after SPL output Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 15/29] tools: kwboot: Allow greater timeout when executing header code Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 16/29] tools: kwboot: Properly finish xmodem transfer Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 17/29] tools: kwboot: Always call kwboot_img_patch_hdr() Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 19/29] tools: kwboot: Don't patch image header if signed Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 20/29] tools: kwboot: Patch source address in image header Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 21/29] tools: kwboot: Patch destination address to DDR area for SPI image Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 22/29] tools: kwbimage: Refactor image_version() Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 23/29] tools: kwbimage: Refactor kwbimage header size determination Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 24/29] tools: kwboot: Round up header size to 128 B when patching Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 25/29] tools: kwboot: Support higher baudrates when booting via UART Marek Behún
2021-08-25 16:49   ` Marek Behún
2021-08-26 13:13   ` Marek Behún
2021-08-25 13:46 ` Marek Behún [this message]
2021-08-25 13:46 ` [PATCH u-boot-marvell 27/29] tools: kwboot: Add Pali and Marek as authors Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 28/29] doc/kwboot.1: Update man page Marek Behún
2021-08-27  1:37   ` Chris Packham
2021-08-27  8:13     ` Pavol Rohár
2021-08-27  8:36       ` Pali Rohár
2021-08-27 13:35         ` Marek Behún
2021-08-27 13:39           ` Pali Rohár
2021-08-25 13:46 ` [PATCH u-boot-marvell 29/29] MAINTAINERS: Add entry for kwbimage / kwboot tools Marek Behún
2021-08-25 17:01 ` [PATCH u-boot-marvell 18/29] tools: kwbimage: Simplify iteration over version 1 optional headers Marek Behún
2021-08-27  1:16 ` [PATCH u-boot-marvell 00/29] kwboot higher baudrate Chris Packham
2021-08-27  1:32   ` Chris Packham
2021-08-27  1:39   ` Marek Behún
2021-08-27  2:45     ` Chris Packham
2021-08-27  8:32       ` Pali Rohár
2021-08-27 10:59         ` Chris Packham
2021-08-27 12:31       ` Marek Behún
2021-08-27 22:09         ` Chris Packham

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210825134634.3959-27-marek.behun@nic.cz \
    --to=marek.behun@nic.cz \
    --cc=baruch@tkos.co.il \
    --cc=dgilmore@redhat.com \
    --cc=jon@solid-run.com \
    --cc=judge.packham@gmail.com \
    --cc=mario.six@gdsys.cc \
    --cc=pali@kernel.org \
    --cc=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.