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

Commit 6fecfb05 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: gadget: add usb3.0 descriptors to serial gadgets 



This patch adds SS descriptors to the ACM & generic serial gadget. The
ACM part was tested with minicom + dummy + send / receive files over
ttyACM <=> ttyGS0.
The generic serial part (f_serial) was not tested (haven't found a
driver on the host side).
The nokia & multi gadget use HS at most.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 609ca228

drivers/usb/gadget/f_acm.c

+50 −0
Original line number Diff line number Diff line
@@ -237,6 +237,42 @@ static struct usb_descriptor_header *acm_hs_function[] = { 
	NULL,

};



static struct usb_endpoint_descriptor acm_ss_in_desc = {

	.bLength =		USB_DT_ENDPOINT_SIZE,

	.bDescriptorType =	USB_DT_ENDPOINT,

	.bmAttributes =		USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize =	cpu_to_le16(1024),

};



static struct usb_endpoint_descriptor acm_ss_out_desc = {

	.bLength =		USB_DT_ENDPOINT_SIZE,

	.bDescriptorType =	USB_DT_ENDPOINT,

	.bmAttributes =		USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize =	cpu_to_le16(1024),

};



static struct usb_ss_ep_comp_descriptor acm_ss_bulk_comp_desc = {

	.bLength =              sizeof acm_ss_bulk_comp_desc,

	.bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,

};



static struct usb_descriptor_header *acm_ss_function[] = {

	(struct usb_descriptor_header *) &acm_iad_descriptor,

	(struct usb_descriptor_header *) &acm_control_interface_desc,

	(struct usb_descriptor_header *) &acm_header_desc,

	(struct usb_descriptor_header *) &acm_call_mgmt_descriptor,

	(struct usb_descriptor_header *) &acm_descriptor,

	(struct usb_descriptor_header *) &acm_union_desc,

	(struct usb_descriptor_header *) &acm_hs_notify_desc,

	(struct usb_descriptor_header *) &acm_ss_bulk_comp_desc,

	(struct usb_descriptor_header *) &acm_data_interface_desc,

	(struct usb_descriptor_header *) &acm_ss_in_desc,

	(struct usb_descriptor_header *) &acm_ss_bulk_comp_desc,

	(struct usb_descriptor_header *) &acm_ss_out_desc,

	(struct usb_descriptor_header *) &acm_ss_bulk_comp_desc,

	NULL,

};



/* string descriptors: */



#define ACM_CTRL_IDX	0
@@ -643,9 +679,21 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) 
		/* copy descriptors */

		f->hs_descriptors = usb_copy_descriptors(acm_hs_function);

	}

	if (gadget_is_superspeed(c->cdev->gadget)) {

		acm_ss_in_desc.bEndpointAddress =

			acm_fs_in_desc.bEndpointAddress;

		acm_ss_out_desc.bEndpointAddress =

			acm_fs_out_desc.bEndpointAddress;



		/* copy descriptors, and track endpoint copies */

		f->ss_descriptors = usb_copy_descriptors(acm_ss_function);

		if (!f->ss_descriptors)

			goto fail;

	}



	DBG(cdev, "acm ttyGS%d: %s speed IN/%s OUT/%s NOTIFY/%s\n",

			acm->port_num,

			gadget_is_superspeed(c->cdev->gadget) ? "super" :

			gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",

			acm->port.in->name, acm->port.out->name,

			acm->notify->name);
@@ -675,6 +723,8 @@ acm_unbind(struct usb_configuration *c, struct usb_function *f) 


	if (gadget_is_dualspeed(c->cdev->gadget))

		usb_free_descriptors(f->hs_descriptors);

	if (gadget_is_superspeed(c->cdev->gadget))

		usb_free_descriptors(f->ss_descriptors);

	usb_free_descriptors(f->descriptors);

	gs_free_req(acm->notify, acm->notify_req);

	kfree(acm);

drivers/usb/gadget/f_serial.c

+42 −0
Original line number Diff line number Diff line
@@ -99,6 +99,34 @@ static struct usb_descriptor_header *gser_hs_function[] __initdata = { 
	NULL,

};



static struct usb_endpoint_descriptor gser_ss_in_desc __initdata = {

	.bLength =		USB_DT_ENDPOINT_SIZE,

	.bDescriptorType =	USB_DT_ENDPOINT,

	.bmAttributes =		USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize =	cpu_to_le16(1024),

};



static struct usb_endpoint_descriptor gser_ss_out_desc __initdata = {

	.bLength =		USB_DT_ENDPOINT_SIZE,

	.bDescriptorType =	USB_DT_ENDPOINT,

	.bmAttributes =		USB_ENDPOINT_XFER_BULK,

	.wMaxPacketSize =	cpu_to_le16(1024),

};



static struct usb_ss_ep_comp_descriptor gser_ss_bulk_comp_desc __initdata = {

	.bLength =              sizeof gser_ss_bulk_comp_desc,

	.bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,

};



static struct usb_descriptor_header *gser_ss_function[] __initdata = {

	(struct usb_descriptor_header *) &gser_interface_desc,

	(struct usb_descriptor_header *) &gser_ss_in_desc,

	(struct usb_descriptor_header *) &gser_ss_bulk_comp_desc,

	(struct usb_descriptor_header *) &gser_ss_out_desc,

	(struct usb_descriptor_header *) &gser_ss_bulk_comp_desc,

	NULL,

};



/* string descriptors: */



static struct usb_string gser_string_defs[] = {
@@ -201,9 +229,21 @@ gser_bind(struct usb_configuration *c, struct usb_function *f) 
		/* copy descriptors, and track endpoint copies */

		f->hs_descriptors = usb_copy_descriptors(gser_hs_function);

	}

	if (gadget_is_superspeed(c->cdev->gadget)) {

		gser_ss_in_desc.bEndpointAddress =

			gser_fs_in_desc.bEndpointAddress;

		gser_ss_out_desc.bEndpointAddress =

			gser_fs_out_desc.bEndpointAddress;



		/* copy descriptors, and track endpoint copies */

		f->ss_descriptors = usb_copy_descriptors(gser_ss_function);

		if (!f->ss_descriptors)

			goto fail;

	}



	DBG(cdev, "generic ttyGS%d: %s speed IN/%s OUT/%s\n",

			gser->port_num,

			gadget_is_superspeed(c->cdev->gadget) ? "super" :

			gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",

			gser->port.in->name, gser->port.out->name);

	return 0;
@@ -225,6 +265,8 @@ gser_unbind(struct usb_configuration *c, struct usb_function *f) 
{

	if (gadget_is_dualspeed(c->cdev->gadget))

		usb_free_descriptors(f->hs_descriptors);

	if (gadget_is_superspeed(c->cdev->gadget))

		usb_free_descriptors(f->ss_descriptors);

	usb_free_descriptors(f->descriptors);

	kfree(func_to_gser(f));

}

drivers/usb/gadget/serial.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static struct usb_composite_driver gserial_driver = { 
	.name		= "g_serial",

	.dev		= &device_desc,

	.strings	= dev_strings,

	.max_speed	= USB_SPEED_HIGH,

	.max_speed	= USB_SPEED_SUPER,

};



static int __init init(void)