Merge "ANDROID: usb: gadget: f_accessory: update SS/SSP descriptors" (f1bbfdbe) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/function/f_accessory.c

+89 −8

Original line number	Original line	Diff line number	Diff line
			// SPDX-License-Identifier: GPL-2.0
	/*		/*
	* Gadget Function Driver for Android USB accessories		* Gadget Function Driver for Android USB accessories
	*		*
	@@ -142,12 +143,62 @@ static struct usb_interface_descriptor acc_interface_desc = {
	.bInterfaceProtocol = 0,		.bInterfaceProtocol = 0,
	};		};

			static struct usb_endpoint_descriptor acc_superspeedplus_in_desc = {
			.bLength = USB_DT_ENDPOINT_SIZE,
			.bDescriptorType = USB_DT_ENDPOINT,
			.bEndpointAddress = USB_DIR_IN,
			.bmAttributes = USB_ENDPOINT_XFER_BULK,
			.wMaxPacketSize = cpu_to_le16(1024),
			};

			static struct usb_endpoint_descriptor acc_superspeedplus_out_desc = {
			.bLength = USB_DT_ENDPOINT_SIZE,
			.bDescriptorType = USB_DT_ENDPOINT,
			.bEndpointAddress = USB_DIR_OUT,
			.bmAttributes = USB_ENDPOINT_XFER_BULK,
			.wMaxPacketSize = cpu_to_le16(1024),
			};

			static struct usb_ss_ep_comp_descriptor acc_superspeedplus_comp_desc = {
			.bLength = sizeof(acc_superspeedplus_comp_desc),
			.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,

			/* the following 2 values can be tweaked if necessary */
			/* .bMaxBurst = 0, */
			/* .bmAttributes = 0, */
			};

			static struct usb_endpoint_descriptor acc_superspeed_in_desc = {
			.bLength = USB_DT_ENDPOINT_SIZE,
			.bDescriptorType = USB_DT_ENDPOINT,
			.bEndpointAddress = USB_DIR_IN,
			.bmAttributes = USB_ENDPOINT_XFER_BULK,
			.wMaxPacketSize = cpu_to_le16(1024),
			};

			static struct usb_endpoint_descriptor acc_superspeed_out_desc = {
			.bLength = USB_DT_ENDPOINT_SIZE,
			.bDescriptorType = USB_DT_ENDPOINT,
			.bEndpointAddress = USB_DIR_OUT,
			.bmAttributes = USB_ENDPOINT_XFER_BULK,
			.wMaxPacketSize = cpu_to_le16(1024),
			};

			static struct usb_ss_ep_comp_descriptor acc_superspeed_comp_desc = {
			.bLength = sizeof(acc_superspeed_comp_desc),
			.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,

			/* the following 2 values can be tweaked if necessary */
			/* .bMaxBurst = 0, */
			/* .bmAttributes = 0, */
			};

	static struct usb_endpoint_descriptor acc_highspeed_in_desc = {		static struct usb_endpoint_descriptor acc_highspeed_in_desc = {
	.bLength = USB_DT_ENDPOINT_SIZE,		.bLength = USB_DT_ENDPOINT_SIZE,
	.bDescriptorType = USB_DT_ENDPOINT,		.bDescriptorType = USB_DT_ENDPOINT,
	.bEndpointAddress = USB_DIR_IN,		.bEndpointAddress = USB_DIR_IN,
	.bmAttributes = USB_ENDPOINT_XFER_BULK,		.bmAttributes = USB_ENDPOINT_XFER_BULK,
	.wMaxPacketSize = __constant_cpu_to_le16(512),		.wMaxPacketSize = cpu_to_le16(512),
	};		};

	static struct usb_endpoint_descriptor acc_highspeed_out_desc = {		static struct usb_endpoint_descriptor acc_highspeed_out_desc = {
	@@ -155,7 +206,7 @@ static struct usb_endpoint_descriptor acc_highspeed_out_desc = {
	.bDescriptorType = USB_DT_ENDPOINT,		.bDescriptorType = USB_DT_ENDPOINT,
	.bEndpointAddress = USB_DIR_OUT,		.bEndpointAddress = USB_DIR_OUT,
	.bmAttributes = USB_ENDPOINT_XFER_BULK,		.bmAttributes = USB_ENDPOINT_XFER_BULK,
	.wMaxPacketSize = __constant_cpu_to_le16(512),		.wMaxPacketSize = cpu_to_le16(512),
	};		};

	static struct usb_endpoint_descriptor acc_fullspeed_in_desc = {		static struct usb_endpoint_descriptor acc_fullspeed_in_desc = {
	@@ -186,6 +237,24 @@ static struct usb_descriptor_header *hs_acc_descs[] = {
	NULL,		NULL,
	};		};

			static struct usb_descriptor_header *ss_acc_descs[] = {
			(struct usb_descriptor_header *) &acc_interface_desc,
			(struct usb_descriptor_header *) &acc_superspeed_in_desc,
			(struct usb_descriptor_header *) &acc_superspeed_comp_desc,
			(struct usb_descriptor_header *) &acc_superspeed_out_desc,
			(struct usb_descriptor_header *) &acc_superspeed_comp_desc,
			NULL,
			};

			static struct usb_descriptor_header *ssp_acc_descs[] = {
			(struct usb_descriptor_header *) &acc_interface_desc,
			(struct usb_descriptor_header *) &acc_superspeedplus_in_desc,
			(struct usb_descriptor_header *) &acc_superspeedplus_comp_desc,
			(struct usb_descriptor_header *) &acc_superspeedplus_out_desc,
			(struct usb_descriptor_header *) &acc_superspeedplus_comp_desc,
			NULL,
			};

	static struct usb_string acc_string_defs[] = {		static struct usb_string acc_string_defs[] = {
	[INTERFACE_STRING_INDEX].s = "Android Accessory Interface",		[INTERFACE_STRING_INDEX].s = "Android Accessory Interface",
	{ }, /* end of list */		{ }, /* end of list */
	@@ -1047,12 +1116,22 @@ __acc_function_bind(struct usb_configuration *c,
	return ret;		return ret;

	/* support high speed hardware */		/* support high speed hardware */
	if (gadget_is_dualspeed(c->cdev->gadget)) {
	acc_highspeed_in_desc.bEndpointAddress =		acc_highspeed_in_desc.bEndpointAddress =
	acc_fullspeed_in_desc.bEndpointAddress;		acc_fullspeed_in_desc.bEndpointAddress;
	acc_highspeed_out_desc.bEndpointAddress =		acc_highspeed_out_desc.bEndpointAddress =
	acc_fullspeed_out_desc.bEndpointAddress;		acc_fullspeed_out_desc.bEndpointAddress;
	}
			/* support super speed hardware */
			acc_superspeed_in_desc.bEndpointAddress =
			acc_fullspeed_in_desc.bEndpointAddress;
			acc_superspeed_out_desc.bEndpointAddress =
			acc_fullspeed_out_desc.bEndpointAddress;

			/* support super speed plus hardware */
			acc_superspeedplus_in_desc.bEndpointAddress =
			acc_fullspeed_in_desc.bEndpointAddress;
			acc_superspeedplus_out_desc.bEndpointAddress =
			acc_fullspeed_out_desc.bEndpointAddress;

	DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",		DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",
	gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",		gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
	@@ -1435,6 +1514,8 @@ static struct usb_function acc_alloc(struct usb_function_instance fi)
	dev->function.strings = acc_strings,		dev->function.strings = acc_strings,
	dev->function.fs_descriptors = fs_acc_descs;		dev->function.fs_descriptors = fs_acc_descs;
	dev->function.hs_descriptors = hs_acc_descs;		dev->function.hs_descriptors = hs_acc_descs;
			dev->function.ss_descriptors = ss_acc_descs;
			dev->function.ssp_descriptors = ssp_acc_descs;
	dev->function.bind = acc_function_bind_configfs;		dev->function.bind = acc_function_bind_configfs;
	dev->function.unbind = acc_function_unbind;		dev->function.unbind = acc_function_unbind;
	dev->function.set_alt = acc_function_set_alt;		dev->function.set_alt = acc_function_set_alt;