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

Commit e117e742 authored by Robert Baldyga's avatar Robert Baldyga Committed by Felipe Balbi
Browse files

usb: gadget: add "maxpacket_limit" field to struct usb_ep 



This patch adds "maxpacket_limit" to struct usb_ep. This field contains
maximum value of maxpacket supported by driver, and is set in driver probe.
This value should be used by autoconfig() function, because value of field
"maxpacket" is set to value from endpoint descriptor when endpoint becomes
enabled. So when autoconfig() function will be called again for this endpoint,
"maxpacket" value will contain wMaxPacketSize from descriptior instead of
maximum packet size for this endpoint.

For this reason this patch adds new field "maxpacket_limit" which contains
value of maximum packet size (which defines maximum endpoint capabilities).
This value is used in ep_matches() function used by autoconfig().

Value of "maxpacket_limit" should be set in UDC driver probe function, using
usb_ep_set_maxpacket_limit() function, defined in gadget.h. This function
set choosen value to both "maxpacket_limit" and "maxpacket" fields.

This patch modifies UDC drivers by adding support for maxpacket_limit.

Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f8800d47

drivers/usb/chipidea/udc.c

+2 −2
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ static int init_eps(struct ci_hdrc *ci) 
			 * eps, maxP is set by epautoconfig() called

			 * by gadget layer

			 */

			hwep->ep.maxpacket = (unsigned short)~0;

			usb_ep_set_maxpacket_limit(&hwep->ep, (unsigned short)~0);



			INIT_LIST_HEAD(&hwep->qh.queue);

			hwep->qh.ptr = dma_pool_alloc(ci->qh_pool, GFP_KERNEL,
@@ -1586,7 +1586,7 @@ static int init_eps(struct ci_hdrc *ci) 
				else

					ci->ep0in = hwep;



				hwep->ep.maxpacket = CTRL_PAYLOAD_MAX;

				usb_ep_set_maxpacket_limit(&hwep->ep, CTRL_PAYLOAD_MAX);

				continue;

			}

drivers/usb/dwc3/gadget.c

+2 −2
Original line number Diff line number Diff line
@@ -1653,7 +1653,7 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, 
		dev_vdbg(dwc->dev, "initializing %s\n", dep->name);



		if (epnum == 0 || epnum == 1) {

			dep->endpoint.maxpacket = 512;

			usb_ep_set_maxpacket_limit(&dep->endpoint, 512);

			dep->endpoint.maxburst = 1;

			dep->endpoint.ops = &dwc3_gadget_ep0_ops;

			if (!epnum)
@@ -1661,7 +1661,7 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, 
		} else {

			int		ret;



			dep->endpoint.maxpacket = 1024;

			usb_ep_set_maxpacket_limit(&dep->endpoint, 1024);

			dep->endpoint.max_streams = 15;

			dep->endpoint.ops = &dwc3_gadget_ep_ops;

			list_add_tail(&dep->endpoint.ep_list,

drivers/usb/gadget/amd5536udc.c

+9 −6
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static void ep_init(struct udc_regs __iomem *regs, struct udc_ep *ep) 
	ep->ep.ops = &udc_ep_ops;

	INIT_LIST_HEAD(&ep->queue);



	ep->ep.maxpacket = (u16) ~0;

	usb_ep_set_maxpacket_limit(&ep->ep,(u16) ~0);

	/* set NAK */

	tmp = readl(&ep->regs->ctl);

	tmp |= AMD_BIT(UDC_EPCTL_SNAK);
@@ -1564,12 +1564,15 @@ static void udc_setup_endpoints(struct udc *dev) 
	}

	/* EP0 max packet */

	if (dev->gadget.speed == USB_SPEED_FULL) {

		dev->ep[UDC_EP0IN_IX].ep.maxpacket = UDC_FS_EP0IN_MAX_PKT_SIZE;

		dev->ep[UDC_EP0OUT_IX].ep.maxpacket =

						UDC_FS_EP0OUT_MAX_PKT_SIZE;

		usb_ep_set_maxpacket_limit(&dev->ep[UDC_EP0IN_IX].ep,

					   UDC_FS_EP0IN_MAX_PKT_SIZE);

		usb_ep_set_maxpacket_limit(&dev->ep[UDC_EP0OUT_IX].ep,

					   UDC_FS_EP0OUT_MAX_PKT_SIZE);

	} else if (dev->gadget.speed == USB_SPEED_HIGH) {

		dev->ep[UDC_EP0IN_IX].ep.maxpacket = UDC_EP0IN_MAX_PKT_SIZE;

		dev->ep[UDC_EP0OUT_IX].ep.maxpacket = UDC_EP0OUT_MAX_PKT_SIZE;

		usb_ep_set_maxpacket_limit(&dev->ep[UDC_EP0IN_IX].ep,

					   UDC_EP0IN_MAX_PKT_SIZE);

		usb_ep_set_maxpacket_limit(&dev->ep[UDC_EP0OUT_IX].ep,

					   UDC_EP0OUT_MAX_PKT_SIZE);

	}



	/*

drivers/usb/gadget/at91_udc.c

+8 −8
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static void udc_reinit(struct at91_udc *udc) 
		ep->ep.desc = NULL;

		ep->stopped = 0;

		ep->fifo_bank = 0;

		ep->ep.maxpacket = ep->maxpacket;

		usb_ep_set_maxpacket_limit(&ep->ep, ep->maxpacket);

		ep->creg = (void __iomem *) udc->udp_baseaddr + AT91_UDP_CSR(i);

		/* initialize one queue per endpoint */

		INIT_LIST_HEAD(&ep->queue);
@@ -1759,15 +1759,15 @@ static int at91udc_probe(struct platform_device *pdev) 


	/* newer chips have more FIFO memory than rm9200 */

	if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) {

		udc->ep[0].maxpacket = 64;

		udc->ep[3].maxpacket = 64;

		udc->ep[4].maxpacket = 512;

		udc->ep[5].maxpacket = 512;

		usb_ep_set_maxpacket_limit(&udc->ep[0], 64);

		usb_ep_set_maxpacket_limit(&udc->ep[3], 64);

		usb_ep_set_maxpacket_limit(&udc->ep[4], 512);

		usb_ep_set_maxpacket_limit(&udc->ep[5], 512);

	} else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {

		udc->ep[3].maxpacket = 64;

		usb_ep_set_maxpacket_limit(&udc->ep[3], 64);

	} else if (cpu_is_at91sam9263()) {

		udc->ep[0].maxpacket = 64;

		udc->ep[3].maxpacket = 64;

		usb_ep_set_maxpacket_limit(&udc->ep[0], 64);

		usb_ep_set_maxpacket_limit(&udc->ep[3], 64);

	}



	udc->udp_baseaddr = ioremap(res->start, resource_size(res));

drivers/usb/gadget/atmel_usba_udc.c

+3 −2
Original line number Diff line number Diff line
@@ -1904,7 +1904,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, 
		ep->dma_regs = udc->regs + USBA_DMA_BASE(i);

		ep->fifo = udc->fifo + USBA_FIFO_BASE(i);

		ep->ep.ops = &usba_ep_ops;

		ep->ep.maxpacket = ep->fifo_size;

		usb_ep_set_maxpacket_limit(&ep->ep, ep->fifo_size);

		ep->udc = udc;

		INIT_LIST_HEAD(&ep->queue);
@@ -1957,7 +1957,8 @@ static struct usba_ep * usba_udc_pdata(struct platform_device *pdev, 
		ep->fifo = udc->fifo + USBA_FIFO_BASE(i);

		ep->ep.ops = &usba_ep_ops;

		ep->ep.name = pdata->ep[i].name;

		ep->fifo_size = ep->ep.maxpacket = pdata->ep[i].fifo_size;

		ep->fifo_size = pdata->ep[i].fifo_size;

		usb_ep_set_maxpacket_limit(&ep->ep, ep->fifo_size);

		ep->udc = udc;

		INIT_LIST_HEAD(&ep->queue);

		ep->nr_banks = pdata->ep[i].nr_banks;