[PATCH u-boot-marvell v3 19/39] tools: kwbimage: Simplify iteration over version 1 optional headers

[PATCH u-boot-marvell v3 19/39] tools: kwbimage: Simplify iteration over version 1 optional headers

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Create macro
  for_each_opt_hdr_v1
and functions
  opt_hdr_v1_size(),
  opt_hdr_v1_valid_size(),
  opt_hdr_v1_ext(),
  opt_hdr_v1_first() and
  opt_hdr_v1_next()
to simplify iteration over version 1 optional headers.

This prevents ugly code repetition and makes it nicer to read.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwbimage.c | 90 +++++++++++++-----------------------------------
 tools/kwbimage.h | 58 +++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index e72555fe74..16b082b35f 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -1618,34 +1618,20 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,
 static void kwbimage_print_header(const void *ptr)
 {
 	struct main_hdr_v0 *mhdr = (struct main_hdr_v0 *)ptr;
+	struct opt_hdr_v1 *ohdr;
 
 	printf("Image Type:   MVEBU Boot from %s Image\n",
 	       image_boot_mode_name(mhdr->blockid));
 	printf("Image version:%d\n", image_version((void *)ptr));
-	if (image_version((void *)ptr) == 1) {
-		struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
 
-		if (mhdr->ext & 0x1) {
-			struct opt_hdr_v1 *ohdr = (struct opt_hdr_v1 *)
-						  ((uint8_t *)ptr +
-						   sizeof(*mhdr));
-
-			while (1) {
-				uint32_t ohdr_size;
-
-				ohdr_size = (ohdr->headersz_msb << 16) |
-					    le16_to_cpu(ohdr->headersz_lsb);
-				if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
-					printf("BIN Hdr Size: ");
-					genimg_print_size(ohdr_size - 12 - 4 * ohdr->data[0]);
-				}
-				if (!(*((uint8_t *)ohdr + ohdr_size - 4) & 0x1))
-					break;
-				ohdr = (struct opt_hdr_v1 *)((uint8_t *)ohdr +
-							     ohdr_size);
-			}
+	for_each_opt_hdr_v1 (ohdr, mhdr) {
+		if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
+			printf("BIN Hdr Size: ");
+			genimg_print_size(opt_hdr_v1_size(ohdr) - 12 -
+					  4 * ohdr->data[0]);
 		}
 	}
+
 	printf("Data Size:    ");
 	genimg_print_size(mhdr->blocksize - sizeof(uint32_t));
 	printf("Load Address: %08x\n", mhdr->destaddr);
@@ -1692,33 +1678,15 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 		}
 	} else if (image_version((void *)ptr) == 1) {
 		struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
+		const uint8_t *mhdr_end;
+		struct opt_hdr_v1 *ohdr;
 		uint32_t offset;
 		uint32_t size;
 
-		if (mhdr->ext & 0x1) {
-			uint32_t ohdr_size;
-			struct opt_hdr_v1 *ohdr = (struct opt_hdr_v1 *)
-						  (ptr + sizeof(*mhdr));
-
-			while (1) {
-				if ((uint8_t *)ohdr + sizeof(*ohdr) >
-				    (uint8_t *)mhdr + header_size)
-					return -FDT_ERR_BADSTRUCTURE;
-
-				ohdr_size = (ohdr->headersz_msb << 16) |
-					    le16_to_cpu(ohdr->headersz_lsb);
-
-				if (ohdr_size < 8 ||
-				    (uint8_t *)ohdr + ohdr_size >
-				    (uint8_t *)mhdr + header_size)
-					return -FDT_ERR_BADSTRUCTURE;
-
-				if (!(*((uint8_t *)ohdr + ohdr_size - 4) & 0x1))
-					break;
-				ohdr = (struct opt_hdr_v1 *)((uint8_t *)ohdr +
-							     ohdr_size);
-			}
-		}
+		mhdr_end = (uint8_t *)mhdr + header_size;
+		for_each_opt_hdr_v1 (ohdr, ptr)
+			if (!opt_hdr_v1_valid_size(ohdr, mhdr_end))
+				return -FDT_ERR_BADSTRUCTURE;
 
 		offset = le32_to_cpu(mhdr->srcaddr);
 
@@ -1865,36 +1833,24 @@ static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params
 {
 	struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
 	size_t header_size = kwbimage_header_size(ptr);
+	struct opt_hdr_v1 *ohdr;
 	int idx = params->pflag;
 	int cur_idx = 0;
 	uint32_t offset;
 	ulong image;
 	ulong size;
 
-	if (image_version((void *)ptr) == 1 && (mhdr->ext & 0x1)) {
-		struct opt_hdr_v1 *ohdr = (struct opt_hdr_v1 *)
-					  ((uint8_t *)ptr +
-					   sizeof(*mhdr));
+	for_each_opt_hdr_v1 (ohdr, ptr) {
+		if (ohdr->headertype != OPT_HDR_V1_BINARY_TYPE)
+			continue;
 
-		while (1) {
-			uint32_t ohdr_size = (ohdr->headersz_msb << 16) |
-					     le16_to_cpu(ohdr->headersz_lsb);
-
-			if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
-				if (idx == cur_idx) {
-					image = (ulong)&ohdr->data[4 +
-					         4 * ohdr->data[0]];
-					size = ohdr_size - 12 -
-					       4 * ohdr->data[0];
-					goto extract;
-				}
-				++cur_idx;
-			}
-			if (!(*((uint8_t *)ohdr + ohdr_size - 4) & 0x1))
-				break;
-			ohdr = (struct opt_hdr_v1 *)((uint8_t *)ohdr +
-						     ohdr_size);
+		if (idx == cur_idx) {
+			image = (ulong)&ohdr->data[4 + 4 * ohdr->data[0]];
+			size = opt_hdr_v1_size(ohdr) - 12 - 4 * ohdr->data[0];
+			goto extract;
 		}
+
+		++cur_idx;
 	}
 
 	if (idx != cur_idx) {
diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index 074bdfbe46..9a949e03c0 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -235,4 +235,62 @@ static inline unsigned int image_version(const void *header)
 	return ptr[8];
 }
 
+static inline uint32_t opt_hdr_v1_size(const struct opt_hdr_v1 *ohdr)
+{
+	return (ohdr->headersz_msb << 16) | le16_to_cpu(ohdr->headersz_lsb);
+}
+
+static inline int opt_hdr_v1_valid_size(const struct opt_hdr_v1 *ohdr,
+					const void *mhdr_end)
+{
+	uint32_t ohdr_size;
+
+	if ((void *)(ohdr + 1) > mhdr_end)
+		return 0;
+
+	ohdr_size = opt_hdr_v1_size(ohdr);
+	if (ohdr_size < 8 || (void *)((uint8_t *)ohdr + ohdr_size) > mhdr_end)
+		return 0;
+
+	return 1;
+}
+
+static inline struct opt_hdr_v1 *opt_hdr_v1_first(void *img) {
+	struct main_hdr_v1 *mhdr;
+
+	if (image_version(img) != 1)
+		return NULL;
+
+	mhdr = img;
+	if (mhdr->ext & 0x1)
+		return (struct opt_hdr_v1 *)(mhdr + 1);
+	else
+		return NULL;
+}
+
+static inline uint8_t *opt_hdr_v1_ext(struct opt_hdr_v1 *cur)
+{
+	uint32_t size = opt_hdr_v1_size(cur);
+
+	return (uint8_t *)cur + size - 4;
+}
+
+static inline struct opt_hdr_v1 *_opt_hdr_v1_next(struct opt_hdr_v1 *cur)
+{
+	return (struct opt_hdr_v1 *)((uint8_t *)cur + opt_hdr_v1_size(cur));
+}
+
+static inline struct opt_hdr_v1 *opt_hdr_v1_next(struct opt_hdr_v1 *cur)
+{
+	if (*opt_hdr_v1_ext(cur) & 0x1)
+		return _opt_hdr_v1_next(cur);
+	else
+		return NULL;
+}
+
+#define for_each_opt_hdr_v1(ohdr, img)		\
+	for ((ohdr) = opt_hdr_v1_first((img));	\
+	     (ohdr) != NULL;			\
+	     (ohdr) = opt_hdr_v1_next((ohdr)))
+
 #endif /* _KWBIMAGE_H_ */
-- 
2.32.0

[PATCH u-boot-marvell v3 39/39] MAINTAINERS: Add entry for kwbimage / kwboot tools

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Add entry for these tools with Marek, Pali and Stefan as maintainers.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 MAINTAINERS | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 67c96a6045..6f103230da 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -776,6 +776,16 @@ S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-i2c.git
 F:	drivers/i2c/
 
+KWBIMAGE / KWBOOT TOOLS
+M:	Pali Rohár <pali@kernel.org>
+M:	Marek Behún <marek.behun@nic.cz>
+M:	Stefan Roese <sr@denx.de>
+S:	Maintained
+T:	git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
+F:	doc/README.kwbimage
+F:	doc/kwboot.1
+F:	tools/kwb*
+
 LOGGING
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
-- 
2.32.0

[PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Hello Stefan and others,

here's v3 of series adding support for booting Marvell platforms via
UART (those bootable with kwboot) at higher baudrates.

Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
115200 Bd.

The user can direct kwboot to use higher baudrate via the -B option.
(BTW this option was there before but did not work with the -b option.)

Only the payload part of the KWB image is uploaded at this higher
baudrate. The header part is still uploaded at 115200 Bd, since the code
that changes baudrate is injected into header as a binary extension.
(The payload part makes up majority of the binary, though. On Turris
 Omnia the payload currently makes ~87%.)

The series also contains various other fixes, refactors and improvements
of the code, upon which the main change is done.

Marek & Pali

Changes since v2:
- fixed integer overflow in patch 15
- fixed commit title in patch 32

Changes since v1:
- fixed uploading of older kwb images, now all kwb images should be able
  to upload at faster baudrate
- fixed injecting code that changes baudrate back
- various other fixes and refactors, the best way to compare with v1 is
  to apply v1 and v2 separately and compare the resulting kwboot.c

Marek Behún (19):
  tools: kwbimage: Fix printf format warning
  tools: kwboot: Fix buffer overflow in kwboot_terminal()
  tools: kwboot: Make the quit sequence buffer const
  tools: kwboot: Refactor and fix writing buffer
  tools: kwboot: Fix comparison of integers with different size
  tools: kwboot: Use a function to check whether received byte is a
    Xmodem reply
  tools: kwboot: Print new line after SPL output
  tools: kwboot: Allow greater timeout when executing header code
  tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
    received
  tools: kwbimage: Simplify iteration over version 1 optional headers
  tools: kwbimage: Refactor image_version()
  tools: kwbimage: Refactor kwbimage header size determination
  tools: kwboot: Explicitly check against size of struct main_hdr_v1
  tools: kwboot: Check whether baudrate was set to requested value
  tools: kwboot: Cosmetic fix
  tools: kwboot: Avoid code repetition in kwboot_img_patch()
  tools: kwboot: Update file header
  doc/kwboot.1: Update man page
  MAINTAINERS: Add entry for kwbimage / kwboot tools

Pali Rohár (20):
  tools: kwboot: Print version information header
  tools: kwboot: Fix kwboot_xm_sendblock() function when
    kwboot_tty_recv() fails
  tools: kwboot: Fix return type of kwboot_xm_makeblock() function
  tools: kwboot: Fix printing progress
  tools: kwboot: Print newline on error when progress was not completed
  tools: kwboot: Split sending image into header and data stages
  tools: kwboot: Allow non-xmodem text output from BootROM only in a
    specific case
  tools: kwboot: Properly finish xmodem transfer
  tools: kwboot: Always call kwboot_img_patch_hdr()
  tools: kwboot: Don't patch image header if signed
  tools: kwboot: Patch source address in image header
  tools: kwboot: Patch destination address to DDR area for SPI image
  tools: kwbimage: Update comments describing kwbimage v1 structures
  tools: kwboot: Round up header size to 128 B when patching
  tools: kwboot: Support higher baudrates when booting via UART
  tools: kwboot: Allow any baudrate on Linux
  tools: kwboot: Fix initializing tty device
  tools: kwboot: Disable tty interbyte timeout
  tools: kwboot: Disable non-blocking mode
  tools: kwboot: Add Pali and Marek as authors

 MAINTAINERS           |   10 +
 doc/kwboot.1          |   60 ++-
 tools/kwbimage.c      |  130 ++---
 tools/kwbimage.h      |   99 +++-
 tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
 tools/termios_linux.h |  189 +++++++
 6 files changed, 1385 insertions(+), 300 deletions(-)
 create mode 100644 tools/termios_linux.h

-- 
2.32.0

[PATCH u-boot-marvell v3 01/39] tools: kwbimage: Fix printf format warning

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

On 32-bit ARM the compiler complains:
  tools/kwbimage.c:547: warning: format ‘%lu’ expects argument of type
                                 ‘long unsigned int’, but argument 4 has
		                 type ‘unsigned int’

Fix this by using %zu instead of %lu format specifier.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwbimage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index d200ff2425..e72555fe74 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -542,7 +542,7 @@ static int kwb_export_pubkey(RSA *key, struct pubkey_der_v1 *dst, FILE *hashf,
 	}
 
 	if (4 + size_seq > sizeof(dst->key)) {
-		fprintf(stderr, "export pk failed: seq too large (%d, %lu)\n",
+		fprintf(stderr, "export pk failed: seq too large (%d, %zu)\n",
 			4 + size_seq, sizeof(dst->key));
 		fprintf(stderr, errmsg, keyname);
 		return -ENOBUFS;
-- 
2.32.0

[PATCH u-boot-marvell v3 02/39] tools: kwboot: Fix buffer overflow in kwboot_terminal()

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

The `in` variable is set to -1 in kwboot_terminal() if stdin is not a
tty. In this case we should not look whether -1 is set in fd_set, for it
can lead to a buffer overflow, which can be reproduced with
  echo "xyz" | ./tools/kwboot -t /dev/ttyUSB0

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 7feeaa45a2..e6e99849a7 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -552,7 +552,7 @@ kwboot_terminal(int tty)
 				break;
 		}
 
-		if (FD_ISSET(in, &rfds)) {
+		if (in >= 0 && FD_ISSET(in, &rfds)) {
 			rc = kwboot_term_pipe(in, tty, quit, &s);
 			if (rc)
 				break;
-- 
2.32.0

[PATCH u-boot-marvell v3 03/39] tools: kwboot: Make the quit sequence buffer const

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

This buffer is never written to. Make it const.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index e6e99849a7..f18f6d2134 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -460,7 +460,7 @@ can:
 }
 
 static int
-kwboot_term_pipe(int in, int out, char *quit, int *s)
+kwboot_term_pipe(int in, int out, const char *quit, int *s)
 {
 	ssize_t nin, nout;
 	char _buf[128], *buf = _buf;
@@ -504,7 +504,7 @@ static int
 kwboot_terminal(int tty)
 {
 	int rc, in, s;
-	char *quit = "\34c";
+	const char *quit = "\34c";
 	struct termios otio, tio;
 
 	rc = -1;
-- 
2.32.0

[PATCH u-boot-marvell v3 04/39] tools: kwboot: Refactor and fix writing buffer

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

There are 3 instances in kwboot.c where we need to write() a given
buffer whole (iteratively writing until all data are written), and 2 of
those instances are wrong, for they do not increment the buffer pointer.

Refactor the code into a new function kwboot_write() where it is fixed.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 55 ++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index f18f6d2134..22cdd137ad 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -72,6 +72,23 @@ static int msg_req_delay = KWBOOT_MSG_REQ_DELAY;
 static int msg_rsp_timeo = KWBOOT_MSG_RSP_TIMEO;
 static int blk_rsp_timeo = KWBOOT_BLK_RSP_TIMEO;
 
+static ssize_t
+kwboot_write(int fd, const char *buf, size_t len)
+{
+	size_t tot = 0;
+
+	while (tot < len) {
+		ssize_t wr = write(fd, buf + tot, len - tot);
+
+		if (wr < 0)
+			return -1;
+
+		tot += wr;
+	}
+
+	return tot;
+}
+
 static void
 kwboot_printv(const char *fmt, ...)
 {
@@ -191,26 +208,13 @@ out:
 static int
 kwboot_tty_send(int fd, const void *buf, size_t len)
 {
-	int rc;
-	ssize_t n;
-
 	if (!buf)
 		return 0;
 
-	rc = -1;
-
-	do {
-		n = write(fd, buf, len);
-		if (n < 0)
-			goto out;
-
-		buf = (char *)buf + n;
-		len -= n;
-	} while (len > 0);
+	if (kwboot_write(fd, buf, len) < 0)
+		return -1;
 
-	rc = tcdrain(fd);
-out:
-	return rc;
+	return tcdrain(fd);
 }
 
 static int
@@ -462,7 +466,7 @@ can:
 static int
 kwboot_term_pipe(int in, int out, const char *quit, int *s)
 {
-	ssize_t nin, nout;
+	ssize_t nin;
 	char _buf[128], *buf = _buf;
 
 	nin = read(in, buf, sizeof(_buf));
@@ -480,22 +484,15 @@ kwboot_term_pipe(int in, int out, const char *quit, int *s)
 				buf++;
 				nin--;
 			} else {
-				while (*s > 0) {
-					nout = write(out, quit, *s);
-					if (nout <= 0)
-						return -1;
-					(*s) -= nout;
-				}
+				if (kwboot_write(out, quit, *s) < 0)
+					return -1;
+				*s = 0;
 			}
 		}
 	}
 
-	while (nin > 0) {
-		nout = write(out, buf, nin);
-		if (nout <= 0)
-			return -1;
-		nin -= nout;
-	}
+	if (kwboot_write(out, buf, nin) < 0)
+		return -1;
 
 	return 0;
 }
-- 
2.32.0

[PATCH u-boot-marvell v3 05/39] tools: kwboot: Print version information header

[Marek Behún]

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

Print kwboot's (U-Boot's) version when printing usage.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 22cdd137ad..454339db14 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -11,6 +11,7 @@
 
 #include "kwbimage.h"
 #include "mkimage.h"
+#include "version.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -681,6 +682,7 @@ out:
 static void
 kwboot_usage(FILE *stream, char *progname)
 {
+	fprintf(stream, "kwboot version %s\n", PLAIN_VERSION);
 	fprintf(stream,
 		"Usage: %s [OPTIONS] [-b <image> | -D <image> ] [-B <baud> ] <TTY>\n",
 		progname);
-- 
2.32.0

[PATCH u-boot-marvell v3 06/39] tools: kwboot: Fix kwboot_xm_sendblock() function when kwboot_tty_recv() fails

[Marek Behún]

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

When kwboot_tty_recv() fails or times out, it does not set the `c`
variable to NAK. The variable is then compared, while it holds either
an undefined value or a value from previous iteration. Set `c` to NAK so
that the other side will try to resend current block, and remove the
now unnecessary break.

In other failure cases return immediately.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 454339db14..b9a402ca91 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -380,12 +380,15 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
 	do {
 		rc = kwboot_tty_send(fd, block, sizeof(*block));
 		if (rc)
-			break;
+			return rc;
 
 		do {
 			rc = kwboot_tty_recv(fd, &c, 1, blk_rsp_timeo);
-			if (rc)
-				break;
+			if (rc) {
+				if (errno != ETIMEDOUT)
+					return rc;
+				c = NAK;
+			}
 
 			if (c != ACK && c != NAK && c != CAN)
 				printf("%c", c);
-- 
2.32.0

[PATCH u-boot-marvell v3 07/39] tools: kwboot: Fix return type of kwboot_xm_makeblock() function

[Marek Behún]

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

Function kwboot_xm_makeblock() always returns length of xmodem block. It
is always non-negative and calculated from variable with size_t type. Set
return type of this function to size_t and remove dead code which checks
for negative value.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index b9a402ca91..88353d19c0 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -347,7 +347,7 @@ kwboot_debugmsg(int tty, void *msg)
 	return rc;
 }
 
-static int
+static size_t
 kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
 		    size_t size, int pnum)
 {
@@ -441,9 +441,6 @@ kwboot_xmodem(int tty, const void *_data, size_t size)
 		n = kwboot_xm_makeblock(&block,
 					data + N, size - N,
 					pnum++);
-		if (n < 0)
-			goto can;
-
 		if (!n)
 			break;
 
-- 
2.32.0

[PATCH u-boot-marvell v3 08/39] tools: kwboot: Fix comparison of integers with different size

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

The compiler complains that we are comparing int with size_t when
compiled with -W.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 88353d19c0..3d9f73e697 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -352,8 +352,7 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
 		    size_t size, int pnum)
 {
 	const size_t blksz = sizeof(block->data);
-	size_t n;
-	int i;
+	size_t i, n;
 
 	block->soh = SOH;
 	block->pnum = pnum;
-- 
2.32.0

[PATCH u-boot-marvell v3 09/39] tools: kwboot: Fix printing progress

[Marek Behún]

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

Ensure that `pos` is still in range up to the `width` so printing 100%
works also for bigger images. After printing 100% progress reset it to
zero, so that next progressbar can be started.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 3d9f73e697..eb4b3fe230 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -140,12 +140,14 @@ __progress(int pct, char c)
 	fputc(c, stdout);
 
 	nl = "]\n";
-	pos++;
+	pos = (pos + 1) % width;
 
 	if (pct == 100) {
-		while (pos++ < width)
+		while (pos && pos++ < width)
 			fputc(' ', stdout);
 		fputs(nl, stdout);
+		nl = "";
+		pos = 0;
 	}
 
 	fflush(stdout);
@@ -162,6 +164,9 @@ kwboot_progress(int _pct, char c)
 
 	if (kwboot_verbose)
 		__progress(pct, c);
+
+	if (pct == 100)
+		pct = 0;
 }
 
 static int
-- 
2.32.0

[PATCH u-boot-marvell v3 10/39] tools: kwboot: Print newline on error when progress was not completed

[Marek Behún]

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

When progress was not completed, current terminal position is in progress
bar. So print newline before printing error message to make error message
more readable.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index eb4b3fe230..0e533e3698 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -459,6 +459,7 @@ kwboot_xmodem(int tty, const void *_data, size_t size)
 	rc = kwboot_tty_send_char(tty, EOT);
 
 out:
+	kwboot_printv("\n");
 	return rc;
 
 can:
-- 
2.32.0

[PATCH u-boot-marvell v3 11/39] tools: kwboot: Split sending image into header and data stages

[Marek Behún]

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

This change is required to implement other features in kwboot.

Split sending header and data parts of the image into two stages.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwbimage.h |  8 +++--
 tools/kwboot.c   | 84 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index e063e3e41e..074bdfbe46 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -195,6 +195,10 @@ struct register_set_hdr_v1 {
 #define OPT_HDR_V1_BINARY_TYPE   0x2
 #define OPT_HDR_V1_REGISTER_TYPE 0x3
 
+#define KWBHEADER_V0_SIZE(hdr) \
+	(((hdr)->ext & 0x1) ? sizeof(struct kwb_header) : \
+			      sizeof(struct main_hdr_v0))
+
 #define KWBHEADER_V1_SIZE(hdr) \
 	(((hdr)->headersz_msb << 16) | le16_to_cpu((hdr)->headersz_lsb))
 
@@ -225,9 +229,9 @@ void init_kwb_image_type (void);
  * header, byte 8 was reserved, and always set to 0. In the v1 header,
  * byte 8 has been changed to a proper field, set to 1.
  */
-static inline unsigned int image_version(void *header)
+static inline unsigned int image_version(const void *header)
 {
-	unsigned char *ptr = header;
+	const unsigned char *ptr = header;
 	return ptr[8];
 }
 
diff --git a/tools/kwboot.c b/tools/kwboot.c
index 0e533e3698..7f231c0823 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -57,11 +57,13 @@ static unsigned char kwboot_msg_debug[] = {
 #define NAK	21	/* target block negative ack */
 #define CAN	24	/* target/sender transfer cancellation */
 
+#define KWBOOT_XM_BLKSZ	128 /* xmodem block size */
+
 struct kwboot_block {
 	uint8_t soh;
 	uint8_t pnum;
 	uint8_t _pnum;
-	uint8_t data[128];
+	uint8_t data[KWBOOT_XM_BLKSZ];
 	uint8_t csum;
 } __packed;
 
@@ -356,16 +358,15 @@ static size_t
 kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
 		    size_t size, int pnum)
 {
-	const size_t blksz = sizeof(block->data);
 	size_t i, n;
 
 	block->soh = SOH;
 	block->pnum = pnum;
 	block->_pnum = ~block->pnum;
 
-	n = size < blksz ? size : blksz;
+	n = size < KWBOOT_XM_BLKSZ ? size : KWBOOT_XM_BLKSZ;
 	memcpy(&block->data[0], data, n);
-	memset(&block->data[n], 0, blksz - n);
+	memset(&block->data[n], 0, KWBOOT_XM_BLKSZ - n);
 
 	block->csum = 0;
 	for (i = 0; i < n; i++)
@@ -425,48 +426,73 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
 }
 
 static int
-kwboot_xmodem(int tty, const void *_data, size_t size)
+kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
+		  size_t size)
 {
-	const uint8_t *data = _data;
-	int rc, pnum, N, err;
-
-	pnum = 1;
-	N = 0;
+	size_t sent, left;
+	int rc;
 
-	kwboot_printv("Sending boot image...\n");
+	kwboot_printv("Sending boot image %s (%zu bytes)...\n",
+		      header ? "header" : "data", size);
 
-	sleep(2); /* flush isn't effective without it */
-	tcflush(tty, TCIOFLUSH);
+	left = size;
+	sent = 0;
 
-	do {
+	while (sent < size) {
 		struct kwboot_block block;
-		int n;
+		size_t blksz;
 
-		n = kwboot_xm_makeblock(&block,
-					data + N, size - N,
-					pnum++);
-		if (!n)
-			break;
+		blksz = kwboot_xm_makeblock(&block, data, left, (*pnum)++);
+		data += blksz;
 
 		rc = kwboot_xm_sendblock(tty, &block);
 		if (rc)
 			goto out;
 
-		N += n;
-		kwboot_progress(N * 100 / size, '.');
-	} while (1);
+		sent += blksz;
+		left -= blksz;
+
+		kwboot_progress(sent * 100 / size, '.');
+	}
 
-	rc = kwboot_tty_send_char(tty, EOT);
+	kwboot_printv("Done\n");
 
+	return 0;
 out:
 	kwboot_printv("\n");
 	return rc;
+}
 
-can:
-	err = errno;
-	kwboot_tty_send_char(tty, CAN);
-	errno = err;
-	goto out;
+static int
+kwboot_xmodem(int tty, const void *_img, size_t size)
+{
+	const uint8_t *img = _img;
+	int rc, pnum;
+	size_t hdrsz;
+
+	if (image_version(img) == 0)
+		hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
+	else
+		hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
+
+	kwboot_printv("Waiting 2s and flushing tty\n");
+	sleep(2); /* flush isn't effective without it */
+	tcflush(tty, TCIOFLUSH);
+
+	pnum = 1;
+
+	rc = kwboot_xmodem_one(tty, &pnum, 1, img, hdrsz);
+	if (rc)
+		return rc;
+
+	img += hdrsz;
+	size -= hdrsz;
+
+	rc = kwboot_xmodem_one(tty, &pnum, 0, img, size);
+	if (rc)
+		return rc;
+
+	return kwboot_tty_send_char(tty, EOT);
 }
 
 static int
-- 
2.32.0

[PATCH u-boot-marvell v3 12/39] tools: kwboot: Use a function to check whether received byte is a Xmodem reply

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

This is a non-functional change that should make the code more readable.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 7f231c0823..2e5684b91c 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -375,6 +375,12 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
 	return n;
 }
 
+static int
+_is_xm_reply(char c)
+{
+	return c == ACK || c == NAK || c == CAN;
+}
+
 static int
 kwboot_xm_sendblock(int fd, struct kwboot_block *block)
 {
@@ -395,10 +401,10 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
 				c = NAK;
 			}
 
-			if (c != ACK && c != NAK && c != CAN)
+			if (!_is_xm_reply(c))
 				printf("%c", c);
 
-		} while (c != ACK && c != NAK && c != CAN);
+		} while (!_is_xm_reply(c));
 
 		if (c != ACK)
 			kwboot_progress(-1, '+');
-- 
2.32.0

[PATCH u-boot-marvell v3 13/39] tools: kwboot: Allow non-xmodem text output from BootROM only in a specific case

[Marek Behún]

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

When sending image header / image data, BootROM does not send any
non-xmodem text output. We should therefore interpret unknown bytes in
the xmodem protocol as errors and resend current packet. This should
improve the transfer in case there are errors on the UART line.

Text output from BootROM may only happen after whole image header is
sent and before ACK for the last packet of image header is received.
In this case BootROM may execute code from the image, which may interact
with UART (U-Boot SPL, for example, prints stuff on UART).

Print received non-xmodem output from BootROM only in this case.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored & simplified ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 70 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 17 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 2e5684b91c..4636622a6c 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -382,33 +382,62 @@ _is_xm_reply(char c)
 }
 
 static int
-kwboot_xm_sendblock(int fd, struct kwboot_block *block)
+kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
+{
+	int rc;
+
+	while (1) {
+		rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
+		if (rc) {
+			if (errno != ETIMEDOUT)
+				return rc;
+			*c = NAK;
+		}
+
+		/* If received xmodem reply, end. */
+		if (_is_xm_reply(*c))
+			break;
+
+		/*
+		 * If printing non-xmodem text output is allowed and such a byte
+		 * was received, print it.
+		 */
+		if (allow_non_xm) {
+			putchar(*c);
+			fflush(stdout);
+		}
+	}
+
+	return 0;
+}
+
+static int
+kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
+		    int *done_print)
 {
 	int rc, retries;
 	char c;
 
+	*done_print = 0;
+
 	retries = 16;
 	do {
 		rc = kwboot_tty_send(fd, block, sizeof(*block));
 		if (rc)
 			return rc;
 
-		do {
-			rc = kwboot_tty_recv(fd, &c, 1, blk_rsp_timeo);
-			if (rc) {
-				if (errno != ETIMEDOUT)
-					return rc;
-				c = NAK;
-			}
-
-			if (!_is_xm_reply(c))
-				printf("%c", c);
+		if (allow_non_xm && !*done_print) {
+			kwboot_progress(100, '.');
+			kwboot_printv("Done\n");
+			*done_print = 1;
+		}
 
-		} while (!_is_xm_reply(c));
+		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm);
+		if (rc)
+			return rc;
 
-		if (c != ACK)
+		if (!allow_non_xm && c != ACK)
 			kwboot_progress(-1, '+');
-
 	} while (c == NAK && retries-- > 0);
 
 	rc = -1;
@@ -435,6 +464,7 @@ static int
 kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
 		  size_t size)
 {
+	int done_print = 0;
 	size_t sent, left;
 	int rc;
 
@@ -446,22 +476,28 @@ kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
 
 	while (sent < size) {
 		struct kwboot_block block;
+		int last_block;
 		size_t blksz;
 
 		blksz = kwboot_xm_makeblock(&block, data, left, (*pnum)++);
 		data += blksz;
 
-		rc = kwboot_xm_sendblock(tty, &block);
+		last_block = (left <= blksz);
+
+		rc = kwboot_xm_sendblock(tty, &block, header && last_block,
+					 &done_print);
 		if (rc)
 			goto out;
 
 		sent += blksz;
 		left -= blksz;
 
-		kwboot_progress(sent * 100 / size, '.');
+		if (!done_print)
+			kwboot_progress(sent * 100 / size, '.');
 	}
 
-	kwboot_printv("Done\n");
+	if (!done_print)
+		kwboot_printv("Done\n");
 
 	return 0;
 out:
-- 
2.32.0

[PATCH u-boot-marvell v3 14/39] tools: kwboot: Print new line after SPL output

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

There is no separation between output from the code from binary header
(U-Boot SPL in most cases) and subsequent kwboot output.

Print '\n' to make distinguishing these two easier.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 4636622a6c..2f4c61bed6 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -382,10 +382,12 @@ _is_xm_reply(char c)
 }
 
 static int
-kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
+kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 {
 	int rc;
 
+	*non_xm_print = 0;
+
 	while (1) {
 		rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
 		if (rc) {
@@ -405,6 +407,7 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
 		if (allow_non_xm) {
 			putchar(*c);
 			fflush(stdout);
+			*non_xm_print = 1;
 		}
 	}
 
@@ -415,6 +418,7 @@ static int
 kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
 		    int *done_print)
 {
+	int non_xm_print;
 	int rc, retries;
 	char c;
 
@@ -432,7 +436,7 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
 			*done_print = 1;
 		}
 
-		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm);
+		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print);
 		if (rc)
 			return rc;
 
@@ -440,6 +444,9 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
 			kwboot_progress(-1, '+');
 	} while (c == NAK && retries-- > 0);
 
+	if (non_xm_print)
+		kwboot_printv("\n");
+
 	rc = -1;
 
 	switch (c) {
-- 
2.32.0

[PATCH u-boot-marvell v3 15/39] tools: kwboot: Allow greater timeout when executing header code

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

When executing header code (which contains U-Boot SPL in most cases),
wait 10s after every non-xmodem character received (i.e. printed by
U-Boot SPL) before timing out.

Sometimes DDR training, which runs in SPL, may be slow.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 2f4c61bed6..cf6e32c6fa 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <termios.h>
+#include <time.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
@@ -68,6 +69,7 @@ struct kwboot_block {
 } __packed;
 
 #define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */
+#define KWBOOT_HDR_RSP_TIMEO 10000 /* ms */
 
 static int kwboot_verbose;
 
@@ -375,6 +377,26 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
 	return n;
 }
 
+static uint64_t
+_now(void)
+{
+	struct timespec ts;
+
+	if (clock_gettime(CLOCK_MONOTONIC, &ts)) {
+		static int err_print;
+
+		if (!err_print) {
+			perror("clock_gettime() does not work");
+			err_print = 1;
+		}
+
+		/* this will just make the timeout not work */
+		return -1ULL;
+	}
+
+	return ts.tv_sec * 1000ULL + (ts.tv_nsec + 500000) / 1000000;
+}
+
 static int
 _is_xm_reply(char c)
 {
@@ -384,16 +406,21 @@ _is_xm_reply(char c)
 static int
 kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 {
+	int timeout = allow_non_xm ? KWBOOT_HDR_RSP_TIMEO : blk_rsp_timeo;
+	uint64_t recv_until = 0;
 	int rc;
 
 	*non_xm_print = 0;
 
 	while (1) {
-		rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
+		rc = kwboot_tty_recv(fd, c, 1, timeout);
 		if (rc) {
 			if (errno != ETIMEDOUT)
 				return rc;
-			*c = NAK;
+			else if (recv_until && recv_until < _now())
+				return -1;
+			else
+				*c = NAK;
 		}
 
 		/* If received xmodem reply, end. */
@@ -402,9 +429,10 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 
 		/*
 		 * If printing non-xmodem text output is allowed and such a byte
-		 * was received, print it.
+		 * was received, print it and increase receiving time.
 		 */
 		if (allow_non_xm) {
+			recv_until = _now() + timeout;
 			putchar(*c);
 			fflush(stdout);
 			*non_xm_print = 1;
-- 
2.32.0

[PATCH u-boot-marvell v3 16/39] tools: kwboot: Prevent waiting indefinitely if no xmodem reply is received

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Currently if BootROM fails to respond with ACK/NAK to a xmodem block, we
will be waiting indefinitely for such response.

Make sure that we only wait at most 1 second (blk_rsp_timeo) for ACK/NAK
for each block in case non-xmodem text output is not being expected.
Interpret this timeout expiration as NAK, to try to send the block
again.

On the other hand, if timeout expires without ACK while some non-xmodem
output was already received (DDR training output, for example), we know
that the block was received, since the code is being executed, so in
this case exit with ETIMEDOUT.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index cf6e32c6fa..8c11dca5ed 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -407,17 +407,18 @@ static int
 kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 {
 	int timeout = allow_non_xm ? KWBOOT_HDR_RSP_TIMEO : blk_rsp_timeo;
-	uint64_t recv_until = 0;
+	uint64_t recv_until = _now() + timeout;
 	int rc;
 
-	*non_xm_print = 0;
+	if (non_xm_print)
+		*non_xm_print = 0;
 
 	while (1) {
 		rc = kwboot_tty_recv(fd, c, 1, timeout);
 		if (rc) {
 			if (errno != ETIMEDOUT)
 				return rc;
-			else if (recv_until && recv_until < _now())
+			else if (allow_non_xm && *non_xm_print)
 				return -1;
 			else
 				*c = NAK;
@@ -430,12 +431,19 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 		/*
 		 * If printing non-xmodem text output is allowed and such a byte
 		 * was received, print it and increase receiving time.
+		 * Otherwise decrease timeout by time elapsed.
 		 */
 		if (allow_non_xm) {
 			recv_until = _now() + timeout;
 			putchar(*c);
 			fflush(stdout);
 			*non_xm_print = 1;
+		} else {
+			timeout = recv_until - _now();
+			if (timeout < 0) {
+				errno = ETIMEDOUT;
+				return -1;
+			}
 		}
 	}
 
-- 
2.32.0

[PATCH u-boot-marvell v3 17/39] tools: kwboot: Properly finish xmodem transfer

[Marek Behún]

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

After kwboot sends EOT, BootROM sends back ACK. Add code for handling
this and retry sending EOT on error.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 62 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 8c11dca5ed..ad91afd075 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -403,6 +403,29 @@ _is_xm_reply(char c)
 	return c == ACK || c == NAK || c == CAN;
 }
 
+static int
+_xm_reply_to_error(int c)
+{
+	int rc = -1;
+
+	switch (c) {
+	case ACK:
+		rc = 0;
+		break;
+	case NAK:
+		errno = EBADMSG;
+		break;
+	case CAN:
+		errno = ECANCELED;
+		break;
+	default:
+		errno = EPROTO;
+		break;
+	}
+
+	return rc;
+}
+
 static int
 kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 {
@@ -483,24 +506,29 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
 	if (non_xm_print)
 		kwboot_printv("\n");
 
-	rc = -1;
+	return _xm_reply_to_error(c);
+}
 
-	switch (c) {
-	case ACK:
-		rc = 0;
-		break;
-	case NAK:
-		errno = EBADMSG;
-		break;
-	case CAN:
-		errno = ECANCELED;
-		break;
-	default:
-		errno = EPROTO;
-		break;
-	}
+static int
+kwboot_xm_finish(int fd)
+{
+	int rc, retries;
+	char c;
 
-	return rc;
+	kwboot_printv("Finishing transfer\n");
+
+	retries = 16;
+	do {
+		rc = kwboot_tty_send_char(fd, EOT);
+		if (rc)
+			return rc;
+
+		rc = kwboot_xm_recv_reply(fd, &c, 0, NULL);
+		if (rc)
+			return rc;
+	} while (c == NAK && retries-- > 0);
+
+	return _xm_reply_to_error(c);
 }
 
 static int
@@ -577,7 +605,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
 	if (rc)
 		return rc;
 
-	return kwboot_tty_send_char(tty, EOT);
+	return kwboot_xm_finish(tty);
 }
 
 static int
-- 
2.32.0

[PATCH u-boot-marvell v3 18/39] tools: kwboot: Always call kwboot_img_patch_hdr()

[Marek Behún]

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

The kwboot_img_patch_hdr() function already decides if header patching
is needed. Always call this function and deprecate the unneeded command
line option `-p`.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index ad91afd075..9394a51380 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -709,9 +709,9 @@ out:
 }
 
 static void *
-kwboot_mmap_image(const char *path, size_t *size, int prot)
+kwboot_mmap_image(const char *path, size_t *size)
 {
-	int rc, fd, flags;
+	int rc, fd;
 	struct stat st;
 	void *img;
 
@@ -726,9 +726,7 @@ kwboot_mmap_image(const char *path, size_t *size, int prot)
 	if (rc)
 		goto out;
 
-	flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED;
-
-	img = mmap(NULL, st.st_size, prot, flags, fd, 0);
+	img = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 	if (img == MAP_FAILED) {
 		img = NULL;
 		goto out;
@@ -833,7 +831,6 @@ kwboot_usage(FILE *stream, char *progname)
 	fprintf(stream, "\n");
 	fprintf(stream,
 		"  -b <image>: boot <image> with preamble (Kirkwood, Armada 370/XP)\n");
-	fprintf(stream, "  -p: patch <image> to type 0x69 (uart boot)\n");
 	fprintf(stream,
 		"  -D <image>: boot <image> without preamble (Dove)\n");
 	fprintf(stream, "  -d: enter debug mode\n");
@@ -853,7 +850,7 @@ int
 main(int argc, char **argv)
 {
 	const char *ttypath, *imgpath;
-	int rv, rc, tty, term, prot, patch;
+	int rv, rc, tty, term;
 	void *bootmsg;
 	void *debugmsg;
 	void *img;
@@ -867,7 +864,6 @@ main(int argc, char **argv)
 	imgpath = NULL;
 	img = NULL;
 	term = 0;
-	patch = 0;
 	size = 0;
 	speed = B115200;
 
@@ -894,7 +890,7 @@ main(int argc, char **argv)
 			break;
 
 		case 'p':
-			patch = 1;
+			/* nop, for backward compatibility */
 			break;
 
 		case 't':
@@ -934,9 +930,6 @@ main(int argc, char **argv)
 	if (!bootmsg && !term && !debugmsg)
 		goto usage;
 
-	if (patch && !imgpath)
-		goto usage;
-
 	if (argc - optind < 1)
 		goto usage;
 
@@ -949,16 +942,12 @@ main(int argc, char **argv)
 	}
 
 	if (imgpath) {
-		prot = PROT_READ | (patch ? PROT_WRITE : 0);
-
-		img = kwboot_mmap_image(imgpath, &size, prot);
+		img = kwboot_mmap_image(imgpath, &size);
 		if (!img) {
 			perror(imgpath);
 			goto out;
 		}
-	}
 
-	if (patch) {
 		rc = kwboot_img_patch_hdr(img, size);
 		if (rc) {
 			fprintf(stderr, "%s: Invalid image.\n", imgpath);
-- 
2.32.0

[PATCH u-boot-marvell v3 20/39] tools: kwboot: Don't patch image header if signed

[Marek Behún]

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

It is not possible to modify image with secure header due to
cryptographic signature.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 9394a51380..2446d0a7b5 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -756,6 +756,18 @@ kwboot_img_csum8(void *_data, size_t size)
 	return csum;
 }
 
+static int
+kwboot_img_is_secure(void *img)
+{
+	struct opt_hdr_v1 *ohdr;
+
+	for_each_opt_hdr_v1 (ohdr, img)
+		if (ohdr->headertype == OPT_HDR_V1_SECURE_TYPE)
+			return 1;
+
+	return 0;
+}
+
 static int
 kwboot_img_patch_hdr(void *img, size_t size)
 {
@@ -764,6 +776,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
 	uint8_t csum;
 	size_t hdrsz = sizeof(*hdr);
 	int image_ver;
+	int is_secure;
 
 	rc = -1;
 	hdr = img;
@@ -796,12 +809,19 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		goto out;
 	}
 
-	if (hdr->blockid == IBR_HDR_UART_ID) {
-		rc = 0;
-		goto out;
-	}
+	is_secure = kwboot_img_is_secure(img);
 
-	hdr->blockid = IBR_HDR_UART_ID;
+	if (hdr->blockid != IBR_HDR_UART_ID) {
+		if (is_secure) {
+			fprintf(stderr,
+				"Image has secure header with signature for non-UART booting\n");
+			errno = EINVAL;
+			goto out;
+		}
+
+		kwboot_printv("Patching image boot signature to UART\n");
+		hdr->blockid = IBR_HDR_UART_ID;
+	}
 
 	if (image_ver == 0) {
 		struct main_hdr_v0 *hdr_v0 = img;
-- 
2.32.0

[PATCH u-boot-marvell v3 21/39] tools: kwboot: Patch source address in image header

[Marek Behún]

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

Some image types have source address in non-bytes unit; for example for
SATA images, it is in 512 B units.

We need to multiply by unit size when patching image type to UART.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 2446d0a7b5..907a574bfc 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -773,6 +773,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
 {
 	int rc;
 	struct main_hdr_v1 *hdr;
+	uint32_t srcaddr;
 	uint8_t csum;
 	size_t hdrsz = sizeof(*hdr);
 	int image_ver;
@@ -809,6 +810,34 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		goto out;
 	}
 
+	if (image_ver == 0) {
+		struct main_hdr_v0 *hdr_v0 = img;
+
+		hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED;
+		hdr_v0->nandpagesize = 0;
+	}
+
+	srcaddr = le32_to_cpu(hdr->srcaddr);
+
+	switch (hdr->blockid) {
+	case IBR_HDR_SATA_ID:
+		if (srcaddr < 1) {
+			errno = EINVAL;
+			goto out;
+		}
+		hdr->srcaddr = cpu_to_le32((srcaddr - 1) * 512);
+		break;
+
+	case IBR_HDR_SDIO_ID:
+		hdr->srcaddr = cpu_to_le32(srcaddr * 512);
+		break;
+
+	case IBR_HDR_PEX_ID:
+		if (srcaddr == 0xFFFFFFFF)
+			hdr->srcaddr = cpu_to_le32(hdrsz);
+		break;
+	}
+
 	is_secure = kwboot_img_is_secure(img);
 
 	if (hdr->blockid != IBR_HDR_UART_ID) {
@@ -823,17 +852,6 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		hdr->blockid = IBR_HDR_UART_ID;
 	}
 
-	if (image_ver == 0) {
-		struct main_hdr_v0 *hdr_v0 = img;
-
-		hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED;
-		hdr_v0->nandpagesize = 0;
-
-		hdr_v0->srcaddr = hdr_v0->ext
-			? sizeof(struct kwb_header)
-			: sizeof(*hdr_v0);
-	}
-
 	hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum;
 
 	rc = 0;
-- 
2.32.0

[PATCH u-boot-marvell v3 22/39] tools: kwboot: Patch destination address to DDR area for SPI image

[Marek Behún]

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

SPI/NOR kwbimage may have destination address set to 0xFFFFFFFF, which
means that the image is not downloaded to DDR but rather it is executed
directly from SPI/NOR. In this case execution address is set to SPI/NOR
area.

When patching image to UART type, change destination and execution
addresses from SPI/NOR XIP area to DDR area 0x00800000 (which is default
for A38x).

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 907a574bfc..b1dcd3796c 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -836,6 +836,14 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		if (srcaddr == 0xFFFFFFFF)
 			hdr->srcaddr = cpu_to_le32(hdrsz);
 		break;
+
+	case IBR_HDR_SPI_ID:
+		if (hdr->destaddr == cpu_to_le32(0xFFFFFFFF)) {
+			kwboot_printv("Patching destination and execution addresses from SPI/NOR XIP area to DDR area 0x00800000\n");
+			hdr->destaddr = cpu_to_le32(0x00800000);
+			hdr->execaddr = cpu_to_le32(0x00800000);
+		}
+		break;
 	}
 
 	is_secure = kwboot_img_is_secure(img);
-- 
2.32.0

[PATCH u-boot-marvell v3 23/39] tools: kwbimage: Refactor image_version()

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Rename this function to kwbimage_version() and don't cast argument if
not needed.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwbimage.c | 8 ++++----
 tools/kwbimage.h | 4 ++--
 tools/kwboot.c   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 16b082b35f..944a108cee 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -282,7 +282,7 @@ static uint8_t image_checksum8(void *start, uint32_t len)
 
 size_t kwbimage_header_size(unsigned char *ptr)
 {
-	if (image_version((void *)ptr) == 0)
+	if (kwbimage_version((void *)ptr) == 0)
 		return sizeof(struct main_hdr_v0);
 	else
 		return KWBHEADER_V1_SIZE((struct main_hdr_v1 *)ptr);
@@ -1622,7 +1622,7 @@ static void kwbimage_print_header(const void *ptr)
 
 	printf("Image Type:   MVEBU Boot from %s Image\n",
 	       image_boot_mode_name(mhdr->blockid));
-	printf("Image version:%d\n", image_version((void *)ptr));
+	printf("Image version:%d\n", kwbimage_version(ptr));
 
 	for_each_opt_hdr_v1 (ohdr, mhdr) {
 		if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
@@ -1659,7 +1659,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 		return -FDT_ERR_BADSTRUCTURE;
 
 	/* Only version 0 extended header has checksum */
-	if (image_version((void *)ptr) == 0) {
+	if (kwbimage_version(ptr) == 0) {
 		struct main_hdr_v0 *mhdr = (struct main_hdr_v0 *)ptr;
 
 		if (mhdr->ext & 0x1) {
@@ -1676,7 +1676,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 			if (checksum != ext_hdr->checksum)
 				return -FDT_ERR_BADSTRUCTURE;
 		}
-	} else if (image_version((void *)ptr) == 1) {
+	} else if (kwbimage_version(ptr) == 1) {
 		struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
 		const uint8_t *mhdr_end;
 		struct opt_hdr_v1 *ohdr;
diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index 9a949e03c0..738034beb1 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -229,7 +229,7 @@ void init_kwb_image_type (void);
  * header, byte 8 was reserved, and always set to 0. In the v1 header,
  * byte 8 has been changed to a proper field, set to 1.
  */
-static inline unsigned int image_version(const void *header)
+static inline unsigned int kwbimage_version(const void *header)
 {
 	const unsigned char *ptr = header;
 	return ptr[8];
@@ -258,7 +258,7 @@ static inline int opt_hdr_v1_valid_size(const struct opt_hdr_v1 *ohdr,
 static inline struct opt_hdr_v1 *opt_hdr_v1_first(void *img) {
 	struct main_hdr_v1 *mhdr;
 
-	if (image_version(img) != 1)
+	if (kwbimage_version(img) != 1)
 		return NULL;
 
 	mhdr = img;
diff --git a/tools/kwboot.c b/tools/kwboot.c
index b1dcd3796c..e47bf94e89 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -583,7 +583,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
 	int rc, pnum;
 	size_t hdrsz;
 
-	if (image_version(img) == 0)
+	if (kwbimage_version(img) == 0)
 		hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
 	else
 		hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
@@ -787,7 +787,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		goto out;
 	}
 
-	image_ver = image_version(img);
+	image_ver = kwbimage_version(img);
 	if (image_ver != 0 && image_ver != 1) {
 		fprintf(stderr, "Invalid image header version\n");
 		errno = EINVAL;
-- 
2.32.0

[PATCH u-boot-marvell v3 24/39] tools: kwbimage: Refactor kwbimage header size determination

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Add functions kwbheader_size() and kwbheader_size_for_csum().

Refactor code determining header size to use these functions.

Refactor header checksum determining function.

Remove stuff that is not needed anymore.

This simplifies the code a little and fixes one instance of validating
header size meant for checksum instead of whole header size.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwbimage.c | 29 +++++++----------------------
 tools/kwbimage.h | 35 +++++++++++++++++++++++------------
 tools/kwboot.c   | 22 ++++++++++------------
 3 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 944a108cee..d1f4f93e0f 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -280,14 +280,6 @@ static uint8_t image_checksum8(void *start, uint32_t len)
 	return csum;
 }
 
-size_t kwbimage_header_size(unsigned char *ptr)
-{
-	if (kwbimage_version((void *)ptr) == 0)
-		return sizeof(struct main_hdr_v0);
-	else
-		return KWBHEADER_V1_SIZE((struct main_hdr_v1 *)ptr);
-}
-
 /*
  * Verify checksum over a complete header that includes the checksum field.
  * Return 1 when OK, otherwise 0.
@@ -298,7 +290,7 @@ static int main_hdr_checksum_ok(void *hdr)
 	struct main_hdr_v0 *main_hdr = (struct main_hdr_v0 *)hdr;
 	uint8_t checksum;
 
-	checksum = image_checksum8(hdr, kwbimage_header_size(hdr));
+	checksum = image_checksum8(hdr, kwbheader_size_for_csum(hdr));
 	/* Calculated checksum includes the header checksum field. Compensate
 	 * for that.
 	 */
@@ -1649,8 +1641,8 @@ static int kwbimage_check_image_types(uint8_t type)
 static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 				  struct image_tool_params *params)
 {
-	uint8_t checksum;
-	size_t header_size = kwbimage_header_size(ptr);
+	size_t header_size = kwbheader_size(ptr);
+	uint8_t csum;
 
 	if (header_size > image_size)
 		return -FDT_ERR_BADSTRUCTURE;
@@ -1663,17 +1655,10 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 		struct main_hdr_v0 *mhdr = (struct main_hdr_v0 *)ptr;
 
 		if (mhdr->ext & 0x1) {
-			struct ext_hdr_v0 *ext_hdr;
-
-			if (header_size + sizeof(*ext_hdr) > image_size)
-				return -FDT_ERR_BADSTRUCTURE;
+			struct ext_hdr_v0 *ext_hdr = (void *)(mhdr + 1);
 
-			ext_hdr = (struct ext_hdr_v0 *)
-				(ptr + sizeof(struct main_hdr_v0));
-			checksum = image_checksum8(ext_hdr,
-						   sizeof(struct ext_hdr_v0)
-						   - sizeof(uint8_t));
-			if (checksum != ext_hdr->checksum)
+			csum = image_checksum8(ext_hdr, sizeof(*ext_hdr) - 1);
+			if (csum != ext_hdr->checksum)
 				return -FDT_ERR_BADSTRUCTURE;
 		}
 	} else if (kwbimage_version(ptr) == 1) {
@@ -1832,7 +1817,7 @@ static int kwbimage_generate(struct image_tool_params *params,
 static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params)
 {
 	struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
-	size_t header_size = kwbimage_header_size(ptr);
+	size_t header_size = kwbheader_size(ptr);
 	struct opt_hdr_v1 *ohdr;
 	int idx = params->pflag;
 	int cur_idx = 0;
diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index 738034beb1..56a748d4cf 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -69,11 +69,6 @@ struct ext_hdr_v0 {
 	uint8_t               checksum;
 } __packed;
 
-struct kwb_header {
-	struct main_hdr_v0	kwb_hdr;
-	struct ext_hdr_v0	kwb_exthdr;
-} __packed;
-
 /* Structure of the main header, version 1 (Armada 370/38x/XP) */
 struct main_hdr_v1 {
 	uint8_t  blockid;               /* 0x0       */
@@ -195,13 +190,6 @@ struct register_set_hdr_v1 {
 #define OPT_HDR_V1_BINARY_TYPE   0x2
 #define OPT_HDR_V1_REGISTER_TYPE 0x3
 
-#define KWBHEADER_V0_SIZE(hdr) \
-	(((hdr)->ext & 0x1) ? sizeof(struct kwb_header) : \
-			      sizeof(struct main_hdr_v0))
-
-#define KWBHEADER_V1_SIZE(hdr) \
-	(((hdr)->headersz_msb << 16) | le16_to_cpu((hdr)->headersz_lsb))
-
 enum kwbimage_cmd {
 	CMD_INVALID,
 	CMD_BOOT_FROM,
@@ -235,6 +223,29 @@ static inline unsigned int kwbimage_version(const void *header)
 	return ptr[8];
 }
 
+static inline size_t kwbheader_size(const void *header)
+{
+	if (kwbimage_version(header) == 0) {
+		const struct main_hdr_v0 *hdr = header;
+
+		return sizeof(*hdr) +
+		       (hdr->ext & 0x1) ? sizeof(struct ext_hdr_v0) : 0;
+	} else {
+		const struct main_hdr_v1 *hdr = header;
+
+		return (hdr->headersz_msb << 16) |
+		       le16_to_cpu(hdr->headersz_lsb);
+	}
+}
+
+static inline size_t kwbheader_size_for_csum(const void *header)
+{
+	if (kwbimage_version(header) == 0)
+		return sizeof(struct main_hdr_v0);
+	else
+		return kwbheader_size(header);
+}
+
 static inline uint32_t opt_hdr_v1_size(const struct opt_hdr_v1 *ohdr)
 {
 	return (ohdr->headersz_msb << 16) | le16_to_cpu(ohdr->headersz_lsb);
diff --git a/tools/kwboot.c b/tools/kwboot.c
index e47bf94e89..e60f7c5b7a 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -583,10 +583,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
 	int rc, pnum;
 	size_t hdrsz;
 
-	if (kwbimage_version(img) == 0)
-		hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
-	else
-		hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
+	hdrsz = kwbheader_size(img);
 
 	kwboot_printv("Waiting 2s and flushing tty\n");
 	sleep(2); /* flush isn't effective without it */
@@ -746,9 +743,13 @@ out:
 }
 
 static uint8_t
-kwboot_img_csum8(void *_data, size_t size)
+kwboot_hdr_csum8(const void *hdr)
 {
-	uint8_t *data = _data, csum;
+	const uint8_t *data = hdr;
+	uint8_t csum;
+	size_t size;
+
+	size = kwbheader_size_for_csum(hdr);
 
 	for (csum = 0; size-- > 0; data++)
 		csum += *data;
@@ -794,17 +795,14 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		goto out;
 	}
 
-	if (image_ver == 0)
-		hdrsz = sizeof(*hdr);
-	else
-		hdrsz = KWBHEADER_V1_SIZE(hdr);
+	hdrsz = kwbheader_size(hdr);
 
 	if (size < hdrsz) {
 		errno = EINVAL;
 		goto out;
 	}
 
-	csum = kwboot_img_csum8(hdr, hdrsz) - hdr->checksum;
+	csum = kwboot_hdr_csum8(hdr) - hdr->checksum;
 	if (csum != hdr->checksum) {
 		errno = EINVAL;
 		goto out;
@@ -860,7 +858,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		hdr->blockid = IBR_HDR_UART_ID;
 	}
 
-	hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum;
+	hdr->checksum = kwboot_hdr_csum8(hdr) - csum;
 
 	rc = 0;
 out:
-- 
2.32.0

[PATCH u-boot-marvell v3 25/39] tools: kwbimage: Update comments describing kwbimage v1 structures

[Marek Behún]

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

These structures are relevant for several other platforms, mention them
all.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwbimage.c | 3 ++-
 tools/kwbimage.h | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index d1f4f93e0f..77bf4dd886 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Image manipulator for Marvell SoCs
- *  supports Kirkwood, Dove, Armada 370, Armada XP, and Armada 38x
+ *  supports Kirkwood, Dove, Armada 370, Armada XP, Armada 375, Armada 38x and
+ *  Armada 39x
  *
  * (C) Copyright 2013 Thomas Petazzoni
  * <thomas.petazzoni@free-electrons.com>
diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index 56a748d4cf..679c454367 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -69,7 +69,7 @@ struct ext_hdr_v0 {
 	uint8_t               checksum;
 } __packed;
 
-/* Structure of the main header, version 1 (Armada 370/38x/XP) */
+/* Structure of the main header, version 1 (Armada 370/XP/375/38x/39x) */
 struct main_hdr_v1 {
 	uint8_t  blockid;               /* 0x0       */
 	uint8_t  flags;                 /* 0x1       */
@@ -103,7 +103,7 @@ struct main_hdr_v1 {
 #define MAIN_HDR_V1_OPT_BAUD_115200	0x7
 
 /*
- * Header for the optional headers, version 1 (Armada 370, Armada XP)
+ * Header for the optional headers, version 1 (Armada 370/XP/375/38x/39x)
  */
 struct opt_hdr_v1 {
 	uint8_t  headertype;
@@ -127,7 +127,7 @@ struct sig_v1 {
 } __packed;
 
 /*
- * Structure of secure header (Armada 38x)
+ * Structure of secure header (Armada XP/375/38x/39x)
  */
 struct secure_hdr_v1 {
 	uint8_t  headertype;		/* 0x0 */
-- 
2.32.0

[PATCH u-boot-marvell v3 26/39] tools: kwboot: Round up header size to 128 B when patching

[Marek Behún]

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

The beginning of image data must be sent in a separate xmodem block;
the block must not contain end of header with the beginning of data.

Therefore we need to ensure that the image header size is a multiple of
xmodem block size (which is 128 B).

Read the file into a malloc()ed buffer of enough size instead of
mmap()ing it. (If we are going to move the data, most of the pages will
be dirty anyway.) Then move the payload if header size needs to be
increased.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 89 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 77 insertions(+), 12 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index e60f7c5b7a..4fae44c46e 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <termios.h>
 #include <time.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 
 /*
@@ -706,11 +705,12 @@ out:
 }
 
 static void *
-kwboot_mmap_image(const char *path, size_t *size)
+kwboot_read_image(const char *path, size_t *size, size_t reserve)
 {
 	int rc, fd;
 	struct stat st;
 	void *img;
+	off_t tot;
 
 	rc = -1;
 	img = NULL;
@@ -723,17 +723,30 @@ kwboot_mmap_image(const char *path, size_t *size)
 	if (rc)
 		goto out;
 
-	img = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-	if (img == MAP_FAILED) {
-		img = NULL;
+	img = malloc(st.st_size + reserve);
+	if (!img)
 		goto out;
+
+	tot = 0;
+	while (tot < st.st_size) {
+		ssize_t rd = read(fd, img + tot, st.st_size - tot);
+
+		if (rd < 0)
+			goto out;
+
+		tot += rd;
+
+		if (!rd && tot < st.st_size) {
+			errno = EIO;
+			goto out;
+		}
 	}
 
 	rc = 0;
 	*size = st.st_size;
 out:
 	if (rc && img) {
-		munmap(img, st.st_size);
+		free(img);
 		img = NULL;
 	}
 	if (fd >= 0)
@@ -769,8 +782,39 @@ kwboot_img_is_secure(void *img)
 	return 0;
 }
 
+static void
+kwboot_img_grow_hdr(void *img, size_t *size, size_t grow)
+{
+	uint32_t hdrsz, datasz, srcaddr;
+	struct main_hdr_v1 *hdr = img;
+	uint8_t *data;
+
+	srcaddr = le32_to_cpu(hdr->srcaddr);
+
+	hdrsz = kwbheader_size(img);
+	data = (uint8_t *)img + srcaddr;
+	datasz = *size - srcaddr;
+
+	/* only move data if there is not enough space */
+	if (hdrsz + grow > srcaddr) {
+		size_t need = hdrsz + grow - srcaddr;
+
+		/* move data by enough bytes */
+		memmove(data + need, data, datasz);
+
+		hdr->srcaddr = cpu_to_le32(srcaddr + need);
+		*size += need;
+	}
+
+	if (kwbimage_version(img) == 1) {
+		hdrsz += grow;
+		hdr->headersz_msb = hdrsz >> 16;
+		hdr->headersz_lsb = cpu_to_le16(hdrsz & 0xffff);
+	}
+}
+
 static int
-kwboot_img_patch_hdr(void *img, size_t size)
+kwboot_img_patch_hdr(void *img, size_t *size)
 {
 	int rc;
 	struct main_hdr_v1 *hdr;
@@ -783,7 +827,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
 	rc = -1;
 	hdr = img;
 
-	if (size < hdrsz) {
+	if (*size < hdrsz) {
 		errno = EINVAL;
 		goto out;
 	}
@@ -797,7 +841,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
 
 	hdrsz = kwbheader_size(hdr);
 
-	if (size < hdrsz) {
+	if (*size < hdrsz) {
 		errno = EINVAL;
 		goto out;
 	}
@@ -844,6 +888,12 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		break;
 	}
 
+	if (hdrsz > le32_to_cpu(hdr->srcaddr) ||
+	    *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize)) {
+		errno = EINVAL;
+		goto out;
+	}
+
 	is_secure = kwboot_img_is_secure(img);
 
 	if (hdr->blockid != IBR_HDR_UART_ID) {
@@ -858,8 +908,23 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		hdr->blockid = IBR_HDR_UART_ID;
 	}
 
+	if (hdrsz % KWBOOT_XM_BLKSZ) {
+		size_t offset = (KWBOOT_XM_BLKSZ - hdrsz % KWBOOT_XM_BLKSZ) %
+				KWBOOT_XM_BLKSZ;
+
+		if (is_secure) {
+			fprintf(stderr, "Cannot align image with secure header\n");
+			errno = EINVAL;
+			goto out;
+		}
+
+		kwboot_printv("Aligning image header to Xmodem block size\n");
+		kwboot_img_grow_hdr(img, size, offset);
+	}
+
 	hdr->checksum = kwboot_hdr_csum8(hdr) - csum;
 
+	*size = le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize);
 	rc = 0;
 out:
 	return rc;
@@ -986,13 +1051,13 @@ main(int argc, char **argv)
 	}
 
 	if (imgpath) {
-		img = kwboot_mmap_image(imgpath, &size);
+		img = kwboot_read_image(imgpath, &size, KWBOOT_XM_BLKSZ);
 		if (!img) {
 			perror(imgpath);
 			goto out;
 		}
 
-		rc = kwboot_img_patch_hdr(img, size);
+		rc = kwboot_img_patch_hdr(img, &size);
 		if (rc) {
 			fprintf(stderr, "%s: Invalid image.\n", imgpath);
 			goto out;
@@ -1035,7 +1100,7 @@ out:
 		close(tty);
 
 	if (img)
-		munmap(img, size);
+		free(img);
 
 	return rv;
 
-- 
2.32.0

[PATCH u-boot-marvell v3 27/39] tools: kwboot: Explicitly check against size of struct main_hdr_v1

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Explicitly check the image size against size of struct main_hdr_v1.
This way the check is more readable, since the `hdrsz` variable
may semantically contain another value.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 4fae44c46e..77bf5cb80b 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -820,14 +820,14 @@ kwboot_img_patch_hdr(void *img, size_t *size)
 	struct main_hdr_v1 *hdr;
 	uint32_t srcaddr;
 	uint8_t csum;
-	size_t hdrsz = sizeof(*hdr);
+	size_t hdrsz;
 	int image_ver;
 	int is_secure;
 
 	rc = -1;
 	hdr = img;
 
-	if (*size < hdrsz) {
+	if (*size < sizeof(struct main_hdr_v1)) {
 		errno = EINVAL;
 		goto out;
 	}
-- 
2.32.0

[PATCH u-boot-marvell v3 28/39] tools: kwboot: Support higher baudrates when booting via UART

[Marek Behún]

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

Add support for uploading the boot image (the data part only) at higher
baudrate than the standard one.

The kwboot utility already has -B option, but choosing other baudrate
than the standard one (115200 Bd) can only work for debug mode, not for
booting the device. The BootROM for kwboot supported platforms (Orion,
Kirkwood, Dove, Discovery, AXP, A37x, A38x, A39x) cannot change the
baudrate when uploading boot image via the Xmodem protocol, nor can it
be configured via strapping pins.

So instead we add this support by injecting baudrate changing code into
the kwbimage v1 header as a new optional binary extension. This code is
executed by BootROM after it receives the whole header. The code sends
the magic string "$baudratechange\0" just before changing the baudrate
to let kwboot know that it should also change it. This is because the
injected code is run as the last binary extension, and we do not want
to loose possible output from other possible binary extensions that
came before it (in most cases this is U-Boot SPL).

We also inject the code before the payload (the data part of the image),
to change the baudrate back to the standard value, in case the payload
does not reset UART.

This change improves boot time via UART significantly (depending on the
chosen baudrate), which is very useful when debugging.

Signed-off-by: Pali Rohár <pali@kernel.org>
[ major refactor ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 637 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 603 insertions(+), 34 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 77bf5cb80b..ba2fd10ff6 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -70,6 +70,187 @@ struct kwboot_block {
 #define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */
 #define KWBOOT_HDR_RSP_TIMEO 10000 /* ms */
 
+/* ARM code making baudrate changing function return to original exec address */
+static unsigned char kwboot_pre_baud_code[] = {
+				/* exec_addr:                                 */
+	0x00, 0x00, 0x00, 0x00, /* .word 0                                    */
+	0x0c, 0xe0, 0x1f, 0xe5, /* ldr lr, exec_addr                          */
+};
+
+/* ARM code for binary header injection to change baudrate */
+static unsigned char kwboot_baud_code[] = {
+				/* ; #define UART_BASE 0xd0012000             */
+				/* ; #define THR       0x00                   */
+				/* ; #define DLL       0x00                   */
+				/* ; #define DLH       0x04                   */
+				/* ; #define LCR       0x0c                   */
+				/* ; #define   DLAB    0x80                   */
+				/* ; #define LSR       0x14                   */
+				/* ; #define   THRE    0x20                   */
+				/* ; #define   TEMT    0x40                   */
+				/* ; #define DIV_ROUND(a, b) ((a + b/2) / b)  */
+				/* ;                                          */
+				/* ; u32 set_baudrate(u32 old_b, u32 new_b) { */
+				/* ;   const u8 *str = "$baudratechange";     */
+				/* ;   u8 c;                                  */
+				/* ;   do {                                   */
+				/* ;       c = *str++;                        */
+				/* ;       writel(UART_BASE + THR, c);        */
+				/* ;   } while (c);                           */
+				/* ;   while                                  */
+				/* ;      (!(readl(UART_BASE + LSR) & TEMT)); */
+				/* ;   u32 lcr = readl(UART_BASE + LCR);      */
+				/* ;   writel(UART_BASE + LCR, lcr | DLAB);   */
+				/* ;   u8 old_dll = readl(UART_BASE + DLL);   */
+				/* ;   u8 old_dlh = readl(UART_BASE + DLH);   */
+				/* ;   u16 old_dl = old_dll | (old_dlh << 8); */
+				/* ;   u32 clk = old_b * old_dl;              */
+				/* ;   u16 new_dl = DIV_ROUND(clk, new_b);    */
+				/* ;   u8 new_dll = new_dl & 0xff;            */
+				/* ;   u8 new_dlh = (new_dl >> 8) & 0xff;     */
+				/* ;   writel(UART_BASE + DLL, new_dll);      */
+				/* ;   writel(UART_BASE + DLH, new_dlh);      */
+				/* ;   writel(UART_BASE + LCR, lcr & ~DLAB);  */
+				/* ;   msleep(1);                             */
+				/* ;   return 0;                              */
+				/* ; }                                        */
+
+	0xfe, 0x5f, 0x2d, 0xe9, /* push  { r1 - r12, lr }                     */
+
+				/*  ; r0 = UART_BASE                          */
+	0x02, 0x0a, 0xa0, 0xe3, /* mov   r0, #0x2000                          */
+	0x01, 0x00, 0x4d, 0xe3, /* movt  r0, #0xd001                          */
+
+				/*  ; r2 = address of preamble string         */
+	0xd0, 0x20, 0x8f, 0xe2, /* adr   r2, preamble                         */
+
+				/*  ; Send preamble string over UART          */
+				/* .Lloop_preamble:                           */
+				/*                                            */
+				/*  ; Wait until Transmitter Holding is Empty */
+				/* .Lloop_thre:                               */
+				/*  ; r1 = UART_BASE[LSR] & THRE              */
+	0x14, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x14]                      */
+	0x20, 0x00, 0x11, 0xe3, /* tst   r1, #0x20                            */
+	0xfc, 0xff, 0xff, 0x0a, /* beq   .Lloop_thre                          */
+
+				/*  ; Put character into Transmitter FIFO     */
+				/*  ; r1 = *r2++                              */
+	0x01, 0x10, 0xd2, 0xe4, /* ldrb  r1, [r2], #1                         */
+				/*  ; UART_BASE[THR] = r1                     */
+	0x00, 0x10, 0x80, 0xe5, /* str   r1, [r0, #0x0]                       */
+
+				/*  ; Loop until end of preamble string       */
+	0x00, 0x00, 0x51, 0xe3, /* cmp   r1, #0                               */
+	0xf8, 0xff, 0xff, 0x1a, /* bne   .Lloop_preamble                      */
+
+				/*  ; Wait until Transmitter FIFO is Empty    */
+				/* .Lloop_txempty:                            */
+				/*  ; r1 = UART_BASE[LSR] & TEMT              */
+	0x14, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x14]                      */
+	0x40, 0x00, 0x11, 0xe3, /* tst   r1, #0x40                            */
+	0xfc, 0xff, 0xff, 0x0a, /* beq   .Lloop_txempty                       */
+
+				/*  ; Set Divisor Latch Access Bit            */
+				/*  ; UART_BASE[LCR] |= DLAB                  */
+	0x0c, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x0c]                      */
+	0x80, 0x10, 0x81, 0xe3, /* orr   r1, r1, #0x80                        */
+	0x0c, 0x10, 0x80, 0xe5, /* str   r1, [r0, #0x0c]                      */
+
+				/*  ; Read current Divisor Latch              */
+				/*  ; r1 = UART_BASE[DLH]<<8 | UART_BASE[DLL] */
+	0x00, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x00]                      */
+	0xff, 0x10, 0x01, 0xe2, /* and   r1, r1, #0xff                        */
+	0x01, 0x20, 0xa0, 0xe1, /* mov   r2, r1                               */
+	0x04, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x04]                      */
+	0xff, 0x10, 0x01, 0xe2, /* and   r1, r1, #0xff                        */
+	0x41, 0x14, 0xa0, 0xe1, /* asr   r1, r1, #8                           */
+	0x02, 0x10, 0x81, 0xe1, /* orr   r1, r1, r2                           */
+
+				/*  ; Read old baudrate value                 */
+				/*  ; r2 = old_baudrate                       */
+	0x8c, 0x20, 0x9f, 0xe5, /* ldr   r2, old_baudrate                     */
+
+				/*  ; Calculate base clock                    */
+				/*  ; r1 = r2 * r1                            */
+	0x92, 0x01, 0x01, 0xe0, /* mul   r1, r2, r1                           */
+
+				/*  ; Read new baudrate value                 */
+				/*  ; r2 = baudrate                           */
+	0x88, 0x20, 0x9f, 0xe5, /* ldr   r2, baudrate                         */
+
+				/*  ; Calculate new Divisor Latch             */
+				/*  ; r1 = DIV_ROUND(r1, r2) =                */
+				/*  ;    = (r1 + r2/2) / r2                   */
+	0xa2, 0x10, 0x81, 0xe0, /* add   r1, r1, r2, lsr #1                   */
+	0x02, 0x40, 0xa0, 0xe1, /* mov   r4, r2                               */
+	0xa1, 0x00, 0x54, 0xe1, /* cmp   r4, r1, lsr #1                       */
+				/* .Lloop_div1:                               */
+	0x84, 0x40, 0xa0, 0x91, /* movls r4, r4, lsl #1                       */
+	0xa1, 0x00, 0x54, 0xe1, /* cmp   r4, r1, lsr #1                       */
+	0xfc, 0xff, 0xff, 0x9a, /* bls   .Lloop_div1                          */
+	0x00, 0x30, 0xa0, 0xe3, /* mov   r3, #0                               */
+				/* .Lloop_div2:                               */
+	0x04, 0x00, 0x51, 0xe1, /* cmp   r1, r4                               */
+	0x04, 0x10, 0x41, 0x20, /* subhs r1, r1, r4                           */
+	0x03, 0x30, 0xa3, 0xe0, /* adc   r3, r3, r3                           */
+	0xa4, 0x40, 0xa0, 0xe1, /* mov   r4, r4, lsr #1                       */
+	0x02, 0x00, 0x54, 0xe1, /* cmp   r4, r2                               */
+	0xf9, 0xff, 0xff, 0x2a, /* bhs   .Lloop_div2                          */
+	0x03, 0x10, 0xa0, 0xe1, /* mov   r1, r3                               */
+
+				/*  ; Set new Divisor Latch Low               */
+				/*  ; UART_BASE[DLL] = r1 & 0xff              */
+	0x01, 0x20, 0xa0, 0xe1, /* mov   r2, r1                               */
+	0xff, 0x20, 0x02, 0xe2, /* and   r2, r2, #0xff                        */
+	0x00, 0x20, 0x80, 0xe5, /* str   r2, [r0, #0x00]                      */
+
+				/*  ; Set new Divisor Latch High              */
+				/*  ; UART_BASE[DLH] = r1>>8 & 0xff           */
+	0x41, 0x24, 0xa0, 0xe1, /* asr   r2, r1, #8                           */
+	0xff, 0x20, 0x02, 0xe2, /* and   r2, r2, #0xff                        */
+	0x04, 0x20, 0x80, 0xe5, /* str   r2, [r0, #0x04]                      */
+
+				/*  ; Clear Divisor Latch Access Bit          */
+				/*  ; UART_BASE[LCR] &= ~DLAB                 */
+	0x0c, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x0c]                      */
+	0x80, 0x10, 0xc1, 0xe3, /* bic   r1, r1, #0x80                        */
+	0x0c, 0x10, 0x80, 0xe5, /* str   r1, [r0, #0x0c]                      */
+
+				/*  ; Sleep 1ms ~~ 600000 cycles at 1200 MHz  */
+				/*  ; r1 = 600000                             */
+	0x9f, 0x1d, 0xa0, 0xe3, /* mov   r1, #0x27c0                          */
+	0x09, 0x10, 0x40, 0xe3, /* movt  r1, #0x0009                          */
+				/* .Lloop_sleep:                              */
+	0x01, 0x10, 0x41, 0xe2, /* sub   r1, r1, #1                           */
+	0x00, 0x00, 0x51, 0xe3, /* cmp   r1, #0                               */
+	0xfc, 0xff, 0xff, 0x1a, /* bne   .Lloop_sleep                         */
+
+				/*  ; Return 0 - no error                     */
+	0x00, 0x00, 0xa0, 0xe3, /* mov   r0, #0                               */
+	0xfe, 0x9f, 0xbd, 0xe8, /* pop   { r1 - r12, pc }                     */
+
+				/*  ; Preamble string                         */
+				/* preamble:                                  */
+	0x24, 0x62, 0x61, 0x75, /* .asciz "$baudratechange"                   */
+	0x64, 0x72, 0x61, 0x74,
+	0x65, 0x63, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x00,
+
+				/*  ; Placeholder for old baudrate value      */
+				/* old_baudrate:                              */
+	0x00, 0x00, 0x00, 0x00, /* .word 0                                    */
+
+				/*  ; Placeholder for new baudrate value      */
+				/* new_baudrate:                              */
+	0x00, 0x00, 0x00, 0x00, /* .word 0                                    */
+};
+
+#define KWBOOT_BAUDRATE_BIN_HEADER_SZ (sizeof(kwboot_baud_code) + \
+				       sizeof(struct opt_hdr_v1) + 8)
+
+static const char kwb_baud_magic[16] = "$baudratechange";
+
 static int kwboot_verbose;
 
 static int msg_req_delay = KWBOOT_MSG_REQ_DELAY;
@@ -233,26 +414,184 @@ kwboot_tty_send_char(int fd, unsigned char c)
 }
 
 static speed_t
-kwboot_tty_speed(int baudrate)
+kwboot_tty_baudrate_to_speed(int baudrate)
 {
 	switch (baudrate) {
+#ifdef B4000000
+	case 4000000:
+		return B4000000;
+#endif
+#ifdef B3500000
+	case 3500000:
+		return B3500000;
+#endif
+#ifdef B3000000
+	case 3000000:
+		return B3000000;
+#endif
+#ifdef B2500000
+	case 2500000:
+		return B2500000;
+#endif
+#ifdef B2000000
+	case 2000000:
+		return B2000000;
+#endif
+#ifdef B1500000
+	case 1500000:
+		return B1500000;
+#endif
+#ifdef B1152000
+	case 1152000:
+		return B1152000;
+#endif
+#ifdef B1000000
+	case 1000000:
+		return B1000000;
+#endif
+#ifdef B921600
+	case 921600:
+		return B921600;
+#endif
+#ifdef B614400
+	case 614400:
+		return B614400;
+#endif
+#ifdef B576000
+	case 576000:
+		return B576000;
+#endif
+#ifdef B500000
+	case 500000:
+		return B500000;
+#endif
+#ifdef B460800
+	case 460800:
+		return B460800;
+#endif
+#ifdef B307200
+	case 307200:
+		return B307200;
+#endif
+#ifdef B230400
+	case 230400:
+		return B230400;
+#endif
+#ifdef B153600
+	case 153600:
+		return B153600;
+#endif
+#ifdef B115200
 	case 115200:
 		return B115200;
+#endif
+#ifdef B76800
+	case 76800:
+		return B76800;
+#endif
+#ifdef B57600
 	case 57600:
 		return B57600;
+#endif
+#ifdef B38400
 	case 38400:
 		return B38400;
+#endif
+#ifdef B19200
 	case 19200:
 		return B19200;
+#endif
+#ifdef B9600
 	case 9600:
 		return B9600;
+#endif
+#ifdef B4800
+	case 4800:
+		return B4800;
+#endif
+#ifdef B2400
+	case 2400:
+		return B2400;
+#endif
+#ifdef B1800
+	case 1800:
+		return B1800;
+#endif
+#ifdef B1200
+	case 1200:
+		return B1200;
+#endif
+#ifdef B600
+	case 600:
+		return B600;
+#endif
+#ifdef B300
+	case 300:
+		return B300;
+#endif
+#ifdef B200
+	case 200:
+		return B200;
+#endif
+#ifdef B150
+	case 150:
+		return B150;
+#endif
+#ifdef B134
+	case 134:
+		return B134;
+#endif
+#ifdef B110
+	case 110:
+		return B110;
+#endif
+#ifdef B75
+	case 75:
+		return B75;
+#endif
+#ifdef B50
+	case 50:
+		return B50;
+#endif
+	default:
+		return B0;
+	}
+}
+
+static int
+kwboot_tty_change_baudrate(int fd, int baudrate)
+{
+	struct termios tio;
+	speed_t speed;
+	int rc;
+
+	rc = tcgetattr(fd, &tio);
+	if (rc)
+		return rc;
+
+	speed = kwboot_tty_baudrate_to_speed(baudrate);
+	if (speed == B0) {
+		errno = EINVAL;
+		return -1;
 	}
 
-	return -1;
+	rc = cfsetospeed(&tio, speed);
+	if (rc)
+		return rc;
+
+	rc = cfsetispeed(&tio, speed);
+	if (rc)
+		return rc;
+
+	rc = tcsetattr(fd, TCSANOW, &tio);
+	if (rc)
+		return rc;
+
+	return 0;
 }
 
 static int
-kwboot_open_tty(const char *path, speed_t speed)
+kwboot_open_tty(const char *path, int baudrate)
 {
 	int rc, fd;
 	struct termios tio;
@@ -271,13 +610,14 @@ kwboot_open_tty(const char *path, speed_t speed)
 	tio.c_cc[VMIN] = 1;
 	tio.c_cc[VTIME] = 10;
 
-	cfsetospeed(&tio, speed);
-	cfsetispeed(&tio, speed);
-
 	rc = tcsetattr(fd, TCSANOW, &tio);
 	if (rc)
 		goto out;
 
+	rc = kwboot_tty_change_baudrate(fd, baudrate);
+	if (rc)
+		goto out;
+
 	rc = fd;
 out:
 	if (rc < 0) {
@@ -426,7 +766,34 @@ _xm_reply_to_error(int c)
 }
 
 static int
-kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
+kwboot_baud_magic_handle(int fd, char c, int baudrate)
+{
+	static size_t rcv_len;
+
+	if (rcv_len < sizeof(kwb_baud_magic)) {
+		/* try to recognize whole magic word */
+		if (c == kwb_baud_magic[rcv_len]) {
+			rcv_len++;
+		} else {
+			printf("%.*s%c", (int)rcv_len, kwb_baud_magic, c);
+			fflush(stdout);
+			rcv_len = 0;
+		}
+	}
+
+	if (rcv_len == sizeof(kwb_baud_magic)) {
+		/* magic word received */
+		kwboot_printv("\nChanging baudrate to %d Bd\n", baudrate);
+
+		return kwboot_tty_change_baudrate(fd, baudrate) ? : 1;
+	} else {
+		return 0;
+	}
+}
+
+static int
+kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print,
+		     int baudrate, int *baud_changed)
 {
 	int timeout = allow_non_xm ? KWBOOT_HDR_RSP_TIMEO : blk_rsp_timeo;
 	uint64_t recv_until = _now() + timeout;
@@ -434,6 +801,8 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 
 	if (non_xm_print)
 		*non_xm_print = 0;
+	if (baud_changed)
+		*baud_changed = 0;
 
 	while (1) {
 		rc = kwboot_tty_recv(fd, c, 1, timeout);
@@ -451,15 +820,30 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 			break;
 
 		/*
-		 * If printing non-xmodem text output is allowed and such a byte
-		 * was received, print it and increase receiving time.
+		 * If receiving/printing non-xmodem text output is allowed and
+		 * such a byte was received, we want to increase receiving time
+		 * and either:
+		 * - print the byte, if it is not part of baudrate change magic
+		 *   sequence while baudrate change was requested (-B option)
+		 * - change baudrate
 		 * Otherwise decrease timeout by time elapsed.
 		 */
 		if (allow_non_xm) {
 			recv_until = _now() + timeout;
-			putchar(*c);
-			fflush(stdout);
-			*non_xm_print = 1;
+
+			if (baudrate && !*baud_changed) {
+				rc = kwboot_baud_magic_handle(fd, *c, baudrate);
+				if (rc == 1)
+					*baud_changed = 1;
+				else if (!rc)
+					*non_xm_print = 1;
+				else
+					return rc;
+			} else if (!baudrate || !*baud_changed) {
+				putchar(*c);
+				fflush(stdout);
+				*non_xm_print = 1;
+			}
 		} else {
 			timeout = recv_until - _now();
 			if (timeout < 0) {
@@ -474,10 +858,10 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
 
 static int
 kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
-		    int *done_print)
+		    int *done_print, int baudrate)
 {
-	int non_xm_print;
-	int rc, retries;
+	int non_xm_print, baud_changed;
+	int rc, err, retries;
 	char c;
 
 	*done_print = 0;
@@ -494,9 +878,10 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
 			*done_print = 1;
 		}
 
-		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print);
+		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print,
+					  baudrate, &baud_changed);
 		if (rc)
-			return rc;
+			goto can;
 
 		if (!allow_non_xm && c != ACK)
 			kwboot_progress(-1, '+');
@@ -505,7 +890,20 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
 	if (non_xm_print)
 		kwboot_printv("\n");
 
+	if (allow_non_xm && baudrate && !baud_changed) {
+		fprintf(stderr, "Baudrate was not changed\n");
+		rc = -1;
+		errno = EPROTO;
+		goto can;
+	}
+
 	return _xm_reply_to_error(c);
+can:
+	err = errno;
+	kwboot_tty_send_char(fd, CAN);
+	kwboot_printv("\n");
+	errno = err;
+	return rc;
 }
 
 static int
@@ -522,7 +920,7 @@ kwboot_xm_finish(int fd)
 		if (rc)
 			return rc;
 
-		rc = kwboot_xm_recv_reply(fd, &c, 0, NULL);
+		rc = kwboot_xm_recv_reply(fd, &c, 0, NULL, 0, NULL);
 		if (rc)
 			return rc;
 	} while (c == NAK && retries-- > 0);
@@ -532,7 +930,7 @@ kwboot_xm_finish(int fd)
 
 static int
 kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
-		  size_t size)
+		  size_t size, int baudrate)
 {
 	int done_print = 0;
 	size_t sent, left;
@@ -555,7 +953,7 @@ kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
 		last_block = (left <= blksz);
 
 		rc = kwboot_xm_sendblock(tty, &block, header && last_block,
-					 &done_print);
+					 &done_print, baudrate);
 		if (rc)
 			goto out;
 
@@ -576,7 +974,7 @@ out:
 }
 
 static int
-kwboot_xmodem(int tty, const void *_img, size_t size)
+kwboot_xmodem(int tty, const void *_img, size_t size, int baudrate)
 {
 	const uint8_t *img = _img;
 	int rc, pnum;
@@ -590,18 +988,41 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
 
 	pnum = 1;
 
-	rc = kwboot_xmodem_one(tty, &pnum, 1, img, hdrsz);
+	rc = kwboot_xmodem_one(tty, &pnum, 1, img, hdrsz, baudrate);
 	if (rc)
 		return rc;
 
 	img += hdrsz;
 	size -= hdrsz;
 
-	rc = kwboot_xmodem_one(tty, &pnum, 0, img, size);
+	rc = kwboot_xmodem_one(tty, &pnum, 0, img, size, 0);
+	if (rc)
+		return rc;
+
+	rc = kwboot_xm_finish(tty);
 	if (rc)
 		return rc;
 
-	return kwboot_xm_finish(tty);
+	if (baudrate) {
+		char buf[sizeof(kwb_baud_magic)];
+
+		/* Wait 1s for baudrate change magic */
+		rc = kwboot_tty_recv(tty, buf, sizeof(buf), 1000);
+		if (rc)
+			return rc;
+
+		if (memcmp(buf, kwb_baud_magic, sizeof(buf))) {
+			errno = EPROTO;
+			return -1;
+		}
+
+		kwboot_printv("\nChanging baudrate back to 115200 Bd\n\n");
+		rc = kwboot_tty_change_baudrate(tty, 115200);
+		if (rc)
+			return rc;
+	}
+
+	return 0;
 }
 
 static int
@@ -782,6 +1203,37 @@ kwboot_img_is_secure(void *img)
 	return 0;
 }
 
+static void *
+kwboot_img_grow_data_left(void *img, size_t *size, size_t grow)
+{
+	uint32_t hdrsz, datasz, srcaddr;
+	struct main_hdr_v1 *hdr = img;
+	uint8_t *data;
+
+	srcaddr = le32_to_cpu(hdr->srcaddr);
+
+	hdrsz = kwbheader_size(hdr);
+	data = (uint8_t *)img + srcaddr;
+	datasz = *size - srcaddr;
+
+	/* only move data if there is not enough space */
+	if (hdrsz + grow > srcaddr) {
+		size_t need = hdrsz + grow - srcaddr;
+
+		/* move data by enough bytes */
+		memmove(data + need, data, datasz);
+		*size += need;
+		srcaddr += need;
+	}
+
+	srcaddr -= grow;
+	hdr->srcaddr = cpu_to_le32(srcaddr);
+	hdr->destaddr = cpu_to_le32(le32_to_cpu(hdr->destaddr) - grow);
+	hdr->blocksize = cpu_to_le32(le32_to_cpu(hdr->blocksize) + grow);
+
+	return (uint8_t *)img + srcaddr;
+}
+
 static void
 kwboot_img_grow_hdr(void *img, size_t *size, size_t grow)
 {
@@ -813,8 +1265,71 @@ kwboot_img_grow_hdr(void *img, size_t *size, size_t grow)
 	}
 }
 
+static void *
+kwboot_add_bin_ohdr_v1(void *img, size_t *size, uint32_t binsz)
+{
+	struct main_hdr_v1 *hdr = img;
+	struct opt_hdr_v1 *ohdr;
+	uint32_t ohdrsz;
+
+	ohdrsz = binsz + 8 + sizeof(*ohdr);
+	kwboot_img_grow_hdr(img, size, ohdrsz);
+
+	if (hdr->ext & 0x1) {
+		for_each_opt_hdr_v1 (ohdr, img)
+			if (opt_hdr_v1_next(ohdr) == NULL)
+				break;
+
+		*opt_hdr_v1_ext(ohdr) |= 1;
+		ohdr = opt_hdr_v1_next(ohdr);
+	} else {
+		hdr->ext |= 1;
+		ohdr = (void *)(hdr + 1);
+	}
+
+	ohdr->headertype = OPT_HDR_V1_BINARY_TYPE;
+	ohdr->headersz_msb = ohdrsz >> 16;
+	ohdr->headersz_lsb = cpu_to_le16(ohdrsz & 0xffff);
+
+	memset(&ohdr->data[0], 0, ohdrsz - sizeof(*ohdr));
+
+	return &ohdr->data[4];
+}
+
+static void
+_copy_baudrate_change_code(struct main_hdr_v1 *hdr, void *dst, int pre,
+			   int old_baud, int new_baud)
+{
+	size_t codesz = sizeof(kwboot_baud_code);
+	uint8_t *code = dst;
+
+	if (pre) {
+		size_t presz = sizeof(kwboot_pre_baud_code);
+
+		/*
+		 * We need to prepend code that loads lr register with original
+		 * value of hdr->execaddr. We do this by putting the original
+		 * exec address before the code that loads it relatively from
+		 * it's beginning.
+		 * Afterwards we change the exec address to this code (which is
+		 * at offset 4, because the first 4 bytes contain the original
+		 * exec address).
+		 */
+		memcpy(code, kwboot_pre_baud_code, presz);
+		*(uint32_t *)code = hdr->execaddr;
+
+		hdr->execaddr = cpu_to_le32(le32_to_cpu(hdr->destaddr) + 4);
+
+		code += presz;
+	}
+
+	memcpy(code, kwboot_baud_code, codesz - 8);
+	*(uint32_t *)(code + codesz - 8) = cpu_to_le32(old_baud);
+	*(uint32_t *)(code + codesz - 4) = cpu_to_le32(new_baud);
+}
+
 static int
-kwboot_img_patch_hdr(void *img, size_t *size)
+kwboot_img_patch(void *img, size_t *size, int baudrate)
 {
 	int rc;
 	struct main_hdr_v1 *hdr;
@@ -908,6 +1423,51 @@ kwboot_img_patch_hdr(void *img, size_t *size)
 		hdr->blockid = IBR_HDR_UART_ID;
 	}
 
+	if (baudrate) {
+		uint32_t codesz = sizeof(kwboot_baud_code);
+		void *code;
+
+		if (image_ver == 0) {
+			fprintf(stderr,
+				"Cannot inject code for changing baudrate into v0 image header\n");
+			errno = EINVAL;
+			goto out;
+		}
+
+		if (is_secure) {
+			fprintf(stderr,
+				"Cannot inject code for changing baudrate into image with secure header\n");
+			errno = EINVAL;
+			goto out;
+		}
+
+		/*
+		 * First inject code that changes the baudrate from the default
+		 * value of 115200 Bd to requested value. This code is inserted
+		 * as a new opt hdr, so it is executed by BootROM after the
+		 * header part is received.
+		 */
+		kwboot_printv("Injecting binary header code for changing baudrate to %d Bd\n",
+			      baudrate);
+
+		code = kwboot_add_bin_ohdr_v1(img, size, codesz);
+		_copy_baudrate_change_code(hdr, code, 0, 115200, baudrate);
+
+		/*
+		 * Now inject code that changes the baudrate back to 115200 Bd.
+		 * This code is prepended to the data part of the image, so it
+		 * is executed before U-Boot proper.
+		 */
+		kwboot_printv("Injecting code for changing baudrate back\n");
+
+		codesz += sizeof(kwboot_pre_baud_code);
+		code = kwboot_img_grow_data_left(img, size, codesz);
+		_copy_baudrate_change_code(hdr, code, 1, baudrate, 115200);
+
+		/* recompute header size */
+		hdrsz = kwbheader_size(hdr);
+	}
+
 	if (hdrsz % KWBOOT_XM_BLKSZ) {
 		size_t offset = (KWBOOT_XM_BLKSZ - hdrsz % KWBOOT_XM_BLKSZ) %
 				KWBOOT_XM_BLKSZ;
@@ -964,7 +1524,8 @@ main(int argc, char **argv)
 	void *debugmsg;
 	void *img;
 	size_t size;
-	speed_t speed;
+	size_t after_img_rsv;
+	int baudrate;
 
 	rv = 1;
 	tty = -1;
@@ -974,7 +1535,8 @@ main(int argc, char **argv)
 	img = NULL;
 	term = 0;
 	size = 0;
-	speed = B115200;
+	after_img_rsv = KWBOOT_XM_BLKSZ;
+	baudrate = 115200;
 
 	kwboot_verbose = isatty(STDOUT_FILENO);
 
@@ -1024,9 +1586,7 @@ main(int argc, char **argv)
 			break;
 
 		case 'B':
-			speed = kwboot_tty_speed(atoi(optarg));
-			if (speed == -1)
-				goto usage;
+			baudrate = atoi(optarg);
 			break;
 
 		case 'h':
@@ -1044,20 +1604,29 @@ main(int argc, char **argv)
 
 	ttypath = argv[optind++];
 
-	tty = kwboot_open_tty(ttypath, speed);
+	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
 	if (tty < 0) {
 		perror(ttypath);
 		goto out;
 	}
 
+	if (baudrate == 115200)
+		/* do not change baudrate during Xmodem to the same value */
+		baudrate = 0;
+	else
+		/* ensure we have enough space for baudrate change code */
+		after_img_rsv += KWBOOT_BAUDRATE_BIN_HEADER_SZ +
+				 sizeof(kwboot_pre_baud_code) +
+				 sizeof(kwboot_baud_code);
+
 	if (imgpath) {
-		img = kwboot_read_image(imgpath, &size, KWBOOT_XM_BLKSZ);
+		img = kwboot_read_image(imgpath, &size, after_img_rsv);
 		if (!img) {
 			perror(imgpath);
 			goto out;
 		}
 
-		rc = kwboot_img_patch_hdr(img, &size);
+		rc = kwboot_img_patch(img, &size, baudrate);
 		if (rc) {
 			fprintf(stderr, "%s: Invalid image.\n", imgpath);
 			goto out;
@@ -1079,7 +1648,7 @@ main(int argc, char **argv)
 	}
 
 	if (img) {
-		rc = kwboot_xmodem(tty, img, size);
+		rc = kwboot_xmodem(tty, img, size, baudrate);
 		if (rc) {
 			perror("xmodem");
 			goto out;
-- 
2.32.0

[PATCH u-boot-marvell v3 29/39] tools: kwboot: Allow any baudrate on Linux

[Marek Behún]

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> (included by <sys/ioctl.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_linux.h ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c        |  16 +++-
 tools/termios_linux.h | 189 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 tools/termios_linux.h

diff --git a/tools/kwboot.c b/tools/kwboot.c
index ba2fd10ff6..7ccab2993f 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
  */
@@ -554,7 +559,11 @@ kwboot_tty_baudrate_to_speed(int baudrate)
 		return B50;
 #endif
 	default:
+#ifdef BOTHER
+		return BOTHER;
+#else
 		return B0;
+#endif
 	}
 }
 
@@ -575,6 +584,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..d73989b625
--- /dev/null
+++ b/tools/termios_linux.h
@@ -0,0 +1,189 @@
+/* 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>
+ * (included by <sys/ioctl.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/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)
+{
+	if (s & ~CBAUD) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	t->c_cflag &= ~CBAUD;
+	t->c_cflag |= s;
+
+	return 0;
+}
+
+#ifdef IBSHIFT
+static inline speed_t cfgetispeed(const struct termios *t)
+{
+	speed_t s = (t->c_cflag >> IBSHIFT) & CBAUD;
+
+	if (s == B0)
+		return cfgetospeed(t);
+	else
+		return s;
+}
+
+static inline int cfsetispeed(struct termios *t, speed_t s)
+{
+	if (s == 0)
+		s = B0;
+
+	if (s & ~CBAUD) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	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)
+{
+	if (cfsetospeed(t, s))
+		return -1;
+#ifdef IBSHIFT
+	if (cfsetispeed(t, s))
+		return -1;
+#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.32.0

[PATCH u-boot-marvell v3 30/39] tools: kwboot: Check whether baudrate was set to requested value

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

The tcsetattr() function can return 0 even if baudrate was not changed.
Check whether baudrate was changed to requested value, and in case of
arbitrary baudrate, check whether the set value is within 3% tolerance.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 7ccab2993f..d8b950787b 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -567,6 +567,13 @@ kwboot_tty_baudrate_to_speed(int baudrate)
 	}
 }
 
+static int
+_is_within_tolerance(int value, int reference, int tolerance)
+{
+	return 100 * value >= reference * (100 - tolerance) &&
+	       100 * value <= reference * (100 + tolerance);
+}
+
 static int
 kwboot_tty_change_baudrate(int fd, int baudrate)
 {
@@ -601,7 +608,32 @@ kwboot_tty_change_baudrate(int fd, int baudrate)
 	if (rc)
 		return rc;
 
+	rc = tcgetattr(fd, &tio);
+	if (rc)
+		return rc;
+
+	if (cfgetospeed(&tio) != speed || cfgetispeed(&tio) != speed)
+		goto baud_fail;
+
+#ifdef BOTHER
+	/*
+	 * Check whether set baudrate is within 3% tolerance.
+	 * If BOTHER is defined, Linux always fills out c_ospeed / c_ispeed
+	 * with real values.
+	 */
+	if (!_is_within_tolerance(tio.c_ospeed, baudrate, 3))
+		goto baud_fail;
+
+	if (!_is_within_tolerance(tio.c_ispeed, baudrate, 3))
+		goto baud_fail;
+#endif
+
 	return 0;
+
+baud_fail:
+	fprintf(stderr, "Could not set baudrate to requested value\n");
+	errno = EINVAL;
+	return -1;
 }
 
 static int
-- 
2.32.0

[PATCH u-boot-marvell v3 31/39] tools: kwboot: Fix initializing tty device

[Marek Behún]

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

Retrieve current terminal settings via tcgetattr(), set to raw mode with
cfmakeraw(), enable receiver via CREAD and ignore modem control lines
via CLOCAL.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index d8b950787b..fc83161d70 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -648,11 +648,12 @@ kwboot_open_tty(const char *path, int baudrate)
 	if (fd < 0)
 		goto out;
 
-	memset(&tio, 0, sizeof(tio));
-
-	tio.c_iflag = 0;
-	tio.c_cflag = CREAD|CLOCAL|CS8;
+	rc = tcgetattr(fd, &tio);
+	if (rc)
+		goto out;
 
+	cfmakeraw(&tio);
+	tio.c_cflag |= CREAD|CLOCAL;
 	tio.c_cc[VMIN] = 1;
 	tio.c_cc[VTIME] = 10;
 
-- 
2.32.0

[PATCH u-boot-marvell v3 32/39] tools: kwboot: Disable tty interbyte timeout

[Marek Behún]

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

Function kwboot_tty_recv() has its own handling of read timeout, we
don't need to do set it in tty settings.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index fc83161d70..a527c79cf3 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -655,7 +655,7 @@ kwboot_open_tty(const char *path, int baudrate)
 	cfmakeraw(&tio);
 	tio.c_cflag |= CREAD|CLOCAL;
 	tio.c_cc[VMIN] = 1;
-	tio.c_cc[VTIME] = 10;
+	tio.c_cc[VTIME] = 0;
 
 	rc = tcsetattr(fd, TCSANOW, &tio);
 	if (rc)
-- 
2.32.0

[PATCH u-boot-marvell v3 33/39] tools: kwboot: Disable non-blocking mode

[Marek Behún]

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

The kwboot utility does not handle EAGAIN / EBUSY errors, it expects
blocking mode on tty - it uses select() to check if data is available.

Disable non-blocking mode by clearing O_NDELAY flag which was set by
open().

We can't just take O_NDELAY from open(), because it is required there
until the CLOCAL flag is set on the tty.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index a527c79cf3..5e491f31a4 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -639,7 +639,7 @@ baud_fail:
 static int
 kwboot_open_tty(const char *path, int baudrate)
 {
-	int rc, fd;
+	int rc, fd, flags;
 	struct termios tio;
 
 	rc = -1;
@@ -661,6 +661,14 @@ kwboot_open_tty(const char *path, int baudrate)
 	if (rc)
 		goto out;
 
+	flags = fcntl(fd, F_GETFL);
+	if (flags < 0)
+		goto out;
+
+	rc = fcntl(fd, F_SETFL, flags & ~O_NDELAY);
+	if (rc)
+		goto out;
+
 	rc = kwboot_tty_change_baudrate(fd, baudrate);
 	if (rc)
 		goto out;
-- 
2.32.0

[PATCH u-boot-marvell v3 34/39] tools: kwboot: Cosmetic fix

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Add spaces around the | operator.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 5e491f31a4..9eb007f1bb 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -644,7 +644,7 @@ kwboot_open_tty(const char *path, int baudrate)
 
 	rc = -1;
 
-	fd = open(path, O_RDWR|O_NOCTTY|O_NDELAY);
+	fd = open(path, O_RDWR | O_NOCTTY | O_NDELAY);
 	if (fd < 0)
 		goto out;
 
@@ -653,7 +653,7 @@ kwboot_open_tty(const char *path, int baudrate)
 		goto out;
 
 	cfmakeraw(&tio);
-	tio.c_cflag |= CREAD|CLOCAL;
+	tio.c_cflag |= CREAD | CLOCAL;
 	tio.c_cc[VMIN] = 1;
 	tio.c_cc[VTIME] = 0;
 
@@ -1137,7 +1137,7 @@ kwboot_terminal(int tty)
 		}
 
 		kwboot_printv("[Type Ctrl-%c + %c to quit]\r\n",
-			      quit[0]|0100, quit[1]);
+			      quit[0] | 0100, quit[1]);
 	} else
 		in = -1;
 
-- 
2.32.0

[PATCH u-boot-marvell v3 35/39] tools: kwboot: Avoid code repetition in kwboot_img_patch()

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Change kwboot_img_patch() to avoid code repetition of setting errno to
EINVAL.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 55 ++++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 9eb007f1bb..9da5b42ebf 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -1386,7 +1386,6 @@ _copy_baudrate_change_code(struct main_hdr_v1 *hdr, void *dst, int pre,
 static int
 kwboot_img_patch(void *img, size_t *size, int baudrate)
 {
-	int rc;
 	struct main_hdr_v1 *hdr;
 	uint32_t srcaddr;
 	uint8_t csum;
@@ -1394,33 +1393,25 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 	int image_ver;
 	int is_secure;
 
-	rc = -1;
 	hdr = img;
 
-	if (*size < sizeof(struct main_hdr_v1)) {
-		errno = EINVAL;
-		goto out;
-	}
+	if (*size < sizeof(struct main_hdr_v1))
+		goto err;
 
 	image_ver = kwbimage_version(img);
 	if (image_ver != 0 && image_ver != 1) {
 		fprintf(stderr, "Invalid image header version\n");
-		errno = EINVAL;
-		goto out;
+		goto err;
 	}
 
 	hdrsz = kwbheader_size(hdr);
 
-	if (*size < hdrsz) {
-		errno = EINVAL;
-		goto out;
-	}
+	if (*size < hdrsz)
+		goto err;
 
 	csum = kwboot_hdr_csum8(hdr) - hdr->checksum;
-	if (csum != hdr->checksum) {
-		errno = EINVAL;
-		goto out;
-	}
+	if (csum != hdr->checksum)
+		goto err;
 
 	if (image_ver == 0) {
 		struct main_hdr_v0 *hdr_v0 = img;
@@ -1433,10 +1424,9 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 
 	switch (hdr->blockid) {
 	case IBR_HDR_SATA_ID:
-		if (srcaddr < 1) {
-			errno = EINVAL;
-			goto out;
-		}
+		if (srcaddr < 1)
+			goto err;
+
 		hdr->srcaddr = cpu_to_le32((srcaddr - 1) * 512);
 		break;
 
@@ -1459,10 +1449,8 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 	}
 
 	if (hdrsz > le32_to_cpu(hdr->srcaddr) ||
-	    *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize)) {
-		errno = EINVAL;
-		goto out;
-	}
+	    *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize))
+		goto err;
 
 	is_secure = kwboot_img_is_secure(img);
 
@@ -1470,8 +1458,7 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 		if (is_secure) {
 			fprintf(stderr,
 				"Image has secure header with signature for non-UART booting\n");
-			errno = EINVAL;
-			goto out;
+			goto err;
 		}
 
 		kwboot_printv("Patching image boot signature to UART\n");
@@ -1485,15 +1472,13 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 		if (image_ver == 0) {
 			fprintf(stderr,
 				"Cannot inject code for changing baudrate into v0 image header\n");
-			errno = EINVAL;
-			goto out;
+			goto err;
 		}
 
 		if (is_secure) {
 			fprintf(stderr,
 				"Cannot inject code for changing baudrate into image with secure header\n");
-			errno = EINVAL;
-			goto out;
+			goto err;
 		}
 
 		/*
@@ -1529,8 +1514,7 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 
 		if (is_secure) {
 			fprintf(stderr, "Cannot align image with secure header\n");
-			errno = EINVAL;
-			goto out;
+			goto err;
 		}
 
 		kwboot_printv("Aligning image header to Xmodem block size\n");
@@ -1540,9 +1524,10 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 	hdr->checksum = kwboot_hdr_csum8(hdr) - csum;
 
 	*size = le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize);
-	rc = 0;
-out:
-	return rc;
+	return 0;
+err:
+	errno = EINVAL;
+	return -1;
 }
 
 static void
-- 
2.32.0

[PATCH u-boot-marvell v3 36/39] tools: kwboot: Update file header

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Mention all supported platforms in file header.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 9da5b42ebf..6fa6dff04d 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -1,6 +1,7 @@
 /*
  * Boot a Marvell SoC, with Xmodem over UART0.
- *  supports Kirkwood, Dove, Armada 370, Armada XP
+ *  supports Kirkwood, Dove, Armada 370, Armada XP, Armada 375, Armada 38x and
+ *           Armada 39x
  *
  * (c) 2012 Daniel Stodden <daniel.stodden@gmail.com>
  *
-- 
2.32.0

[PATCH u-boot-marvell v3 37/39] tools: kwboot: Add Pali and Marek as authors

[Marek Behún]

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

Add Pali and Marek as another authors of the kwboot utility.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 6fa6dff04d..6a1a030308 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -4,6 +4,8 @@
  *           Armada 39x
  *
  * (c) 2012 Daniel Stodden <daniel.stodden@gmail.com>
+ * (c) 2021 Pali Rohár <pali@kernel.org>
+ * (c) 2021 Marek Behún <marek.behun@nic.cz>
  *
  * References: marvell.com, "88F6180, 88F6190, 88F6192, and 88F6281
  *   Integrated Controller: Functional Specifications" December 2,
-- 
2.32.0

[PATCH u-boot-marvell v3 38/39] doc/kwboot.1: Update man page

[Marek Behún]

From: Marek Behún <marek.behun@nic.cz>

Update man page for the kwboot utility.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 doc/kwboot.1 | 60 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/doc/kwboot.1 b/doc/kwboot.1
index 1e9ca268f7..acdea891d9 100644
--- a/doc/kwboot.1
+++ b/doc/kwboot.1
@@ -1,21 +1,22 @@
-.TH KWBOOT 1 "2012-05-19"
+.TH KWBOOT 1 "2021-08-25"
 
 .SH NAME
-kwboot \- Boot Marvell Kirkwood SoCs over a serial link.
+kwboot \- Boot Marvell Kirkwood (and others 32-bit) SoCs over a serial link.
 .SH SYNOPSIS
 .B kwboot
 .RB [ "-b \fIimage\fP" ]
-.RB [ "-p" ]
 .RB [ "-t" ]
 .RB [ "-B \fIbaudrate\fP" ]
 .RB \fITTY\fP
 .SH "DESCRIPTION"
 
-The \fBmkimage\fP program boots boards based on Marvell's Kirkwood
-platform over their integrated UART. Boot image files will typically
+The \fBkwboot\fP program boots boards based on Marvell's 32-bit
+platforms including Kirkwood, Dove, A370, AXP, A375, A38x
+and A39x over their integrated UART. Boot image files will typically
 contain a second stage boot loader, such as U-Boot. The image file
 must conform to Marvell's BootROM firmware image format
-(\fIkwbimage\fP), created using a tool such as \fBmkimage\fP.
+(\fIkwbimage v0\fP or \fIv1\fP), created using a tool such as
+\fBmkimage\fP.
 
 Following power-up or a system reset, system BootROM code polls the
 UART for a brief period of time, sensing a handshake message which
@@ -36,25 +37,23 @@ by the second-stage loader.
 Handshake; then upload file \fIimage\fP over \fITTY\fP.
 
 Note that for the encapsulated boot code to be executed, \fIimage\fP
-must be of type "UART boot" (0x69). Boot images of different types,
-such as backup images of vendor firmware downloaded from flash memory
-(type 0x8B), will not work (or not as expected). See \fB-p\fP for a
-workaround.
+must be of type "UART boot" (0x69). The \fBkwboot\fP program changes
+this type automatically, unless the \fIimage\fP is signed, in which
+case it cannot be changed.
 
 This mode writes handshake status and upload progress indication to
-stdout.
+stdout. It is possible that \fIimage\fP contains an optional binary
+code in it's header which may also print some output via UART (for
+example U-Boot SPL does this). In such a case, this output is also
+written to stdout after the header is sent.
 
 .TP
 .BI "\-p"
-In combination with \fB-b\fP, patches the header in \fIimage\fP prior
-to upload, to "UART boot" type.
+Obsolete. Does nothing.
 
-This option attempts on-the-fly conversion of some none-UART image
-types, such as images which were originally formatted to be stored in
-flash memory.
-
-Conversion is performed in memory. The contents of \fIimage\fP will
-not be altered.
+In the past, when this option was used, the program patched the header
+in the image prior upload, to "UART boot" type. This is now done by
+default.
 
 .TP
 .BI "\-t"
@@ -65,11 +64,26 @@ If used in combination with \fB-b\fP, terminal mode is entered
 immediately following a successful image upload.
 
 If standard I/O streams connect to a console, this mode will terminate
-after receiving 'ctrl-\\' followed by 'c' from console input.
+after receiving \fBctrl-\e\fP followed by \fBc\fP from console input.
 
 .TP
 .BI "\-B \fIbaudrate\fP"
-Adjust the baud rate on \fITTY\fP. Default rate is 115200.
+If used in combination with \fB-b\fP, inject into the image header
+code that changes baud rate to \fIbaudrate\fP after uploading image
+header, and code that changes the baud rate back to the default
+(115200 Bd) before executing payload, and also adjust the baud rate
+on \fITTY\fP correspondingly. This can make the upload significantly
+faster.
+
+If used in combination with \fB-t\fP, adjust the baud rate to
+\fIbaudrate\fP on \fITTY\fP before starting terminal.
+
+If both \fB-b\fP and \fB-t\fP are used, the baud rate is changed
+back to 115200 after the upload.
+
+Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
+230400, 460800, 500000, 576000, 921600, 1000000, 1152000, 1500000,
+2000000, 2500000, 3125000, 4000000 and 5200000.
 
 .SH "SEE ALSO"
 .PP
@@ -82,3 +96,7 @@ Daniel Stodden <daniel.stodden@gmail.com>
 Luka Perkov <luka@openwrt.org>
 .br
 David Purdy <david.c.purdy@gmail.com>
+.br
+Pali Rohár <pali@kernel.org>
+.br
+Marek Behún <marek.behun@nic.cz>
-- 
2.32.0

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Pali Rohár]

Hello!

Could you test or review this patch series?

It is a big improvement for kwboot as it allows to transfer u-boot over
uart into mvebu platforms much faster.

On Friday 24 September 2021 23:06:37 Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Hello Stefan and others,
> 
> here's v3 of series adding support for booting Marvell platforms via
> UART (those bootable with kwboot) at higher baudrates.
> 
> Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
> 115200 Bd.
> 
> The user can direct kwboot to use higher baudrate via the -B option.
> (BTW this option was there before but did not work with the -b option.)
> 
> Only the payload part of the KWB image is uploaded at this higher
> baudrate. The header part is still uploaded at 115200 Bd, since the code
> that changes baudrate is injected into header as a binary extension.
> (The payload part makes up majority of the binary, though. On Turris
>  Omnia the payload currently makes ~87%.)
> 
> The series also contains various other fixes, refactors and improvements
> of the code, upon which the main change is done.
> 
> Marek & Pali
> 
> Changes since v2:
> - fixed integer overflow in patch 15
> - fixed commit title in patch 32
> 
> Changes since v1:
> - fixed uploading of older kwb images, now all kwb images should be able
>   to upload at faster baudrate
> - fixed injecting code that changes baudrate back
> - various other fixes and refactors, the best way to compare with v1 is
>   to apply v1 and v2 separately and compare the resulting kwboot.c
> 
> Marek Behún (19):
>   tools: kwbimage: Fix printf format warning
>   tools: kwboot: Fix buffer overflow in kwboot_terminal()
>   tools: kwboot: Make the quit sequence buffer const
>   tools: kwboot: Refactor and fix writing buffer
>   tools: kwboot: Fix comparison of integers with different size
>   tools: kwboot: Use a function to check whether received byte is a
>     Xmodem reply
>   tools: kwboot: Print new line after SPL output
>   tools: kwboot: Allow greater timeout when executing header code
>   tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
>     received
>   tools: kwbimage: Simplify iteration over version 1 optional headers
>   tools: kwbimage: Refactor image_version()
>   tools: kwbimage: Refactor kwbimage header size determination
>   tools: kwboot: Explicitly check against size of struct main_hdr_v1
>   tools: kwboot: Check whether baudrate was set to requested value
>   tools: kwboot: Cosmetic fix
>   tools: kwboot: Avoid code repetition in kwboot_img_patch()
>   tools: kwboot: Update file header
>   doc/kwboot.1: Update man page
>   MAINTAINERS: Add entry for kwbimage / kwboot tools
> 
> Pali Rohár (20):
>   tools: kwboot: Print version information header
>   tools: kwboot: Fix kwboot_xm_sendblock() function when
>     kwboot_tty_recv() fails
>   tools: kwboot: Fix return type of kwboot_xm_makeblock() function
>   tools: kwboot: Fix printing progress
>   tools: kwboot: Print newline on error when progress was not completed
>   tools: kwboot: Split sending image into header and data stages
>   tools: kwboot: Allow non-xmodem text output from BootROM only in a
>     specific case
>   tools: kwboot: Properly finish xmodem transfer
>   tools: kwboot: Always call kwboot_img_patch_hdr()
>   tools: kwboot: Don't patch image header if signed
>   tools: kwboot: Patch source address in image header
>   tools: kwboot: Patch destination address to DDR area for SPI image
>   tools: kwbimage: Update comments describing kwbimage v1 structures
>   tools: kwboot: Round up header size to 128 B when patching
>   tools: kwboot: Support higher baudrates when booting via UART
>   tools: kwboot: Allow any baudrate on Linux
>   tools: kwboot: Fix initializing tty device
>   tools: kwboot: Disable tty interbyte timeout
>   tools: kwboot: Disable non-blocking mode
>   tools: kwboot: Add Pali and Marek as authors
> 
>  MAINTAINERS           |   10 +
>  doc/kwboot.1          |   60 ++-
>  tools/kwbimage.c      |  130 ++---
>  tools/kwbimage.h      |   99 +++-
>  tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
>  tools/termios_linux.h |  189 +++++++
>  6 files changed, 1385 insertions(+), 300 deletions(-)
>  create mode 100644 tools/termios_linux.h
> 
> -- 
> 2.32.0
> 

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Pali,

On 30.09.21 20:14, Pali Rohár wrote:
> Hello!
> 
> Could you test or review this patch series?

It's on my list.

> It is a big improvement for kwboot as it allows to transfer u-boot over
> uart into mvebu platforms much faster.

Very much appreciated. I'll try to find some time today to review it
and perhaps push it to next soon.

Thanks,
Stefan

> On Friday 24 September 2021 23:06:37 Marek Behún wrote:
>> From: Marek Behún <marek.behun@nic.cz>
>>
>> Hello Stefan and others,
>>
>> here's v3 of series adding support for booting Marvell platforms via
>> UART (those bootable with kwboot) at higher baudrates.
>>
>> Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
>> 115200 Bd.
>>
>> The user can direct kwboot to use higher baudrate via the -B option.
>> (BTW this option was there before but did not work with the -b option.)
>>
>> Only the payload part of the KWB image is uploaded at this higher
>> baudrate. The header part is still uploaded at 115200 Bd, since the code
>> that changes baudrate is injected into header as a binary extension.
>> (The payload part makes up majority of the binary, though. On Turris
>>   Omnia the payload currently makes ~87%.)
>>
>> The series also contains various other fixes, refactors and improvements
>> of the code, upon which the main change is done.
>>
>> Marek & Pali
>>
>> Changes since v2:
>> - fixed integer overflow in patch 15
>> - fixed commit title in patch 32
>>
>> Changes since v1:
>> - fixed uploading of older kwb images, now all kwb images should be able
>>    to upload at faster baudrate
>> - fixed injecting code that changes baudrate back
>> - various other fixes and refactors, the best way to compare with v1 is
>>    to apply v1 and v2 separately and compare the resulting kwboot.c
>>
>> Marek Behún (19):
>>    tools: kwbimage: Fix printf format warning
>>    tools: kwboot: Fix buffer overflow in kwboot_terminal()
>>    tools: kwboot: Make the quit sequence buffer const
>>    tools: kwboot: Refactor and fix writing buffer
>>    tools: kwboot: Fix comparison of integers with different size
>>    tools: kwboot: Use a function to check whether received byte is a
>>      Xmodem reply
>>    tools: kwboot: Print new line after SPL output
>>    tools: kwboot: Allow greater timeout when executing header code
>>    tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
>>      received
>>    tools: kwbimage: Simplify iteration over version 1 optional headers
>>    tools: kwbimage: Refactor image_version()
>>    tools: kwbimage: Refactor kwbimage header size determination
>>    tools: kwboot: Explicitly check against size of struct main_hdr_v1
>>    tools: kwboot: Check whether baudrate was set to requested value
>>    tools: kwboot: Cosmetic fix
>>    tools: kwboot: Avoid code repetition in kwboot_img_patch()
>>    tools: kwboot: Update file header
>>    doc/kwboot.1: Update man page
>>    MAINTAINERS: Add entry for kwbimage / kwboot tools
>>
>> Pali Rohár (20):
>>    tools: kwboot: Print version information header
>>    tools: kwboot: Fix kwboot_xm_sendblock() function when
>>      kwboot_tty_recv() fails
>>    tools: kwboot: Fix return type of kwboot_xm_makeblock() function
>>    tools: kwboot: Fix printing progress
>>    tools: kwboot: Print newline on error when progress was not completed
>>    tools: kwboot: Split sending image into header and data stages
>>    tools: kwboot: Allow non-xmodem text output from BootROM only in a
>>      specific case
>>    tools: kwboot: Properly finish xmodem transfer
>>    tools: kwboot: Always call kwboot_img_patch_hdr()
>>    tools: kwboot: Don't patch image header if signed
>>    tools: kwboot: Patch source address in image header
>>    tools: kwboot: Patch destination address to DDR area for SPI image
>>    tools: kwbimage: Update comments describing kwbimage v1 structures
>>    tools: kwboot: Round up header size to 128 B when patching
>>    tools: kwboot: Support higher baudrates when booting via UART
>>    tools: kwboot: Allow any baudrate on Linux
>>    tools: kwboot: Fix initializing tty device
>>    tools: kwboot: Disable tty interbyte timeout
>>    tools: kwboot: Disable non-blocking mode
>>    tools: kwboot: Add Pali and Marek as authors
>>
>>   MAINTAINERS           |   10 +
>>   doc/kwboot.1          |   60 ++-
>>   tools/kwbimage.c      |  130 ++---
>>   tools/kwbimage.h      |   99 +++-
>>   tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
>>   tools/termios_linux.h |  189 +++++++
>>   6 files changed, 1385 insertions(+), 300 deletions(-)
>>   create mode 100644 tools/termios_linux.h
>>
>> -- 
>> 2.32.0
>>


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 01/39] tools: kwbimage: Fix printf format warning

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> On 32-bit ARM the compiler complains:
>    tools/kwbimage.c:547: warning: format ‘%lu’ expects argument of type
>                                   ‘long unsigned int’, but argument 4 has
> 		                 type ‘unsigned int’
> 
> Fix this by using %zu instead of %lu format specifier.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index d200ff2425..e72555fe74 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -542,7 +542,7 @@ static int kwb_export_pubkey(RSA *key, struct pubkey_der_v1 *dst, FILE *hashf,
>   	}
>   
>   	if (4 + size_seq > sizeof(dst->key)) {
> -		fprintf(stderr, "export pk failed: seq too large (%d, %lu)\n",
> +		fprintf(stderr, "export pk failed: seq too large (%d, %zu)\n",
>   			4 + size_seq, sizeof(dst->key));
>   		fprintf(stderr, errmsg, keyname);
>   		return -ENOBUFS;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 02/39] tools: kwboot: Fix buffer overflow in kwboot_terminal()

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> The `in` variable is set to -1 in kwboot_terminal() if stdin is not a
> tty. In this case we should not look whether -1 is set in fd_set, for it
> can lead to a buffer overflow, which can be reproduced with
>    echo "xyz" | ./tools/kwboot -t /dev/ttyUSB0
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 7feeaa45a2..e6e99849a7 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -552,7 +552,7 @@ kwboot_terminal(int tty)
>   				break;
>   		}
>   
> -		if (FD_ISSET(in, &rfds)) {
> +		if (in >= 0 && FD_ISSET(in, &rfds)) {
>   			rc = kwboot_term_pipe(in, tty, quit, &s);
>   			if (rc)
>   				break;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 03/39] tools: kwboot: Make the quit sequence buffer const

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> This buffer is never written to. Make it const.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index e6e99849a7..f18f6d2134 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -460,7 +460,7 @@ can:
>   }
>   
>   static int
> -kwboot_term_pipe(int in, int out, char *quit, int *s)
> +kwboot_term_pipe(int in, int out, const char *quit, int *s)
>   {
>   	ssize_t nin, nout;
>   	char _buf[128], *buf = _buf;
> @@ -504,7 +504,7 @@ static int
>   kwboot_terminal(int tty)
>   {
>   	int rc, in, s;
> -	char *quit = "\34c";
> +	const char *quit = "\34c";
>   	struct termios otio, tio;
>   
>   	rc = -1;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 04/39] tools: kwboot: Refactor and fix writing buffer

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> There are 3 instances in kwboot.c where we need to write() a given
> buffer whole (iteratively writing until all data are written), and 2 of
> those instances are wrong, for they do not increment the buffer pointer.
> 
> Refactor the code into a new function kwboot_write() where it is fixed.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 55 ++++++++++++++++++++++++--------------------------
>   1 file changed, 26 insertions(+), 29 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index f18f6d2134..22cdd137ad 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -72,6 +72,23 @@ static int msg_req_delay = KWBOOT_MSG_REQ_DELAY;
>   static int msg_rsp_timeo = KWBOOT_MSG_RSP_TIMEO;
>   static int blk_rsp_timeo = KWBOOT_BLK_RSP_TIMEO;
>   
> +static ssize_t
> +kwboot_write(int fd, const char *buf, size_t len)
> +{
> +	size_t tot = 0;
> +
> +	while (tot < len) {
> +		ssize_t wr = write(fd, buf + tot, len - tot);
> +
> +		if (wr < 0)
> +			return -1;
> +
> +		tot += wr;
> +	}
> +
> +	return tot;
> +}
> +
>   static void
>   kwboot_printv(const char *fmt, ...)
>   {
> @@ -191,26 +208,13 @@ out:
>   static int
>   kwboot_tty_send(int fd, const void *buf, size_t len)
>   {
> -	int rc;
> -	ssize_t n;
> -
>   	if (!buf)
>   		return 0;
>   
> -	rc = -1;
> -
> -	do {
> -		n = write(fd, buf, len);
> -		if (n < 0)
> -			goto out;
> -
> -		buf = (char *)buf + n;
> -		len -= n;
> -	} while (len > 0);
> +	if (kwboot_write(fd, buf, len) < 0)
> +		return -1;
>   
> -	rc = tcdrain(fd);
> -out:
> -	return rc;
> +	return tcdrain(fd);
>   }
>   
>   static int
> @@ -462,7 +466,7 @@ can:
>   static int
>   kwboot_term_pipe(int in, int out, const char *quit, int *s)
>   {
> -	ssize_t nin, nout;
> +	ssize_t nin;
>   	char _buf[128], *buf = _buf;
>   
>   	nin = read(in, buf, sizeof(_buf));
> @@ -480,22 +484,15 @@ kwboot_term_pipe(int in, int out, const char *quit, int *s)
>   				buf++;
>   				nin--;
>   			} else {
> -				while (*s > 0) {
> -					nout = write(out, quit, *s);
> -					if (nout <= 0)
> -						return -1;
> -					(*s) -= nout;
> -				}
> +				if (kwboot_write(out, quit, *s) < 0)
> +					return -1;
> +				*s = 0;
>   			}
>   		}
>   	}
>   
> -	while (nin > 0) {
> -		nout = write(out, buf, nin);
> -		if (nout <= 0)
> -			return -1;
> -		nin -= nout;
> -	}
> +	if (kwboot_write(out, buf, nin) < 0)
> +		return -1;
>   
>   	return 0;
>   }
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 05/39] tools: kwboot: Print version information header

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Print kwboot's (U-Boot's) version when printing usage.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 22cdd137ad..454339db14 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -11,6 +11,7 @@
>   
>   #include "kwbimage.h"
>   #include "mkimage.h"
> +#include "version.h"
>   
>   #include <stdlib.h>
>   #include <stdio.h>
> @@ -681,6 +682,7 @@ out:
>   static void
>   kwboot_usage(FILE *stream, char *progname)
>   {
> +	fprintf(stream, "kwboot version %s\n", PLAIN_VERSION);
>   	fprintf(stream,
>   		"Usage: %s [OPTIONS] [-b <image> | -D <image> ] [-B <baud> ] <TTY>\n",
>   		progname);
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 06/39] tools: kwboot: Fix kwboot_xm_sendblock() function when kwboot_tty_recv() fails

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> When kwboot_tty_recv() fails or times out, it does not set the `c`
> variable to NAK. The variable is then compared, while it holds either
> an undefined value or a value from previous iteration. Set `c` to NAK so
> that the other side will try to resend current block, and remove the
> now unnecessary break.
> 
> In other failure cases return immediately.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 454339db14..b9a402ca91 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -380,12 +380,15 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
>   	do {
>   		rc = kwboot_tty_send(fd, block, sizeof(*block));
>   		if (rc)
> -			break;
> +			return rc;
>   
>   		do {
>   			rc = kwboot_tty_recv(fd, &c, 1, blk_rsp_timeo);
> -			if (rc)
> -				break;
> +			if (rc) {
> +				if (errno != ETIMEDOUT)
> +					return rc;
> +				c = NAK;
> +			}
>   
>   			if (c != ACK && c != NAK && c != CAN)
>   				printf("%c", c);
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 07/39] tools: kwboot: Fix return type of kwboot_xm_makeblock() function

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Function kwboot_xm_makeblock() always returns length of xmodem block. It
> is always non-negative and calculated from variable with size_t type. Set
> return type of this function to size_t and remove dead code which checks
> for negative value.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index b9a402ca91..88353d19c0 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -347,7 +347,7 @@ kwboot_debugmsg(int tty, void *msg)
>   	return rc;
>   }
>   
> -static int
> +static size_t
>   kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
>   		    size_t size, int pnum)
>   {
> @@ -441,9 +441,6 @@ kwboot_xmodem(int tty, const void *_data, size_t size)
>   		n = kwboot_xm_makeblock(&block,
>   					data + N, size - N,
>   					pnum++);
> -		if (n < 0)
> -			goto can;
> -
>   		if (!n)
>   			break;
>   
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 08/39] tools: kwboot: Fix comparison of integers with different size

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> The compiler complains that we are comparing int with size_t when
> compiled with -W.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 88353d19c0..3d9f73e697 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -352,8 +352,7 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
>   		    size_t size, int pnum)
>   {
>   	const size_t blksz = sizeof(block->data);
> -	size_t n;
> -	int i;
> +	size_t i, n;
>   
>   	block->soh = SOH;
>   	block->pnum = pnum;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 09/39] tools: kwboot: Fix printing progress

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Ensure that `pos` is still in range up to the `width` so printing 100%
> works also for bigger images. After printing 100% progress reset it to
> zero, so that next progressbar can be started.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 3d9f73e697..eb4b3fe230 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -140,12 +140,14 @@ __progress(int pct, char c)
>   	fputc(c, stdout);
>   
>   	nl = "]\n";
> -	pos++;
> +	pos = (pos + 1) % width;
>   
>   	if (pct == 100) {
> -		while (pos++ < width)
> +		while (pos && pos++ < width)
>   			fputc(' ', stdout);
>   		fputs(nl, stdout);
> +		nl = "";
> +		pos = 0;
>   	}
>   
>   	fflush(stdout);
> @@ -162,6 +164,9 @@ kwboot_progress(int _pct, char c)
>   
>   	if (kwboot_verbose)
>   		__progress(pct, c);
> +
> +	if (pct == 100)
> +		pct = 0;
>   }
>   
>   static int
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 10/39] tools: kwboot: Print newline on error when progress was not completed

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> When progress was not completed, current terminal position is in progress
> bar. So print newline before printing error message to make error message
> more readable.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index eb4b3fe230..0e533e3698 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -459,6 +459,7 @@ kwboot_xmodem(int tty, const void *_data, size_t size)
>   	rc = kwboot_tty_send_char(tty, EOT);
>   
>   out:
> +	kwboot_printv("\n");
>   	return rc;
>   
>   can:
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 11/39] tools: kwboot: Split sending image into header and data stages

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> This change is required to implement other features in kwboot.
> 
> Split sending header and data parts of the image into two stages.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ refactored ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.h |  8 +++--
>   tools/kwboot.c   | 84 +++++++++++++++++++++++++++++++-----------------
>   2 files changed, 61 insertions(+), 31 deletions(-)
> 
> diff --git a/tools/kwbimage.h b/tools/kwbimage.h
> index e063e3e41e..074bdfbe46 100644
> --- a/tools/kwbimage.h
> +++ b/tools/kwbimage.h
> @@ -195,6 +195,10 @@ struct register_set_hdr_v1 {
>   #define OPT_HDR_V1_BINARY_TYPE   0x2
>   #define OPT_HDR_V1_REGISTER_TYPE 0x3
>   
> +#define KWBHEADER_V0_SIZE(hdr) \
> +	(((hdr)->ext & 0x1) ? sizeof(struct kwb_header) : \
> +			      sizeof(struct main_hdr_v0))
> +
>   #define KWBHEADER_V1_SIZE(hdr) \
>   	(((hdr)->headersz_msb << 16) | le16_to_cpu((hdr)->headersz_lsb))
>   
> @@ -225,9 +229,9 @@ void init_kwb_image_type (void);
>    * header, byte 8 was reserved, and always set to 0. In the v1 header,
>    * byte 8 has been changed to a proper field, set to 1.
>    */
> -static inline unsigned int image_version(void *header)
> +static inline unsigned int image_version(const void *header)
>   {
> -	unsigned char *ptr = header;
> +	const unsigned char *ptr = header;
>   	return ptr[8];
>   }
>   
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 0e533e3698..7f231c0823 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -57,11 +57,13 @@ static unsigned char kwboot_msg_debug[] = {
>   #define NAK	21	/* target block negative ack */
>   #define CAN	24	/* target/sender transfer cancellation */
>   
> +#define KWBOOT_XM_BLKSZ	128 /* xmodem block size */
> +
>   struct kwboot_block {
>   	uint8_t soh;
>   	uint8_t pnum;
>   	uint8_t _pnum;
> -	uint8_t data[128];
> +	uint8_t data[KWBOOT_XM_BLKSZ];
>   	uint8_t csum;
>   } __packed;
>   
> @@ -356,16 +358,15 @@ static size_t
>   kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
>   		    size_t size, int pnum)
>   {
> -	const size_t blksz = sizeof(block->data);
>   	size_t i, n;
>   
>   	block->soh = SOH;
>   	block->pnum = pnum;
>   	block->_pnum = ~block->pnum;
>   
> -	n = size < blksz ? size : blksz;
> +	n = size < KWBOOT_XM_BLKSZ ? size : KWBOOT_XM_BLKSZ;
>   	memcpy(&block->data[0], data, n);
> -	memset(&block->data[n], 0, blksz - n);
> +	memset(&block->data[n], 0, KWBOOT_XM_BLKSZ - n);
>   
>   	block->csum = 0;
>   	for (i = 0; i < n; i++)
> @@ -425,48 +426,73 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
>   }
>   
>   static int
> -kwboot_xmodem(int tty, const void *_data, size_t size)
> +kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
> +		  size_t size)
>   {
> -	const uint8_t *data = _data;
> -	int rc, pnum, N, err;
> -
> -	pnum = 1;
> -	N = 0;
> +	size_t sent, left;
> +	int rc;
>   
> -	kwboot_printv("Sending boot image...\n");
> +	kwboot_printv("Sending boot image %s (%zu bytes)...\n",
> +		      header ? "header" : "data", size);
>   
> -	sleep(2); /* flush isn't effective without it */
> -	tcflush(tty, TCIOFLUSH);
> +	left = size;
> +	sent = 0;
>   
> -	do {
> +	while (sent < size) {
>   		struct kwboot_block block;
> -		int n;
> +		size_t blksz;
>   
> -		n = kwboot_xm_makeblock(&block,
> -					data + N, size - N,
> -					pnum++);
> -		if (!n)
> -			break;
> +		blksz = kwboot_xm_makeblock(&block, data, left, (*pnum)++);
> +		data += blksz;
>   
>   		rc = kwboot_xm_sendblock(tty, &block);
>   		if (rc)
>   			goto out;
>   
> -		N += n;
> -		kwboot_progress(N * 100 / size, '.');
> -	} while (1);
> +		sent += blksz;
> +		left -= blksz;
> +
> +		kwboot_progress(sent * 100 / size, '.');
> +	}
>   
> -	rc = kwboot_tty_send_char(tty, EOT);
> +	kwboot_printv("Done\n");
>   
> +	return 0;
>   out:
>   	kwboot_printv("\n");
>   	return rc;
> +}
>   
> -can:
> -	err = errno;
> -	kwboot_tty_send_char(tty, CAN);
> -	errno = err;
> -	goto out;
> +static int
> +kwboot_xmodem(int tty, const void *_img, size_t size)
> +{
> +	const uint8_t *img = _img;
> +	int rc, pnum;
> +	size_t hdrsz;
> +
> +	if (image_version(img) == 0)
> +		hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
> +	else
> +		hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
> +
> +	kwboot_printv("Waiting 2s and flushing tty\n");
> +	sleep(2); /* flush isn't effective without it */
> +	tcflush(tty, TCIOFLUSH);
> +
> +	pnum = 1;
> +
> +	rc = kwboot_xmodem_one(tty, &pnum, 1, img, hdrsz);
> +	if (rc)
> +		return rc;
> +
> +	img += hdrsz;
> +	size -= hdrsz;
> +
> +	rc = kwboot_xmodem_one(tty, &pnum, 0, img, size);
> +	if (rc)
> +		return rc;
> +
> +	return kwboot_tty_send_char(tty, EOT);
>   }
>   
>   static int
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 12/39] tools: kwboot: Use a function to check whether received byte is a Xmodem reply

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> This is a non-functional change that should make the code more readable.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 7f231c0823..2e5684b91c 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -375,6 +375,12 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
>   	return n;
>   }
>   
> +static int
> +_is_xm_reply(char c)
> +{
> +	return c == ACK || c == NAK || c == CAN;
> +}
> +
>   static int
>   kwboot_xm_sendblock(int fd, struct kwboot_block *block)
>   {
> @@ -395,10 +401,10 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
>   				c = NAK;
>   			}
>   
> -			if (c != ACK && c != NAK && c != CAN)
> +			if (!_is_xm_reply(c))
>   				printf("%c", c);
>   
> -		} while (c != ACK && c != NAK && c != CAN);
> +		} while (!_is_xm_reply(c));
>   
>   		if (c != ACK)
>   			kwboot_progress(-1, '+');
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 13/39] tools: kwboot: Allow non-xmodem text output from BootROM only in a specific case

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> When sending image header / image data, BootROM does not send any
> non-xmodem text output. We should therefore interpret unknown bytes in
> the xmodem protocol as errors and resend current packet. This should
> improve the transfer in case there are errors on the UART line.
> 
> Text output from BootROM may only happen after whole image header is
> sent and before ACK for the last packet of image header is received.
> In this case BootROM may execute code from the image, which may interact
> with UART (U-Boot SPL, for example, prints stuff on UART).
> 
> Print received non-xmodem output from BootROM only in this case.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ refactored & simplified ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 70 ++++++++++++++++++++++++++++++++++++++------------
>   1 file changed, 53 insertions(+), 17 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 2e5684b91c..4636622a6c 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -382,33 +382,62 @@ _is_xm_reply(char c)
>   }
>   
>   static int
> -kwboot_xm_sendblock(int fd, struct kwboot_block *block)
> +kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
> +{
> +	int rc;
> +
> +	while (1) {
> +		rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
> +		if (rc) {
> +			if (errno != ETIMEDOUT)
> +				return rc;
> +			*c = NAK;
> +		}
> +
> +		/* If received xmodem reply, end. */
> +		if (_is_xm_reply(*c))
> +			break;
> +
> +		/*
> +		 * If printing non-xmodem text output is allowed and such a byte
> +		 * was received, print it.
> +		 */
> +		if (allow_non_xm) {
> +			putchar(*c);
> +			fflush(stdout);
> +		}
> +	}
> +
> +	return 0;
> +}
> +
> +static int
> +kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
> +		    int *done_print)
>   {
>   	int rc, retries;
>   	char c;
>   
> +	*done_print = 0;
> +
>   	retries = 16;
>   	do {
>   		rc = kwboot_tty_send(fd, block, sizeof(*block));
>   		if (rc)
>   			return rc;
>   
> -		do {
> -			rc = kwboot_tty_recv(fd, &c, 1, blk_rsp_timeo);
> -			if (rc) {
> -				if (errno != ETIMEDOUT)
> -					return rc;
> -				c = NAK;
> -			}
> -
> -			if (!_is_xm_reply(c))
> -				printf("%c", c);
> +		if (allow_non_xm && !*done_print) {
> +			kwboot_progress(100, '.');
> +			kwboot_printv("Done\n");
> +			*done_print = 1;
> +		}
>   
> -		} while (!_is_xm_reply(c));
> +		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm);
> +		if (rc)
> +			return rc;
>   
> -		if (c != ACK)
> +		if (!allow_non_xm && c != ACK)
>   			kwboot_progress(-1, '+');
> -
>   	} while (c == NAK && retries-- > 0);
>   
>   	rc = -1;
> @@ -435,6 +464,7 @@ static int
>   kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
>   		  size_t size)
>   {
> +	int done_print = 0;
>   	size_t sent, left;
>   	int rc;
>   
> @@ -446,22 +476,28 @@ kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
>   
>   	while (sent < size) {
>   		struct kwboot_block block;
> +		int last_block;
>   		size_t blksz;
>   
>   		blksz = kwboot_xm_makeblock(&block, data, left, (*pnum)++);
>   		data += blksz;
>   
> -		rc = kwboot_xm_sendblock(tty, &block);
> +		last_block = (left <= blksz);
> +
> +		rc = kwboot_xm_sendblock(tty, &block, header && last_block,
> +					 &done_print);
>   		if (rc)
>   			goto out;
>   
>   		sent += blksz;
>   		left -= blksz;
>   
> -		kwboot_progress(sent * 100 / size, '.');
> +		if (!done_print)
> +			kwboot_progress(sent * 100 / size, '.');
>   	}
>   
> -	kwboot_printv("Done\n");
> +	if (!done_print)
> +		kwboot_printv("Done\n");
>   
>   	return 0;
>   out:
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 14/39] tools: kwboot: Print new line after SPL output

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> There is no separation between output from the code from binary header
> (U-Boot SPL in most cases) and subsequent kwboot output.
> 
> Print '\n' to make distinguishing these two easier.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 4636622a6c..2f4c61bed6 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -382,10 +382,12 @@ _is_xm_reply(char c)
>   }
>   
>   static int
> -kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
> +kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   {
>   	int rc;
>   
> +	*non_xm_print = 0;
> +
>   	while (1) {
>   		rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
>   		if (rc) {
> @@ -405,6 +407,7 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm)
>   		if (allow_non_xm) {
>   			putchar(*c);
>   			fflush(stdout);
> +			*non_xm_print = 1;
>   		}
>   	}
>   
> @@ -415,6 +418,7 @@ static int
>   kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
>   		    int *done_print)
>   {
> +	int non_xm_print;
>   	int rc, retries;
>   	char c;
>   
> @@ -432,7 +436,7 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
>   			*done_print = 1;
>   		}
>   
> -		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm);
> +		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print);
>   		if (rc)
>   			return rc;
>   
> @@ -440,6 +444,9 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
>   			kwboot_progress(-1, '+');
>   	} while (c == NAK && retries-- > 0);
>   
> +	if (non_xm_print)
> +		kwboot_printv("\n");
> +
>   	rc = -1;
>   
>   	switch (c) {
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 15/39] tools: kwboot: Allow greater timeout when executing header code

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> When executing header code (which contains U-Boot SPL in most cases),
> wait 10s after every non-xmodem character received (i.e. printed by
> U-Boot SPL) before timing out.
> 
> Sometimes DDR training, which runs in SPL, may be slow.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 34 +++++++++++++++++++++++++++++++---
>   1 file changed, 31 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 2f4c61bed6..cf6e32c6fa 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -24,6 +24,7 @@
>   #include <unistd.h>
>   #include <stdint.h>
>   #include <termios.h>
> +#include <time.h>
>   #include <sys/mman.h>
>   #include <sys/stat.h>
>   
> @@ -68,6 +69,7 @@ struct kwboot_block {
>   } __packed;
>   
>   #define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */
> +#define KWBOOT_HDR_RSP_TIMEO 10000 /* ms */
>   
>   static int kwboot_verbose;
>   
> @@ -375,6 +377,26 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data,
>   	return n;
>   }
>   
> +static uint64_t
> +_now(void)
> +{
> +	struct timespec ts;
> +
> +	if (clock_gettime(CLOCK_MONOTONIC, &ts)) {
> +		static int err_print;
> +
> +		if (!err_print) {
> +			perror("clock_gettime() does not work");
> +			err_print = 1;
> +		}
> +
> +		/* this will just make the timeout not work */
> +		return -1ULL;
> +	}
> +
> +	return ts.tv_sec * 1000ULL + (ts.tv_nsec + 500000) / 1000000;
> +}
> +
>   static int
>   _is_xm_reply(char c)
>   {
> @@ -384,16 +406,21 @@ _is_xm_reply(char c)
>   static int
>   kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   {
> +	int timeout = allow_non_xm ? KWBOOT_HDR_RSP_TIMEO : blk_rsp_timeo;
> +	uint64_t recv_until = 0;
>   	int rc;
>   
>   	*non_xm_print = 0;
>   
>   	while (1) {
> -		rc = kwboot_tty_recv(fd, c, 1, blk_rsp_timeo);
> +		rc = kwboot_tty_recv(fd, c, 1, timeout);
>   		if (rc) {
>   			if (errno != ETIMEDOUT)
>   				return rc;
> -			*c = NAK;
> +			else if (recv_until && recv_until < _now())
> +				return -1;
> +			else
> +				*c = NAK;
>   		}
>   
>   		/* If received xmodem reply, end. */
> @@ -402,9 +429,10 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   
>   		/*
>   		 * If printing non-xmodem text output is allowed and such a byte
> -		 * was received, print it.
> +		 * was received, print it and increase receiving time.
>   		 */
>   		if (allow_non_xm) {
> +			recv_until = _now() + timeout;
>   			putchar(*c);
>   			fflush(stdout);
>   			*non_xm_print = 1;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 16/39] tools: kwboot: Prevent waiting indefinitely if no xmodem reply is received

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Currently if BootROM fails to respond with ACK/NAK to a xmodem block, we
> will be waiting indefinitely for such response.
> 
> Make sure that we only wait at most 1 second (blk_rsp_timeo) for ACK/NAK
> for each block in case non-xmodem text output is not being expected.
> Interpret this timeout expiration as NAK, to try to send the block
> again.
> 
> On the other hand, if timeout expires without ACK while some non-xmodem
> output was already received (DDR training output, for example), we know
> that the block was received, since the code is being executed, so in
> this case exit with ETIMEDOUT.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 14 +++++++++++---
>   1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index cf6e32c6fa..8c11dca5ed 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -407,17 +407,18 @@ static int
>   kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   {
>   	int timeout = allow_non_xm ? KWBOOT_HDR_RSP_TIMEO : blk_rsp_timeo;
> -	uint64_t recv_until = 0;
> +	uint64_t recv_until = _now() + timeout;
>   	int rc;
>   
> -	*non_xm_print = 0;
> +	if (non_xm_print)
> +		*non_xm_print = 0;
>   
>   	while (1) {
>   		rc = kwboot_tty_recv(fd, c, 1, timeout);
>   		if (rc) {
>   			if (errno != ETIMEDOUT)
>   				return rc;
> -			else if (recv_until && recv_until < _now())
> +			else if (allow_non_xm && *non_xm_print)
>   				return -1;
>   			else
>   				*c = NAK;
> @@ -430,12 +431,19 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   		/*
>   		 * If printing non-xmodem text output is allowed and such a byte
>   		 * was received, print it and increase receiving time.
> +		 * Otherwise decrease timeout by time elapsed.
>   		 */
>   		if (allow_non_xm) {
>   			recv_until = _now() + timeout;
>   			putchar(*c);
>   			fflush(stdout);
>   			*non_xm_print = 1;
> +		} else {
> +			timeout = recv_until - _now();
> +			if (timeout < 0) {
> +				errno = ETIMEDOUT;
> +				return -1;
> +			}
>   		}
>   	}
>   
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 17/39] tools: kwboot: Properly finish xmodem transfer

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> After kwboot sends EOT, BootROM sends back ACK. Add code for handling
> this and retry sending EOT on error.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ refactored ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 62 ++++++++++++++++++++++++++++++++++++--------------
>   1 file changed, 45 insertions(+), 17 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 8c11dca5ed..ad91afd075 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -403,6 +403,29 @@ _is_xm_reply(char c)
>   	return c == ACK || c == NAK || c == CAN;
>   }
>   
> +static int
> +_xm_reply_to_error(int c)
> +{
> +	int rc = -1;
> +
> +	switch (c) {
> +	case ACK:
> +		rc = 0;
> +		break;
> +	case NAK:
> +		errno = EBADMSG;
> +		break;
> +	case CAN:
> +		errno = ECANCELED;
> +		break;
> +	default:
> +		errno = EPROTO;
> +		break;
> +	}
> +
> +	return rc;
> +}
> +
>   static int
>   kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   {
> @@ -483,24 +506,29 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
>   	if (non_xm_print)
>   		kwboot_printv("\n");
>   
> -	rc = -1;
> +	return _xm_reply_to_error(c);
> +}
>   
> -	switch (c) {
> -	case ACK:
> -		rc = 0;
> -		break;
> -	case NAK:
> -		errno = EBADMSG;
> -		break;
> -	case CAN:
> -		errno = ECANCELED;
> -		break;
> -	default:
> -		errno = EPROTO;
> -		break;
> -	}
> +static int
> +kwboot_xm_finish(int fd)
> +{
> +	int rc, retries;
> +	char c;
>   
> -	return rc;
> +	kwboot_printv("Finishing transfer\n");
> +
> +	retries = 16;
> +	do {
> +		rc = kwboot_tty_send_char(fd, EOT);
> +		if (rc)
> +			return rc;
> +
> +		rc = kwboot_xm_recv_reply(fd, &c, 0, NULL);
> +		if (rc)
> +			return rc;
> +	} while (c == NAK && retries-- > 0);
> +
> +	return _xm_reply_to_error(c);
>   }
>   
>   static int
> @@ -577,7 +605,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
>   	if (rc)
>   		return rc;
>   
> -	return kwboot_tty_send_char(tty, EOT);
> +	return kwboot_xm_finish(tty);
>   }
>   
>   static int
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 18/39] tools: kwboot: Always call kwboot_img_patch_hdr()

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> The kwboot_img_patch_hdr() function already decides if header patching
> is needed. Always call this function and deprecate the unneeded command
> line option `-p`.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 23 ++++++-----------------
>   1 file changed, 6 insertions(+), 17 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index ad91afd075..9394a51380 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -709,9 +709,9 @@ out:
>   }
>   
>   static void *
> -kwboot_mmap_image(const char *path, size_t *size, int prot)
> +kwboot_mmap_image(const char *path, size_t *size)
>   {
> -	int rc, fd, flags;
> +	int rc, fd;
>   	struct stat st;
>   	void *img;
>   
> @@ -726,9 +726,7 @@ kwboot_mmap_image(const char *path, size_t *size, int prot)
>   	if (rc)
>   		goto out;
>   
> -	flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED;
> -
> -	img = mmap(NULL, st.st_size, prot, flags, fd, 0);
> +	img = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
>   	if (img == MAP_FAILED) {
>   		img = NULL;
>   		goto out;
> @@ -833,7 +831,6 @@ kwboot_usage(FILE *stream, char *progname)
>   	fprintf(stream, "\n");
>   	fprintf(stream,
>   		"  -b <image>: boot <image> with preamble (Kirkwood, Armada 370/XP)\n");
> -	fprintf(stream, "  -p: patch <image> to type 0x69 (uart boot)\n");
>   	fprintf(stream,
>   		"  -D <image>: boot <image> without preamble (Dove)\n");
>   	fprintf(stream, "  -d: enter debug mode\n");
> @@ -853,7 +850,7 @@ int
>   main(int argc, char **argv)
>   {
>   	const char *ttypath, *imgpath;
> -	int rv, rc, tty, term, prot, patch;
> +	int rv, rc, tty, term;
>   	void *bootmsg;
>   	void *debugmsg;
>   	void *img;
> @@ -867,7 +864,6 @@ main(int argc, char **argv)
>   	imgpath = NULL;
>   	img = NULL;
>   	term = 0;
> -	patch = 0;
>   	size = 0;
>   	speed = B115200;
>   
> @@ -894,7 +890,7 @@ main(int argc, char **argv)
>   			break;
>   
>   		case 'p':
> -			patch = 1;
> +			/* nop, for backward compatibility */
>   			break;
>   
>   		case 't':
> @@ -934,9 +930,6 @@ main(int argc, char **argv)
>   	if (!bootmsg && !term && !debugmsg)
>   		goto usage;
>   
> -	if (patch && !imgpath)
> -		goto usage;
> -
>   	if (argc - optind < 1)
>   		goto usage;
>   
> @@ -949,16 +942,12 @@ main(int argc, char **argv)
>   	}
>   
>   	if (imgpath) {
> -		prot = PROT_READ | (patch ? PROT_WRITE : 0);
> -
> -		img = kwboot_mmap_image(imgpath, &size, prot);
> +		img = kwboot_mmap_image(imgpath, &size);
>   		if (!img) {
>   			perror(imgpath);
>   			goto out;
>   		}
> -	}
>   
> -	if (patch) {
>   		rc = kwboot_img_patch_hdr(img, size);
>   		if (rc) {
>   			fprintf(stderr, "%s: Invalid image.\n", imgpath);
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 21/39] tools: kwboot: Patch source address in image header

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Some image types have source address in non-bytes unit; for example for
> SATA images, it is in 512 B units.
> 
> We need to multiply by unit size when patching image type to UART.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ refactored ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 40 +++++++++++++++++++++++++++++-----------
>   1 file changed, 29 insertions(+), 11 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 2446d0a7b5..907a574bfc 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -773,6 +773,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   {
>   	int rc;
>   	struct main_hdr_v1 *hdr;
> +	uint32_t srcaddr;
>   	uint8_t csum;
>   	size_t hdrsz = sizeof(*hdr);
>   	int image_ver;
> @@ -809,6 +810,34 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		goto out;
>   	}
>   
> +	if (image_ver == 0) {
> +		struct main_hdr_v0 *hdr_v0 = img;
> +
> +		hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED;
> +		hdr_v0->nandpagesize = 0;
> +	}
> +
> +	srcaddr = le32_to_cpu(hdr->srcaddr);
> +
> +	switch (hdr->blockid) {
> +	case IBR_HDR_SATA_ID:
> +		if (srcaddr < 1) {
> +			errno = EINVAL;
> +			goto out;
> +		}
> +		hdr->srcaddr = cpu_to_le32((srcaddr - 1) * 512);
> +		break;
> +
> +	case IBR_HDR_SDIO_ID:
> +		hdr->srcaddr = cpu_to_le32(srcaddr * 512);
> +		break;
> +
> +	case IBR_HDR_PEX_ID:
> +		if (srcaddr == 0xFFFFFFFF)
> +			hdr->srcaddr = cpu_to_le32(hdrsz);
> +		break;
> +	}
> +
>   	is_secure = kwboot_img_is_secure(img);
>   
>   	if (hdr->blockid != IBR_HDR_UART_ID) {
> @@ -823,17 +852,6 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		hdr->blockid = IBR_HDR_UART_ID;
>   	}
>   
> -	if (image_ver == 0) {
> -		struct main_hdr_v0 *hdr_v0 = img;
> -
> -		hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED;
> -		hdr_v0->nandpagesize = 0;
> -
> -		hdr_v0->srcaddr = hdr_v0->ext
> -			? sizeof(struct kwb_header)
> -			: sizeof(*hdr_v0);
> -	}
> -
>   	hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum;
>   
>   	rc = 0;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 22/39] tools: kwboot: Patch destination address to DDR area for SPI image

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> SPI/NOR kwbimage may have destination address set to 0xFFFFFFFF, which
> means that the image is not downloaded to DDR but rather it is executed
> directly from SPI/NOR. In this case execution address is set to SPI/NOR
> area.
> 
> When patching image to UART type, change destination and execution
> addresses from SPI/NOR XIP area to DDR area 0x00800000 (which is default
> for A38x).
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ refactored ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 907a574bfc..b1dcd3796c 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -836,6 +836,14 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		if (srcaddr == 0xFFFFFFFF)
>   			hdr->srcaddr = cpu_to_le32(hdrsz);
>   		break;
> +
> +	case IBR_HDR_SPI_ID:
> +		if (hdr->destaddr == cpu_to_le32(0xFFFFFFFF)) {
> +			kwboot_printv("Patching destination and execution addresses from SPI/NOR XIP area to DDR area 0x00800000\n");
> +			hdr->destaddr = cpu_to_le32(0x00800000);
> +			hdr->execaddr = cpu_to_le32(0x00800000);
> +		}
> +		break;
>   	}
>   
>   	is_secure = kwboot_img_is_secure(img);
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 23/39] tools: kwbimage: Refactor image_version()

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Rename this function to kwbimage_version() and don't cast argument if
> not needed.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 8 ++++----
>   tools/kwbimage.h | 4 ++--
>   tools/kwboot.c   | 4 ++--
>   3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index 16b082b35f..944a108cee 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -282,7 +282,7 @@ static uint8_t image_checksum8(void *start, uint32_t len)
>   
>   size_t kwbimage_header_size(unsigned char *ptr)
>   {
> -	if (image_version((void *)ptr) == 0)
> +	if (kwbimage_version((void *)ptr) == 0)
>   		return sizeof(struct main_hdr_v0);
>   	else
>   		return KWBHEADER_V1_SIZE((struct main_hdr_v1 *)ptr);
> @@ -1622,7 +1622,7 @@ static void kwbimage_print_header(const void *ptr)
>   
>   	printf("Image Type:   MVEBU Boot from %s Image\n",
>   	       image_boot_mode_name(mhdr->blockid));
> -	printf("Image version:%d\n", image_version((void *)ptr));
> +	printf("Image version:%d\n", kwbimage_version(ptr));
>   
>   	for_each_opt_hdr_v1 (ohdr, mhdr) {
>   		if (ohdr->headertype == OPT_HDR_V1_BINARY_TYPE) {
> @@ -1659,7 +1659,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
>   		return -FDT_ERR_BADSTRUCTURE;
>   
>   	/* Only version 0 extended header has checksum */
> -	if (image_version((void *)ptr) == 0) {
> +	if (kwbimage_version(ptr) == 0) {
>   		struct main_hdr_v0 *mhdr = (struct main_hdr_v0 *)ptr;
>   
>   		if (mhdr->ext & 0x1) {
> @@ -1676,7 +1676,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
>   			if (checksum != ext_hdr->checksum)
>   				return -FDT_ERR_BADSTRUCTURE;
>   		}
> -	} else if (image_version((void *)ptr) == 1) {
> +	} else if (kwbimage_version(ptr) == 1) {
>   		struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
>   		const uint8_t *mhdr_end;
>   		struct opt_hdr_v1 *ohdr;
> diff --git a/tools/kwbimage.h b/tools/kwbimage.h
> index 9a949e03c0..738034beb1 100644
> --- a/tools/kwbimage.h
> +++ b/tools/kwbimage.h
> @@ -229,7 +229,7 @@ void init_kwb_image_type (void);
>    * header, byte 8 was reserved, and always set to 0. In the v1 header,
>    * byte 8 has been changed to a proper field, set to 1.
>    */
> -static inline unsigned int image_version(const void *header)
> +static inline unsigned int kwbimage_version(const void *header)
>   {
>   	const unsigned char *ptr = header;
>   	return ptr[8];
> @@ -258,7 +258,7 @@ static inline int opt_hdr_v1_valid_size(const struct opt_hdr_v1 *ohdr,
>   static inline struct opt_hdr_v1 *opt_hdr_v1_first(void *img) {
>   	struct main_hdr_v1 *mhdr;
>   
> -	if (image_version(img) != 1)
> +	if (kwbimage_version(img) != 1)
>   		return NULL;
>   
>   	mhdr = img;
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index b1dcd3796c..e47bf94e89 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -583,7 +583,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
>   	int rc, pnum;
>   	size_t hdrsz;
>   
> -	if (image_version(img) == 0)
> +	if (kwbimage_version(img) == 0)
>   		hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
>   	else
>   		hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
> @@ -787,7 +787,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		goto out;
>   	}
>   
> -	image_ver = image_version(img);
> +	image_ver = kwbimage_version(img);
>   	if (image_ver != 0 && image_ver != 1) {
>   		fprintf(stderr, "Invalid image header version\n");
>   		errno = EINVAL;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 24/39] tools: kwbimage: Refactor kwbimage header size determination

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Add functions kwbheader_size() and kwbheader_size_for_csum().
> 
> Refactor code determining header size to use these functions.
> 
> Refactor header checksum determining function.
> 
> Remove stuff that is not needed anymore.
> 
> This simplifies the code a little and fixes one instance of validating
> header size meant for checksum instead of whole header size.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 29 +++++++----------------------
>   tools/kwbimage.h | 35 +++++++++++++++++++++++------------
>   tools/kwboot.c   | 22 ++++++++++------------
>   3 files changed, 40 insertions(+), 46 deletions(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index 944a108cee..d1f4f93e0f 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -280,14 +280,6 @@ static uint8_t image_checksum8(void *start, uint32_t len)
>   	return csum;
>   }
>   
> -size_t kwbimage_header_size(unsigned char *ptr)
> -{
> -	if (kwbimage_version((void *)ptr) == 0)
> -		return sizeof(struct main_hdr_v0);
> -	else
> -		return KWBHEADER_V1_SIZE((struct main_hdr_v1 *)ptr);
> -}
> -
>   /*
>    * Verify checksum over a complete header that includes the checksum field.
>    * Return 1 when OK, otherwise 0.
> @@ -298,7 +290,7 @@ static int main_hdr_checksum_ok(void *hdr)
>   	struct main_hdr_v0 *main_hdr = (struct main_hdr_v0 *)hdr;
>   	uint8_t checksum;
>   
> -	checksum = image_checksum8(hdr, kwbimage_header_size(hdr));
> +	checksum = image_checksum8(hdr, kwbheader_size_for_csum(hdr));
>   	/* Calculated checksum includes the header checksum field. Compensate
>   	 * for that.
>   	 */
> @@ -1649,8 +1641,8 @@ static int kwbimage_check_image_types(uint8_t type)
>   static int kwbimage_verify_header(unsigned char *ptr, int image_size,
>   				  struct image_tool_params *params)
>   {
> -	uint8_t checksum;
> -	size_t header_size = kwbimage_header_size(ptr);
> +	size_t header_size = kwbheader_size(ptr);
> +	uint8_t csum;
>   
>   	if (header_size > image_size)
>   		return -FDT_ERR_BADSTRUCTURE;
> @@ -1663,17 +1655,10 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
>   		struct main_hdr_v0 *mhdr = (struct main_hdr_v0 *)ptr;
>   
>   		if (mhdr->ext & 0x1) {
> -			struct ext_hdr_v0 *ext_hdr;
> -
> -			if (header_size + sizeof(*ext_hdr) > image_size)
> -				return -FDT_ERR_BADSTRUCTURE;
> +			struct ext_hdr_v0 *ext_hdr = (void *)(mhdr + 1);
>   
> -			ext_hdr = (struct ext_hdr_v0 *)
> -				(ptr + sizeof(struct main_hdr_v0));
> -			checksum = image_checksum8(ext_hdr,
> -						   sizeof(struct ext_hdr_v0)
> -						   - sizeof(uint8_t));
> -			if (checksum != ext_hdr->checksum)
> +			csum = image_checksum8(ext_hdr, sizeof(*ext_hdr) - 1);
> +			if (csum != ext_hdr->checksum)
>   				return -FDT_ERR_BADSTRUCTURE;
>   		}
>   	} else if (kwbimage_version(ptr) == 1) {
> @@ -1832,7 +1817,7 @@ static int kwbimage_generate(struct image_tool_params *params,
>   static int kwbimage_extract_subimage(void *ptr, struct image_tool_params *params)
>   {
>   	struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
> -	size_t header_size = kwbimage_header_size(ptr);
> +	size_t header_size = kwbheader_size(ptr);
>   	struct opt_hdr_v1 *ohdr;
>   	int idx = params->pflag;
>   	int cur_idx = 0;
> diff --git a/tools/kwbimage.h b/tools/kwbimage.h
> index 738034beb1..56a748d4cf 100644
> --- a/tools/kwbimage.h
> +++ b/tools/kwbimage.h
> @@ -69,11 +69,6 @@ struct ext_hdr_v0 {
>   	uint8_t               checksum;
>   } __packed;
>   
> -struct kwb_header {
> -	struct main_hdr_v0	kwb_hdr;
> -	struct ext_hdr_v0	kwb_exthdr;
> -} __packed;
> -
>   /* Structure of the main header, version 1 (Armada 370/38x/XP) */
>   struct main_hdr_v1 {
>   	uint8_t  blockid;               /* 0x0       */
> @@ -195,13 +190,6 @@ struct register_set_hdr_v1 {
>   #define OPT_HDR_V1_BINARY_TYPE   0x2
>   #define OPT_HDR_V1_REGISTER_TYPE 0x3
>   
> -#define KWBHEADER_V0_SIZE(hdr) \
> -	(((hdr)->ext & 0x1) ? sizeof(struct kwb_header) : \
> -			      sizeof(struct main_hdr_v0))
> -
> -#define KWBHEADER_V1_SIZE(hdr) \
> -	(((hdr)->headersz_msb << 16) | le16_to_cpu((hdr)->headersz_lsb))
> -
>   enum kwbimage_cmd {
>   	CMD_INVALID,
>   	CMD_BOOT_FROM,
> @@ -235,6 +223,29 @@ static inline unsigned int kwbimage_version(const void *header)
>   	return ptr[8];
>   }
>   
> +static inline size_t kwbheader_size(const void *header)
> +{
> +	if (kwbimage_version(header) == 0) {
> +		const struct main_hdr_v0 *hdr = header;
> +
> +		return sizeof(*hdr) +
> +		       (hdr->ext & 0x1) ? sizeof(struct ext_hdr_v0) : 0;
> +	} else {
> +		const struct main_hdr_v1 *hdr = header;
> +
> +		return (hdr->headersz_msb << 16) |
> +		       le16_to_cpu(hdr->headersz_lsb);
> +	}
> +}
> +
> +static inline size_t kwbheader_size_for_csum(const void *header)
> +{
> +	if (kwbimage_version(header) == 0)
> +		return sizeof(struct main_hdr_v0);
> +	else
> +		return kwbheader_size(header);
> +}
> +
>   static inline uint32_t opt_hdr_v1_size(const struct opt_hdr_v1 *ohdr)
>   {
>   	return (ohdr->headersz_msb << 16) | le16_to_cpu(ohdr->headersz_lsb);
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index e47bf94e89..e60f7c5b7a 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -583,10 +583,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
>   	int rc, pnum;
>   	size_t hdrsz;
>   
> -	if (kwbimage_version(img) == 0)
> -		hdrsz = KWBHEADER_V0_SIZE((struct main_hdr_v0 *)img);
> -	else
> -		hdrsz = KWBHEADER_V1_SIZE((struct main_hdr_v1 *)img);
> +	hdrsz = kwbheader_size(img);
>   
>   	kwboot_printv("Waiting 2s and flushing tty\n");
>   	sleep(2); /* flush isn't effective without it */
> @@ -746,9 +743,13 @@ out:
>   }
>   
>   static uint8_t
> -kwboot_img_csum8(void *_data, size_t size)
> +kwboot_hdr_csum8(const void *hdr)
>   {
> -	uint8_t *data = _data, csum;
> +	const uint8_t *data = hdr;
> +	uint8_t csum;
> +	size_t size;
> +
> +	size = kwbheader_size_for_csum(hdr);
>   
>   	for (csum = 0; size-- > 0; data++)
>   		csum += *data;
> @@ -794,17 +795,14 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		goto out;
>   	}
>   
> -	if (image_ver == 0)
> -		hdrsz = sizeof(*hdr);
> -	else
> -		hdrsz = KWBHEADER_V1_SIZE(hdr);
> +	hdrsz = kwbheader_size(hdr);
>   
>   	if (size < hdrsz) {
>   		errno = EINVAL;
>   		goto out;
>   	}
>   
> -	csum = kwboot_img_csum8(hdr, hdrsz) - hdr->checksum;
> +	csum = kwboot_hdr_csum8(hdr) - hdr->checksum;
>   	if (csum != hdr->checksum) {
>   		errno = EINVAL;
>   		goto out;
> @@ -860,7 +858,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		hdr->blockid = IBR_HDR_UART_ID;
>   	}
>   
> -	hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum;
> +	hdr->checksum = kwboot_hdr_csum8(hdr) - csum;
>   
>   	rc = 0;
>   out:
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 25/39] tools: kwbimage: Update comments describing kwbimage v1 structures

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> These structures are relevant for several other platforms, mention them
> all.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 3 ++-
>   tools/kwbimage.h | 6 +++---
>   2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index d1f4f93e0f..77bf4dd886 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -1,7 +1,8 @@
>   // SPDX-License-Identifier: GPL-2.0+
>   /*
>    * Image manipulator for Marvell SoCs
> - *  supports Kirkwood, Dove, Armada 370, Armada XP, and Armada 38x
> + *  supports Kirkwood, Dove, Armada 370, Armada XP, Armada 375, Armada 38x and
> + *  Armada 39x
>    *
>    * (C) Copyright 2013 Thomas Petazzoni
>    * <thomas.petazzoni@free-electrons.com>
> diff --git a/tools/kwbimage.h b/tools/kwbimage.h
> index 56a748d4cf..679c454367 100644
> --- a/tools/kwbimage.h
> +++ b/tools/kwbimage.h
> @@ -69,7 +69,7 @@ struct ext_hdr_v0 {
>   	uint8_t               checksum;
>   } __packed;
>   
> -/* Structure of the main header, version 1 (Armada 370/38x/XP) */
> +/* Structure of the main header, version 1 (Armada 370/XP/375/38x/39x) */
>   struct main_hdr_v1 {
>   	uint8_t  blockid;               /* 0x0       */
>   	uint8_t  flags;                 /* 0x1       */
> @@ -103,7 +103,7 @@ struct main_hdr_v1 {
>   #define MAIN_HDR_V1_OPT_BAUD_115200	0x7
>   
>   /*
> - * Header for the optional headers, version 1 (Armada 370, Armada XP)
> + * Header for the optional headers, version 1 (Armada 370/XP/375/38x/39x)
>    */
>   struct opt_hdr_v1 {
>   	uint8_t  headertype;
> @@ -127,7 +127,7 @@ struct sig_v1 {
>   } __packed;
>   
>   /*
> - * Structure of secure header (Armada 38x)
> + * Structure of secure header (Armada XP/375/38x/39x)
>    */
>   struct secure_hdr_v1 {
>   	uint8_t  headertype;		/* 0x0 */
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 26/39] tools: kwboot: Round up header size to 128 B when patching

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> The beginning of image data must be sent in a separate xmodem block;
> the block must not contain end of header with the beginning of data.
> 
> Therefore we need to ensure that the image header size is a multiple of
> xmodem block size (which is 128 B).
> 
> Read the file into a malloc()ed buffer of enough size instead of
> mmap()ing it. (If we are going to move the data, most of the pages will
> be dirty anyway.) Then move the payload if header size needs to be
> increased.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ refactored ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 89 +++++++++++++++++++++++++++++++++++++++++++-------
>   1 file changed, 77 insertions(+), 12 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index e60f7c5b7a..4fae44c46e 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -25,7 +25,6 @@
>   #include <stdint.h>
>   #include <termios.h>
>   #include <time.h>
> -#include <sys/mman.h>
>   #include <sys/stat.h>
>   
>   /*
> @@ -706,11 +705,12 @@ out:
>   }
>   
>   static void *
> -kwboot_mmap_image(const char *path, size_t *size)
> +kwboot_read_image(const char *path, size_t *size, size_t reserve)
>   {
>   	int rc, fd;
>   	struct stat st;
>   	void *img;
> +	off_t tot;
>   
>   	rc = -1;
>   	img = NULL;
> @@ -723,17 +723,30 @@ kwboot_mmap_image(const char *path, size_t *size)
>   	if (rc)
>   		goto out;
>   
> -	img = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
> -	if (img == MAP_FAILED) {
> -		img = NULL;
> +	img = malloc(st.st_size + reserve);
> +	if (!img)
>   		goto out;
> +
> +	tot = 0;
> +	while (tot < st.st_size) {
> +		ssize_t rd = read(fd, img + tot, st.st_size - tot);
> +
> +		if (rd < 0)
> +			goto out;
> +
> +		tot += rd;
> +
> +		if (!rd && tot < st.st_size) {
> +			errno = EIO;
> +			goto out;
> +		}
>   	}
>   
>   	rc = 0;
>   	*size = st.st_size;
>   out:
>   	if (rc && img) {
> -		munmap(img, st.st_size);
> +		free(img);
>   		img = NULL;
>   	}
>   	if (fd >= 0)
> @@ -769,8 +782,39 @@ kwboot_img_is_secure(void *img)
>   	return 0;
>   }
>   
> +static void
> +kwboot_img_grow_hdr(void *img, size_t *size, size_t grow)
> +{
> +	uint32_t hdrsz, datasz, srcaddr;
> +	struct main_hdr_v1 *hdr = img;
> +	uint8_t *data;
> +
> +	srcaddr = le32_to_cpu(hdr->srcaddr);
> +
> +	hdrsz = kwbheader_size(img);
> +	data = (uint8_t *)img + srcaddr;
> +	datasz = *size - srcaddr;
> +
> +	/* only move data if there is not enough space */
> +	if (hdrsz + grow > srcaddr) {
> +		size_t need = hdrsz + grow - srcaddr;
> +
> +		/* move data by enough bytes */
> +		memmove(data + need, data, datasz);
> +
> +		hdr->srcaddr = cpu_to_le32(srcaddr + need);
> +		*size += need;
> +	}
> +
> +	if (kwbimage_version(img) == 1) {
> +		hdrsz += grow;
> +		hdr->headersz_msb = hdrsz >> 16;
> +		hdr->headersz_lsb = cpu_to_le16(hdrsz & 0xffff);
> +	}
> +}
> +
>   static int
> -kwboot_img_patch_hdr(void *img, size_t size)
> +kwboot_img_patch_hdr(void *img, size_t *size)
>   {
>   	int rc;
>   	struct main_hdr_v1 *hdr;
> @@ -783,7 +827,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   	rc = -1;
>   	hdr = img;
>   
> -	if (size < hdrsz) {
> +	if (*size < hdrsz) {
>   		errno = EINVAL;
>   		goto out;
>   	}
> @@ -797,7 +841,7 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   
>   	hdrsz = kwbheader_size(hdr);
>   
> -	if (size < hdrsz) {
> +	if (*size < hdrsz) {
>   		errno = EINVAL;
>   		goto out;
>   	}
> @@ -844,6 +888,12 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		break;
>   	}
>   
> +	if (hdrsz > le32_to_cpu(hdr->srcaddr) ||
> +	    *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize)) {
> +		errno = EINVAL;
> +		goto out;
> +	}
> +
>   	is_secure = kwboot_img_is_secure(img);
>   
>   	if (hdr->blockid != IBR_HDR_UART_ID) {
> @@ -858,8 +908,23 @@ kwboot_img_patch_hdr(void *img, size_t size)
>   		hdr->blockid = IBR_HDR_UART_ID;
>   	}
>   
> +	if (hdrsz % KWBOOT_XM_BLKSZ) {
> +		size_t offset = (KWBOOT_XM_BLKSZ - hdrsz % KWBOOT_XM_BLKSZ) %
> +				KWBOOT_XM_BLKSZ;
> +
> +		if (is_secure) {
> +			fprintf(stderr, "Cannot align image with secure header\n");
> +			errno = EINVAL;
> +			goto out;
> +		}
> +
> +		kwboot_printv("Aligning image header to Xmodem block size\n");
> +		kwboot_img_grow_hdr(img, size, offset);
> +	}
> +
>   	hdr->checksum = kwboot_hdr_csum8(hdr) - csum;
>   
> +	*size = le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize);
>   	rc = 0;
>   out:
>   	return rc;
> @@ -986,13 +1051,13 @@ main(int argc, char **argv)
>   	}
>   
>   	if (imgpath) {
> -		img = kwboot_mmap_image(imgpath, &size);
> +		img = kwboot_read_image(imgpath, &size, KWBOOT_XM_BLKSZ);
>   		if (!img) {
>   			perror(imgpath);
>   			goto out;
>   		}
>   
> -		rc = kwboot_img_patch_hdr(img, size);
> +		rc = kwboot_img_patch_hdr(img, &size);
>   		if (rc) {
>   			fprintf(stderr, "%s: Invalid image.\n", imgpath);
>   			goto out;
> @@ -1035,7 +1100,7 @@ out:
>   		close(tty);
>   
>   	if (img)
> -		munmap(img, size);
> +		free(img);
>   
>   	return rv;
>   
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 27/39] tools: kwboot: Explicitly check against size of struct main_hdr_v1

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Explicitly check the image size against size of struct main_hdr_v1.
> This way the check is more readable, since the `hdrsz` variable
> may semantically contain another value.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 4fae44c46e..77bf5cb80b 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -820,14 +820,14 @@ kwboot_img_patch_hdr(void *img, size_t *size)
>   	struct main_hdr_v1 *hdr;
>   	uint32_t srcaddr;
>   	uint8_t csum;
> -	size_t hdrsz = sizeof(*hdr);
> +	size_t hdrsz;
>   	int image_ver;
>   	int is_secure;
>   
>   	rc = -1;
>   	hdr = img;
>   
> -	if (*size < hdrsz) {
> +	if (*size < sizeof(struct main_hdr_v1)) {
>   		errno = EINVAL;
>   		goto out;
>   	}
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 28/39] tools: kwboot: Support higher baudrates when booting via UART

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Add support for uploading the boot image (the data part only) at higher
> baudrate than the standard one.
> 
> The kwboot utility already has -B option, but choosing other baudrate
> than the standard one (115200 Bd) can only work for debug mode, not for
> booting the device. The BootROM for kwboot supported platforms (Orion,
> Kirkwood, Dove, Discovery, AXP, A37x, A38x, A39x) cannot change the
> baudrate when uploading boot image via the Xmodem protocol, nor can it
> be configured via strapping pins.
> 
> So instead we add this support by injecting baudrate changing code into
> the kwbimage v1 header as a new optional binary extension. This code is
> executed by BootROM after it receives the whole header. The code sends
> the magic string "$baudratechange\0" just before changing the baudrate
> to let kwboot know that it should also change it. This is because the
> injected code is run as the last binary extension, and we do not want
> to loose possible output from other possible binary extensions that
> came before it (in most cases this is U-Boot SPL).
> 
> We also inject the code before the payload (the data part of the image),
> to change the baudrate back to the standard value, in case the payload
> does not reset UART.
> 
> This change improves boot time via UART significantly (depending on the
> chosen baudrate), which is very useful when debugging.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> [ major refactor ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Impressive change.

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 637 ++++++++++++++++++++++++++++++++++++++++++++++---
>   1 file changed, 603 insertions(+), 34 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 77bf5cb80b..ba2fd10ff6 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -70,6 +70,187 @@ struct kwboot_block {
>   #define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */
>   #define KWBOOT_HDR_RSP_TIMEO 10000 /* ms */
>   
> +/* ARM code making baudrate changing function return to original exec address */
> +static unsigned char kwboot_pre_baud_code[] = {
> +				/* exec_addr:                                 */
> +	0x00, 0x00, 0x00, 0x00, /* .word 0                                    */
> +	0x0c, 0xe0, 0x1f, 0xe5, /* ldr lr, exec_addr                          */
> +};
> +
> +/* ARM code for binary header injection to change baudrate */
> +static unsigned char kwboot_baud_code[] = {
> +				/* ; #define UART_BASE 0xd0012000             */
> +				/* ; #define THR       0x00                   */
> +				/* ; #define DLL       0x00                   */
> +				/* ; #define DLH       0x04                   */
> +				/* ; #define LCR       0x0c                   */
> +				/* ; #define   DLAB    0x80                   */
> +				/* ; #define LSR       0x14                   */
> +				/* ; #define   THRE    0x20                   */
> +				/* ; #define   TEMT    0x40                   */
> +				/* ; #define DIV_ROUND(a, b) ((a + b/2) / b)  */
> +				/* ;                                          */
> +				/* ; u32 set_baudrate(u32 old_b, u32 new_b) { */
> +				/* ;   const u8 *str = "$baudratechange";     */
> +				/* ;   u8 c;                                  */
> +				/* ;   do {                                   */
> +				/* ;       c = *str++;                        */
> +				/* ;       writel(UART_BASE + THR, c);        */
> +				/* ;   } while (c);                           */
> +				/* ;   while                                  */
> +				/* ;      (!(readl(UART_BASE + LSR) & TEMT)); */
> +				/* ;   u32 lcr = readl(UART_BASE + LCR);      */
> +				/* ;   writel(UART_BASE + LCR, lcr | DLAB);   */
> +				/* ;   u8 old_dll = readl(UART_BASE + DLL);   */
> +				/* ;   u8 old_dlh = readl(UART_BASE + DLH);   */
> +				/* ;   u16 old_dl = old_dll | (old_dlh << 8); */
> +				/* ;   u32 clk = old_b * old_dl;              */
> +				/* ;   u16 new_dl = DIV_ROUND(clk, new_b);    */
> +				/* ;   u8 new_dll = new_dl & 0xff;            */
> +				/* ;   u8 new_dlh = (new_dl >> 8) & 0xff;     */
> +				/* ;   writel(UART_BASE + DLL, new_dll);      */
> +				/* ;   writel(UART_BASE + DLH, new_dlh);      */
> +				/* ;   writel(UART_BASE + LCR, lcr & ~DLAB);  */
> +				/* ;   msleep(1);                             */
> +				/* ;   return 0;                              */
> +				/* ; }                                        */
> +
> +	0xfe, 0x5f, 0x2d, 0xe9, /* push  { r1 - r12, lr }                     */
> +
> +				/*  ; r0 = UART_BASE                          */
> +	0x02, 0x0a, 0xa0, 0xe3, /* mov   r0, #0x2000                          */
> +	0x01, 0x00, 0x4d, 0xe3, /* movt  r0, #0xd001                          */
> +
> +				/*  ; r2 = address of preamble string         */
> +	0xd0, 0x20, 0x8f, 0xe2, /* adr   r2, preamble                         */
> +
> +				/*  ; Send preamble string over UART          */
> +				/* .Lloop_preamble:                           */
> +				/*                                            */
> +				/*  ; Wait until Transmitter Holding is Empty */
> +				/* .Lloop_thre:                               */
> +				/*  ; r1 = UART_BASE[LSR] & THRE              */
> +	0x14, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x14]                      */
> +	0x20, 0x00, 0x11, 0xe3, /* tst   r1, #0x20                            */
> +	0xfc, 0xff, 0xff, 0x0a, /* beq   .Lloop_thre                          */
> +
> +				/*  ; Put character into Transmitter FIFO     */
> +				/*  ; r1 = *r2++                              */
> +	0x01, 0x10, 0xd2, 0xe4, /* ldrb  r1, [r2], #1                         */
> +				/*  ; UART_BASE[THR] = r1                     */
> +	0x00, 0x10, 0x80, 0xe5, /* str   r1, [r0, #0x0]                       */
> +
> +				/*  ; Loop until end of preamble string       */
> +	0x00, 0x00, 0x51, 0xe3, /* cmp   r1, #0                               */
> +	0xf8, 0xff, 0xff, 0x1a, /* bne   .Lloop_preamble                      */
> +
> +				/*  ; Wait until Transmitter FIFO is Empty    */
> +				/* .Lloop_txempty:                            */
> +				/*  ; r1 = UART_BASE[LSR] & TEMT              */
> +	0x14, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x14]                      */
> +	0x40, 0x00, 0x11, 0xe3, /* tst   r1, #0x40                            */
> +	0xfc, 0xff, 0xff, 0x0a, /* beq   .Lloop_txempty                       */
> +
> +				/*  ; Set Divisor Latch Access Bit            */
> +				/*  ; UART_BASE[LCR] |= DLAB                  */
> +	0x0c, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x0c]                      */
> +	0x80, 0x10, 0x81, 0xe3, /* orr   r1, r1, #0x80                        */
> +	0x0c, 0x10, 0x80, 0xe5, /* str   r1, [r0, #0x0c]                      */
> +
> +				/*  ; Read current Divisor Latch              */
> +				/*  ; r1 = UART_BASE[DLH]<<8 | UART_BASE[DLL] */
> +	0x00, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x00]                      */
> +	0xff, 0x10, 0x01, 0xe2, /* and   r1, r1, #0xff                        */
> +	0x01, 0x20, 0xa0, 0xe1, /* mov   r2, r1                               */
> +	0x04, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x04]                      */
> +	0xff, 0x10, 0x01, 0xe2, /* and   r1, r1, #0xff                        */
> +	0x41, 0x14, 0xa0, 0xe1, /* asr   r1, r1, #8                           */
> +	0x02, 0x10, 0x81, 0xe1, /* orr   r1, r1, r2                           */
> +
> +				/*  ; Read old baudrate value                 */
> +				/*  ; r2 = old_baudrate                       */
> +	0x8c, 0x20, 0x9f, 0xe5, /* ldr   r2, old_baudrate                     */
> +
> +				/*  ; Calculate base clock                    */
> +				/*  ; r1 = r2 * r1                            */
> +	0x92, 0x01, 0x01, 0xe0, /* mul   r1, r2, r1                           */
> +
> +				/*  ; Read new baudrate value                 */
> +				/*  ; r2 = baudrate                           */
> +	0x88, 0x20, 0x9f, 0xe5, /* ldr   r2, baudrate                         */
> +
> +				/*  ; Calculate new Divisor Latch             */
> +				/*  ; r1 = DIV_ROUND(r1, r2) =                */
> +				/*  ;    = (r1 + r2/2) / r2                   */
> +	0xa2, 0x10, 0x81, 0xe0, /* add   r1, r1, r2, lsr #1                   */
> +	0x02, 0x40, 0xa0, 0xe1, /* mov   r4, r2                               */
> +	0xa1, 0x00, 0x54, 0xe1, /* cmp   r4, r1, lsr #1                       */
> +				/* .Lloop_div1:                               */
> +	0x84, 0x40, 0xa0, 0x91, /* movls r4, r4, lsl #1                       */
> +	0xa1, 0x00, 0x54, 0xe1, /* cmp   r4, r1, lsr #1                       */
> +	0xfc, 0xff, 0xff, 0x9a, /* bls   .Lloop_div1                          */
> +	0x00, 0x30, 0xa0, 0xe3, /* mov   r3, #0                               */
> +				/* .Lloop_div2:                               */
> +	0x04, 0x00, 0x51, 0xe1, /* cmp   r1, r4                               */
> +	0x04, 0x10, 0x41, 0x20, /* subhs r1, r1, r4                           */
> +	0x03, 0x30, 0xa3, 0xe0, /* adc   r3, r3, r3                           */
> +	0xa4, 0x40, 0xa0, 0xe1, /* mov   r4, r4, lsr #1                       */
> +	0x02, 0x00, 0x54, 0xe1, /* cmp   r4, r2                               */
> +	0xf9, 0xff, 0xff, 0x2a, /* bhs   .Lloop_div2                          */
> +	0x03, 0x10, 0xa0, 0xe1, /* mov   r1, r3                               */
> +
> +				/*  ; Set new Divisor Latch Low               */
> +				/*  ; UART_BASE[DLL] = r1 & 0xff              */
> +	0x01, 0x20, 0xa0, 0xe1, /* mov   r2, r1                               */
> +	0xff, 0x20, 0x02, 0xe2, /* and   r2, r2, #0xff                        */
> +	0x00, 0x20, 0x80, 0xe5, /* str   r2, [r0, #0x00]                      */
> +
> +				/*  ; Set new Divisor Latch High              */
> +				/*  ; UART_BASE[DLH] = r1>>8 & 0xff           */
> +	0x41, 0x24, 0xa0, 0xe1, /* asr   r2, r1, #8                           */
> +	0xff, 0x20, 0x02, 0xe2, /* and   r2, r2, #0xff                        */
> +	0x04, 0x20, 0x80, 0xe5, /* str   r2, [r0, #0x04]                      */
> +
> +				/*  ; Clear Divisor Latch Access Bit          */
> +				/*  ; UART_BASE[LCR] &= ~DLAB                 */
> +	0x0c, 0x10, 0x90, 0xe5, /* ldr   r1, [r0, #0x0c]                      */
> +	0x80, 0x10, 0xc1, 0xe3, /* bic   r1, r1, #0x80                        */
> +	0x0c, 0x10, 0x80, 0xe5, /* str   r1, [r0, #0x0c]                      */
> +
> +				/*  ; Sleep 1ms ~~ 600000 cycles at 1200 MHz  */
> +				/*  ; r1 = 600000                             */
> +	0x9f, 0x1d, 0xa0, 0xe3, /* mov   r1, #0x27c0                          */
> +	0x09, 0x10, 0x40, 0xe3, /* movt  r1, #0x0009                          */
> +				/* .Lloop_sleep:                              */
> +	0x01, 0x10, 0x41, 0xe2, /* sub   r1, r1, #1                           */
> +	0x00, 0x00, 0x51, 0xe3, /* cmp   r1, #0                               */
> +	0xfc, 0xff, 0xff, 0x1a, /* bne   .Lloop_sleep                         */
> +
> +				/*  ; Return 0 - no error                     */
> +	0x00, 0x00, 0xa0, 0xe3, /* mov   r0, #0                               */
> +	0xfe, 0x9f, 0xbd, 0xe8, /* pop   { r1 - r12, pc }                     */
> +
> +				/*  ; Preamble string                         */
> +				/* preamble:                                  */
> +	0x24, 0x62, 0x61, 0x75, /* .asciz "$baudratechange"                   */
> +	0x64, 0x72, 0x61, 0x74,
> +	0x65, 0x63, 0x68, 0x61,
> +	0x6e, 0x67, 0x65, 0x00,
> +
> +				/*  ; Placeholder for old baudrate value      */
> +				/* old_baudrate:                              */
> +	0x00, 0x00, 0x00, 0x00, /* .word 0                                    */
> +
> +				/*  ; Placeholder for new baudrate value      */
> +				/* new_baudrate:                              */
> +	0x00, 0x00, 0x00, 0x00, /* .word 0                                    */
> +};
> +
> +#define KWBOOT_BAUDRATE_BIN_HEADER_SZ (sizeof(kwboot_baud_code) + \
> +				       sizeof(struct opt_hdr_v1) + 8)
> +
> +static const char kwb_baud_magic[16] = "$baudratechange";
> +
>   static int kwboot_verbose;
>   
>   static int msg_req_delay = KWBOOT_MSG_REQ_DELAY;
> @@ -233,26 +414,184 @@ kwboot_tty_send_char(int fd, unsigned char c)
>   }
>   
>   static speed_t
> -kwboot_tty_speed(int baudrate)
> +kwboot_tty_baudrate_to_speed(int baudrate)
>   {
>   	switch (baudrate) {
> +#ifdef B4000000
> +	case 4000000:
> +		return B4000000;
> +#endif
> +#ifdef B3500000
> +	case 3500000:
> +		return B3500000;
> +#endif
> +#ifdef B3000000
> +	case 3000000:
> +		return B3000000;
> +#endif
> +#ifdef B2500000
> +	case 2500000:
> +		return B2500000;
> +#endif
> +#ifdef B2000000
> +	case 2000000:
> +		return B2000000;
> +#endif
> +#ifdef B1500000
> +	case 1500000:
> +		return B1500000;
> +#endif
> +#ifdef B1152000
> +	case 1152000:
> +		return B1152000;
> +#endif
> +#ifdef B1000000
> +	case 1000000:
> +		return B1000000;
> +#endif
> +#ifdef B921600
> +	case 921600:
> +		return B921600;
> +#endif
> +#ifdef B614400
> +	case 614400:
> +		return B614400;
> +#endif
> +#ifdef B576000
> +	case 576000:
> +		return B576000;
> +#endif
> +#ifdef B500000
> +	case 500000:
> +		return B500000;
> +#endif
> +#ifdef B460800
> +	case 460800:
> +		return B460800;
> +#endif
> +#ifdef B307200
> +	case 307200:
> +		return B307200;
> +#endif
> +#ifdef B230400
> +	case 230400:
> +		return B230400;
> +#endif
> +#ifdef B153600
> +	case 153600:
> +		return B153600;
> +#endif
> +#ifdef B115200
>   	case 115200:
>   		return B115200;
> +#endif
> +#ifdef B76800
> +	case 76800:
> +		return B76800;
> +#endif
> +#ifdef B57600
>   	case 57600:
>   		return B57600;
> +#endif
> +#ifdef B38400
>   	case 38400:
>   		return B38400;
> +#endif
> +#ifdef B19200
>   	case 19200:
>   		return B19200;
> +#endif
> +#ifdef B9600
>   	case 9600:
>   		return B9600;
> +#endif
> +#ifdef B4800
> +	case 4800:
> +		return B4800;
> +#endif
> +#ifdef B2400
> +	case 2400:
> +		return B2400;
> +#endif
> +#ifdef B1800
> +	case 1800:
> +		return B1800;
> +#endif
> +#ifdef B1200
> +	case 1200:
> +		return B1200;
> +#endif
> +#ifdef B600
> +	case 600:
> +		return B600;
> +#endif
> +#ifdef B300
> +	case 300:
> +		return B300;
> +#endif
> +#ifdef B200
> +	case 200:
> +		return B200;
> +#endif
> +#ifdef B150
> +	case 150:
> +		return B150;
> +#endif
> +#ifdef B134
> +	case 134:
> +		return B134;
> +#endif
> +#ifdef B110
> +	case 110:
> +		return B110;
> +#endif
> +#ifdef B75
> +	case 75:
> +		return B75;
> +#endif
> +#ifdef B50
> +	case 50:
> +		return B50;
> +#endif
> +	default:
> +		return B0;
> +	}
> +}
> +
> +static int
> +kwboot_tty_change_baudrate(int fd, int baudrate)
> +{
> +	struct termios tio;
> +	speed_t speed;
> +	int rc;
> +
> +	rc = tcgetattr(fd, &tio);
> +	if (rc)
> +		return rc;
> +
> +	speed = kwboot_tty_baudrate_to_speed(baudrate);
> +	if (speed == B0) {
> +		errno = EINVAL;
> +		return -1;
>   	}
>   
> -	return -1;
> +	rc = cfsetospeed(&tio, speed);
> +	if (rc)
> +		return rc;
> +
> +	rc = cfsetispeed(&tio, speed);
> +	if (rc)
> +		return rc;
> +
> +	rc = tcsetattr(fd, TCSANOW, &tio);
> +	if (rc)
> +		return rc;
> +
> +	return 0;
>   }
>   
>   static int
> -kwboot_open_tty(const char *path, speed_t speed)
> +kwboot_open_tty(const char *path, int baudrate)
>   {
>   	int rc, fd;
>   	struct termios tio;
> @@ -271,13 +610,14 @@ kwboot_open_tty(const char *path, speed_t speed)
>   	tio.c_cc[VMIN] = 1;
>   	tio.c_cc[VTIME] = 10;
>   
> -	cfsetospeed(&tio, speed);
> -	cfsetispeed(&tio, speed);
> -
>   	rc = tcsetattr(fd, TCSANOW, &tio);
>   	if (rc)
>   		goto out;
>   
> +	rc = kwboot_tty_change_baudrate(fd, baudrate);
> +	if (rc)
> +		goto out;
> +
>   	rc = fd;
>   out:
>   	if (rc < 0) {
> @@ -426,7 +766,34 @@ _xm_reply_to_error(int c)
>   }
>   
>   static int
> -kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
> +kwboot_baud_magic_handle(int fd, char c, int baudrate)
> +{
> +	static size_t rcv_len;
> +
> +	if (rcv_len < sizeof(kwb_baud_magic)) {
> +		/* try to recognize whole magic word */
> +		if (c == kwb_baud_magic[rcv_len]) {
> +			rcv_len++;
> +		} else {
> +			printf("%.*s%c", (int)rcv_len, kwb_baud_magic, c);
> +			fflush(stdout);
> +			rcv_len = 0;
> +		}
> +	}
> +
> +	if (rcv_len == sizeof(kwb_baud_magic)) {
> +		/* magic word received */
> +		kwboot_printv("\nChanging baudrate to %d Bd\n", baudrate);
> +
> +		return kwboot_tty_change_baudrate(fd, baudrate) ? : 1;
> +	} else {
> +		return 0;
> +	}
> +}
> +
> +static int
> +kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print,
> +		     int baudrate, int *baud_changed)
>   {
>   	int timeout = allow_non_xm ? KWBOOT_HDR_RSP_TIMEO : blk_rsp_timeo;
>   	uint64_t recv_until = _now() + timeout;
> @@ -434,6 +801,8 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   
>   	if (non_xm_print)
>   		*non_xm_print = 0;
> +	if (baud_changed)
> +		*baud_changed = 0;
>   
>   	while (1) {
>   		rc = kwboot_tty_recv(fd, c, 1, timeout);
> @@ -451,15 +820,30 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   			break;
>   
>   		/*
> -		 * If printing non-xmodem text output is allowed and such a byte
> -		 * was received, print it and increase receiving time.
> +		 * If receiving/printing non-xmodem text output is allowed and
> +		 * such a byte was received, we want to increase receiving time
> +		 * and either:
> +		 * - print the byte, if it is not part of baudrate change magic
> +		 *   sequence while baudrate change was requested (-B option)
> +		 * - change baudrate
>   		 * Otherwise decrease timeout by time elapsed.
>   		 */
>   		if (allow_non_xm) {
>   			recv_until = _now() + timeout;
> -			putchar(*c);
> -			fflush(stdout);
> -			*non_xm_print = 1;
> +
> +			if (baudrate && !*baud_changed) {
> +				rc = kwboot_baud_magic_handle(fd, *c, baudrate);
> +				if (rc == 1)
> +					*baud_changed = 1;
> +				else if (!rc)
> +					*non_xm_print = 1;
> +				else
> +					return rc;
> +			} else if (!baudrate || !*baud_changed) {
> +				putchar(*c);
> +				fflush(stdout);
> +				*non_xm_print = 1;
> +			}
>   		} else {
>   			timeout = recv_until - _now();
>   			if (timeout < 0) {
> @@ -474,10 +858,10 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print)
>   
>   static int
>   kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
> -		    int *done_print)
> +		    int *done_print, int baudrate)
>   {
> -	int non_xm_print;
> -	int rc, retries;
> +	int non_xm_print, baud_changed;
> +	int rc, err, retries;
>   	char c;
>   
>   	*done_print = 0;
> @@ -494,9 +878,10 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
>   			*done_print = 1;
>   		}
>   
> -		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print);
> +		rc = kwboot_xm_recv_reply(fd, &c, allow_non_xm, &non_xm_print,
> +					  baudrate, &baud_changed);
>   		if (rc)
> -			return rc;
> +			goto can;
>   
>   		if (!allow_non_xm && c != ACK)
>   			kwboot_progress(-1, '+');
> @@ -505,7 +890,20 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm,
>   	if (non_xm_print)
>   		kwboot_printv("\n");
>   
> +	if (allow_non_xm && baudrate && !baud_changed) {
> +		fprintf(stderr, "Baudrate was not changed\n");
> +		rc = -1;
> +		errno = EPROTO;
> +		goto can;
> +	}
> +
>   	return _xm_reply_to_error(c);
> +can:
> +	err = errno;
> +	kwboot_tty_send_char(fd, CAN);
> +	kwboot_printv("\n");
> +	errno = err;
> +	return rc;
>   }
>   
>   static int
> @@ -522,7 +920,7 @@ kwboot_xm_finish(int fd)
>   		if (rc)
>   			return rc;
>   
> -		rc = kwboot_xm_recv_reply(fd, &c, 0, NULL);
> +		rc = kwboot_xm_recv_reply(fd, &c, 0, NULL, 0, NULL);
>   		if (rc)
>   			return rc;
>   	} while (c == NAK && retries-- > 0);
> @@ -532,7 +930,7 @@ kwboot_xm_finish(int fd)
>   
>   static int
>   kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
> -		  size_t size)
> +		  size_t size, int baudrate)
>   {
>   	int done_print = 0;
>   	size_t sent, left;
> @@ -555,7 +953,7 @@ kwboot_xmodem_one(int tty, int *pnum, int header, const uint8_t *data,
>   		last_block = (left <= blksz);
>   
>   		rc = kwboot_xm_sendblock(tty, &block, header && last_block,
> -					 &done_print);
> +					 &done_print, baudrate);
>   		if (rc)
>   			goto out;
>   
> @@ -576,7 +974,7 @@ out:
>   }
>   
>   static int
> -kwboot_xmodem(int tty, const void *_img, size_t size)
> +kwboot_xmodem(int tty, const void *_img, size_t size, int baudrate)
>   {
>   	const uint8_t *img = _img;
>   	int rc, pnum;
> @@ -590,18 +988,41 @@ kwboot_xmodem(int tty, const void *_img, size_t size)
>   
>   	pnum = 1;
>   
> -	rc = kwboot_xmodem_one(tty, &pnum, 1, img, hdrsz);
> +	rc = kwboot_xmodem_one(tty, &pnum, 1, img, hdrsz, baudrate);
>   	if (rc)
>   		return rc;
>   
>   	img += hdrsz;
>   	size -= hdrsz;
>   
> -	rc = kwboot_xmodem_one(tty, &pnum, 0, img, size);
> +	rc = kwboot_xmodem_one(tty, &pnum, 0, img, size, 0);
> +	if (rc)
> +		return rc;
> +
> +	rc = kwboot_xm_finish(tty);
>   	if (rc)
>   		return rc;
>   
> -	return kwboot_xm_finish(tty);
> +	if (baudrate) {
> +		char buf[sizeof(kwb_baud_magic)];
> +
> +		/* Wait 1s for baudrate change magic */
> +		rc = kwboot_tty_recv(tty, buf, sizeof(buf), 1000);
> +		if (rc)
> +			return rc;
> +
> +		if (memcmp(buf, kwb_baud_magic, sizeof(buf))) {
> +			errno = EPROTO;
> +			return -1;
> +		}
> +
> +		kwboot_printv("\nChanging baudrate back to 115200 Bd\n\n");
> +		rc = kwboot_tty_change_baudrate(tty, 115200);
> +		if (rc)
> +			return rc;
> +	}
> +
> +	return 0;
>   }
>   
>   static int
> @@ -782,6 +1203,37 @@ kwboot_img_is_secure(void *img)
>   	return 0;
>   }
>   
> +static void *
> +kwboot_img_grow_data_left(void *img, size_t *size, size_t grow)
> +{
> +	uint32_t hdrsz, datasz, srcaddr;
> +	struct main_hdr_v1 *hdr = img;
> +	uint8_t *data;
> +
> +	srcaddr = le32_to_cpu(hdr->srcaddr);
> +
> +	hdrsz = kwbheader_size(hdr);
> +	data = (uint8_t *)img + srcaddr;
> +	datasz = *size - srcaddr;
> +
> +	/* only move data if there is not enough space */
> +	if (hdrsz + grow > srcaddr) {
> +		size_t need = hdrsz + grow - srcaddr;
> +
> +		/* move data by enough bytes */
> +		memmove(data + need, data, datasz);
> +		*size += need;
> +		srcaddr += need;
> +	}
> +
> +	srcaddr -= grow;
> +	hdr->srcaddr = cpu_to_le32(srcaddr);
> +	hdr->destaddr = cpu_to_le32(le32_to_cpu(hdr->destaddr) - grow);
> +	hdr->blocksize = cpu_to_le32(le32_to_cpu(hdr->blocksize) + grow);
> +
> +	return (uint8_t *)img + srcaddr;
> +}
> +
>   static void
>   kwboot_img_grow_hdr(void *img, size_t *size, size_t grow)
>   {
> @@ -813,8 +1265,71 @@ kwboot_img_grow_hdr(void *img, size_t *size, size_t grow)
>   	}
>   }
>   
> +static void *
> +kwboot_add_bin_ohdr_v1(void *img, size_t *size, uint32_t binsz)
> +{
> +	struct main_hdr_v1 *hdr = img;
> +	struct opt_hdr_v1 *ohdr;
> +	uint32_t ohdrsz;
> +
> +	ohdrsz = binsz + 8 + sizeof(*ohdr);
> +	kwboot_img_grow_hdr(img, size, ohdrsz);
> +
> +	if (hdr->ext & 0x1) {
> +		for_each_opt_hdr_v1 (ohdr, img)
> +			if (opt_hdr_v1_next(ohdr) == NULL)
> +				break;
> +
> +		*opt_hdr_v1_ext(ohdr) |= 1;
> +		ohdr = opt_hdr_v1_next(ohdr);
> +	} else {
> +		hdr->ext |= 1;
> +		ohdr = (void *)(hdr + 1);
> +	}
> +
> +	ohdr->headertype = OPT_HDR_V1_BINARY_TYPE;
> +	ohdr->headersz_msb = ohdrsz >> 16;
> +	ohdr->headersz_lsb = cpu_to_le16(ohdrsz & 0xffff);
> +
> +	memset(&ohdr->data[0], 0, ohdrsz - sizeof(*ohdr));
> +
> +	return &ohdr->data[4];
> +}
> +
> +static void
> +_copy_baudrate_change_code(struct main_hdr_v1 *hdr, void *dst, int pre,
> +			   int old_baud, int new_baud)
> +{
> +	size_t codesz = sizeof(kwboot_baud_code);
> +	uint8_t *code = dst;
> +
> +	if (pre) {
> +		size_t presz = sizeof(kwboot_pre_baud_code);
> +
> +		/*
> +		 * We need to prepend code that loads lr register with original
> +		 * value of hdr->execaddr. We do this by putting the original
> +		 * exec address before the code that loads it relatively from
> +		 * it's beginning.
> +		 * Afterwards we change the exec address to this code (which is
> +		 * at offset 4, because the first 4 bytes contain the original
> +		 * exec address).
> +		 */
> +		memcpy(code, kwboot_pre_baud_code, presz);
> +		*(uint32_t *)code = hdr->execaddr;
> +
> +		hdr->execaddr = cpu_to_le32(le32_to_cpu(hdr->destaddr) + 4);
> +
> +		code += presz;
> +	}
> +
> +	memcpy(code, kwboot_baud_code, codesz - 8);
> +	*(uint32_t *)(code + codesz - 8) = cpu_to_le32(old_baud);
> +	*(uint32_t *)(code + codesz - 4) = cpu_to_le32(new_baud);
> +}
> +
>   static int
> -kwboot_img_patch_hdr(void *img, size_t *size)
> +kwboot_img_patch(void *img, size_t *size, int baudrate)
>   {
>   	int rc;
>   	struct main_hdr_v1 *hdr;
> @@ -908,6 +1423,51 @@ kwboot_img_patch_hdr(void *img, size_t *size)
>   		hdr->blockid = IBR_HDR_UART_ID;
>   	}
>   
> +	if (baudrate) {
> +		uint32_t codesz = sizeof(kwboot_baud_code);
> +		void *code;
> +
> +		if (image_ver == 0) {
> +			fprintf(stderr,
> +				"Cannot inject code for changing baudrate into v0 image header\n");
> +			errno = EINVAL;
> +			goto out;
> +		}
> +
> +		if (is_secure) {
> +			fprintf(stderr,
> +				"Cannot inject code for changing baudrate into image with secure header\n");
> +			errno = EINVAL;
> +			goto out;
> +		}
> +
> +		/*
> +		 * First inject code that changes the baudrate from the default
> +		 * value of 115200 Bd to requested value. This code is inserted
> +		 * as a new opt hdr, so it is executed by BootROM after the
> +		 * header part is received.
> +		 */
> +		kwboot_printv("Injecting binary header code for changing baudrate to %d Bd\n",
> +			      baudrate);
> +
> +		code = kwboot_add_bin_ohdr_v1(img, size, codesz);
> +		_copy_baudrate_change_code(hdr, code, 0, 115200, baudrate);
> +
> +		/*
> +		 * Now inject code that changes the baudrate back to 115200 Bd.
> +		 * This code is prepended to the data part of the image, so it
> +		 * is executed before U-Boot proper.
> +		 */
> +		kwboot_printv("Injecting code for changing baudrate back\n");
> +
> +		codesz += sizeof(kwboot_pre_baud_code);
> +		code = kwboot_img_grow_data_left(img, size, codesz);
> +		_copy_baudrate_change_code(hdr, code, 1, baudrate, 115200);
> +
> +		/* recompute header size */
> +		hdrsz = kwbheader_size(hdr);
> +	}
> +
>   	if (hdrsz % KWBOOT_XM_BLKSZ) {
>   		size_t offset = (KWBOOT_XM_BLKSZ - hdrsz % KWBOOT_XM_BLKSZ) %
>   				KWBOOT_XM_BLKSZ;
> @@ -964,7 +1524,8 @@ main(int argc, char **argv)
>   	void *debugmsg;
>   	void *img;
>   	size_t size;
> -	speed_t speed;
> +	size_t after_img_rsv;
> +	int baudrate;
>   
>   	rv = 1;
>   	tty = -1;
> @@ -974,7 +1535,8 @@ main(int argc, char **argv)
>   	img = NULL;
>   	term = 0;
>   	size = 0;
> -	speed = B115200;
> +	after_img_rsv = KWBOOT_XM_BLKSZ;
> +	baudrate = 115200;
>   
>   	kwboot_verbose = isatty(STDOUT_FILENO);
>   
> @@ -1024,9 +1586,7 @@ main(int argc, char **argv)
>   			break;
>   
>   		case 'B':
> -			speed = kwboot_tty_speed(atoi(optarg));
> -			if (speed == -1)
> -				goto usage;
> +			baudrate = atoi(optarg);
>   			break;
>   
>   		case 'h':
> @@ -1044,20 +1604,29 @@ main(int argc, char **argv)
>   
>   	ttypath = argv[optind++];
>   
> -	tty = kwboot_open_tty(ttypath, speed);
> +	tty = kwboot_open_tty(ttypath, imgpath ? 115200 : baudrate);
>   	if (tty < 0) {
>   		perror(ttypath);
>   		goto out;
>   	}
>   
> +	if (baudrate == 115200)
> +		/* do not change baudrate during Xmodem to the same value */
> +		baudrate = 0;
> +	else
> +		/* ensure we have enough space for baudrate change code */
> +		after_img_rsv += KWBOOT_BAUDRATE_BIN_HEADER_SZ +
> +				 sizeof(kwboot_pre_baud_code) +
> +				 sizeof(kwboot_baud_code);
> +
>   	if (imgpath) {
> -		img = kwboot_read_image(imgpath, &size, KWBOOT_XM_BLKSZ);
> +		img = kwboot_read_image(imgpath, &size, after_img_rsv);
>   		if (!img) {
>   			perror(imgpath);
>   			goto out;
>   		}
>   
> -		rc = kwboot_img_patch_hdr(img, &size);
> +		rc = kwboot_img_patch(img, &size, baudrate);
>   		if (rc) {
>   			fprintf(stderr, "%s: Invalid image.\n", imgpath);
>   			goto out;
> @@ -1079,7 +1648,7 @@ main(int argc, char **argv)
>   	}
>   
>   	if (img) {
> -		rc = kwboot_xmodem(tty, img, size);
> +		rc = kwboot_xmodem(tty, img, size, baudrate);
>   		if (rc) {
>   			perror("xmodem");
>   			goto out;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 29/39] tools: kwboot: Allow any baudrate on Linux

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> 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> (included by <sys/ioctl.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_linux.h ]
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c        |  16 +++-
>   tools/termios_linux.h | 189 ++++++++++++++++++++++++++++++++++++++++++
>   2 files changed, 204 insertions(+), 1 deletion(-)
>   create mode 100644 tools/termios_linux.h
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index ba2fd10ff6..7ccab2993f 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
>    */
> @@ -554,7 +559,11 @@ kwboot_tty_baudrate_to_speed(int baudrate)
>   		return B50;
>   #endif
>   	default:
> +#ifdef BOTHER
> +		return BOTHER;
> +#else
>   		return B0;
> +#endif
>   	}
>   }
>   
> @@ -575,6 +584,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..d73989b625
> --- /dev/null
> +++ b/tools/termios_linux.h
> @@ -0,0 +1,189 @@
> +/* 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>
> + * (included by <sys/ioctl.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/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)
> +{
> +	if (s & ~CBAUD) {
> +		errno = EINVAL;
> +		return -1;
> +	}
> +
> +	t->c_cflag &= ~CBAUD;
> +	t->c_cflag |= s;
> +
> +	return 0;
> +}
> +
> +#ifdef IBSHIFT
> +static inline speed_t cfgetispeed(const struct termios *t)
> +{
> +	speed_t s = (t->c_cflag >> IBSHIFT) & CBAUD;
> +
> +	if (s == B0)
> +		return cfgetospeed(t);
> +	else
> +		return s;
> +}
> +
> +static inline int cfsetispeed(struct termios *t, speed_t s)
> +{
> +	if (s == 0)
> +		s = B0;
> +
> +	if (s & ~CBAUD) {
> +		errno = EINVAL;
> +		return -1;
> +	}
> +
> +	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)
> +{
> +	if (cfsetospeed(t, s))
> +		return -1;
> +#ifdef IBSHIFT
> +	if (cfsetispeed(t, s))
> +		return -1;
> +#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_ */
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 30/39] tools: kwboot: Check whether baudrate was set to requested value

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> The tcsetattr() function can return 0 even if baudrate was not changed.
> Check whether baudrate was changed to requested value, and in case of
> arbitrary baudrate, check whether the set value is within 3% tolerance.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 32 ++++++++++++++++++++++++++++++++
>   1 file changed, 32 insertions(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 7ccab2993f..d8b950787b 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -567,6 +567,13 @@ kwboot_tty_baudrate_to_speed(int baudrate)
>   	}
>   }
>   
> +static int
> +_is_within_tolerance(int value, int reference, int tolerance)
> +{
> +	return 100 * value >= reference * (100 - tolerance) &&
> +	       100 * value <= reference * (100 + tolerance);
> +}
> +
>   static int
>   kwboot_tty_change_baudrate(int fd, int baudrate)
>   {
> @@ -601,7 +608,32 @@ kwboot_tty_change_baudrate(int fd, int baudrate)
>   	if (rc)
>   		return rc;
>   
> +	rc = tcgetattr(fd, &tio);
> +	if (rc)
> +		return rc;
> +
> +	if (cfgetospeed(&tio) != speed || cfgetispeed(&tio) != speed)
> +		goto baud_fail;
> +
> +#ifdef BOTHER
> +	/*
> +	 * Check whether set baudrate is within 3% tolerance.
> +	 * If BOTHER is defined, Linux always fills out c_ospeed / c_ispeed
> +	 * with real values.
> +	 */
> +	if (!_is_within_tolerance(tio.c_ospeed, baudrate, 3))
> +		goto baud_fail;
> +
> +	if (!_is_within_tolerance(tio.c_ispeed, baudrate, 3))
> +		goto baud_fail;
> +#endif
> +
>   	return 0;
> +
> +baud_fail:
> +	fprintf(stderr, "Could not set baudrate to requested value\n");
> +	errno = EINVAL;
> +	return -1;
>   }
>   
>   static int
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 31/39] tools: kwboot: Fix initializing tty device

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Retrieve current terminal settings via tcgetattr(), set to raw mode with
> cfmakeraw(), enable receiver via CREAD and ignore modem control lines
> via CLOCAL.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index d8b950787b..fc83161d70 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -648,11 +648,12 @@ kwboot_open_tty(const char *path, int baudrate)
>   	if (fd < 0)
>   		goto out;
>   
> -	memset(&tio, 0, sizeof(tio));
> -
> -	tio.c_iflag = 0;
> -	tio.c_cflag = CREAD|CLOCAL|CS8;
> +	rc = tcgetattr(fd, &tio);
> +	if (rc)
> +		goto out;
>   
> +	cfmakeraw(&tio);
> +	tio.c_cflag |= CREAD|CLOCAL;
>   	tio.c_cc[VMIN] = 1;
>   	tio.c_cc[VTIME] = 10;
>   
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 32/39] tools: kwboot: Disable tty interbyte timeout

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Function kwboot_tty_recv() has its own handling of read timeout, we
> don't need to do set it in tty settings.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index fc83161d70..a527c79cf3 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -655,7 +655,7 @@ kwboot_open_tty(const char *path, int baudrate)
>   	cfmakeraw(&tio);
>   	tio.c_cflag |= CREAD|CLOCAL;
>   	tio.c_cc[VMIN] = 1;
> -	tio.c_cc[VTIME] = 10;
> +	tio.c_cc[VTIME] = 0;
>   
>   	rc = tcsetattr(fd, TCSANOW, &tio);
>   	if (rc)
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 34/39] tools: kwboot: Cosmetic fix

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Add spaces around the | operator.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 5e491f31a4..9eb007f1bb 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -644,7 +644,7 @@ kwboot_open_tty(const char *path, int baudrate)
>   
>   	rc = -1;
>   
> -	fd = open(path, O_RDWR|O_NOCTTY|O_NDELAY);
> +	fd = open(path, O_RDWR | O_NOCTTY | O_NDELAY);
>   	if (fd < 0)
>   		goto out;
>   
> @@ -653,7 +653,7 @@ kwboot_open_tty(const char *path, int baudrate)
>   		goto out;
>   
>   	cfmakeraw(&tio);
> -	tio.c_cflag |= CREAD|CLOCAL;
> +	tio.c_cflag |= CREAD | CLOCAL;
>   	tio.c_cc[VMIN] = 1;
>   	tio.c_cc[VTIME] = 0;
>   
> @@ -1137,7 +1137,7 @@ kwboot_terminal(int tty)
>   		}
>   
>   		kwboot_printv("[Type Ctrl-%c + %c to quit]\r\n",
> -			      quit[0]|0100, quit[1]);
> +			      quit[0] | 0100, quit[1]);
>   	} else
>   		in = -1;
>   
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 35/39] tools: kwboot: Avoid code repetition in kwboot_img_patch()

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Change kwboot_img_patch() to avoid code repetition of setting errno to
> EINVAL.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 55 ++++++++++++++++++--------------------------------
>   1 file changed, 20 insertions(+), 35 deletions(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 9eb007f1bb..9da5b42ebf 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -1386,7 +1386,6 @@ _copy_baudrate_change_code(struct main_hdr_v1 *hdr, void *dst, int pre,
>   static int
>   kwboot_img_patch(void *img, size_t *size, int baudrate)
>   {
> -	int rc;
>   	struct main_hdr_v1 *hdr;
>   	uint32_t srcaddr;
>   	uint8_t csum;
> @@ -1394,33 +1393,25 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   	int image_ver;
>   	int is_secure;
>   
> -	rc = -1;
>   	hdr = img;
>   
> -	if (*size < sizeof(struct main_hdr_v1)) {
> -		errno = EINVAL;
> -		goto out;
> -	}
> +	if (*size < sizeof(struct main_hdr_v1))
> +		goto err;
>   
>   	image_ver = kwbimage_version(img);
>   	if (image_ver != 0 && image_ver != 1) {
>   		fprintf(stderr, "Invalid image header version\n");
> -		errno = EINVAL;
> -		goto out;
> +		goto err;
>   	}
>   
>   	hdrsz = kwbheader_size(hdr);
>   
> -	if (*size < hdrsz) {
> -		errno = EINVAL;
> -		goto out;
> -	}
> +	if (*size < hdrsz)
> +		goto err;
>   
>   	csum = kwboot_hdr_csum8(hdr) - hdr->checksum;
> -	if (csum != hdr->checksum) {
> -		errno = EINVAL;
> -		goto out;
> -	}
> +	if (csum != hdr->checksum)
> +		goto err;
>   
>   	if (image_ver == 0) {
>   		struct main_hdr_v0 *hdr_v0 = img;
> @@ -1433,10 +1424,9 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   
>   	switch (hdr->blockid) {
>   	case IBR_HDR_SATA_ID:
> -		if (srcaddr < 1) {
> -			errno = EINVAL;
> -			goto out;
> -		}
> +		if (srcaddr < 1)
> +			goto err;
> +
>   		hdr->srcaddr = cpu_to_le32((srcaddr - 1) * 512);
>   		break;
>   
> @@ -1459,10 +1449,8 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   	}
>   
>   	if (hdrsz > le32_to_cpu(hdr->srcaddr) ||
> -	    *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize)) {
> -		errno = EINVAL;
> -		goto out;
> -	}
> +	    *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize))
> +		goto err;
>   
>   	is_secure = kwboot_img_is_secure(img);
>   
> @@ -1470,8 +1458,7 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   		if (is_secure) {
>   			fprintf(stderr,
>   				"Image has secure header with signature for non-UART booting\n");
> -			errno = EINVAL;
> -			goto out;
> +			goto err;
>   		}
>   
>   		kwboot_printv("Patching image boot signature to UART\n");
> @@ -1485,15 +1472,13 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   		if (image_ver == 0) {
>   			fprintf(stderr,
>   				"Cannot inject code for changing baudrate into v0 image header\n");
> -			errno = EINVAL;
> -			goto out;
> +			goto err;
>   		}
>   
>   		if (is_secure) {
>   			fprintf(stderr,
>   				"Cannot inject code for changing baudrate into image with secure header\n");
> -			errno = EINVAL;
> -			goto out;
> +			goto err;
>   		}
>   
>   		/*
> @@ -1529,8 +1514,7 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   
>   		if (is_secure) {
>   			fprintf(stderr, "Cannot align image with secure header\n");
> -			errno = EINVAL;
> -			goto out;
> +			goto err;
>   		}
>   
>   		kwboot_printv("Aligning image header to Xmodem block size\n");
> @@ -1540,9 +1524,10 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
>   	hdr->checksum = kwboot_hdr_csum8(hdr) - csum;
>   
>   	*size = le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize);
> -	rc = 0;
> -out:
> -	return rc;
> +	return 0;
> +err:
> +	errno = EINVAL;
> +	return -1;
>   }
>   
>   static void
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 36/39] tools: kwboot: Update file header

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Mention all supported platforms in file header.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 9da5b42ebf..6fa6dff04d 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -1,6 +1,7 @@
>   /*
>    * Boot a Marvell SoC, with Xmodem over UART0.
> - *  supports Kirkwood, Dove, Armada 370, Armada XP
> + *  supports Kirkwood, Dove, Armada 370, Armada XP, Armada 375, Armada 38x and
> + *           Armada 39x
>    *
>    * (c) 2012 Daniel Stodden <daniel.stodden@gmail.com>
>    *
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 37/39] tools: kwboot: Add Pali and Marek as authors

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Add Pali and Marek as another authors of the kwboot utility.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   tools/kwboot.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 6fa6dff04d..6a1a030308 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -4,6 +4,8 @@
>    *           Armada 39x
>    *
>    * (c) 2012 Daniel Stodden <daniel.stodden@gmail.com>
> + * (c) 2021 Pali Rohár <pali@kernel.org>
> + * (c) 2021 Marek Behún <marek.behun@nic.cz>
>    *
>    * References: marvell.com, "88F6180, 88F6190, 88F6192, and 88F6281
>    *   Integrated Controller: Functional Specifications" December 2,
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 38/39] doc/kwboot.1: Update man page

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Update man page for the kwboot utility.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   doc/kwboot.1 | 60 ++++++++++++++++++++++++++++++++++------------------
>   1 file changed, 39 insertions(+), 21 deletions(-)
> 
> diff --git a/doc/kwboot.1 b/doc/kwboot.1
> index 1e9ca268f7..acdea891d9 100644
> --- a/doc/kwboot.1
> +++ b/doc/kwboot.1
> @@ -1,21 +1,22 @@
> -.TH KWBOOT 1 "2012-05-19"
> +.TH KWBOOT 1 "2021-08-25"
>   
>   .SH NAME
> -kwboot \- Boot Marvell Kirkwood SoCs over a serial link.
> +kwboot \- Boot Marvell Kirkwood (and others 32-bit) SoCs over a serial link.
>   .SH SYNOPSIS
>   .B kwboot
>   .RB [ "-b \fIimage\fP" ]
> -.RB [ "-p" ]
>   .RB [ "-t" ]
>   .RB [ "-B \fIbaudrate\fP" ]
>   .RB \fITTY\fP
>   .SH "DESCRIPTION"
>   
> -The \fBmkimage\fP program boots boards based on Marvell's Kirkwood
> -platform over their integrated UART. Boot image files will typically
> +The \fBkwboot\fP program boots boards based on Marvell's 32-bit
> +platforms including Kirkwood, Dove, A370, AXP, A375, A38x
> +and A39x over their integrated UART. Boot image files will typically
>   contain a second stage boot loader, such as U-Boot. The image file
>   must conform to Marvell's BootROM firmware image format
> -(\fIkwbimage\fP), created using a tool such as \fBmkimage\fP.
> +(\fIkwbimage v0\fP or \fIv1\fP), created using a tool such as
> +\fBmkimage\fP.
>   
>   Following power-up or a system reset, system BootROM code polls the
>   UART for a brief period of time, sensing a handshake message which
> @@ -36,25 +37,23 @@ by the second-stage loader.
>   Handshake; then upload file \fIimage\fP over \fITTY\fP.
>   
>   Note that for the encapsulated boot code to be executed, \fIimage\fP
> -must be of type "UART boot" (0x69). Boot images of different types,
> -such as backup images of vendor firmware downloaded from flash memory
> -(type 0x8B), will not work (or not as expected). See \fB-p\fP for a
> -workaround.
> +must be of type "UART boot" (0x69). The \fBkwboot\fP program changes
> +this type automatically, unless the \fIimage\fP is signed, in which
> +case it cannot be changed.
>   
>   This mode writes handshake status and upload progress indication to
> -stdout.
> +stdout. It is possible that \fIimage\fP contains an optional binary
> +code in it's header which may also print some output via UART (for
> +example U-Boot SPL does this). In such a case, this output is also
> +written to stdout after the header is sent.
>   
>   .TP
>   .BI "\-p"
> -In combination with \fB-b\fP, patches the header in \fIimage\fP prior
> -to upload, to "UART boot" type.
> +Obsolete. Does nothing.
>   
> -This option attempts on-the-fly conversion of some none-UART image
> -types, such as images which were originally formatted to be stored in
> -flash memory.
> -
> -Conversion is performed in memory. The contents of \fIimage\fP will
> -not be altered.
> +In the past, when this option was used, the program patched the header
> +in the image prior upload, to "UART boot" type. This is now done by
> +default.
>   
>   .TP
>   .BI "\-t"
> @@ -65,11 +64,26 @@ If used in combination with \fB-b\fP, terminal mode is entered
>   immediately following a successful image upload.
>   
>   If standard I/O streams connect to a console, this mode will terminate
> -after receiving 'ctrl-\\' followed by 'c' from console input.
> +after receiving \fBctrl-\e\fP followed by \fBc\fP from console input.
>   
>   .TP
>   .BI "\-B \fIbaudrate\fP"
> -Adjust the baud rate on \fITTY\fP. Default rate is 115200.
> +If used in combination with \fB-b\fP, inject into the image header
> +code that changes baud rate to \fIbaudrate\fP after uploading image
> +header, and code that changes the baud rate back to the default
> +(115200 Bd) before executing payload, and also adjust the baud rate
> +on \fITTY\fP correspondingly. This can make the upload significantly
> +faster.
> +
> +If used in combination with \fB-t\fP, adjust the baud rate to
> +\fIbaudrate\fP on \fITTY\fP before starting terminal.
> +
> +If both \fB-b\fP and \fB-t\fP are used, the baud rate is changed
> +back to 115200 after the upload.
> +
> +Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
> +230400, 460800, 500000, 576000, 921600, 1000000, 1152000, 1500000,
> +2000000, 2500000, 3125000, 4000000 and 5200000.
>   
>   .SH "SEE ALSO"
>   .PP
> @@ -82,3 +96,7 @@ Daniel Stodden <daniel.stodden@gmail.com>
>   Luka Perkov <luka@openwrt.org>
>   .br
>   David Purdy <david.c.purdy@gmail.com>
> +.br
> +Pali Rohár <pali@kernel.org>
> +.br
> +Marek Behún <marek.behun@nic.cz>
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 39/39] MAINTAINERS: Add entry for kwbimage / kwboot tools

[Stefan Roese]

On 24.09.21 23:07, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Add entry for these tools with Marek, Pali and Stefan as maintainers.
> 
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   MAINTAINERS | 10 ++++++++++
>   1 file changed, 10 insertions(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 67c96a6045..6f103230da 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -776,6 +776,16 @@ S:	Maintained
>   T:	git https://source.denx.de/u-boot/custodians/u-boot-i2c.git
>   F:	drivers/i2c/
>   
> +KWBIMAGE / KWBOOT TOOLS
> +M:	Pali Rohár <pali@kernel.org>
> +M:	Marek Behún <marek.behun@nic.cz>
> +M:	Stefan Roese <sr@denx.de>
> +S:	Maintained
> +T:	git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
> +F:	doc/README.kwbimage
> +F:	doc/kwboot.1
> +F:	tools/kwb*
> +
>   LOGGING
>   M:	Simon Glass <sjg@chromium.org>
>   S:	Maintained
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Pali,

On 30.09.21 20:14, Pali Rohár wrote:
> Hello!
> 
> Could you test or review this patch series?
> 
> It is a big improvement for kwboot as it allows to transfer u-boot over
> uart into mvebu platforms much faster.

I'm testing this series right now on my theadorable target, which
is Armada XP based. Here I get this error:

$ ./tools/kwboot -B 230400 -b u-boot-spl.kwb -t 
/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
Patching image boot signature to UART
Injecting binary header code for changing baudrate to 230400 Bd
Injecting code for changing baudrate back
Aligning image header to Xmodem block size
Sending boot message. Please reboot the target...|
Waiting 2s and flushing tty
Sending boot image header (90496 bytes)...
   0 % 
[......................................................................]
  10 % 
[......................................................................]
  19 % 
[......................................................................]
  29 % 
[......................................................................]
  39 % 
[......................................................................]
  49 % 
[......................................................................]
  59 % 
[......................................................................]
  69 % 
[......................................................................]
  79 % 
[......................................................................]
  89 % 
[......................................................................]
  99 % [....... 
       ]
Done

U-Boot SPL 2021.10-rc5-00228-g5523b4689ff9 (Oct 01 2021 - 08:39:06 +0200)
High speed PHY - Version: 2.1.5 (COM-PHY-V20)
High speed PHY - Ended Successfully
DDR3 Training Sequence - Ver 5.7.4
DDR3 Training Sequence - Ended Successfully
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff0aa0)...

Changing baudrate to 230400 Bd
Baudrate was not changed


xmodem: Protocol error


UART booting currently only seems to work with the default 115kBaud.

Do you have any idea what might go wrong here?

Thanks,
Stefan

> On Friday 24 September 2021 23:06:37 Marek Behún wrote:
>> From: Marek Behún <marek.behun@nic.cz>
>>
>> Hello Stefan and others,
>>
>> here's v3 of series adding support for booting Marvell platforms via
>> UART (those bootable with kwboot) at higher baudrates.
>>
>> Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
>> 115200 Bd.
>>
>> The user can direct kwboot to use higher baudrate via the -B option.
>> (BTW this option was there before but did not work with the -b option.)
>>
>> Only the payload part of the KWB image is uploaded at this higher
>> baudrate. The header part is still uploaded at 115200 Bd, since the code
>> that changes baudrate is injected into header as a binary extension.
>> (The payload part makes up majority of the binary, though. On Turris
>>   Omnia the payload currently makes ~87%.)
>>
>> The series also contains various other fixes, refactors and improvements
>> of the code, upon which the main change is done.
>>
>> Marek & Pali
>>
>> Changes since v2:
>> - fixed integer overflow in patch 15
>> - fixed commit title in patch 32
>>
>> Changes since v1:
>> - fixed uploading of older kwb images, now all kwb images should be able
>>    to upload at faster baudrate
>> - fixed injecting code that changes baudrate back
>> - various other fixes and refactors, the best way to compare with v1 is
>>    to apply v1 and v2 separately and compare the resulting kwboot.c
>>
>> Marek Behún (19):
>>    tools: kwbimage: Fix printf format warning
>>    tools: kwboot: Fix buffer overflow in kwboot_terminal()
>>    tools: kwboot: Make the quit sequence buffer const
>>    tools: kwboot: Refactor and fix writing buffer
>>    tools: kwboot: Fix comparison of integers with different size
>>    tools: kwboot: Use a function to check whether received byte is a
>>      Xmodem reply
>>    tools: kwboot: Print new line after SPL output
>>    tools: kwboot: Allow greater timeout when executing header code
>>    tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
>>      received
>>    tools: kwbimage: Simplify iteration over version 1 optional headers
>>    tools: kwbimage: Refactor image_version()
>>    tools: kwbimage: Refactor kwbimage header size determination
>>    tools: kwboot: Explicitly check against size of struct main_hdr_v1
>>    tools: kwboot: Check whether baudrate was set to requested value
>>    tools: kwboot: Cosmetic fix
>>    tools: kwboot: Avoid code repetition in kwboot_img_patch()
>>    tools: kwboot: Update file header
>>    doc/kwboot.1: Update man page
>>    MAINTAINERS: Add entry for kwbimage / kwboot tools
>>
>> Pali Rohár (20):
>>    tools: kwboot: Print version information header
>>    tools: kwboot: Fix kwboot_xm_sendblock() function when
>>      kwboot_tty_recv() fails
>>    tools: kwboot: Fix return type of kwboot_xm_makeblock() function
>>    tools: kwboot: Fix printing progress
>>    tools: kwboot: Print newline on error when progress was not completed
>>    tools: kwboot: Split sending image into header and data stages
>>    tools: kwboot: Allow non-xmodem text output from BootROM only in a
>>      specific case
>>    tools: kwboot: Properly finish xmodem transfer
>>    tools: kwboot: Always call kwboot_img_patch_hdr()
>>    tools: kwboot: Don't patch image header if signed
>>    tools: kwboot: Patch source address in image header
>>    tools: kwboot: Patch destination address to DDR area for SPI image
>>    tools: kwbimage: Update comments describing kwbimage v1 structures
>>    tools: kwboot: Round up header size to 128 B when patching
>>    tools: kwboot: Support higher baudrates when booting via UART
>>    tools: kwboot: Allow any baudrate on Linux
>>    tools: kwboot: Fix initializing tty device
>>    tools: kwboot: Disable tty interbyte timeout
>>    tools: kwboot: Disable non-blocking mode
>>    tools: kwboot: Add Pali and Marek as authors
>>
>>   MAINTAINERS           |   10 +
>>   doc/kwboot.1          |   60 ++-
>>   tools/kwbimage.c      |  130 ++---
>>   tools/kwbimage.h      |   99 +++-
>>   tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
>>   tools/termios_linux.h |  189 +++++++
>>   6 files changed, 1385 insertions(+), 300 deletions(-)
>>   create mode 100644 tools/termios_linux.h
>>
>> -- 
>> 2.32.0
>>


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Marek Behún]

On Fri, 1 Oct 2021 09:46:58 +0200
Stefan Roese <sr@denx.de> wrote:

> Hi Pali,
> 
> On 30.09.21 20:14, Pali Rohár wrote:
> > Hello!
> > 
> > Could you test or review this patch series?
> > 
> > It is a big improvement for kwboot as it allows to transfer u-boot over
> > uart into mvebu platforms much faster.  
> 
> I'm testing this series right now on my theadorable target, which
> is Armada XP based. Here I get this error:

Stefan, I have sent 39 patches, but for some of them (I think 3) I
received "undelivered mail" from your address, due to too many messages
or something. So I resent those 3 patches to you. But now that I am
looking at your "Reviewed-by" replies, I did not get "Reviewed-by" for
patches 19, 20 and 33. Could you check whether you got those 3 and
applied them?

Marek

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Marek,

On 01.10.21 11:16, Marek Behún wrote:
> On Fri, 1 Oct 2021 09:46:58 +0200
> Stefan Roese <sr@denx.de> wrote:
> 
>> Hi Pali,
>>
>> On 30.09.21 20:14, Pali Rohár wrote:
>>> Hello!
>>>
>>> Could you test or review this patch series?
>>>
>>> It is a big improvement for kwboot as it allows to transfer u-boot over
>>> uart into mvebu platforms much faster.
>>
>> I'm testing this series right now on my theadorable target, which
>> is Armada XP based. Here I get this error:
> 
> Stefan, I have sent 39 patches, but for some of them (I think 3) I
> received "undelivered mail" from your address, due to too many messages
> or something. So I resent those 3 patches to you. But now that I am
> looking at your "Reviewed-by" replies, I did not get "Reviewed-by" for
> patches 19, 20 and 33. Could you check whether you got those 3 and
> applied them?

Hmmm, I think I reviewed all and am pretty sure that I applied all
(to marvell/next). At least its 39 patches.

Please check yourself, if I missed something:

https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/next

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Pali Rohár]

Hello!

On Friday 01 October 2021 09:46:58 Stefan Roese wrote:
> Hi Pali,
> 
> On 30.09.21 20:14, Pali Rohár wrote:
> > Hello!
> > 
> > Could you test or review this patch series?
> > 
> > It is a big improvement for kwboot as it allows to transfer u-boot over
> > uart into mvebu platforms much faster.
> 
> I'm testing this series right now on my theadorable target, which
> is Armada XP based. Here I get this error:
> 
> $ ./tools/kwboot -B 230400 -b u-boot-spl.kwb -t
> /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
> Patching image boot signature to UART
> Injecting binary header code for changing baudrate to 230400 Bd
> Injecting code for changing baudrate back
> Aligning image header to Xmodem block size
> Sending boot message. Please reboot the target...|
> Waiting 2s and flushing tty
> Sending boot image header (90496 bytes)...
>   0 %
> [......................................................................]
>  10 %
> [......................................................................]
>  19 %
> [......................................................................]
>  29 %
> [......................................................................]
>  39 %
> [......................................................................]
>  49 %
> [......................................................................]
>  59 %
> [......................................................................]
>  69 %
> [......................................................................]
>  79 %
> [......................................................................]
>  89 %
> [......................................................................]
>  99 % [.......       ]
> Done
> 
> U-Boot SPL 2021.10-rc5-00228-g5523b4689ff9 (Oct 01 2021 - 08:39:06 +0200)
> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
> High speed PHY - Ended Successfully
> DDR3 Training Sequence - Ver 5.7.4
> DDR3 Training Sequence - Ended Successfully
> Trying to boot from BOOTROM
> Returning to BootROM (return address 0xffff0aa0)...

At this stage SPL was successfully executed and returned control back to
BootROM. BootROM now should execute second (injected) header for
changing baudrate.

> Changing baudrate to 230400 Bd

At this stage kwboot received baudrate change magic string which
indicates that BootROM started executing second injected header, as this
string is printed at the beginning of the injected code (kwboot_baud_code[])

But we do not know if whole code was successfully executed or not.

In case of error (e.g. executing unsupported instructions or touching
unavailable memory) CPU is reset.

Can you check if CPU was reset and BootROM started booting from primary
source (probably SPI) immediately when you saw this message?

Or is board even after executing kwboot stucked in some UART execution?

> Baudrate was not changed

At this stage kwboot already instructed your FTDI adapter to switch
baudrate and is ready for receiving data from AXP at higher speed.

This message indicates that kwboot has not received xmodem ACK for the
last packet.

Could you check what is the delay between "Changing baudrate to ..." and
"Baudrate was not changed" messages? It is in immediately or few seconds
or minute?

What is CPU speed of your AXP? Could you try to increase or decrease
sleep timeout which is in ARM kwboot_baud_code[] bellow comment
"Sleep 1ms ~~ 600000 cycles at 1200 MHz"

To debug you can try to also add debug prints in while loop which is in
function kwboot_xm_sendblock() to check when and how many times it is
executed.

And another case for test. Check if AXP really switched to higher
baudrate. You can do it by commenting code which changes baudrate on
local PC side in function kwboot_baud_magic_handle(). If AXP does not
change baudrate then it continue communication at 115200 and so if you
comment code "Changing baudrate to %d Bd" in kwboot_baud_magic_handle()
it would also continue communication at 115200.

> 
> xmodem: Protocol error
> 
> 
> UART booting currently only seems to work with the default 115kBaud.

Does it work with lower speed? If not then it indicates that issue is in
this baudrate change logic.

> Do you have any idea what might go wrong here?
> 
> Thanks,
> Stefan
> 
> > On Friday 24 September 2021 23:06:37 Marek Behún wrote:
> > > From: Marek Behún <marek.behun@nic.cz>
> > > 
> > > Hello Stefan and others,
> > > 
> > > here's v3 of series adding support for booting Marvell platforms via
> > > UART (those bootable with kwboot) at higher baudrates.
> > > 
> > > Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
> > > 115200 Bd.
> > > 
> > > The user can direct kwboot to use higher baudrate via the -B option.
> > > (BTW this option was there before but did not work with the -b option.)
> > > 
> > > Only the payload part of the KWB image is uploaded at this higher
> > > baudrate. The header part is still uploaded at 115200 Bd, since the code
> > > that changes baudrate is injected into header as a binary extension.
> > > (The payload part makes up majority of the binary, though. On Turris
> > >   Omnia the payload currently makes ~87%.)
> > > 
> > > The series also contains various other fixes, refactors and improvements
> > > of the code, upon which the main change is done.
> > > 
> > > Marek & Pali
> > > 
> > > Changes since v2:
> > > - fixed integer overflow in patch 15
> > > - fixed commit title in patch 32
> > > 
> > > Changes since v1:
> > > - fixed uploading of older kwb images, now all kwb images should be able
> > >    to upload at faster baudrate
> > > - fixed injecting code that changes baudrate back
> > > - various other fixes and refactors, the best way to compare with v1 is
> > >    to apply v1 and v2 separately and compare the resulting kwboot.c
> > > 
> > > Marek Behún (19):
> > >    tools: kwbimage: Fix printf format warning
> > >    tools: kwboot: Fix buffer overflow in kwboot_terminal()
> > >    tools: kwboot: Make the quit sequence buffer const
> > >    tools: kwboot: Refactor and fix writing buffer
> > >    tools: kwboot: Fix comparison of integers with different size
> > >    tools: kwboot: Use a function to check whether received byte is a
> > >      Xmodem reply
> > >    tools: kwboot: Print new line after SPL output
> > >    tools: kwboot: Allow greater timeout when executing header code
> > >    tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
> > >      received
> > >    tools: kwbimage: Simplify iteration over version 1 optional headers
> > >    tools: kwbimage: Refactor image_version()
> > >    tools: kwbimage: Refactor kwbimage header size determination
> > >    tools: kwboot: Explicitly check against size of struct main_hdr_v1
> > >    tools: kwboot: Check whether baudrate was set to requested value
> > >    tools: kwboot: Cosmetic fix
> > >    tools: kwboot: Avoid code repetition in kwboot_img_patch()
> > >    tools: kwboot: Update file header
> > >    doc/kwboot.1: Update man page
> > >    MAINTAINERS: Add entry for kwbimage / kwboot tools
> > > 
> > > Pali Rohár (20):
> > >    tools: kwboot: Print version information header
> > >    tools: kwboot: Fix kwboot_xm_sendblock() function when
> > >      kwboot_tty_recv() fails
> > >    tools: kwboot: Fix return type of kwboot_xm_makeblock() function
> > >    tools: kwboot: Fix printing progress
> > >    tools: kwboot: Print newline on error when progress was not completed
> > >    tools: kwboot: Split sending image into header and data stages
> > >    tools: kwboot: Allow non-xmodem text output from BootROM only in a
> > >      specific case
> > >    tools: kwboot: Properly finish xmodem transfer
> > >    tools: kwboot: Always call kwboot_img_patch_hdr()
> > >    tools: kwboot: Don't patch image header if signed
> > >    tools: kwboot: Patch source address in image header
> > >    tools: kwboot: Patch destination address to DDR area for SPI image
> > >    tools: kwbimage: Update comments describing kwbimage v1 structures
> > >    tools: kwboot: Round up header size to 128 B when patching
> > >    tools: kwboot: Support higher baudrates when booting via UART
> > >    tools: kwboot: Allow any baudrate on Linux
> > >    tools: kwboot: Fix initializing tty device
> > >    tools: kwboot: Disable tty interbyte timeout
> > >    tools: kwboot: Disable non-blocking mode
> > >    tools: kwboot: Add Pali and Marek as authors
> > > 
> > >   MAINTAINERS           |   10 +
> > >   doc/kwboot.1          |   60 ++-
> > >   tools/kwbimage.c      |  130 ++---
> > >   tools/kwbimage.h      |   99 +++-
> > >   tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
> > >   tools/termios_linux.h |  189 +++++++
> > >   6 files changed, 1385 insertions(+), 300 deletions(-)
> > >   create mode 100644 tools/termios_linux.h
> > > 
> > > -- 
> > > 2.32.0
> > > 
> 
> 
> Viele Grüße,
> Stefan
> 
> -- 
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Marek Behún]

On Fri, 1 Oct 2021 11:23:10 +0200
Stefan Roese <sr@denx.de> wrote:

> Hi Marek,
> 
> On 01.10.21 11:16, Marek Behún wrote:
> > On Fri, 1 Oct 2021 09:46:58 +0200
> > Stefan Roese <sr@denx.de> wrote:
> >   
> >> Hi Pali,
> >>
> >> On 30.09.21 20:14, Pali Rohár wrote:  
> >>> Hello!
> >>>
> >>> Could you test or review this patch series?
> >>>
> >>> It is a big improvement for kwboot as it allows to transfer u-boot over
> >>> uart into mvebu platforms much faster.  
> >>
> >> I'm testing this series right now on my theadorable target, which
> >> is Armada XP based. Here I get this error:  
> > 
> > Stefan, I have sent 39 patches, but for some of them (I think 3) I
> > received "undelivered mail" from your address, due to too many messages
> > or something. So I resent those 3 patches to you. But now that I am
> > looking at your "Reviewed-by" replies, I did not get "Reviewed-by" for
> > patches 19, 20 and 33. Could you check whether you got those 3 and
> > applied them?  
> 
> Hmmm, I think I reviewed all and am pretty sure that I applied all
> (to marvell/next). At least its 39 patches.
> 
> Please check yourself, if I missed something:
> 
> https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/next

Yes, seems that you applied all patches. The issue must be somewhere
else, lets wait for Pali's opinion.

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Pali,

On 01.10.21 11:28, Pali Rohár wrote:
> Hello!
> 
> On Friday 01 October 2021 09:46:58 Stefan Roese wrote:
>> Hi Pali,
>>
>> On 30.09.21 20:14, Pali Rohár wrote:
>>> Hello!
>>>
>>> Could you test or review this patch series?
>>>
>>> It is a big improvement for kwboot as it allows to transfer u-boot over
>>> uart into mvebu platforms much faster.
>>
>> I'm testing this series right now on my theadorable target, which
>> is Armada XP based. Here I get this error:
>>
>> $ ./tools/kwboot -B 230400 -b u-boot-spl.kwb -t
>> /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
>> Patching image boot signature to UART
>> Injecting binary header code for changing baudrate to 230400 Bd
>> Injecting code for changing baudrate back
>> Aligning image header to Xmodem block size
>> Sending boot message. Please reboot the target...|
>> Waiting 2s and flushing tty
>> Sending boot image header (90496 bytes)...
>>    0 %
>> [......................................................................]
>>   10 %
>> [......................................................................]
>>   19 %
>> [......................................................................]
>>   29 %
>> [......................................................................]
>>   39 %
>> [......................................................................]
>>   49 %
>> [......................................................................]
>>   59 %
>> [......................................................................]
>>   69 %
>> [......................................................................]
>>   79 %
>> [......................................................................]
>>   89 %
>> [......................................................................]
>>   99 % [.......       ]
>> Done
>>
>> U-Boot SPL 2021.10-rc5-00228-g5523b4689ff9 (Oct 01 2021 - 08:39:06 +0200)
>> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
>> High speed PHY - Ended Successfully
>> DDR3 Training Sequence - Ver 5.7.4
>> DDR3 Training Sequence - Ended Successfully
>> Trying to boot from BOOTROM
>> Returning to BootROM (return address 0xffff0aa0)...
> 
> At this stage SPL was successfully executed and returned control back to
> BootROM. BootROM now should execute second (injected) header for
> changing baudrate.
> 
>> Changing baudrate to 230400 Bd
> 
> At this stage kwboot received baudrate change magic string which
> indicates that BootROM started executing second injected header, as this
> string is printed at the beginning of the injected code (kwboot_baud_code[])
> 
> But we do not know if whole code was successfully executed or not.
> 
> In case of error (e.g. executing unsupported instructions or touching
> unavailable memory) CPU is reset.
> 
> Can you check if CPU was reset and BootROM started booting from primary
> source (probably SPI) immediately when you saw this message?

I checked by quickly starting a terminal app and it does not seem that
the CPU did go through a reboot. Nothing on the UART at this stage.

BUT:
The tests I did in this mail were done with your 39 patches applied
on top of "master-kwboot" [1]. Here booting with 115k works as explained 
below.

Now I applied the same 39 patches on top of "next" [2]. And here not
even booting with 115k works on my AXP target. It always hangs at this
stage:

[stefan@ryzen u-boot-marvell (next)]$ ./tools/kwboot -b u-boot-spl.kwb 
-t /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
Patching image boot signature to UART
Sending boot message. Please reboot the target...|
Waiting 2s and flushing tty
Sending boot image header (90112 bytes)...
   0 % 
[......................................................................]
  10 % 
[......................................................................]
  20 % 
[......................................................................]
  29 % 
[......................................................................]
  39 % 
[......................................................................]
  49 % 
[......................................................................]
  59 % 
[......................................................................]
  69 % 
[......................................................................]
  79 % 
[......................................................................]
  89 % 
[......................................................................]
  99 % [.... 
       ]
Done

U-Boot SPL 2021.10-rc5-00431-g6c96332441cf (Oct 01 2021 - 11:56:49 +0200)
High speed PHY - Version: 2.1.5 (COM-PHY-V20)
High speed PHY - Ended Successfully
DDR3 Training Sequence - Ver 5.7.4
DDR3 Training Sequence - Ended Successfully
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff0aa0)...


xmodem: Connection timed out


This seems to work at least for 115k in the "master-kwboot" branch.

Any ideas?

Thanks,
Stefan

[1] 
https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/master-kwboot
[2] https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/next

> Or is board even after executing kwboot stucked in some UART execution?
> 
>> Baudrate was not changed
> 
> At this stage kwboot already instructed your FTDI adapter to switch
> baudrate and is ready for receiving data from AXP at higher speed.
> 
> This message indicates that kwboot has not received xmodem ACK for the
> last packet.
> 
> Could you check what is the delay between "Changing baudrate to ..." and
> "Baudrate was not changed" messages? It is in immediately or few seconds
> or minute?
> 
> What is CPU speed of your AXP? Could you try to increase or decrease
> sleep timeout which is in ARM kwboot_baud_code[] bellow comment
> "Sleep 1ms ~~ 600000 cycles at 1200 MHz"
> 
> To debug you can try to also add debug prints in while loop which is in
> function kwboot_xm_sendblock() to check when and how many times it is
> executed.
> 
> And another case for test. Check if AXP really switched to higher
> baudrate. You can do it by commenting code which changes baudrate on
> local PC side in function kwboot_baud_magic_handle(). If AXP does not
> change baudrate then it continue communication at 115200 and so if you
> comment code "Changing baudrate to %d Bd" in kwboot_baud_magic_handle()
> it would also continue communication at 115200.
> 
>>
>> xmodem: Protocol error
>>
>>
>> UART booting currently only seems to work with the default 115kBaud.
> 
> Does it work with lower speed? If not then it indicates that issue is in
> this baudrate change logic.
> 
>> Do you have any idea what might go wrong here?
>>
>> Thanks,
>> Stefan
>>
>>> On Friday 24 September 2021 23:06:37 Marek Behún wrote:
>>>> From: Marek Behún <marek.behun@nic.cz>
>>>>
>>>> Hello Stefan and others,
>>>>
>>>> here's v3 of series adding support for booting Marvell platforms via
>>>> UART (those bootable with kwboot) at higher baudrates.
>>>>
>>>> Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
>>>> 115200 Bd.
>>>>
>>>> The user can direct kwboot to use higher baudrate via the -B option.
>>>> (BTW this option was there before but did not work with the -b option.)
>>>>
>>>> Only the payload part of the KWB image is uploaded at this higher
>>>> baudrate. The header part is still uploaded at 115200 Bd, since the code
>>>> that changes baudrate is injected into header as a binary extension.
>>>> (The payload part makes up majority of the binary, though. On Turris
>>>>    Omnia the payload currently makes ~87%.)
>>>>
>>>> The series also contains various other fixes, refactors and improvements
>>>> of the code, upon which the main change is done.
>>>>
>>>> Marek & Pali
>>>>
>>>> Changes since v2:
>>>> - fixed integer overflow in patch 15
>>>> - fixed commit title in patch 32
>>>>
>>>> Changes since v1:
>>>> - fixed uploading of older kwb images, now all kwb images should be able
>>>>     to upload at faster baudrate
>>>> - fixed injecting code that changes baudrate back
>>>> - various other fixes and refactors, the best way to compare with v1 is
>>>>     to apply v1 and v2 separately and compare the resulting kwboot.c
>>>>
>>>> Marek Behún (19):
>>>>     tools: kwbimage: Fix printf format warning
>>>>     tools: kwboot: Fix buffer overflow in kwboot_terminal()
>>>>     tools: kwboot: Make the quit sequence buffer const
>>>>     tools: kwboot: Refactor and fix writing buffer
>>>>     tools: kwboot: Fix comparison of integers with different size
>>>>     tools: kwboot: Use a function to check whether received byte is a
>>>>       Xmodem reply
>>>>     tools: kwboot: Print new line after SPL output
>>>>     tools: kwboot: Allow greater timeout when executing header code
>>>>     tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
>>>>       received
>>>>     tools: kwbimage: Simplify iteration over version 1 optional headers
>>>>     tools: kwbimage: Refactor image_version()
>>>>     tools: kwbimage: Refactor kwbimage header size determination
>>>>     tools: kwboot: Explicitly check against size of struct main_hdr_v1
>>>>     tools: kwboot: Check whether baudrate was set to requested value
>>>>     tools: kwboot: Cosmetic fix
>>>>     tools: kwboot: Avoid code repetition in kwboot_img_patch()
>>>>     tools: kwboot: Update file header
>>>>     doc/kwboot.1: Update man page
>>>>     MAINTAINERS: Add entry for kwbimage / kwboot tools
>>>>
>>>> Pali Rohár (20):
>>>>     tools: kwboot: Print version information header
>>>>     tools: kwboot: Fix kwboot_xm_sendblock() function when
>>>>       kwboot_tty_recv() fails
>>>>     tools: kwboot: Fix return type of kwboot_xm_makeblock() function
>>>>     tools: kwboot: Fix printing progress
>>>>     tools: kwboot: Print newline on error when progress was not completed
>>>>     tools: kwboot: Split sending image into header and data stages
>>>>     tools: kwboot: Allow non-xmodem text output from BootROM only in a
>>>>       specific case
>>>>     tools: kwboot: Properly finish xmodem transfer
>>>>     tools: kwboot: Always call kwboot_img_patch_hdr()
>>>>     tools: kwboot: Don't patch image header if signed
>>>>     tools: kwboot: Patch source address in image header
>>>>     tools: kwboot: Patch destination address to DDR area for SPI image
>>>>     tools: kwbimage: Update comments describing kwbimage v1 structures
>>>>     tools: kwboot: Round up header size to 128 B when patching
>>>>     tools: kwboot: Support higher baudrates when booting via UART
>>>>     tools: kwboot: Allow any baudrate on Linux
>>>>     tools: kwboot: Fix initializing tty device
>>>>     tools: kwboot: Disable tty interbyte timeout
>>>>     tools: kwboot: Disable non-blocking mode
>>>>     tools: kwboot: Add Pali and Marek as authors
>>>>
>>>>    MAINTAINERS           |   10 +
>>>>    doc/kwboot.1          |   60 ++-
>>>>    tools/kwbimage.c      |  130 ++---
>>>>    tools/kwbimage.h      |   99 +++-
>>>>    tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
>>>>    tools/termios_linux.h |  189 +++++++
>>>>    6 files changed, 1385 insertions(+), 300 deletions(-)
>>>>    create mode 100644 tools/termios_linux.h
>>>>
>>>> -- 
>>>> 2.32.0
>>>>
>>
>>
>> Viele Grüße,
>> Stefan
>>
>> -- 
>> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
>> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
>> Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Pali Rohár]

Hello!

On Friday 01 October 2021 11:58:14 Stefan Roese wrote:
> I checked by quickly starting a terminal app and it does not seem that
> the CPU did go through a reboot. Nothing on the UART at this stage.
> 
> BUT:
> The tests I did in this mail were done with your 39 patches applied
> on top of "master-kwboot" [1]. Here booting with 115k works as explained
> below.
> 
> Now I applied the same 39 patches on top of "next" [2]. And here not
> even booting with 115k works on my AXP target. It always hangs at this
> stage:

So default baudrate 115200 works fine on master+39patches and does not
work on next+39patches? Could you check if it works on next without
applying any patch?

> [stefan@ryzen u-boot-marvell (next)]$ ./tools/kwboot -b u-boot-spl.kwb -t
> /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
> Patching image boot signature to UART
> Sending boot message. Please reboot the target...|
> Waiting 2s and flushing tty
> Sending boot image header (90112 bytes)...
>   0 %
> [......................................................................]
>  10 %
> [......................................................................]
>  20 %
> [......................................................................]
>  29 %
> [......................................................................]
>  39 %
> [......................................................................]
>  49 %
> [......................................................................]
>  59 %
> [......................................................................]
>  69 %
> [......................................................................]
>  79 %
> [......................................................................]
>  89 %
> [......................................................................]
>  99 % [....       ]
> Done
> 
> U-Boot SPL 2021.10-rc5-00431-g6c96332441cf (Oct 01 2021 - 11:56:49 +0200)
> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
> High speed PHY - Ended Successfully
> DDR3 Training Sequence - Ver 5.7.4
> DDR3 Training Sequence - Ended Successfully
> Trying to boot from BOOTROM
> Returning to BootROM (return address 0xffff0aa0)...
> 
> 
> xmodem: Connection timed out
> 
> 
> This seems to work at least for 115k in the "master-kwboot" branch.
> 
> Any ideas?
> 
> Thanks,
> Stefan
> 
> [1] https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/master-kwboot
> [2] https://source.denx.de/u-boot/custodians/u-boot-marvell/-/commits/next

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Pali,

On 01.10.21 12:09, Pali Rohár wrote:
> Hello!
> 
> On Friday 01 October 2021 11:58:14 Stefan Roese wrote:
>> I checked by quickly starting a terminal app and it does not seem that
>> the CPU did go through a reboot. Nothing on the UART at this stage.
>>
>> BUT:
>> The tests I did in this mail were done with your 39 patches applied
>> on top of "master-kwboot" [1]. Here booting with 115k works as explained
>> below.
>>
>> Now I applied the same 39 patches on top of "next" [2]. And here not
>> even booting with 115k works on my AXP target. It always hangs at this
>> stage:
> 
> So default baudrate 115200 works fine on master+39patches and does not
> work on next+39patches? Could you check if it works on next without
> applying any patch?

Sure, here you go:

First the test on "next" without the 39 patches:

[stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t 
/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
Sending boot message. Please reboot the target...|
Sending boot image...
   0 % 
[......................................................................]
   1 % 
[......................................................................]
   2 % 
[......................................................................]
   4 % 
[......................................................................]
   5 % 
[......................................................................]
   7 % 
[......................................................................]
   8 % 
[......................................................................]
   9 % 
[......................................................................]
  11 % 
[......................................................................]
  12 % 
[......................................................................]
  14 % [...
U-Boot SPL 2021.10-rc5-00392-g7fde64c004ea (Oct 01 2021 - 12:27:27 +0200)
High speed PHY - Version: 2.1.5 (COM-PHY-V20)
High speed PHY - Ended Successfully
DDR3 Training Sequence - Ver 5.7.4
DDR3 Training Sequence - Ended Successfully
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff0aa0)...
+xmodem: Protocol error


Not working!

And now test on "master" without the 39 patches:

[stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t 
/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
Sending boot message. Please reboot the target...|
Sending boot image...
   0 % 
[......................................................................]
   1 % 
[......................................................................]
   2 % 
[......................................................................]
   4 % 
[......................................................................]
   5 % 
[......................................................................]
   7 % 
[......................................................................]
   8 % 
[......................................................................]
   9 % 
[......................................................................]
  11 % 
[......................................................................]
  12 % 
[......................................................................]
  14 % [...
U-Boot SPL 2021.10-rc5-00012-gbf9fcc20000c (Oct 01 2021 - 12:25:35 +0200)
High speed PHY - Version: 2.1.5 (COM-PHY-V20)
High speed PHY - Ended Successfully
DDR3 Training Sequence - Ver 5.7.4
DDR3 Training Sequence - Ended Successfully
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff0aa0)...
...................................................................]
  15 % 
[......................................................................]
  16 % 
[......................................................................]
  18 % 
[......................................................................]
  19 % 
[......................................................................]
  21 % 
[......................................................................]
  22 % 
[......................................................................]
  23 % 
[......................................................................]
  25 % 
[......................................................................]
  26 % 
[......................................................................^C

Seems to okay.

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Marek Behún]

On Fri, 1 Oct 2021 12:09:04 +0200
Pali Rohár <pali@kernel.org> wrote:

> Hello!
> 
> On Friday 01 October 2021 11:58:14 Stefan Roese wrote:
> > I checked by quickly starting a terminal app and it does not seem that
> > the CPU did go through a reboot. Nothing on the UART at this stage.
> > 
> > BUT:
> > The tests I did in this mail were done with your 39 patches applied
> > on top of "master-kwboot" [1]. Here booting with 115k works as explained
> > below.
> > 
> > Now I applied the same 39 patches on top of "next" [2]. And here not
> > even booting with 115k works on my AXP target. It always hangs at this
> > stage:  
> 
> So default baudrate 115200 works fine on master+39patches and does not
> work on next+39patches? Could you check if it works on next without
> applying any patch?

This seems as if the ACK was not sent by the BootROM.

Stefan, could you apply the patch below, recompile and then send the output again?

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 6a1a030308..d433ec6d9c 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -865,6 +865,7 @@ kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print,
 	while (1) {
 		rc = kwboot_tty_recv(fd, c, 1, timeout);
 		if (rc) {
+			printf("rc=%i errno=%i allow_non_xm=%i *non_xm_print=%i\n", rc, errno, allow_non_xm, allow_non_xm ? *non_xm_print : -1);
 			if (errno != ETIMEDOUT)
 				return rc;
 			else if (allow_non_xm && *non_xm_print)

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Pali Rohár]

Hello!

On Friday 01 October 2021 12:28:34 Stefan Roese wrote:
> First the test on "next" without the 39 patches:
> 
> [stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
...
> DDR3 Training Sequence - Ended Successfully
> Trying to boot from BOOTROM
> Returning to BootROM (return address 0xffff0aa0)...
> +xmodem: Protocol error
> 
> 
> Not working!
> 
> And now test on "master" without the 39 patches:
> 
> [stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
...
> 
> Seems to okay.
> 
> Thanks,
> Stefan

So something is broken in next branch. I have looked at kwboot and
kwbimage code and there is no change in next branch which is not in
master branch.

So it looks like that something not related to kwboot broke it in next
branch. And seems that git bisect on AXP hw would be required. But I do
not own AXP board, so I cannot do it.

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

On 01.10.21 12:36, Marek Behún wrote:
> On Fri, 1 Oct 2021 12:09:04 +0200
> Pali Rohár <pali@kernel.org> wrote:
> 
>> Hello!
>>
>> On Friday 01 October 2021 11:58:14 Stefan Roese wrote:
>>> I checked by quickly starting a terminal app and it does not seem that
>>> the CPU did go through a reboot. Nothing on the UART at this stage.
>>>
>>> BUT:
>>> The tests I did in this mail were done with your 39 patches applied
>>> on top of "master-kwboot" [1]. Here booting with 115k works as explained
>>> below.
>>>
>>> Now I applied the same 39 patches on top of "next" [2]. And here not
>>> even booting with 115k works on my AXP target. It always hangs at this
>>> stage:
>>
>> So default baudrate 115200 works fine on master+39patches and does not
>> work on next+39patches? Could you check if it works on next without
>> applying any patch?
> 
> This seems as if the ACK was not sent by the BootROM.
> 
> Stefan, could you apply the patch below, recompile and then send the output again?

Sure. This is on top of next with the 39 patches:

[stefan@ryzen u-boot-marvell (next)]$ ./tools/kwboot -p -b 
u-boot-spl.kwb -t 
/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
Patching image boot signature to UART
Sending boot message. Please reboot the target.../
Waiting 2s and flushing tty
Sending boot image header (90112 bytes)...
   0 % 
[......................................................................]
  10 % 
[......................................................................]
  20 % 
[......................................................................]
  29 % 
[......................................................................]
  39 % 
[......................................................................]
  49 % 
[......................................................................]
  59 % 
[......................................................................]
  69 % 
[......................................................................]
  79 % 
[......................................................................]
  89 % 
[......................................................................]
  99 % [.... 
       ]
Done

U-Boot SPL 2021.10-rc5-00431-g6c96332441cf-dirty (Oct 01 2021 - 12:38:55 
+0200)
High speed PHY - Version: 2.1.5 (COM-PHY-V20)
High speed PHY - Ended Successfully
DDR3 Training Sequence - Ver 5.7.4
DDR3 Training Sequence - Ended Successfully
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff0aa0)...
rc=-1 errno=110 allow_non_xm=1 *non_xm_print=1


xmodem: Connection timed out

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

On 01.10.21 12:39, Pali Rohár wrote:
> Hello!
> 
> On Friday 01 October 2021 12:28:34 Stefan Roese wrote:
>> First the test on "next" without the 39 patches:
>>
>> [stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
> ...
>> DDR3 Training Sequence - Ended Successfully
>> Trying to boot from BOOTROM
>> Returning to BootROM (return address 0xffff0aa0)...
>> +xmodem: Protocol error
>>
>>
>> Not working!
>>
>> And now test on "master" without the 39 patches:
>>
>> [stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
> ...
>>
>> Seems to okay.
>>
>> Thanks,
>> Stefan
> 
> So something is broken in next branch. I have looked at kwboot and
> kwbimage code and there is no change in next branch which is not in
> master branch.
> 
> So it looks like that something not related to kwboot broke it in next
> branch. And seems that git bisect on AXP hw would be required. But I do
> not own AXP board, so I cannot do it.

I can try to do this here later, if I find the time.

Did you try booting on some other MVEBU SoC (e.g. A38x) using "next"
as base?

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Marek Behún]

On Fri, 1 Oct 2021 12:40:29 +0200
Stefan Roese <sr@denx.de> wrote:

> U-Boot SPL 2021.10-rc5-00431-g6c96332441cf-dirty (Oct 01 2021 - 12:38:55 
> +0200)
> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
> High speed PHY - Ended Successfully
> DDR3 Training Sequence - Ver 5.7.4
> DDR3 Training Sequence - Ended Successfully
> Trying to boot from BOOTROM
> Returning to BootROM (return address 0xffff0aa0)...
> rc=-1 errno=110 allow_non_xm=1 *non_xm_print=1
> 
> 
> xmodem: Connection timed out

No ACK from BootROM. It is possible that return_from_bootrom() was not
called, or failed, somehow in SPL.

I guess bisecting would be the best option here. Maybe it is related
to the previous "arm: mvebu:" that reduced SPL size...

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Pali Rohár]

On Friday 01 October 2021 12:43:19 Stefan Roese wrote:
> On 01.10.21 12:39, Pali Rohár wrote:
> > Hello!
> > 
> > On Friday 01 October 2021 12:28:34 Stefan Roese wrote:
> > > First the test on "next" without the 39 patches:
> > > 
> > > [stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
> > ...
> > > DDR3 Training Sequence - Ended Successfully
> > > Trying to boot from BOOTROM
> > > Returning to BootROM (return address 0xffff0aa0)...
> > > +xmodem: Protocol error
> > > 
> > > 
> > > Not working!
> > > 
> > > And now test on "master" without the 39 patches:
> > > 
> > > [stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
> > ...
> > > 
> > > Seems to okay.
> > > 
> > > Thanks,
> > > Stefan
> > 
> > So something is broken in next branch. I have looked at kwboot and
> > kwbimage code and there is no change in next branch which is not in
> > master branch.
> > 
> > So it looks like that something not related to kwboot broke it in next
> > branch. And seems that git bisect on AXP hw would be required. But I do
> > not own AXP board, so I cannot do it.
> 
> I can try to do this here later, if I find the time.
> 
> Did you try booting on some other MVEBU SoC (e.g. A38x) using "next"
> as base?

Now I tested "next" branch (commit 7fde64c004ea) on A38x and it is
working fine.

$ ./tools/kwboot -b ./u-boot-spl.kwb -t /dev/ttyUSB0 
Sending boot message. Please reboot the target...-
Sending boot image...
  0 % [......................................................................]
  1 % [......................................................................]
  2 % [......................................................................]
  3 % [......................................................................]
  4 % [......................................................................]
  5 % [......................................................................]
  6 % [......................................................................]
  7 % [......................................................................]
  8 % [......................................................................]
  9 % [......................................................................]
 10 % [......................................................................]
 11 % [......................................................................]
 12 % [.......................................................
U-Boot SPL 2021.10-rc5-00392-g7fde64c004ea (Oct 01 2021 - 12:46:16 +0200)
High speed PHY - Version: 2.0
MiniPCIe/mSATA card detection... MiniPCIe
Detected Device ID 6820
board SerDes lanes topology details:
 | Lane # | Speed |  Type       |
 --------------------------------
 |   0    |   5   | PCIe0       |
 |   1    |   5   | USB3 HOST0  |
 |   2    |   5   | PCIe1       |
 |   3    |   5   | USB3 HOST1  |
 |   4    |   5   | PCIe2       |
 |   5    |   0   | SGMII2      |
 --------------------------------
:** Link is Gen1, check the EP capability
PCIe, Idx 0: remains Gen1
:** Link is Gen1, check the EP capability
PCIe, Idx 1: remains Gen1
:** Link is Gen1, check the EP capability
PCIe, Idx 2: remains Gen1
High speed PHY - Ended Successfully
mv_ddr: 14.0.0 
DDR3 Training Sequence - Switching XBAR Window to FastPath Window
mv_ddr: completed successfully
Disabling MCU watchdog... disabled
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff05c4)...
...............]
 13 % [......................................................................]
 14 % [......................................................................]
 15 % [......................................................................]
...
 95 % [......................................................................]
 96 % [......................................................................]
 97 % [......................................................................]
 98 % [......................................................................]
 99 % [................]
[Type Ctrl-\ + c to quit]


U-Boot 2021.10-rc5-00392-g7fde64c004ea (Oct 01 2021 - 12:46:16 +0200)

SoC:   MV88F6820-A0 at 1600 MHz
DRAM:  2 GiB (800 MHz, 32-bit, 2T, ECC not enabled)
WDT:   Started watchdog@20300 with servicing (60s timeout)
MMC:   mv_sdh: 0
Loading Environment from SPIFlash... SF: Detected s25fl164k with page size 256 Bytes, erase size 4 KiB, total 8 MiB
OK
Model: Turris Omnia
Turris Omnia:
  RAM size: 2048 MiB
  Serial Number: 0000000B00007B3C
Regdomain set to **
Net:   eth0: ethernet@70000, eth1: ethernet@30000, eth2: ethernet@34000
=> 

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Added to Tom to Cc

On 01.10.21 12:43, Stefan Roese wrote:
> On 01.10.21 12:39, Pali Rohár wrote:
>> Hello!
>>
>> On Friday 01 October 2021 12:28:34 Stefan Roese wrote:
>>> First the test on "next" without the 39 patches:
>>>
>>> [stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
>> ...
>>> DDR3 Training Sequence - Ended Successfully
>>> Trying to boot from BOOTROM
>>> Returning to BootROM (return address 0xffff0aa0)...
>>> +xmodem: Protocol error
>>>
>>>
>>> Not working!
>>>
>>> And now test on "master" without the 39 patches:
>>>
>>> [stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
>> ...
>>>
>>> Seems to okay.
>>>
>>> Thanks,
>>> Stefan
>>
>> So something is broken in next branch. I have looked at kwboot and
>> kwbimage code and there is no change in next branch which is not in
>> master branch.
>>
>> So it looks like that something not related to kwboot broke it in next
>> branch. And seems that git bisect on AXP hw would be required. But I do
>> not own AXP board, so I cannot do it.
> 
> I can try to do this here later, if I find the time.

git bisect leads to this problematic commit:

[stefan@ryzen u-boot ((ab92b38a0161...)|BISECTING)]$ git bisect good
a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0 is the first bad commit
commit a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0
Author: Tom Rini <trini@konsulko.com>
Date:   Fri Aug 27 21:18:30 2021 -0400

     Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig

     This converts the following to Kconfig:
        CONFIG_SKIP_LOWLEVEL_INIT
        CONFIG_SKIP_LOWLEVEL_INIT_ONLY

     In order to do this, we need to introduce SPL and TPL variants of these
     options so that we can clearly disable these options only in SPL in 
some
     cases, and both instances in other cases.

     Signed-off-by: Tom Rini <trini@konsulko.com>


Frankly, I did not analyse this change fully. But it seems to
responsible for this breakage on Armada XP in "next".

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

On 24.09.21 23:06, Marek Behún wrote:
> From: Marek Behún <marek.behun@nic.cz>
> 
> Hello Stefan and others,
> 
> here's v3 of series adding support for booting Marvell platforms via
> UART (those bootable with kwboot) at higher baudrates.
> 
> Tested on Turris Omnia up to 5.15 MBd, which is 44x faster than
> 115200 Bd.
> 
> The user can direct kwboot to use higher baudrate via the -B option.
> (BTW this option was there before but did not work with the -b option.)
> 
> Only the payload part of the KWB image is uploaded at this higher
> baudrate. The header part is still uploaded at 115200 Bd, since the code
> that changes baudrate is injected into header as a binary extension.
> (The payload part makes up majority of the binary, though. On Turris
>   Omnia the payload currently makes ~87%.)
> 
> The series also contains various other fixes, refactors and improvements
> of the code, upon which the main change is done.
> 
> Marek & Pali
> 
> Changes since v2:
> - fixed integer overflow in patch 15
> - fixed commit title in patch 32
> 
> Changes since v1:
> - fixed uploading of older kwb images, now all kwb images should be able
>    to upload at faster baudrate
> - fixed injecting code that changes baudrate back
> - various other fixes and refactors, the best way to compare with v1 is
>    to apply v1 and v2 separately and compare the resulting kwboot.c
> 
> Marek Behún (19):
>    tools: kwbimage: Fix printf format warning
>    tools: kwboot: Fix buffer overflow in kwboot_terminal()
>    tools: kwboot: Make the quit sequence buffer const
>    tools: kwboot: Refactor and fix writing buffer
>    tools: kwboot: Fix comparison of integers with different size
>    tools: kwboot: Use a function to check whether received byte is a
>      Xmodem reply
>    tools: kwboot: Print new line after SPL output
>    tools: kwboot: Allow greater timeout when executing header code
>    tools: kwboot: Prevent waiting indefinitely if no xmodem reply is
>      received
>    tools: kwbimage: Simplify iteration over version 1 optional headers
>    tools: kwbimage: Refactor image_version()
>    tools: kwbimage: Refactor kwbimage header size determination
>    tools: kwboot: Explicitly check against size of struct main_hdr_v1
>    tools: kwboot: Check whether baudrate was set to requested value
>    tools: kwboot: Cosmetic fix
>    tools: kwboot: Avoid code repetition in kwboot_img_patch()
>    tools: kwboot: Update file header
>    doc/kwboot.1: Update man page
>    MAINTAINERS: Add entry for kwbimage / kwboot tools
> 
> Pali Rohár (20):
>    tools: kwboot: Print version information header
>    tools: kwboot: Fix kwboot_xm_sendblock() function when
>      kwboot_tty_recv() fails
>    tools: kwboot: Fix return type of kwboot_xm_makeblock() function
>    tools: kwboot: Fix printing progress
>    tools: kwboot: Print newline on error when progress was not completed
>    tools: kwboot: Split sending image into header and data stages
>    tools: kwboot: Allow non-xmodem text output from BootROM only in a
>      specific case
>    tools: kwboot: Properly finish xmodem transfer
>    tools: kwboot: Always call kwboot_img_patch_hdr()
>    tools: kwboot: Don't patch image header if signed
>    tools: kwboot: Patch source address in image header
>    tools: kwboot: Patch destination address to DDR area for SPI image
>    tools: kwbimage: Update comments describing kwbimage v1 structures
>    tools: kwboot: Round up header size to 128 B when patching
>    tools: kwboot: Support higher baudrates when booting via UART
>    tools: kwboot: Allow any baudrate on Linux
>    tools: kwboot: Fix initializing tty device
>    tools: kwboot: Disable tty interbyte timeout
>    tools: kwboot: Disable non-blocking mode
>    tools: kwboot: Add Pali and Marek as authors
> 
>   MAINTAINERS           |   10 +
>   doc/kwboot.1          |   60 ++-
>   tools/kwbimage.c      |  130 ++---
>   tools/kwbimage.h      |   99 +++-
>   tools/kwboot.c        | 1197 +++++++++++++++++++++++++++++++++++------
>   tools/termios_linux.h |  189 +++++++
>   6 files changed, 1385 insertions(+), 300 deletions(-)
>   create mode 100644 tools/termios_linux.h

Series applied to u-boot-marvell/next

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 2775 bytes --]

On Fri, Oct 01, 2021 at 01:01:37PM +0200, Stefan Roese wrote:
> Added to Tom to Cc
> 
> On 01.10.21 12:43, Stefan Roese wrote:
> > On 01.10.21 12:39, Pali Rohár wrote:
> > > Hello!
> > > 
> > > On Friday 01 October 2021 12:28:34 Stefan Roese wrote:
> > > > First the test on "next" without the 39 patches:
> > > > 
> > > > [stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
> > > ...
> > > > DDR3 Training Sequence - Ended Successfully
> > > > Trying to boot from BOOTROM
> > > > Returning to BootROM (return address 0xffff0aa0)...
> > > > +xmodem: Protocol error
> > > > 
> > > > 
> > > > Not working!
> > > > 
> > > > And now test on "master" without the 39 patches:
> > > > 
> > > > [stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
> > > ...
> > > > 
> > > > Seems to okay.
> > > > 
> > > > Thanks,
> > > > Stefan
> > > 
> > > So something is broken in next branch. I have looked at kwboot and
> > > kwbimage code and there is no change in next branch which is not in
> > > master branch.
> > > 
> > > So it looks like that something not related to kwboot broke it in next
> > > branch. And seems that git bisect on AXP hw would be required. But I do
> > > not own AXP board, so I cannot do it.
> > 
> > I can try to do this here later, if I find the time.
> 
> git bisect leads to this problematic commit:
> 
> [stefan@ryzen u-boot ((ab92b38a0161...)|BISECTING)]$ git bisect good
> a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0 is the first bad commit
> commit a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0
> Author: Tom Rini <trini@konsulko.com>
> Date:   Fri Aug 27 21:18:30 2021 -0400
> 
>     Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig
> 
>     This converts the following to Kconfig:
>        CONFIG_SKIP_LOWLEVEL_INIT
>        CONFIG_SKIP_LOWLEVEL_INIT_ONLY
> 
>     In order to do this, we need to introduce SPL and TPL variants of these
>     options so that we can clearly disable these options only in SPL in some
>     cases, and both instances in other cases.
> 
>     Signed-off-by: Tom Rini <trini@konsulko.com>
> 
> 
> Frankly, I did not analyse this change fully. But it seems to
> responsible for this breakage on Armada XP in "next".

OK, I guess the conversion from
arch/arm/mach-mvebu/include/mach/config.h didn't work right.  These
boards should have set CONFIG_SPL_SKIP_LOWLEVEL_INIT but don't.

Why it was missed, well, I can't spot the magic to include
<mach/config.h> if it exists, but I just missed that, so I'll need to
make sure to take more care on the tricky conversions that also use
mach/config.h.  Let me know if you need me to re-convert platforms here,
or now that you know what's missing you can fix it, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Tom,

On 01.10.21 14:59, Tom Rini wrote:
> On Fri, Oct 01, 2021 at 01:01:37PM +0200, Stefan Roese wrote:
>> Added to Tom to Cc
>>
>> On 01.10.21 12:43, Stefan Roese wrote:
>>> On 01.10.21 12:39, Pali Rohár wrote:
>>>> Hello!
>>>>
>>>> On Friday 01 October 2021 12:28:34 Stefan Roese wrote:
>>>>> First the test on "next" without the 39 patches:
>>>>>
>>>>> [stefan@ryzen u-boot (next)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
>>>> ...
>>>>> DDR3 Training Sequence - Ended Successfully
>>>>> Trying to boot from BOOTROM
>>>>> Returning to BootROM (return address 0xffff0aa0)...
>>>>> +xmodem: Protocol error
>>>>>
>>>>>
>>>>> Not working!
>>>>>
>>>>> And now test on "master" without the 39 patches:
>>>>>
>>>>> [stefan@ryzen u-boot (master)]$ ./tools/kwboot -p -b u-boot-spl.kwb -t
>>>> ...
>>>>>
>>>>> Seems to okay.
>>>>>
>>>>> Thanks,
>>>>> Stefan
>>>>
>>>> So something is broken in next branch. I have looked at kwboot and
>>>> kwbimage code and there is no change in next branch which is not in
>>>> master branch.
>>>>
>>>> So it looks like that something not related to kwboot broke it in next
>>>> branch. And seems that git bisect on AXP hw would be required. But I do
>>>> not own AXP board, so I cannot do it.
>>>
>>> I can try to do this here later, if I find the time.
>>
>> git bisect leads to this problematic commit:
>>
>> [stefan@ryzen u-boot ((ab92b38a0161...)|BISECTING)]$ git bisect good
>> a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0 is the first bad commit
>> commit a2ac2b964bfbb20d6791ee94b9034a50cfadb5b0
>> Author: Tom Rini <trini@konsulko.com>
>> Date:   Fri Aug 27 21:18:30 2021 -0400
>>
>>      Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig
>>
>>      This converts the following to Kconfig:
>>         CONFIG_SKIP_LOWLEVEL_INIT
>>         CONFIG_SKIP_LOWLEVEL_INIT_ONLY
>>
>>      In order to do this, we need to introduce SPL and TPL variants of these
>>      options so that we can clearly disable these options only in SPL in some
>>      cases, and both instances in other cases.
>>
>>      Signed-off-by: Tom Rini <trini@konsulko.com>
>>
>>
>> Frankly, I did not analyse this change fully. But it seems to
>> responsible for this breakage on Armada XP in "next".
> 
> OK, I guess the conversion from
> arch/arm/mach-mvebu/include/mach/config.h didn't work right.  These
> boards should have set CONFIG_SPL_SKIP_LOWLEVEL_INIT but don't.

Yes, this seems to be the case here.

> Why it was missed, well, I can't spot the magic to include
> <mach/config.h> if it exists, but I just missed that, so I'll need to
> make sure to take more care on the tricky conversions that also use
> mach/config.h.  Let me know if you need me to re-convert platforms here,
> or now that you know what's missing you can fix it, thanks!

I'll send a fix for "next" to the list shortly.

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Marek, Hi Pali,

since now all is merged into master, I'm testing on my AXP target
again. Please see below.

On 01.10.21 12:45, Marek Behún wrote:
> On Fri, 1 Oct 2021 12:40:29 +0200
> Stefan Roese <sr@denx.de> wrote:
> 
>> U-Boot SPL 2021.10-rc5-00431-g6c96332441cf-dirty (Oct 01 2021 - 12:38:55
>> +0200)
>> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
>> High speed PHY - Ended Successfully
>> DDR3 Training Sequence - Ver 5.7.4
>> DDR3 Training Sequence - Ended Successfully
>> Trying to boot from BOOTROM
>> Returning to BootROM (return address 0xffff0aa0)...
>> rc=-1 errno=110 allow_non_xm=1 *non_xm_print=1
>>
>>
>> xmodem: Connection timed out
> 
> No ACK from BootROM. It is possible that return_from_bootrom() was not
> called, or failed, somehow in SPL.

I'm not getting this when using master:

[stefan@ryzen u-boot (master)]$ ./tools/kwboot -B 230400 -p -b 
u-boot-spl.kwb -t 
/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
Patching image boot signature to UART
Injecting binary header code for changing baudrate to 230400 Bd
Injecting code for changing baudrate back
Aligning image header to Xmodem block size
Sending boot message. Please reboot the target.../
Waiting 2s and flushing tty
Sending boot image header (90496 bytes)...
   0 % 
[......................................................................]
  10 % 
[......................................................................]
  19 % 
[......................................................................]
  29 % 
[......................................................................]
  39 % 
[......................................................................]
  49 % 
[......................................................................]
  59 % 
[......................................................................]
  69 % 
[......................................................................]
  79 % 
[......................................................................]
  89 % 
[......................................................................]
  99 % [....... 
       ]
Done

U-Boot SPL 2021.10-00815-gf200a4bcecf1-dirty (Oct 22 2021 - 10:33:19 +0200)
High speed PHY - Version: 2.1.5 (COM-PHY-V20)
High speed PHY - Ended Successfully
DDR3 Training Sequence - Ver 5.7.4
DDR3 Training Sequence - Ended Successfully
Trying to boot from BOOTROM
Returning to BootROM (return address 0xffff0aa0)...

Changing baudrate to 230400 Bd
Baudrate was not changed


xmodem: Protocol error

It works with the standard 115k. Any ideas why switching baudrate fails
on AXP?

Thanks,
Stefan

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Pali Rohár]

On Friday 22 October 2021 10:38:16 Stefan Roese wrote:
> Hi Marek, Hi Pali,
> 
> since now all is merged into master, I'm testing on my AXP target
> again. Please see below.
> 
> On 01.10.21 12:45, Marek Behún wrote:
> > On Fri, 1 Oct 2021 12:40:29 +0200
> > Stefan Roese <sr@denx.de> wrote:
> > 
> > > U-Boot SPL 2021.10-rc5-00431-g6c96332441cf-dirty (Oct 01 2021 - 12:38:55
> > > +0200)
> > > High speed PHY - Version: 2.1.5 (COM-PHY-V20)
> > > High speed PHY - Ended Successfully
> > > DDR3 Training Sequence - Ver 5.7.4
> > > DDR3 Training Sequence - Ended Successfully
> > > Trying to boot from BOOTROM
> > > Returning to BootROM (return address 0xffff0aa0)...
> > > rc=-1 errno=110 allow_non_xm=1 *non_xm_print=1
> > > 
> > > 
> > > xmodem: Connection timed out
> > 
> > No ACK from BootROM. It is possible that return_from_bootrom() was not
> > called, or failed, somehow in SPL.
> 
> I'm not getting this when using master:
> 
> [stefan@ryzen u-boot (master)]$ ./tools/kwboot -B 230400 -p -b
> u-boot-spl.kwb -t
> /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
> Patching image boot signature to UART
> Injecting binary header code for changing baudrate to 230400 Bd
> Injecting code for changing baudrate back
> Aligning image header to Xmodem block size
> Sending boot message. Please reboot the target.../
> Waiting 2s and flushing tty
> Sending boot image header (90496 bytes)...
>   0 %
> [......................................................................]
>  10 %
> [......................................................................]
>  19 %
> [......................................................................]
>  29 %
> [......................................................................]
>  39 %
> [......................................................................]
>  49 %
> [......................................................................]
>  59 %
> [......................................................................]
>  69 %
> [......................................................................]
>  79 %
> [......................................................................]
>  89 %
> [......................................................................]
>  99 % [.......       ]
> Done
> 
> U-Boot SPL 2021.10-00815-gf200a4bcecf1-dirty (Oct 22 2021 - 10:33:19 +0200)
> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
> High speed PHY - Ended Successfully
> DDR3 Training Sequence - Ver 5.7.4
> DDR3 Training Sequence - Ended Successfully
> Trying to boot from BOOTROM
> Returning to BootROM (return address 0xffff0aa0)...
> 
> Changing baudrate to 230400 Bd
> Baudrate was not changed
> 
> 
> xmodem: Protocol error
> 
> It works with the standard 115k. Any ideas why switching baudrate fails
> on AXP?

When 115k baudrate is specified (or no baudrate is specified) then
kwboot does not inject any code for changing baudrate (as 115k is
default). So it looks like that issue is with switching.

I have already some more "fixup" patches for kwboot and kwbimage, which
are fixing some issues which I found. So it is possible that you hit
some of that issue. I will pass patches to Marek and after some testing
we will send them to mailing list for review.

I do not have any AXP board, so I cannot test or debug it manually.

Re: [PATCH u-boot-marvell v3 00/39] kwboot higher baudrate

[Stefan Roese]

Hi Pali,

On 22.10.21 10:48, Pali Rohár wrote:
> On Friday 22 October 2021 10:38:16 Stefan Roese wrote:
>> Hi Marek, Hi Pali,
>>
>> since now all is merged into master, I'm testing on my AXP target
>> again. Please see below.
>>
>> On 01.10.21 12:45, Marek Behún wrote:
>>> On Fri, 1 Oct 2021 12:40:29 +0200
>>> Stefan Roese <sr@denx.de> wrote:
>>>
>>>> U-Boot SPL 2021.10-rc5-00431-g6c96332441cf-dirty (Oct 01 2021 - 12:38:55
>>>> +0200)
>>>> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
>>>> High speed PHY - Ended Successfully
>>>> DDR3 Training Sequence - Ver 5.7.4
>>>> DDR3 Training Sequence - Ended Successfully
>>>> Trying to boot from BOOTROM
>>>> Returning to BootROM (return address 0xffff0aa0)...
>>>> rc=-1 errno=110 allow_non_xm=1 *non_xm_print=1
>>>>
>>>>
>>>> xmodem: Connection timed out
>>>
>>> No ACK from BootROM. It is possible that return_from_bootrom() was not
>>> called, or failed, somehow in SPL.
>>
>> I'm not getting this when using master:
>>
>> [stefan@ryzen u-boot (master)]$ ./tools/kwboot -B 230400 -p -b
>> u-boot-spl.kwb -t
>> /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A1019EGY-if00-port0
>> Patching image boot signature to UART
>> Injecting binary header code for changing baudrate to 230400 Bd
>> Injecting code for changing baudrate back
>> Aligning image header to Xmodem block size
>> Sending boot message. Please reboot the target.../
>> Waiting 2s and flushing tty
>> Sending boot image header (90496 bytes)...
>>    0 %
>> [......................................................................]
>>   10 %
>> [......................................................................]
>>   19 %
>> [......................................................................]
>>   29 %
>> [......................................................................]
>>   39 %
>> [......................................................................]
>>   49 %
>> [......................................................................]
>>   59 %
>> [......................................................................]
>>   69 %
>> [......................................................................]
>>   79 %
>> [......................................................................]
>>   89 %
>> [......................................................................]
>>   99 % [.......       ]
>> Done
>>
>> U-Boot SPL 2021.10-00815-gf200a4bcecf1-dirty (Oct 22 2021 - 10:33:19 +0200)
>> High speed PHY - Version: 2.1.5 (COM-PHY-V20)
>> High speed PHY - Ended Successfully
>> DDR3 Training Sequence - Ver 5.7.4
>> DDR3 Training Sequence - Ended Successfully
>> Trying to boot from BOOTROM
>> Returning to BootROM (return address 0xffff0aa0)...
>>
>> Changing baudrate to 230400 Bd
>> Baudrate was not changed
>>
>>
>> xmodem: Protocol error
>>
>> It works with the standard 115k. Any ideas why switching baudrate fails
>> on AXP?
> 
> When 115k baudrate is specified (or no baudrate is specified) then
> kwboot does not inject any code for changing baudrate (as 115k is
> default). So it looks like that issue is with switching.
> 
> I have already some more "fixup" patches for kwboot and kwbimage, which
> are fixing some issues which I found. So it is possible that you hit
> some of that issue. I will pass patches to Marek and after some testing
> we will send them to mailing list for review.

Okay, sounds like a plan. I'll re-test after you (or Marek) sent these
new patches.

> I do not have any AXP board, so I cannot test or debug it manually.

Unlucky but no big deal. I'll do the testing.

Thanks,
Stefan