From patchwork Tue Nov 25 13:11:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Cherian X-Patchwork-Id: 5378941 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DB0F59F39D for ; Tue, 25 Nov 2014 13:19:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F0A5E2015A for ; Tue, 25 Nov 2014 13:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB0D22014A for ; Tue, 25 Nov 2014 13:19:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918AbaKYNQc (ORCPT ); Tue, 25 Nov 2014 08:16:32 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:37207 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753037AbaKYNQ1 (ORCPT ); Tue, 25 Nov 2014 08:16:27 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id sAPDFTC8022786; Tue, 25 Nov 2014 07:15:29 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id sAPDFT46021167; Tue, 25 Nov 2014 07:15:29 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Tue, 25 Nov 2014 07:15:29 -0600 Received: from george-pc.apr.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id sAPDEBE5020093; Tue, 25 Nov 2014 07:15:24 -0600 From: George Cherian To: , , , , CC: , , , , , , , , , , , , , , , George Cherian Subject: [PATCH 12/19] usb: dwc3: gadget: Adapt gadget to drd library Date: Tue, 25 Nov 2014 18:41:48 +0530 Message-ID: <1416921115-10467-13-git-send-email-george.cherian@ti.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1416921115-10467-1-git-send-email-george.cherian@ti.com> References: <1416921115-10467-1-git-send-email-george.cherian@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adapt the dwc3 gadget to use drd library functions. In prepration to support DRD on dwc3. Signed-off-by: George Cherian --- drivers/usb/dwc3/gadget.c | 128 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 28 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 2c54d45..a75fae5 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -29,6 +29,7 @@ #include #include +#include #include "debug.h" #include "core.h" @@ -2681,6 +2682,89 @@ static irqreturn_t dwc3_interrupt(int irq, void *_dwc) return ret; } +void dwc3_gadget_release(struct device *dev) +{ + struct usb_gadget *gadget = container_of(dev, struct usb_gadget, dev); + struct dwc3_gadget *dwc_gadget = gadget_to_dwc_gadget(gadget); + struct dwc3 *dwc = dwc_gadget->dwc; + + dev_dbg(dev, "releasing '%s'\n", dev_name(dev)); + dwc3_gadget_free_endpoints(dwc); + dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, + dwc->ep0_bounce, dwc->ep0_bounce_addr); + kfree(dwc->setup_buf); + dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb), + dwc->ep0_trb, dwc->ep0_trb_addr); + dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), + dwc->ctrl_req, dwc->ctrl_req_addr); + usb_drd_unregister_udc(dwc->dev); + kfree(dwc_gadget); +} + +int dwc3_gadget_setup(void *data) +{ + struct dwc3 *dwc = data; + struct dwc3_gadget *dwc_gadget; + struct usb_drd_gadget *drd_gadget; + struct usb_drd_setup *gadget_setup; + int ret; + + drd_gadget = kzalloc(sizeof(*drd_gadget), GFP_KERNEL); + if (!drd_gadget) { + ret = -ENOMEM; + goto err1; + } + + gadget_setup = kzalloc(sizeof(*gadget_setup), GFP_KERNEL); + if (!gadget_setup) { + ret = -ENOMEM; + goto err2; + } + + dwc_gadget = kzalloc(sizeof(*dwc_gadget), GFP_KERNEL); + if (!dwc_gadget) { + ret = -ENOMEM; + goto err3; + } + + drd_gadget->g_driver = dwc->gadget_driver; + + /* + * Pass the DWC3 specific routines for + * switching roles to the drd library + */ + gadget_setup->ll_start = NULL; + gadget_setup->ll_stop = NULL; + gadget_setup->ll_release = dwc3_gadget_release; + gadget_setup->data = (void *)dwc; + drd_gadget->gadget_setup = gadget_setup; + + dwc_gadget->gadget.ops = &dwc3_gadget_ops; + dwc_gadget->gadget.max_speed = USB_SPEED_SUPER; + dwc_gadget->gadget.speed = USB_SPEED_UNKNOWN; + dwc_gadget->gadget.sg_supported = true; + dwc_gadget->gadget.name = "dwc3-gadget"; + dwc_gadget->dwc = dwc; + drd_gadget->gadget = &dwc_gadget->gadget; + + /* + * Per databook, DWC3 needs buffer size to be aligned to MaxPacketSize + * on ep out. + */ + dwc_gadget->gadget.quirk_ep_out_aligned_size = true; + dwc->dwc_gadget = dwc_gadget; + usb_drd_register_udc(dwc->dev, drd_gadget); + + return 0; + +err3: + kfree(gadget_setup); +err2: + kfree(drd_gadget); +err1: + return ret; +} + /** * dwc3_gadget_init - Initializes gadget related registers * @dwc: pointer to our controller context structure @@ -2690,7 +2774,6 @@ static irqreturn_t dwc3_interrupt(int irq, void *_dwc) int dwc3_gadget_init(struct dwc3 *dwc) { int ret; - struct dwc3_gadget *dwc_gadget; dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req), &dwc->ctrl_req_addr, GFP_KERNEL); @@ -2723,24 +2806,9 @@ int dwc3_gadget_init(struct dwc3 *dwc) goto err3; } - dwc_gadget = kzalloc(sizeof(*dwc_gadget), GFP_KERNEL); - if (!dwc_gadget) { - ret = -ENOMEM; + ret = dwc3_gadget_setup(dwc); + if (ret) goto err3; - } - - dwc_gadget->gadget.ops = &dwc3_gadget_ops; - dwc_gadget->gadget.max_speed = USB_SPEED_SUPER; - dwc_gadget->gadget.speed = USB_SPEED_UNKNOWN; - dwc_gadget->gadget.sg_supported = true; - dwc_gadget->gadget.name = "dwc3-gadget"; - dwc_gadget->dwc = dwc; - - /* - * Per databook, DWC3 needs buffer size to be aligned to MaxPacketSize - * on ep out. - */ - dwc_gadget->gadget.quirk_ep_out_aligned_size = true; /* * REVISIT: Here we should clear all pending IRQs to be @@ -2751,7 +2819,8 @@ int dwc3_gadget_init(struct dwc3 *dwc) if (ret) goto err4; - ret = usb_add_gadget_udc(dwc->dev, &dwc_gadget->gadget); + ret = usb_add_gadget_udc_release(dwc->dev, &dwc->dwc_gadget->gadget, + dwc3_gadget_release); if (ret) { dev_err(dwc->dev, "failed to register udc\n"); goto err4; @@ -2760,6 +2829,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) return 0; err4: + usb_drd_unregister_udc(dwc->dev); dwc3_gadget_free_endpoints(dwc); dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, dwc->ep0_bounce, dwc->ep0_bounce_addr); @@ -2785,20 +2855,22 @@ void dwc3_gadget_exit(struct dwc3 *dwc) { struct dwc3_gadget *dwc_gadget = dwc->dwc_gadget; - usb_del_gadget_udc(&dwc_gadget->gadget); + if (usb_drd_get_state(dwc->dev) & DRD_DEVICE_REGISTERED) { + usb_del_gadget_udc(&dwc_gadget->gadget); - dwc3_gadget_free_endpoints(dwc); + dwc3_gadget_free_endpoints(dwc); - dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, - dwc->ep0_bounce, dwc->ep0_bounce_addr); + dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE, + dwc->ep0_bounce, dwc->ep0_bounce_addr); - kfree(dwc->setup_buf); + kfree(dwc->setup_buf); - dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb), - dwc->ep0_trb, dwc->ep0_trb_addr); + dma_free_coherent(dwc->dev, sizeof(*dwc->ep0_trb), + dwc->ep0_trb, dwc->ep0_trb_addr); - dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), - dwc->ctrl_req, dwc->ctrl_req_addr); + dma_free_coherent(dwc->dev, sizeof(*dwc->ctrl_req), + dwc->ctrl_req, dwc->ctrl_req_addr); + } } int dwc3_gadget_suspend(struct dwc3 *dwc)