Merge "adbd & fastbootd: Support for new f_fs descriptor format" (83b4047b) · Commits · e / os / android_system_core

adb/usb_linux_client.c

+101 −114

Original line number	Diff line number	Diff line
		@@ -56,37 +56,37 @@ struct usb_handle
		int bulk_in; /* "in" from the host's perspective => sink for adbd */
		};

		static const struct {
		struct func_desc {
		struct usb_interface_descriptor intf;
		struct usb_endpoint_descriptor_no_audio source;
		struct usb_endpoint_descriptor_no_audio sink;
		} __attribute__((packed));

		struct desc_v1 {
		struct usb_functionfs_descs_head_v1 {
		__le32 magic;
		__le32 length;
		__le32 fs_count;
		__le32 hs_count;
		} __attribute__((packed)) header;
		struct func_desc fs_descs, hs_descs;
		} __attribute__((packed));

		struct desc_v2 {
		struct usb_functionfs_descs_head_v2 {
		__le32 magic;
		__le32 length;
		__le32 flags;
		__le32 fs_count;
		__le32 hs_count;
		__le32 ss_count;
		struct {
		struct usb_interface_descriptor intf;
		struct usb_endpoint_descriptor_no_audio source;
		struct usb_endpoint_descriptor_no_audio sink;
		} __attribute__((packed)) fs_descs, hs_descs;
		struct {
		struct usb_interface_descriptor intf;
		struct usb_endpoint_descriptor_no_audio source;
		struct usb_ss_ep_comp_descriptor source_comp;
		struct usb_endpoint_descriptor_no_audio sink;
		struct usb_ss_ep_comp_descriptor sink_comp;
		} __attribute__((packed)) ss_descs;
		} __attribute__((packed)) descriptors = {
		.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2),
		.length = cpu_to_le32(sizeof(descriptors)),
		.flags = cpu_to_le32(FUNCTIONFS_HAS_FS_DESC \|
		FUNCTIONFS_HAS_HS_DESC \|
		FUNCTIONFS_HAS_SS_DESC),
		.fs_count = 3,
		.hs_count = 3,
		.ss_count = 5,
		.fs_descs = {
		} __attribute__((packed)) header;
		struct func_desc fs_descs, hs_descs;
		} __attribute__((packed));

		struct func_desc fs_descriptors = {
		.intf = {
		.bLength = sizeof(descriptors.fs_descs.intf),
		.bLength = sizeof(fs_descriptors.intf),
		.bDescriptorType = USB_DT_INTERFACE,
		.bInterfaceNumber = 0,
		.bNumEndpoints = 2,
		@@ -96,23 +96,24 @@ static const struct {
		.iInterface = 1, /* first string from the provided table */
		},
		.source = {
		.bLength = sizeof(descriptors.fs_descs.source),
		.bLength = sizeof(fs_descriptors.source),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 1 \| USB_DIR_OUT,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_FS,
		},
		.sink = {
		.bLength = sizeof(descriptors.fs_descs.sink),
		.bLength = sizeof(fs_descriptors.sink),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 2 \| USB_DIR_IN,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_FS,
		},
		},
		.hs_descs = {
		};

		struct func_desc hs_descriptors = {
		.intf = {
		.bLength = sizeof(descriptors.hs_descs.intf),
		.bLength = sizeof(hs_descriptors.intf),
		.bDescriptorType = USB_DT_INTERFACE,
		.bInterfaceNumber = 0,
		.bNumEndpoints = 2,
		@@ -122,54 +123,19 @@ static const struct {
		.iInterface = 1, /* first string from the provided table */
		},
		.source = {
		.bLength = sizeof(descriptors.hs_descs.source),
		.bLength = sizeof(hs_descriptors.source),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 1 \| USB_DIR_OUT,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_HS,
		},
		.sink = {
		.bLength = sizeof(descriptors.hs_descs.sink),
		.bLength = sizeof(hs_descriptors.sink),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 2 \| USB_DIR_IN,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_HS,
		},
		},
		.ss_descs = {
		.intf = {
		.bLength = sizeof(descriptors.ss_descs.intf),
		.bDescriptorType = USB_DT_INTERFACE,
		.bInterfaceNumber = 0,
		.bNumEndpoints = 2,
		.bInterfaceClass = ADB_CLASS,
		.bInterfaceSubClass = ADB_SUBCLASS,
		.bInterfaceProtocol = ADB_PROTOCOL,
		.iInterface = 1, /* first string from the provided table */
		},
		.source = {
		.bLength = sizeof(descriptors.ss_descs.source),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 1 \| USB_DIR_OUT,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_SS,
		},
		.source_comp = {
		.bLength = sizeof(descriptors.ss_descs.source_comp),
		.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
		},
		.sink = {
		.bLength = sizeof(descriptors.ss_descs.sink),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 2 \| USB_DIR_IN,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_SS,
		},
		.sink_comp = {
		.bLength = sizeof(descriptors.ss_descs.sink_comp),
		.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
		},
		},
		};

		#define STR_INTERFACE_ "ADB Interface"
		@@ -312,6 +278,17 @@ static void usb_adb_init()
		static void init_functionfs(struct usb_handle *h)
		{
		ssize_t ret;
		struct desc_v1 v1_descriptor;
		struct desc_v2 v2_descriptor;

		v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);
		v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor));
		v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC \| FUNCTIONFS_HAS_HS_DESC;
		v2_descriptor.header.fs_count = 3;
		v2_descriptor.header.hs_count = 3;
		v2_descriptor.header.ss_count = 0;
		v2_descriptor.fs_descs = fs_descriptors;
		v2_descriptor.hs_descs = hs_descriptors;

		if (h->control < 0) { // might have already done this before
		D("OPENING %s\n", USB_FFS_ADB_EP0);
		@@ -321,11 +298,21 @@ static void init_functionfs(struct usb_handle *h)
		goto err;
		}

		ret = adb_write(h->control, &descriptors, sizeof(descriptors));
		ret = adb_write(h->control, &v2_descriptor, sizeof(v2_descriptor));
		if (ret < 0) {
		v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC);
		v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor));
		v1_descriptor.header.fs_count = 3;
		v1_descriptor.header.hs_count = 3;
		v1_descriptor.fs_descs = fs_descriptors;
		v1_descriptor.hs_descs = hs_descriptors;
		D("[ %s: Switching to V1_descriptor format errno=%d ]\n", USB_FFS_ADB_EP0, errno);
		ret = adb_write(h->control, &v1_descriptor, sizeof(v1_descriptor));
		if (ret < 0) {
		D("[ %s: write descriptors failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno);
		goto err;
		}
		}

		ret = adb_write(h->control, &strings, sizeof(strings));
		if (ret < 0) {

fastbootd/usb_linux_client.c

+101 −66

Original line number	Diff line number	Diff line
		@@ -69,72 +69,86 @@ struct usb_handle {
		struct transport_handle handle;
		};

		static const struct {
		struct usb_functionfs_descs_head header;
		struct {
		struct func_desc {
		struct usb_interface_descriptor intf;
		struct usb_endpoint_descriptor_no_audio source;
		struct usb_endpoint_descriptor_no_audio sink;
		} __attribute__((packed)) fs_descs, hs_descs;
		} __attribute__((packed)) descriptors = {
		.header = {
		.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC),
		.length = cpu_to_le32(sizeof(descriptors)),
		.fs_count = 3,
		.hs_count = 3,
		},
		.fs_descs = {
		} __attribute__((packed));

		struct desc_v1 {
		struct usb_functionfs_descs_head_v1 {
		__le32 magic;
		__le32 length;
		__le32 fs_count;
		__le32 hs_count;
		} __attribute__((packed)) header;
		struct func_desc fs_descs, hs_descs;
		} __attribute__((packed));

		struct desc_v2 {
		struct usb_functionfs_descs_head_v2 {
		__le32 magic;
		__le32 length;
		__le32 flags;
		__le32 fs_count;
		__le32 hs_count;
		__le32 ss_count;
		} __attribute__((packed)) header;
		struct func_desc fs_descs, hs_descs;
		} __attribute__((packed));

		struct func_desc fs_descriptors = {
		.intf = {
		.bLength = sizeof(descriptors.fs_descs.intf),
		.bLength = sizeof(fs_descriptors.intf),
		.bDescriptorType = USB_DT_INTERFACE,
		.bInterfaceNumber = 0,
		.bNumEndpoints = 2,
		.bInterfaceClass = FASTBOOT_CLASS,
		.bInterfaceSubClass = FASTBOOT_SUBCLASS,
		.bInterfaceProtocol = FASTBOOT_PROTOCOL,
		.bInterfaceClass = ADB_CLASS,
		.bInterfaceSubClass = ADB_SUBCLASS,
		.bInterfaceProtocol = ADB_PROTOCOL,
		.iInterface = 1, /* first string from the provided table */
		},
		.source = {
		.bLength = sizeof(descriptors.fs_descs.source),
		.bLength = sizeof(fs_descriptors.source),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 1 \| USB_DIR_OUT,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_FS,
		},
		.sink = {
		.bLength = sizeof(descriptors.fs_descs.sink),
		.bLength = sizeof(fs_descriptors.sink),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 2 \| USB_DIR_IN,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_FS,
		},
		},
		.hs_descs = {
		};

		struct func_desc hs_descriptors = {
		.intf = {
		.bLength = sizeof(descriptors.hs_descs.intf),
		.bLength = sizeof(hs_descriptors.intf),
		.bDescriptorType = USB_DT_INTERFACE,
		.bInterfaceNumber = 0,
		.bNumEndpoints = 2,
		.bInterfaceClass = FASTBOOT_CLASS,
		.bInterfaceSubClass = FASTBOOT_SUBCLASS,
		.bInterfaceProtocol = FASTBOOT_PROTOCOL,
		.bInterfaceClass = ADB_CLASS,
		.bInterfaceSubClass = ADB_SUBCLASS,
		.bInterfaceProtocol = ADB_PROTOCOL,
		.iInterface = 1, /* first string from the provided table */
		},
		.source = {
		.bLength = sizeof(descriptors.hs_descs.source),
		.bLength = sizeof(hs_descriptors.source),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 1 \| USB_DIR_OUT,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_HS,
		},
		.sink = {
		.bLength = sizeof(descriptors.hs_descs.sink),
		.bLength = sizeof(hs_descriptors.sink),
		.bDescriptorType = USB_DT_ENDPOINT,
		.bEndpointAddress = 2 \| USB_DIR_IN,
		.bmAttributes = USB_ENDPOINT_XFER_BULK,
		.wMaxPacketSize = MAX_PACKET_SIZE_HS,
		},
		},
		};

		#define STR_INTERFACE_ "Fastboot Interface"
		@@ -161,6 +175,17 @@ static const struct {
		static int init_functionfs(struct usb_transport *usb_transport)
		{
		ssize_t ret;
		struct desc_v1 v1_descriptor;
		struct desc_v2 v2_descriptor;

		v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);
		v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor));
		v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC \| FUNCTIONFS_HAS_HS_DESC;
		v2_descriptor.header.fs_count = 3;
		v2_descriptor.header.hs_count = 3;
		v2_descriptor.header.ss_count = 0;
		v2_descriptor.fs_descs = fs_descriptors;
		v2_descriptor.hs_descs = hs_descriptors;

		D(VERBOSE, "OPENING %s", USB_FFS_FASTBOOT_EP0);
		usb_transport->control = open(USB_FFS_FASTBOOT_EP0, O_RDWR);
		@@ -169,11 +194,21 @@ static int init_functionfs(struct usb_transport *usb_transport)
		goto err;
		}

		ret = write(usb_transport->control, &descriptors, sizeof(descriptors));
		ret = write(usb_transport->control, &v2_descriptor, sizeof(v2_descriptor));
		if (ret < 0) {
		v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC);
		v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor));
		v1_descriptor.header.fs_count = 3;
		v1_descriptor.header.hs_count = 3;
		v1_descriptor.fs_descs = fs_descriptors;
		v1_descriptor.hs_descs = hs_descriptors;
		D("[ %s: Switching to V1_descriptor format errno=%d ]\n", USB_FFS_FASTBOOT_EP0, errno);
		ret = write(usb_transport->control, &v1_descriptor, sizeof(v1_descriptor));
		if (ret < 0) {
		D(ERR, "[ %s: write descriptors failed: errno=%d ]", USB_FFS_FASTBOOT_EP0, errno);
		goto err;
		}
		}

		ret = write(usb_transport->control, &strings, sizeof(strings));
		if (ret < 0) {