usb: host: allow dynamic allocation of USB devices

Allow dynamic allocation of USB devices on connected event.
Add very basic USB device validation and configuration.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

include/zephyr/drivers/usb/uhc.h

@@ -35,20 +35,61 @@ enum usb_device_state {
 	USB_STATE_CONFIGURED,
 };
 
+/**
+ * @brief USB device operating speed
+ */
+enum usb_device_speed {
+	/** Device is probably not connected */
+	USB_SPEED_UNKNOWN,
+	/** Low speed */
+	USB_SPEED_SPEED_LS,
+	/** Full speed */
+	USB_SPEED_SPEED_FS,
+	/** High speed */
+	USB_SPEED_SPEED_HS,
+	/** Super speed */
+	USB_SPEED_SPEED_SS,
+};
+
+#define UHC_INTERFACES_MAX 32
+
+struct usb_host_interface {
+	struct usb_desc_header *dhp;
+	uint8_t alternate;
+};
+
+struct usb_host_ep {
+	struct usb_ep_descriptor *desc;
+};
+
 /**
  * Host representation of a USB device
  */
 struct usb_device {
+	/** dlist node */
+	sys_dnode_t node;
 	/** An opaque pointer to the host context to which this device belongs */
 	void *ctx;
+	/** Device mutex */
+	struct k_mutex mutex;
 	/** USB device descriptor */
 	struct usb_device_descriptor dev_desc;
 	/** Device state */
 	enum usb_device_state state;
+	/** Device speed */
+	enum usb_device_speed speed;
 	/** Actual active device configuration */
 	uint8_t actual_cfg;
 	/** Device address */
 	uint8_t addr;
+	/** Pointer to actual device configuration descriptor */
+	void *cfg_desc;
+	/** Pointers to device interfaces */
+	struct usb_host_interface ifaces[UHC_INTERFACES_MAX + 1];
+	/** Pointers to device OUT endpoints */
+	struct usb_host_ep ep_out[16];
+	/** Pointers to device IN endpoints */
+	struct usb_host_ep ep_in[16];
 };
 
 /**

include/zephyr/usb/usbh.h

@@ -18,6 +18,7 @@
 #include <zephyr/device.h>
 #include <zephyr/net_buf.h>
 #include <zephyr/sys/dlist.h>
+#include <zephyr/sys/bitarray.h>
 #include <zephyr/drivers/usb/uhc.h>
 #include <zephyr/sys/iterable_sections.h>
 
@@ -42,15 +43,21 @@ struct usbh_contex {
 	struct k_mutex mutex;
 	/** Pointer to UHC device struct */
 	const struct device *dev;
-	/** peripheral list */
-	sys_dlist_t peripherals;
+	/** USB device list */
+	sys_dlist_t udevs;
+	/** USB root device */
+	struct usb_device *root;
+	/** Allocated device addresses bit array */
+	struct sys_bitarray *addr_ba;
 };
 
 #define USBH_CONTROLLER_DEFINE(device_name, uhc_dev)			\
+	SYS_BITARRAY_DEFINE_STATIC(ba_##device_name, 128);		\
 	static STRUCT_SECTION_ITERABLE(usbh_contex, device_name) = {	\
 		.name = STRINGIFY(device_name),				\
 		.mutex = Z_MUTEX_INITIALIZER(device_name.mutex),	\
 		.dev = uhc_dev,						\
+		.addr_ba = &ba_##device_name,				\
 	}
 
 /**

subsys/usb/host/Kconfig

@@ -15,6 +15,20 @@ module = USBH
 module-str = usbh
 source "subsys/logging/Kconfig.template.log_config"
 
+config USBH_USB_DEVICE_MAX
+	int "Maximum number of USB devices supported."
+	default 4
+	range 2 127
+	help
+	  Maximum number of USB devices supported for all controllers.
+
+config USBH_USB_DEVICE_HEAP
+	int "Memory used to cache device descriptors"
+	default 1024
+	range 256 16384
+	help
+	  Memory used to cache device descriptors.
+
 config USBH_SHELL
 	bool "USB host shell"
 	depends on SHELL

subsys/usb/host/usbh_ch9.c

@@ -174,44 +174,17 @@ int usbh_req_set_address(struct usb_device *const udev,
 {
 	const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7;
 	const uint8_t bRequest = USB_SREQ_SET_ADDRESS;
-	int ret;
-
-	ret = usbh_req_setup(udev, bmRequestType, bRequest, addr, 0, 0, NULL);
-	if (ret == 0) {
-		udev->addr = addr;
-		if (addr == 0) {
-			udev->state = USB_STATE_DEFAULT;
-		}
 
-		if (addr != 0 && udev->state == USB_STATE_DEFAULT) {
-			udev->state = USB_STATE_ADDRESSED;
-		}
-	}
-
-	return ret;
+	return usbh_req_setup(udev, bmRequestType, bRequest, addr, 0, 0, NULL);
 }
 
 int usbh_req_set_cfg(struct usb_device *const udev,
 		     const uint8_t cfg)
 {
 	const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_DEVICE << 7;
 	const uint8_t bRequest = USB_SREQ_SET_CONFIGURATION;
-	int ret;
-
-	/* Ignore the required state change condition for now. */
-	ret = usbh_req_setup(udev, bmRequestType, bRequest, cfg, 0, 0, NULL);
-	if (ret == 0) {
-		udev->actual_cfg = cfg;
-		if (cfg == 0) {
-			udev->state = USB_STATE_ADDRESSED;
-		}
 
-		if (cfg != 0 && udev->state == USB_STATE_ADDRESSED) {
-			udev->state = USB_STATE_CONFIGURED;
-		}
-	}
-
-	return ret;
+	return usbh_req_setup(udev, bmRequestType, bRequest, cfg, 0, 0, NULL);
 }
 
 int usbh_req_get_cfg(struct usb_device *const udev,

subsys/usb/host/usbh_core.c

@@ -43,6 +43,47 @@ static int usbh_event_carrier(const struct device *dev,
 	return err;
 }
 
+static void dev_connected_handler(struct usbh_contex *const ctx,
+				  const struct uhc_event *const event)
+{
+
+	LOG_DBG("Device connected event");
+	if (ctx->root != NULL) {
+		LOG_ERR("Device already connected");
+		usbh_device_free(ctx->root);
+		ctx->root = NULL;
+	}
+
+	ctx->root = usbh_device_alloc(ctx);
+	if (ctx->root == NULL) {
+		LOG_ERR("Failed allocate new device");
+		return;
+	}
+
+	ctx->root->state = USB_STATE_DEFAULT;
+
+	if (event->type == UHC_EVT_DEV_CONNECTED_HS) {
+		ctx->root->speed = USB_SPEED_SPEED_HS;
+	} else {
+		ctx->root->speed = USB_SPEED_SPEED_FS;
+	}
+
+	if (usbh_device_init(ctx->root)) {
+		LOG_ERR("Failed to reset new USB device");
+	}
+}
+
+static void dev_removed_handler(struct usbh_contex *const ctx)
+{
+	if (ctx->root != NULL) {
+		usbh_device_free(ctx->root);
+		ctx->root = NULL;
+		LOG_DBG("Device removed");
+	} else {
+		LOG_DBG("Spurious device removed event");
+	}
+}
+
 static int discard_ep_request(struct usbh_contex *const ctx,
 			      struct uhc_transfer *const xfer)
 {
@@ -63,12 +104,14 @@ static ALWAYS_INLINE int usbh_event_handler(struct usbh_contex *const ctx,
 
 	switch (event->type) {
 	case UHC_EVT_DEV_CONNECTED_LS:
+		LOG_ERR("Low speed device not supported (connected event)");
+		break;
 	case UHC_EVT_DEV_CONNECTED_FS:
 	case UHC_EVT_DEV_CONNECTED_HS:
-		LOG_DBG("Device connected event");
+		dev_connected_handler(ctx, event);
 		break;
 	case UHC_EVT_DEV_REMOVED:
-		LOG_DBG("Device removed event");
+		dev_removed_handler(ctx);
 		break;
 	case UHC_EVT_RESETED:
 		LOG_DBG("Bus reset");
@@ -149,6 +192,8 @@ int usbh_init_device_intl(struct usbh_contex *const uhs_ctx)
 		return ret;
 	}
 
+	sys_dlist_init(&uhs_ctx->udevs);
+
 	STRUCT_SECTION_FOREACH(usbh_class_data, cdata) {
 		/*
 		 * For now, we have not implemented any class drivers,