Hi Svyatoslav,

Thank you for the patch.

On mer., nov. 15, 2023 at 17:38, Svyatoslav Ryhel clamor95@gmail.com wrote:

From: Ion Agorria ion@agorria.com

Currently u-boot fastboot can only send one message back to host, so if there is a need to print more than one line messages must be kept sending until all the required data is obtained. This behavior can be adjusted using multiresponce ability (getting multiple lines of response) proposed in this patch.

Signed-off-by: Ion Agorria ion@agorria.com Signed-off-by: Svyatoslav Ryhel clamor95@gmail.com

Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com

---

drivers/fastboot/fb_command.c | 10 ++++++++++ drivers/usb/gadget/f_fastboot.c | 29 +++++++++++++++++++++++++++++ include/fastboot.h | 18 ++++++++++++++++++ net/fastboot_udp.c | 29 +++++++++++++++++++++++------ 4 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 5fcadcdf50..ab72d8c781 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -5,6 +5,7 @@

#include <common.h> #include <command.h> +#include <console.h> #include <env.h> #include <fastboot.h> #include <fastboot-internal.h> @@ -152,6 +153,15 @@ int fastboot_handle_command(char *cmd_string, char *response) return -1; }

+void fastboot_multiresponse(int cmd, char *response) +{

• switch (cmd) {
• default:

• fastboot_fail("Unknown multiresponse command", response);
  

• break;
  

• }

+}

/**

• okay() - Send bare OKAY response

diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 741775a7bc..0850350331 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -497,6 +497,25 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) do_exit_on_complete(ep, req); }

+static int multiresponse_cmd = -1; +static void multiresponse_on_complete(struct usb_ep *ep, struct usb_request *req) +{

• char response[FASTBOOT_RESPONSE_LEN] = {0};
• if (multiresponse_cmd == -1)

• return;
  

• /* Call handler to obtain next response */
• fastboot_multiresponse(multiresponse_cmd, response);
• fastboot_tx_write_str(response);
• /* If response is final OKAY/FAIL response disconnect this handler and unset cmd */
• if (!strncmp("OKAY", response, 4) || !strncmp("FAIL", response, 4)) {

• multiresponse_cmd = -1;
  

• fastboot_func->in_req->complete = fastboot_complete;
  

• }

+}

static void do_acmd_complete(struct usb_ep *ep, struct usb_request *req) { /* When usb dequeue complete will be called @@ -524,6 +543,16 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) fastboot_fail("buffer overflow", response); }

• if (!strncmp(FASTBOOT_MULTIRESPONSE_START, response, 4)) {

• multiresponse_cmd = cmd;
  

• fastboot_multiresponse(multiresponse_cmd, response);
  

• /* Only add complete callback if first is not a final OKAY/FAIL response */
  

• if (strncmp("OKAY", response, 4) && strncmp("FAIL", response, 4)) {
  

• 	fastboot_func->in_req->complete = multiresponse_on_complete;
  

• }
  

• }
• if (!strncmp("DATA", response, 4)) { req->complete = rx_handler_dl_image; req->length = rx_bytes_expected(ep);

diff --git a/include/fastboot.h b/include/fastboot.h index 296451f89d..59cbea61ec 100644 --- a/include/fastboot.h +++ b/include/fastboot.h @@ -14,6 +14,16 @@

#define FASTBOOT_VERSION "0.4"

+/*

• • Signals u-boot fastboot code to send multiple responses by
• • calling response generating function repeatedly until a OKAY/FAIL
• • is generated as final response.
• • This status code is only used internally to signal, must NOT
• • be sent to host.
• */

+#define FASTBOOT_MULTIRESPONSE_START ("MORE")

/* The 64 defined bytes plus \0 */ #define FASTBOOT_COMMAND_LEN (64 + 1) #define FASTBOOT_RESPONSE_LEN (64 + 1) @@ -172,5 +182,13 @@ void fastboot_data_download(const void *fastboot_data, */ void fastboot_data_complete(char *response);

+/**

• • fastboot_handle_multiresponse() - Called for each response to send
• • @cmd: Command id that requested multiresponse
• • @response: Pointer to fastboot response buffer
• */

+void fastboot_multiresponse(int cmd, char *response);

void fastboot_acmd_complete(void); #endif /* _FASTBOOT_H_ */ diff --git a/net/fastboot_udp.c b/net/fastboot_udp.c index d690787478..6fee441ab3 100644 --- a/net/fastboot_udp.c +++ b/net/fastboot_udp.c @@ -42,16 +42,15 @@ static int fastboot_remote_port; static int fastboot_our_port;

/**

• • fastboot_udp_send_info() - Send an INFO packet during long commands.

• • fastboot_udp_send_response() - Send an response into UDP

• • @msg: String describing the reason for waiting

• • @response: Response to send
  */

-static void fastboot_udp_send_info(const char *msg) +static void fastboot_udp_send_response(const char *response) { uchar *packet; uchar *packet_base; int len = 0;

• char response[FASTBOOT_RESPONSE_LEN] = {0};

  struct fastboot_header response_header = { .id = FASTBOOT_FASTBOOT,

@@ -66,7 +65,6 @@ static void fastboot_udp_send_info(const char *msg) memcpy(packet, &response_header, sizeof(response_header)); packet += sizeof(response_header); /* Write response */

• fastboot_response("INFO", response, "%s", msg); memcpy(packet, response, strlen(response)); packet += strlen(response);

@@ -91,6 +89,7 @@ static void fastboot_udp_send_info(const char *msg) static void fastboot_timed_send_info(const char *msg) { static ulong start;

• char response[FASTBOOT_RESPONSE_LEN] = {0};

  /* Initialize timer */ if (start == 0)

@@ -99,7 +98,8 @@ static void fastboot_timed_send_info(const char *msg) /* Send INFO packet to host every 30 seconds */ if (time >= 30000) { start = get_timer(0);

• fastboot_udp_send_info(msg);
  

• fastboot_response("INFO", response, "%s", msg);
  

• fastboot_udp_send_response(response);
  

  }

}

@@ -180,6 +180,23 @@ static void fastboot_send(struct fastboot_header header, char *fastboot_data, } else { cmd = fastboot_handle_command(command, response); pending_command = false;

• 	if (!strncmp(FASTBOOT_MULTIRESPONSE_START, response, 4)) {
  

• 		while (1) {
  

• 			/* Call handler to obtain next response */
  

• 			fastboot_multiresponse(cmd, response);
  

• 			/*
  

• 			 * Send more responses or break to send
  

• 			 * final OKAY/FAIL response
  

• 			 */
  

• 			if (strncmp("OKAY", response, 4) &&
  

• 			    strncmp("FAIL", response, 4))
  

• 				fastboot_udp_send_response(response);
  

• 			else
  

• 				break;
  

• 		}
  

• 	}
  

  } /*
  • Sent some INFO packets, need to update sequence number in

-- 2.40.1

Hi Svyatoslav,

Thank you for your patch.

On mer., nov. 15, 2023 at 17:38, Svyatoslav Ryhel clamor95@gmail.com wrote:

From: Ion Agorria ion@agorria.com

This commit implements "fastboot getvar all" listing by iterating the existing dispatchers that don't require parameters (as we pass NULL), uses fastboot multiresponse.

Signed-off-by: Ion Agorria ion@agorria.com Signed-off-by: Svyatoslav Ryhel clamor95@gmail.com Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com

---

doc/android/fastboot-protocol.rst | 3 ++ drivers/fastboot/fb_command.c | 3 ++ drivers/fastboot/fb_getvar.c | 75 +++++++++++++++++++++++++------ include/fastboot-internal.h | 7 +++ 4 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/doc/android/fastboot-protocol.rst b/doc/android/fastboot-protocol.rst index e8cbd7f24e..8bd6d7168f 100644 --- a/doc/android/fastboot-protocol.rst +++ b/doc/android/fastboot-protocol.rst @@ -173,6 +173,9 @@ The various currently defined names are:: bootloader requiring a signature before it will install or boot images.

• all Provides all info from commands above as

•                  they were called one by one
  

Names starting with a lowercase character are reserved by this specification. OEM-specific names should not start with lowercase characters. diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index ab72d8c781..6f621df074 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -156,6 +156,9 @@ int fastboot_handle_command(char *cmd_string, char *response) void fastboot_multiresponse(int cmd, char *response) { switch (cmd) {

• case FASTBOOT_COMMAND_GETVAR:

• fastboot_getvar_all(response);
  

• break;
  

  default: fastboot_fail("Unknown multiresponse command", response); break;

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 8cb8ffa2c6..0307fdfece 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -29,53 +29,67 @@ static void getvar_is_userspace(char *var_parameter, char *response);

static const struct { const char *variable;

• bool list; void (*dispatch)(char *var_parameter, char *response);

} getvar_dispatch[] = { { .variable = "version",

• .dispatch = getvar_version
  

• .dispatch = getvar_version,
  

• .list = true,
  

  }, { .variable = "version-bootloader",

• .dispatch = getvar_version_bootloader
  

• .dispatch = getvar_version_bootloader,
  

• .list = true
  

  }, { .variable = "downloadsize",

• .dispatch = getvar_downloadsize
  

• .dispatch = getvar_downloadsize,
  

• .list = true
  

  }, { .variable = "max-download-size",

• .dispatch = getvar_downloadsize
  

• .dispatch = getvar_downloadsize,
  

• .list = true
  

  }, { .variable = "serialno",

• .dispatch = getvar_serialno
  

• .dispatch = getvar_serialno,
  

• .list = true
  

  }, { .variable = "version-baseband",

• .dispatch = getvar_version_baseband
  

• .dispatch = getvar_version_baseband,
  

• .list = true
  

  }, { .variable = "product",

• .dispatch = getvar_product
  

• .dispatch = getvar_product,
  

• .list = true
  

  }, { .variable = "platform",

• .dispatch = getvar_platform
  

• .dispatch = getvar_platform,
  

• .list = true
  

  }, { .variable = "current-slot",

• .dispatch = getvar_current_slot
  

• .dispatch = getvar_current_slot,
  

• .list = true
  

#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "has-slot",

• .dispatch = getvar_has_slot
  

• .dispatch = getvar_has_slot,
  

• .list = false
  

#endif #if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) }, { .variable = "partition-type",

• .dispatch = getvar_partition_type
  

• .dispatch = getvar_partition_type,
  

• .list = false
  

#endif #if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "partition-size",

• .dispatch = getvar_partition_size
  

• .dispatch = getvar_partition_size,
  

• .list = false
  

#endif }, { .variable = "is-userspace",

• .dispatch = getvar_is_userspace
  

• .dispatch = getvar_is_userspace,
  

• .list = true
  

  }

};

@@ -237,6 +251,38 @@ static void getvar_is_userspace(char *var_parameter, char *response) fastboot_okay("no", response); }

+static int current_all_dispatch; +void fastboot_getvar_all(char *response) +{

• /*

• * Find a dispatch getvar that can be listed and send
  

• * it as INFO until we reach the end.
  

• */
  

• while (current_all_dispatch < ARRAY_SIZE(getvar_dispatch)) {

• if (!getvar_dispatch[current_all_dispatch].list) {
  

• 	current_all_dispatch++;
  

• 	continue;
  

• }
  

• char envstr[FASTBOOT_RESPONSE_LEN] = { 0 };
  

• getvar_dispatch[current_all_dispatch].dispatch(NULL, envstr);
  

As requested in [1], please resolve the checkpatch errors. They are reported as WARNING:

WARNING: Missing a blank line after declarations

And the doc states [2] that WARNINGs need a careful review.

Since a respin is needed (because we need to add a stub in [3/5]) could you please also reorder this to avoid any warnings?

If not, I can do it while applying this to the u-boot-dfu custodian tree.

Thanks! Mattijs

[1] https://lore.kernel.org/all/87pm0cn0i4.fsf@baylibre.com/ [2] https://docs.u-boot.org/en/latest/develop/checkpatch.html?highlight=checkpat...

• char *envstr_start = envstr;
  

• if (!strncmp("OKAY", envstr, 4) || !strncmp("FAIL", envstr, 4))
  

• 	envstr_start += 4;
  

• fastboot_response("INFO", response, "%s: %s",
  

• 		  getvar_dispatch[current_all_dispatch].variable,
  

• 		  envstr_start);
  

• current_all_dispatch++;
  

• return;
  

• }
• fastboot_response("OKAY", response, NULL);
• current_all_dispatch = 0;

+}

/**

• fastboot_getvar() - Writes variable indicated by cmd_parameter to response.

@@ -254,6 +300,9 @@ void fastboot_getvar(char *cmd_parameter, char *response) { if (!cmd_parameter) { fastboot_fail("missing var", response);

• } else if (!strncmp("all", cmd_parameter, 3) && strlen(cmd_parameter) == 3) {

• current_all_dispatch = 0;
  

• fastboot_response(FASTBOOT_MULTIRESPONSE_START, response, NULL);
  

  } else {

#define FASTBOOT_ENV_PREFIX "fastboot." int i; diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h index bf2f2b3c89..610d4f9141 100644 --- a/include/fastboot-internal.h +++ b/include/fastboot-internal.h @@ -18,6 +18,13 @@ extern u32 fastboot_buf_size; */ extern void (*fastboot_progress_callback)(const char *msg);

+/**

• • fastboot_getvar_all() - Writes current variable being listed from "all" to response.
• • @response: Pointer to fastboot response buffer
• */

+void fastboot_getvar_all(char *response);

/**

• fastboot_getvar() - Writes variable indicated by cmd_parameter to response.

-- 2.40.1

Hi Svyatoslav,

Thank you for your patch.

On mer., nov. 15, 2023 at 17:38, Svyatoslav Ryhel clamor95@gmail.com wrote:

From: Ion Agorria ion@agorria.com

Separate record overflow logic and add console_record_isempty as available calls don't serve to know output has been read fully with readline's.

Signed-off-by: Ion Agorria ion@agorria.com Signed-off-by: Svyatoslav Ryhel clamor95@gmail.com

---

common/console.c | 15 ++++++++++++--- include/console.h | 14 ++++++++++++++ test/ut.c | 9 ++++----- 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/common/console.c b/common/console.c index 98c3ee6ca6..8a869b137e 100644 --- a/common/console.c +++ b/common/console.c @@ -818,6 +818,8 @@ int console_record_init(void) ret = membuff_new((struct membuff *)&gd->console_in, CONFIG_CONSOLE_RECORD_IN_SIZE);

• gd->flags |= GD_FLG_RECORD;
• return ret;

}

@@ -836,11 +838,13 @@ int console_record_reset_enable(void) return 0; }

-int console_record_readline(char *str, int maxlen) +bool console_record_overflow(void) {

• if (gd->flags & GD_FLG_RECORD_OVF)

• return -ENOSPC;
  

• return gd->flags & GD_FLG_RECORD_OVF ? true : false;

+}

+int console_record_readline(char *str, int maxlen) +{ return membuff_readline((struct membuff *)&gd->console_out, str, maxlen, '\0'); } @@ -850,6 +854,11 @@ int console_record_avail(void) return membuff_avail((struct membuff *)&gd->console_out); }

+bool console_record_isempty(void) +{

• return membuff_isempty((struct membuff *)&gd->console_out);

+}

We should also add a stub for console_record_isempty(), otherwise build errors will creep in when when CONFIG_CONSOLE_RECORD is not set.

For example, on this series, we can see:

drivers/fastboot/fb_command.c: In function 'fastboot_multiresponse': drivers/fastboot/fb_command.c:171:29: warning: implicit declaration of function 'console_record_isempty'; did you mean 'console_record_reset'? [-Wimplicit-function-declaration] 171 | if (console_record_isempty()) { | ^~~~~~~~~~~~~~~~~~~~~~ | console_record_reset

The following diff fixes it:

diff --git a/include/console.h b/include/console.h index c053bc9ba82c..b5adae740650 100644 --- a/include/console.h +++ b/include/console.h @@ -145,6 +145,12 @@ static inline int console_in_puts(const char *str) return 0; }

+static inline bool console_record_isempty(void) +{ + /* Always empty */ + return true; +} +

With that addressed, please add:

Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com

int console_in_puts(const char *str) { return membuff_put((struct membuff *)&gd->console_in, str, strlen(str)); diff --git a/include/console.h b/include/console.h index ceb733b5cb..c053bc9ba8 100644 --- a/include/console.h +++ b/include/console.h @@ -64,6 +64,13 @@ void console_record_reset(void); */ int console_record_reset_enable(void);

+/**

• • console_record_overflow() - returns state of buffers overflow
• • Return: true if the console buffer was overflowed
• */

+bool console_record_overflow(void);

/**

• console_record_readline() - Read a line from the console output

@@ -84,6 +91,13 @@ int console_record_readline(char *str, int maxlen); */ int console_record_avail(void);

+/**

• • console_record_isempty() - Returns if console output is empty
• • Return: true if empty
• */

+bool console_record_isempty(void);

/**

• console_in_puts() - Write a string to the console input buffer

diff --git a/test/ut.c b/test/ut.c index 28da417686..d202644a15 100644 --- a/test/ut.c +++ b/test/ut.c @@ -53,15 +53,14 @@ long ut_check_delta(ulong last)

static int readline_check(struct unit_test_state *uts) {

• int ret;
• ret = console_record_readline(uts->actual_str, sizeof(uts->actual_str));
• if (ret == -ENOSPC) {

• if (console_record_overflow()) { ut_fail(uts, __FILE__, __LINE__, __func__, "Console record buffer too small - increase CONFIG_CONSOLE_RECORD_OUT_SIZE");

• return ret;
  

• return -ENOSPC;
  

  }

• console_record_readline(uts->actual_str, sizeof(uts->actual_str));

• return 0;

}

-- 2.40.1

Hi Svyatoslav,

Thank you for your patch.

On mer., nov. 15, 2023 at 17:38, Svyatoslav Ryhel clamor95@gmail.com wrote:

From: Ion Agorria ion@agorria.com

If line overflows readline it will not be returned, fix this behavior, make it optional and documented properly.

Signed-off-by: Ion Agorria ion@agorria.com Signed-off-by: Svyatoslav Ryhel clamor95@gmail.com

Reviewed-by: Mattijs Korpershoek mkorpershoek@baylibre.com

---

boot/bootmeth_extlinux.c | 2 +- common/console.c | 2 +- include/membuff.h | 5 +++-- lib/membuff.c | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index aa2a4591eb..ae0ad1d53e 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -82,7 +82,7 @@ static int extlinux_fill_info(struct bootflow *bflow) log_debug("parsing bflow file size %x\n", bflow->size); membuff_init(&mb, bflow->buf, bflow->size); membuff_putraw(&mb, bflow->size, true, &data);

• while (len = membuff_readline(&mb, line, sizeof(line) - 1, ' '), len) {

• while (len = membuff_readline(&mb, line, sizeof(line) - 1, ' ', true), len) { char *tok, *p = line;

  tok = strsep(&p, " ");

diff --git a/common/console.c b/common/console.c index 8a869b137e..cd56035171 100644 --- a/common/console.c +++ b/common/console.c @@ -846,7 +846,7 @@ bool console_record_overflow(void) int console_record_readline(char *str, int maxlen) { return membuff_readline((struct membuff *)&gd->console_out, str,

• 		maxlen, '\0');
  

• 		maxlen, '\0', false);
  

}

int console_record_avail(void) diff --git a/include/membuff.h b/include/membuff.h index 21051b0c54..4eba626ce1 100644 --- a/include/membuff.h +++ b/include/membuff.h @@ -192,10 +192,11 @@ int membuff_free(struct membuff *mb);

• @mb: membuff to adjust
• @str: Place to put the line
• @maxlen: Maximum line length (excluding terminator)

• • @must_fit: If true then str is empty if line doesn't fit
  • Return: number of bytes read (including terminator) if a line has been

• •   read, 0 if nothing was there
    

• •   read, 0 if nothing was there or line didn't fit when must_fit is set
    

  */

-int membuff_readline(struct membuff *mb, char *str, int maxlen, int minch); +int membuff_readline(struct membuff *mb, char *str, int maxlen, int minch, bool must_fit);

/**

• membuff_extend_by() - expand a membuff

diff --git a/lib/membuff.c b/lib/membuff.c index 36dc43a523..964e504d5b 100644 --- a/lib/membuff.c +++ b/lib/membuff.c @@ -288,7 +288,7 @@ int membuff_free(struct membuff *mb) (mb->end - mb->start) - 1 - membuff_avail(mb); }

-int membuff_readline(struct membuff *mb, char *str, int maxlen, int minch) +int membuff_readline(struct membuff *mb, char *str, int maxlen, int minch, bool must_fit) { int len; /* number of bytes read (!= string length) */ char *s, *end; @@ -310,7 +310,7 @@ int membuff_readline(struct membuff *mb, char *str, int maxlen, int minch) }

/* couldn't get the whole string */

• if (!ok) {

• if (!ok && must_fit) { if (maxlen) *orig = '\0'; return 0;

-- 2.40.1