Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec6ac1c authored by taehyun.cho's avatar taehyun.cho Committed by Pratham Pratap
Browse files

ANDROID: USB: gadget: f_accessory: add support for SuperSpeed Plus 



Adds the necessary SuperSpeed Plus support for f_accessory.

[Not upstream as this file is not upstream].

Bug: 170925797
Signed-off-by: default avatartaehyun.cho <taehyun.cho@samsung.com>
Change-Id: Ia2a5f4a6cefac2418f8f29bf1a56355b96d80fc0
(cherry picked from commit 00572be28ec474d7953f1b9dd681cc2dd290d9bf)
[willmcvicker: only cherry-pick f_accessory from original patch]
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
(cherry picked from commit 4d7ced0819d3f30acbde46991393249049cefa05)
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Git-commit: 9acdbad022c88c958ba69ab3f021f2e8a07cfc45
Git-Repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarPratham Pratap <ppratap@codeaurora.org>
parent 37a3bfb6

drivers/usb/gadget/function/f_accessory.c

+73 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Gadget Function Driver for Android USB accessories

 *
@@ -142,12 +143,62 @@ static struct usb_interface_descriptor acc_interface_desc = { 
	.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 = {

	.bLength                = USB_DT_ENDPOINT_SIZE,

	.bDescriptorType        = USB_DT_ENDPOINT,

	.bEndpointAddress       = USB_DIR_IN,

	.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 = {
@@ -155,7 +206,7 @@ static struct usb_endpoint_descriptor acc_highspeed_out_desc = { 
	.bDescriptorType        = USB_DT_ENDPOINT,

	.bEndpointAddress       = USB_DIR_OUT,

	.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 = {
@@ -186,6 +237,24 @@ static struct usb_descriptor_header *hs_acc_descs[] = { 
	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[] = {

	[INTERFACE_STRING_INDEX].s	= "Android Accessory Interface",

	{  },	/* end of list */
@@ -1435,6 +1504,8 @@ static struct usb_function *acc_alloc(struct usb_function_instance *fi) 
	dev->function.strings = acc_strings,

	dev->function.fs_descriptors = fs_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.unbind = acc_function_unbind;

	dev->function.set_alt = acc_function_set_alt;