From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908AbcEJKKq (ORCPT ); Tue, 10 May 2016 06:10:46 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:39018 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751450AbcEJKKo (ORCPT ); Tue, 10 May 2016 06:10:44 -0400 Subject: Re: [PATCH v7 5/5] usb: dwc3: core: cleanup IRQ resources To: Felipe Balbi References: <1462873919-20532-1-git-send-email-rogerq@ti.com> <1462873919-20532-6-git-send-email-rogerq@ti.com> <877ff2i61f.fsf@linux.intel.com> CC: , , , , , , , , , , , From: Roger Quadros Message-ID: <5731B395.4010201@ti.com> Date: Tue, 10 May 2016 13:10:29 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <877ff2i61f.fsf@linux.intel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/05/16 13:03, Felipe Balbi wrote: > > Hi, > > Roger Quadros writes: >> Implementations might use different IRQs for >> host, gadget and OTG so use named interrupt resources >> to allow Device tree to specify the 3 interrupts. >> >> Following are the interrupt names >> >> Peripheral Interrupt - peripheral >> HOST Interrupt - host >> OTG Interrupt - otg >> >> We still maintain backward compatibility for a single named >> interrupt for all 3 interrupts (e.g. for dwc3-pci) and >> single unnamed interrupt for all 3 interrupts (e.g. old DT). > > cool :-) > >> @@ -748,6 +750,20 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) >> } >> break; >> case USB_DR_MODE_OTG: >> + dwc->otg_irq = platform_get_irq_byname(dwc3_pdev, "otg"); >> + if (dwc->otg_irq <= 0) { >> + dwc->otg_irq = platform_get_irq_byname(dwc3_pdev, >> + "dwc_usb3"); >> + if (dwc->otg_irq <= 0) { >> + res = platform_get_resource(dwc3_pdev, >> + IORESOURCE_IRQ, 0); >> + if (!res) { >> + dev_err(dwc->dev, "missing otg IRQ\n"); >> + return -ENODEV; >> + } >> + dwc->otg_irq = res->start; >> + } >> + } > > I suppose this part can be removed and added only when OTG is > supported. Then dwc3_otg_init() (or whatever) can do this. Sure. > >> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h >> index 186a886..2e20892 100644 >> --- a/drivers/usb/dwc3/core.h >> +++ b/drivers/usb/dwc3/core.h >> @@ -716,6 +716,8 @@ struct dwc3_scratchpad_array { >> * @maximum_speed: maximum speed requested (mainly for testing purposes) >> * @revision: revision register contents >> * @dr_mode: requested mode of operation >> + * @gadget_irq: IRQ number for Peripheral IRQs >> + * @otg_irq: IRQ number for OTG IRQs >> * @usb2_phy: pointer to USB2 PHY >> * @usb3_phy: pointer to USB3 PHY >> * @usb2_generic_phy: pointer to USB2 PHY >> @@ -817,6 +819,9 @@ struct dwc3 { >> >> enum usb_dr_mode dr_mode; >> >> + int gadget_irq; >> + int otg_irq; > > while at that, let's add host_irq too and do proper changes to dwc3/host.c Sure. So we add host_irq here, and manually create an irq resource in dwc3_host_init? > >> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c >> index c3b0d01..8db8d13 100644 >> --- a/drivers/usb/dwc3/gadget.c >> +++ b/drivers/usb/dwc3/gadget.c >> @@ -1605,7 +1605,7 @@ static int dwc3_gadget_start(struct usb_gadget *g, >> int irq; >> u32 reg; >> >> - irq = platform_get_irq(to_platform_device(dwc->dev), 0); >> + irq = dwc->gadget_irq; >> ret = request_threaded_irq(irq, dwc3_interrupt, dwc3_thread_interrupt, >> IRQF_SHARED, "dwc3", dwc->ev_buf); >> if (ret) { >> @@ -2781,6 +2781,23 @@ static irqreturn_t dwc3_interrupt(int irq, void *_evt) >> int dwc3_gadget_init(struct dwc3 *dwc) >> { >> int ret; >> + struct resource *res; >> + struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); >> + >> + dwc->gadget_irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); >> + if (dwc->gadget_irq <= 0) { >> + dwc->gadget_irq = platform_get_irq_byname(dwc3_pdev, >> + "dwc_usb3"); >> + if (dwc->gadget_irq <= 0) { >> + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, >> + 0); >> + if (!res) { >> + dev_err(dwc->dev, "missing peripheral IRQ\n"); >> + return -ENODEV; >> + } >> + dwc->gadget_irq = res->start; >> + } >> + } >> >> dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req), >> &dwc->ctrl_req_addr, GFP_KERNEL); > > you're regressing dwc3_gadget_stop(). > ah, good catch. cheers, -roger