Support for Fastboot over UDP

index e93f6a01f..3f0f31b35 100644
@@ -370,7 +370,7 @@ void phy_write_mmd_indirect(struct phy_device *phydev, int prtad, int devad,
 
 static inline bool phy_acquired(struct phy_device *phydev)
 {
-	return phydev && slice_acquired(&phydev->bus->slice);
+	return phydev && phydev->bus && slice_acquired(&phydev->bus->slice);
 }
 
 #ifdef CONFIG_PHYLIB

index 01a5d0cc6..279da5e0a 100644
@@ -76,7 +76,7 @@ static struct poller_struct gpio0_poller = {
 
 static int gpio0_poweroff_probe(void)
 {
-	return poller_register(&gpio0_poller);
+	return poller_register(&gpio0_poller, "power-button");
 }
 
 device_initcall(gpio0_poweroff_probe);

index c768e98d2..d9be4c5f9 100644
@@ -408,7 +408,7 @@ static void ek_add_device_hdmi(void)
 	hdmi_reset_start = get_time_ns();
 	hdmi_poller.func = hdmi_off_poller;
 
-	poller_register(&hdmi_poller);
+	poller_register(&hdmi_poller, "hdmi-reset");
 }
 #else
 static void ek_add_device_hdmi(void)

index 6fea5a7b1..fddb18714 100644
@@ -409,7 +409,7 @@ static int ax88179_bind(struct usbnet *dev)
 
 	priv->last = get_time_ns();
 	priv->poller.func = ax88179_poller;
-	poller_register(&priv->poller);
+	poller_register(&priv->poller, dev_name(&dev->udev->dev));
 
 	return 0;
 }

index f2ff62458..899f270d4 100644
@@ -10,6 +10,7 @@
 #include <malloc.h>
 #include <command.h>
 #include <errno.h>
+#include <slice.h>
 
 static LIST_HEAD(binfmt_hooks);
 

@@ -23,7 +24,9 @@ static int binfmt_run(char *file, int argc, char **argv)
 		if (b->type != type)
 			continue;
 
+		idle_slice_acquire();
 		ret = b->hook(b, file, argc, argv);
+		idle_slice_release();
 		if (ret != -ERESTARTNOHAND)
 			return ret;
 	}

index 49845938a..2b10248f5 100644
@@ -30,6 +30,7 @@
 #include <init.h>
 #include <complete.h>
 #include <getopt.h>
+#include <slice.h>
 
 LIST_HEAD(command_list);
 EXPORT_SYMBOL(command_list);

@@ -72,7 +73,9 @@ int execute_command(int argc, char **argv)
 	/* Look up command in command table */
 	if ((cmdtp = find_cmd(argv[0]))) {
 		/* OK - call function to do the command */
+		idle_slice_acquire();
 		ret = cmdtp->cmd(argc, argv);
+		idle_slice_release();
 		if (ret == COMMAND_ERROR_USAGE) {
 			barebox_cmd_usage(cmdtp);
 			ret = COMMAND_ERROR;

index 8d09894c3..f161cf7df 100644
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <console_countdown.h>
 #include <stdio.h>
+#include <slice.h>
 
 static bool console_countdown_timeout_abort;
 

@@ -59,6 +60,7 @@ int console_countdown(int timeout_s, unsigned flags, const char *keys,
 	if (!(flags & CONSOLE_COUNTDOWN_SILENT))
 		printf("%4d", countdown--);
 
+	idle_slice_release();
 	do {
 		if (tstc()) {
 			key = getchar();

@@ -91,6 +93,7 @@ int console_countdown(int timeout_s, unsigned flags, const char *keys,
 	ret = 0;
 
  out:
+	idle_slice_acquire();
 	if (!(flags & CONSOLE_COUNTDOWN_SILENT))
 		printf("\n");
 	if (key && out_key)

index cccffcb88..60a3461b2 100644
@@ -116,7 +116,9 @@ void poller_call(void)
 			continue;
 
 		slice_acquire(&poller->slice);
+		idle_slice_acquire();
 		poller->func(poller);
+		idle_slice_release();
 		slice_release(&poller->slice);
 	}
 }

index b4460335d..960bb2ff8 100644
@@ -3,6 +3,7 @@
 #define pr_fmt(fmt) "slice: " fmt
 
 #include <common.h>
+#include <init.h>
 #include <slice.h>
 
 /*

@@ -221,6 +222,29 @@ void slice_init(struct slice *slice, const char *name)
 	list_add_tail(&slice->list, &slices);
 }
 
+#ifdef CONFIG_IDLE_SLICE
+struct slice idle_slice;
+
+void idle_slice_acquire(void)
+{
+	slice_acquire(&idle_slice);
+}
+
+void idle_slice_release(void)
+{
+	slice_release(&idle_slice);
+}
+
+static int idle_slice_init(void)
+{
+	slice_init(&idle_slice, "idle");
+	slice_acquire(&idle_slice);
+	return 0;
+}
+
+pure_initcall(idle_slice_init);
+#endif
+
 #if defined CONFIG_CMD_SLICE
 
 #include <command.h>

index 4874f1afc..068daaa7c 100644
@@ -28,4 +28,14 @@ void slice_init(struct slice *slice, const char *name);
 
 void slice_debug_acquired(struct slice *slice);
 
+#ifdef CONFIG_IDLE_SLICE
+extern struct slice idle_slice;
+
+void idle_slice_acquire(void);
+void idle_slice_release(void);
+#else
+static inline void idle_slice_acquire(void) {}
+static inline void idle_slice_release(void) {}
+#endif
+
 #endif /* __SLICE_H */

index 3d16c1838..709efb375 100644
@@ -3,6 +3,7 @@
 #include <init.h>
 #include <libbb.h>
 #include <poller.h>
+#include <slice.h>
 #include <ratp_bb.h>
 #include <xfuncs.h>
 #include <complete.h>

@@ -200,11 +201,16 @@ int readline(const char *prompt, char *buf, int len)
 	puts (prompt);
 
 	while (1) {
+		idle_slice_release();
 		while (!tstc()) {
 			poller_call();
-			if (IS_ENABLED(CONFIG_CONSOLE_RATP))
+			if (IS_ENABLED(CONFIG_CONSOLE_RATP)) {
+				idle_slice_acquire();
 				barebox_ratp_command_run();
+				idle_slice_release();
+			}
 		}
+		idle_slice_acquire();
 
 		ichar = read_key();
 

index 9625a31b1..9b3ea0f98 100644
@@ -53,6 +53,7 @@ struct ratp_ctx {
 	struct ratp_bb_pkt *fs_rx;
 
 	struct poller_struct poller;
+	struct poller_struct execution_poller;
 };
 
 static int compare_ratp_command(struct list_head *a, struct list_head *b)

@@ -302,7 +303,7 @@ static int ratp_console_register(struct ratp_ctx *ctx)
 	return 0;
 }
 
-void barebox_ratp_command_run(void)
+static void barebox_ratp_command_run(struct poller_struct *poller)
 {
 	int ret;
 

@@ -336,6 +337,7 @@ static void ratp_console_unregister(struct ratp_ctx *ctx)
 	int ret;
 
 	console_set_active(&ctx->ratp_console, 0);
+	poller_unregister(&ctx->execution_poller);
 	poller_unregister(&ctx->poller);
 	ratp_close(&ctx->ratp);
 	console_set_active(ctx->cdev, ctx->old_active);

@@ -436,6 +438,7 @@ int barebox_ratp(struct console_device *cdev)
 		ctx->console_recv_fifo = kfifo_alloc(512);
 		ctx->console_transmit_fifo = kfifo_alloc(SZ_128K);
 		ctx->poller.func = ratp_poller;
+		ctx->execution_poller.func = barebox_ratp_command_run;
 		ratp_console_register(ctx);
 	}
 

@@ -458,11 +461,18 @@ int barebox_ratp(struct console_device *cdev)
 	if (ret)
 		goto out1;
 
+	ret = poller_register(&ctx->execution_poller, "ratp-exec");
+	if (ret)
+		goto out2;
+
+	slice_add(&ctx->execution_poller.slice, &idle_slice);
 	console_set_active(&ctx->ratp_console, CONSOLE_STDOUT | CONSOLE_STDERR |
 			CONSOLE_STDIN);
 
 	return 0;
 
+out2:
+	poller_unregister(&ctx->poller);
 out1:
 	ratp_close(ratp);
 out:

index a4f28c642..b710f99bf 100644
@@ -41,7 +41,6 @@ struct ratp_bb_pkt {
 };
 
 int  barebox_ratp(struct console_device *cdev);
-void barebox_ratp_command_run(void);
 int  barebox_ratp_fs_call(struct ratp_bb_pkt *tx, struct ratp_bb_pkt **rx);
 int  barebox_ratp_fs_mount(const char *path);
 

index 709efb375..79bac6f42 100644
@@ -4,7 +4,6 @@
 #include <libbb.h>
 #include <poller.h>
 #include <slice.h>
-#include <ratp_bb.h>
 #include <xfuncs.h>
 #include <complete.h>
 #include <linux/ctype.h>

@@ -202,14 +201,8 @@ int readline(const char *prompt, char *buf, int len)
 
 	while (1) {
 		idle_slice_release();
-		while (!tstc()) {
+		while (!tstc())
 			poller_call();
-			if (IS_ENABLED(CONFIG_CONSOLE_RATP)) {
-				idle_slice_acquire();
-				barebox_ratp_command_run();
-				idle_slice_release();
-			}
-		}
 		idle_slice_acquire();
 
 		ichar = read_key();

index e8e1e9ada..4d3810f6f 100644
@@ -71,7 +71,7 @@ BAREBOX_CMD_HELP_TEXT("")
 BAREBOX_CMD_HELP_TEXT("Options:")
 BAREBOX_CMD_HELP_OPT ("-a\t", "Create CDC ACM function")
 BAREBOX_CMD_HELP_OPT ("-A <desc>", "Create Android Fastboot function. If 'desc' is not provided, "
-				   "try to use 'global.usbgadget.fastboot_function' variable.")
+				   "try to use 'global.fastboot.partitions' variable.")
 BAREBOX_CMD_HELP_OPT ("-b\t", "include registered barebox update handlers (fastboot specific)")
 BAREBOX_CMD_HELP_OPT ("-D <desc>", "Create DFU function. If 'desc' is not provided, "
 				   "try to use 'global.usbgadget.dfu_function' variable.")

index d58f68f1b..d50f61ff2 100644
@@ -48,6 +48,8 @@
 #define FASTBOOT_TMPFILE		"/.fastboot.img"
 
 static unsigned int fastboot_max_download_size = SZ_8M;
+int fastboot_bbu;
+char *fastboot_partitions;
 
 struct fb_variable {
 	char *name;

@@ -946,12 +948,21 @@ static int fastboot_globalvars_init(void)
 	if (IS_ENABLED(CONFIG_FASTBOOT_SPARSE))
 		globalvar_add_simple_int("usbgadget.fastboot_max_download_size",
 				 &fastboot_max_download_size, "%u");
+	globalvar_add_simple_bool("fastboot.bbu", &fastboot_bbu);
+	globalvar_add_simple_string("fastboot.partitions",
+				    &fastboot_partitions);
 
 	return 0;
 }
 
 device_initcall(fastboot_globalvars_init);
 
-BAREBOX_MAGICVAR_NAMED(global_usbgadget_fastboot_max_download_size,
-		       global.usbgadget.fastboot_max_download_size,
+BAREBOX_MAGICVAR_NAMED(global_fastboot_max_download_size,
+		       global.fastboot.max_download_size,
 		       "Fastboot maximum download size");
+BAREBOX_MAGICVAR_NAMED(global_fastboot_partitions,
+		       global.fastboot.partitions,
+		       "Partitions exported for update via fastboot");
+BAREBOX_MAGICVAR_NAMED(global_fastboot_bbu,
+		       global.fastboot.bbu,
+		       "Export barebox update handlers via fastboot");

index a8f104cf1..25fd99493 100644
@@ -30,8 +30,6 @@
 static int autostart;
 static int acm;
 static char *dfu_function;
-static char *fastboot_function;
-static int fastboot_bbu;
 
 static struct file_list *parse(const char *files)
 {

@@ -56,8 +54,8 @@ int usbgadget_register(bool dfu, const char *dfu_opts,
 		dfu_opts = dfu_function;
 
 	if (fastboot && !fastboot_opts &&
-	    fastboot_function && *fastboot_function)
-		fastboot_opts = fastboot_function;
+	    fastboot_partitions && *fastboot_partitions)
+		fastboot_opts = fastboot_partitions;
 
 	if (!dfu_opts && !fastboot_opts && !acm)
 		return COMMAND_ERROR_USAGE;

@@ -116,12 +114,8 @@ static int usbgadget_globalvars_init(void)
 	if (IS_ENABLED(CONFIG_USB_GADGET_AUTOSTART)) {
 		globalvar_add_simple_bool("usbgadget.autostart", &autostart);
 		globalvar_add_simple_bool("usbgadget.acm", &acm);
-		globalvar_add_simple_bool("usbgadget.fastboot_bbu",
-					  &fastboot_bbu);
 	}
 	globalvar_add_simple_string("usbgadget.dfu_function", &dfu_function);
-	globalvar_add_simple_string("usbgadget.fastboot_function",
-				    &fastboot_function);
 
 	return 0;
 }

@@ -136,9 +130,3 @@ BAREBOX_MAGICVAR_NAMED(global_usbgadget_acm,
 BAREBOX_MAGICVAR_NAMED(global_usbgadget_dfu_function,
 		       global.usbgadget.dfu_function,
 		       "usbgadget: Create DFU function");
-BAREBOX_MAGICVAR_NAMED(global_usbgadget_fastboot_function,
-		       global.usbgadget.fastboot_function,
-		       "usbgadget: Create Android Fastboot function");
-BAREBOX_MAGICVAR_NAMED(global_usbgadget_fastboot_bbu,
-		       global.usbgadget.fastboot_bbu,
-		       "usbgadget: export barebox update handlers via fastboot");

index 3b6cae8a5..7df137bb8 100644
@@ -53,6 +53,9 @@ enum fastboot_msg_type {
 	FASTBOOT_MSG_DATA,
 };
 
+extern int fastboot_bbu;
+extern char *fastboot_partitions;
+
 int fastboot_generic_init(struct fastboot *fb, bool export_bbu);
 void fastboot_generic_close(struct fastboot *fb);
 void fastboot_generic_free(struct fastboot *fb);

index 706547309..3fcc69f62 100644
@@ -347,7 +347,8 @@ int fastboot_handle_download_data(struct fastboot *fb, const void *buffer,
 
 void fastboot_download_finished(struct fastboot *fb)
 {
-	close(fb->download_fd);
+	if (!fastboot_download_to_buf(fb))
+		close(fb->download_fd);
 
 	printf("\n");
 

957 lines not on this page · raw message

1,106 lines not on this page · raw message

index d6edfb8cf..445cc3242 100644
@@ -127,10 +127,7 @@ static int multi_bind_fastboot(struct usb_composite_dev *cdev)
 	}
 
 	opts = container_of(fi_fastboot, struct f_fastboot_opts, func_inst);
-	opts->files = gadget_multi_opts->fastboot_opts.files;
-	opts->cmd_exec = gadget_multi_opts->fastboot_opts.cmd_exec;
-	opts->cmd_flash = gadget_multi_opts->fastboot_opts.cmd_flash;
-	opts->export_bbu = gadget_multi_opts->fastboot_opts.export_bbu;
+	opts->common = gadget_multi_opts->fastboot_opts;
 
 	f_fastboot = usb_get_function(fi_fastboot);
 	if (IS_ERR(f_fastboot)) {

66 lines not on this page · raw message

index c0775c67d..a3609ba5d 100644
@@ -1,45 +1,17 @@
 #ifndef _USB_FASTBOOT_H
 #define _USB_FASTBOOT_H
 
-#include <linux/types.h>
-#include <file-list.h>
 #include <usb/composite.h>
-
-struct f_fastboot;
+#include <fastboot.h>
 
 /**
  * struct f_fastboot_opts - options to configure the fastboot gadget
+ * @common:	Options common to all fastboot protocol variants
  * @func_inst:	The USB function instance to register on
- * @files:	A file_list containing the files (partitions) to export via fastboot
- * @export_bbu:	Automatically include the partitions provided by barebox update (bbu)
  */
 struct f_fastboot_opts {
+	struct fastboot_opts common;
 	struct usb_function_instance func_inst;
-	struct file_list *files;
-	bool export_bbu;
-	int (*cmd_exec)(struct f_fastboot *, const char *cmd);
-	int (*cmd_flash)(struct f_fastboot *, struct file_list_entry *entry,
-			 const char *filename, const void *buf, size_t len);
-};
-
-/*
- * Return codes for the exec_cmd callback above:
- *
- * FASTBOOT_CMD_FALLTHROUGH - Not handled by the external command dispatcher,
- *                            handle it with internal dispatcher
- * Other than these negative error codes mean errors handling the command and
- * zero means the command has been successfully handled.
- */
-#define FASTBOOT_CMD_FALLTHROUGH	1
-
-enum fastboot_msg_type {
-	FASTBOOT_MSG_OKAY,
-	FASTBOOT_MSG_FAIL,
-	FASTBOOT_MSG_INFO,
-	FASTBOOT_MSG_DATA,
 };
 
-int fastboot_tx_print(struct f_fastboot *f_fb, enum fastboot_msg_type type,
-		      const char *fmt, ...);
-
 #endif /* _USB_FASTBOOT_H */

index 030e604fe..9bb6c889f 100644
@@ -6,7 +6,7 @@
 #include <usb/usbserial.h>
 
 struct f_multi_opts {
-	struct f_fastboot_opts fastboot_opts;
+	struct fastboot_opts fastboot_opts;
 	struct f_dfu_opts dfu_opts;
 	int create_acm;
 	void (*release)(struct f_multi_opts *opts);

index d50f61ff2..706547309 100644
@@ -247,6 +247,7 @@ static char *fastboot_msg[] = {
 	[FASTBOOT_MSG_FAIL] = "FAIL",
 	[FASTBOOT_MSG_INFO] = "INFO",
 	[FASTBOOT_MSG_DATA] = "DATA",
+	[FASTBOOT_MSG_NONE] = "",
 };
 
 int fastboot_tx_print(struct fastboot *fb, enum fastboot_msg_type type,

@@ -275,6 +276,7 @@ int fastboot_tx_print(struct fastboot *fb, enum fastboot_msg_type type,
 	case FASTBOOT_MSG_INFO:
 		pr_info("%pV\n", &vaf);
 		break;
+	case FASTBOOT_MSG_NONE:
 	case FASTBOOT_MSG_DATA:
 		break;
 	}

@@ -289,6 +291,7 @@ int fastboot_tx_print(struct fastboot *fb, enum fastboot_msg_type type,
 
 static void cb_reboot(struct fastboot *fb, const char *cmd)
 {
+	fastboot_tx_print(fb, FASTBOOT_MSG_OKAY, "");
 	restart_machine();
 }
 

index 7df137bb8..eb1971209 100644
@@ -51,6 +51,7 @@ enum fastboot_msg_type {
 	FASTBOOT_MSG_FAIL,
 	FASTBOOT_MSG_INFO,
 	FASTBOOT_MSG_DATA,
+	FASTBOOT_MSG_NONE,
 };
 
 extern int fastboot_bbu;

new file mode 100644
index 000000000..e4b9d9809
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+#ifndef __FASTBOOT_NET__
+#define __FASTBOOT_NET__
+
+#include <fastboot.h>
+
+struct fastboot_net;
+
+struct fastboot_net *fastboot_net_init(struct fastboot_opts *opts);
+void fastboot_net_free(struct fastboot_net *fbn);
+
+#endif

496 lines not on this page · raw message