From: Roger Quadros <rogerq@ti.com> To: Grygorii Strashko <grygorii.strashko@ti.com>, <balbi@kernel.org> Cc: <tony@atomide.com>, <Joao.Pinto@synopsys.com>, <sergei.shtylyov@cogentembedded.com>, <peter.chen@freescale.com>, <jun.li@freescale.com>, <yoshihiro.shimoda.uh@renesas.com>, <nsekhar@ti.com>, <b-liu@ti.com>, <linux-usb@vger.kernel.org>, <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: Re: [PATCH v9 5/5] usb: dwc3: core: cleanup IRQ resources Date: Tue, 7 Jun 2016 12:34:59 +0300 [thread overview] Message-ID: <57569543.4090007@ti.com> (raw) In-Reply-To: <57501E0D.4010007@ti.com> On 02/06/16 14:52, Grygorii Strashko wrote: > On 06/01/2016 10:46 AM, Roger Quadros wrote: >> 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 > > or "dwc_usb3"?? That is for backward compatibility only. I could explicitly mention it in the next line. > >> >> 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). > > bindings OK. > >> >> Signed-off-by: Roger Quadros <rogerq@ti.com> >> --- >> v9: rebased on top of balbi/testing/next >> >> drivers/usb/dwc3/core.c | 10 ---------- >> drivers/usb/dwc3/gadget.c | 20 ++++++++++++++++++-- >> drivers/usb/dwc3/host.c | 19 +++++++++++++++++++ >> 3 files changed, 37 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> index 9c4e1d8d..5cedf3d 100644 >> --- a/drivers/usb/dwc3/core.c >> +++ b/drivers/usb/dwc3/core.c >> @@ -843,16 +843,6 @@ static int dwc3_probe(struct platform_device *pdev) >> dwc->mem = mem; >> dwc->dev = dev; >> >> - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); >> - if (!res) { >> - dev_err(dev, "missing IRQ\n"); >> - return -ENODEV; >> - } >> - dwc->xhci_resources[1].start = res->start; >> - dwc->xhci_resources[1].end = res->end; >> - dwc->xhci_resources[1].flags = res->flags; >> - dwc->xhci_resources[1].name = res->name; >> - >> res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> if (!res) { >> dev_err(dev, "missing memory resource\n"); >> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c >> index c37168d..c18c72f 100644 >> --- a/drivers/usb/dwc3/gadget.c >> +++ b/drivers/usb/dwc3/gadget.c >> @@ -1726,7 +1726,7 @@ static int dwc3_gadget_start(struct usb_gadget *g, >> int ret = 0; >> int irq; >> >> - irq = platform_get_irq(to_platform_device(dwc->dev), 0); >> + irq = dwc->irq_gadget; >> ret = request_threaded_irq(irq, dwc3_interrupt, dwc3_thread_interrupt, >> IRQF_SHARED, "dwc3", dwc->ev_buf); >> if (ret) { >> @@ -1734,7 +1734,6 @@ static int dwc3_gadget_start(struct usb_gadget *g, >> irq, ret); >> goto err0; >> } >> - dwc->irq_gadget = irq; >> >> spin_lock_irqsave(&dwc->lock, flags); >> if (dwc->gadget_driver) { >> @@ -2853,6 +2852,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->irq_gadget = platform_get_irq_byname(dwc3_pdev, "peripheral"); >> + if (dwc->irq_gadget <= 0) { > > Is it expected to get -EPROBE_DEFER here? Probably not as we don't have any chance of deferring probe here. We've already probed successfully and are just turning on the gadget mode here. > >> + dwc->irq_gadget = platform_get_irq_byname(dwc3_pdev, >> + "dwc_usb3"); >> + if (dwc->irq_gadget <= 0) { >> + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, >> + 0); > > It's better to use platform_get_irq(). OK. > >> + if (!res) { >> + dev_err(dwc->dev, "missing peripheral IRQ\n"); >> + return -ENODEV; >> + } >> + dwc->irq_gadget = res->start; >> + } >> + } >> >> dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req), >> &dwc->ctrl_req_addr, GFP_KERNEL); >> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c >> index c679f63..f2b60a4 100644 >> --- a/drivers/usb/dwc3/host.c >> +++ b/drivers/usb/dwc3/host.c >> @@ -25,6 +25,25 @@ int dwc3_host_init(struct dwc3 *dwc) >> struct platform_device *xhci; >> struct usb_xhci_pdata pdata; >> int ret; >> + struct resource *res; >> + struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); >> + >> + res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, "host"); >> + if (!res) { >> + res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, >> + "dwc_usb3"); >> + if (!res) { >> + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, >> + 0); >> + if (!res) > >> + return -ENOMEM; >> + } >> + } > > Is it expected to have more than one IRQ here? No. > > if not - it will better to use platform_get_irq[_byname](). OK. > > >> + >> + dwc->xhci_resources[1].start = res->start; >> + dwc->xhci_resources[1].end = res->end; >> + dwc->xhci_resources[1].flags = res->flags; >> + dwc->xhci_resources[1].name = res->name; >> >> xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO); >> if (!xhci) { >> > > cheers, -roger
WARNING: multiple messages have this Message-ID (diff)
From: Roger Quadros <rogerq@ti.com> To: Grygorii Strashko <grygorii.strashko@ti.com>, balbi@kernel.org Cc: tony@atomide.com, Joao.Pinto@synopsys.com, sergei.shtylyov@cogentembedded.com, peter.chen@freescale.com, jun.li@freescale.com, yoshihiro.shimoda.uh@renesas.com, nsekhar@ti.com, b-liu@ti.com, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v9 5/5] usb: dwc3: core: cleanup IRQ resources Date: Tue, 7 Jun 2016 12:34:59 +0300 [thread overview] Message-ID: <57569543.4090007@ti.com> (raw) In-Reply-To: <57501E0D.4010007@ti.com> On 02/06/16 14:52, Grygorii Strashko wrote: > On 06/01/2016 10:46 AM, Roger Quadros wrote: >> 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 > > or "dwc_usb3"?? That is for backward compatibility only. I could explicitly mention it in the next line. > >> >> 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). > > bindings OK. > >> >> Signed-off-by: Roger Quadros <rogerq@ti.com> >> --- >> v9: rebased on top of balbi/testing/next >> >> drivers/usb/dwc3/core.c | 10 ---------- >> drivers/usb/dwc3/gadget.c | 20 ++++++++++++++++++-- >> drivers/usb/dwc3/host.c | 19 +++++++++++++++++++ >> 3 files changed, 37 insertions(+), 12 deletions(-) >> >> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >> index 9c4e1d8d..5cedf3d 100644 >> --- a/drivers/usb/dwc3/core.c >> +++ b/drivers/usb/dwc3/core.c >> @@ -843,16 +843,6 @@ static int dwc3_probe(struct platform_device *pdev) >> dwc->mem = mem; >> dwc->dev = dev; >> >> - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); >> - if (!res) { >> - dev_err(dev, "missing IRQ\n"); >> - return -ENODEV; >> - } >> - dwc->xhci_resources[1].start = res->start; >> - dwc->xhci_resources[1].end = res->end; >> - dwc->xhci_resources[1].flags = res->flags; >> - dwc->xhci_resources[1].name = res->name; >> - >> res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> if (!res) { >> dev_err(dev, "missing memory resource\n"); >> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c >> index c37168d..c18c72f 100644 >> --- a/drivers/usb/dwc3/gadget.c >> +++ b/drivers/usb/dwc3/gadget.c >> @@ -1726,7 +1726,7 @@ static int dwc3_gadget_start(struct usb_gadget *g, >> int ret = 0; >> int irq; >> >> - irq = platform_get_irq(to_platform_device(dwc->dev), 0); >> + irq = dwc->irq_gadget; >> ret = request_threaded_irq(irq, dwc3_interrupt, dwc3_thread_interrupt, >> IRQF_SHARED, "dwc3", dwc->ev_buf); >> if (ret) { >> @@ -1734,7 +1734,6 @@ static int dwc3_gadget_start(struct usb_gadget *g, >> irq, ret); >> goto err0; >> } >> - dwc->irq_gadget = irq; >> >> spin_lock_irqsave(&dwc->lock, flags); >> if (dwc->gadget_driver) { >> @@ -2853,6 +2852,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->irq_gadget = platform_get_irq_byname(dwc3_pdev, "peripheral"); >> + if (dwc->irq_gadget <= 0) { > > Is it expected to get -EPROBE_DEFER here? Probably not as we don't have any chance of deferring probe here. We've already probed successfully and are just turning on the gadget mode here. > >> + dwc->irq_gadget = platform_get_irq_byname(dwc3_pdev, >> + "dwc_usb3"); >> + if (dwc->irq_gadget <= 0) { >> + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, >> + 0); > > It's better to use platform_get_irq(). OK. > >> + if (!res) { >> + dev_err(dwc->dev, "missing peripheral IRQ\n"); >> + return -ENODEV; >> + } >> + dwc->irq_gadget = res->start; >> + } >> + } >> >> dwc->ctrl_req = dma_alloc_coherent(dwc->dev, sizeof(*dwc->ctrl_req), >> &dwc->ctrl_req_addr, GFP_KERNEL); >> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c >> index c679f63..f2b60a4 100644 >> --- a/drivers/usb/dwc3/host.c >> +++ b/drivers/usb/dwc3/host.c >> @@ -25,6 +25,25 @@ int dwc3_host_init(struct dwc3 *dwc) >> struct platform_device *xhci; >> struct usb_xhci_pdata pdata; >> int ret; >> + struct resource *res; >> + struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); >> + >> + res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, "host"); >> + if (!res) { >> + res = platform_get_resource_byname(dwc3_pdev, IORESOURCE_IRQ, >> + "dwc_usb3"); >> + if (!res) { >> + res = platform_get_resource(dwc3_pdev, IORESOURCE_IRQ, >> + 0); >> + if (!res) > >> + return -ENOMEM; >> + } >> + } > > Is it expected to have more than one IRQ here? No. > > if not - it will better to use platform_get_irq[_byname](). OK. > > >> + >> + dwc->xhci_resources[1].start = res->start; >> + dwc->xhci_resources[1].end = res->end; >> + dwc->xhci_resources[1].flags = res->flags; >> + dwc->xhci_resources[1].name = res->name; >> >> xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO); >> if (!xhci) { >> > > cheers, -roger
next prev parent reply other threads:[~2016-06-07 9:35 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-11 14:36 [PATCH v8 0/5] dwc3: omap: fixes and dual-role preparation Roger Quadros 2016-05-11 14:36 ` Roger Quadros 2016-05-11 14:36 ` [PATCH v8 1/5] usb: dwc3: omap: use request_threaded_irq() Roger Quadros 2016-05-11 14:36 ` Roger Quadros 2016-05-11 14:36 ` [PATCH v8 2/5] usb: dwc3: omap: Mark the interrupt handler as shared Roger Quadros 2016-05-11 14:36 ` Roger Quadros 2016-05-11 14:36 ` [PATCH v8 3/5] usb: dwc3: omap: Don't set POWERPRESENT Roger Quadros 2016-05-11 14:36 ` Roger Quadros 2016-05-11 14:36 ` [PATCH v8 4/5] usb: dwc3: omap: Pass VBUS and ID events transparently Roger Quadros 2016-05-11 14:36 ` Roger Quadros 2016-05-11 14:36 ` [PATCH v8 5/5] usb: dwc3: core: cleanup IRQ resources Roger Quadros 2016-05-11 14:36 ` Roger Quadros 2016-05-24 9:35 ` Felipe Balbi 2016-05-24 9:35 ` Felipe Balbi 2016-05-24 12:35 ` Roger Quadros 2016-05-24 12:35 ` Roger Quadros 2016-06-01 7:46 ` [PATCH v9 " Roger Quadros 2016-06-01 7:46 ` Roger Quadros 2016-06-01 8:06 ` Felipe Balbi 2016-06-01 8:06 ` Felipe Balbi 2016-06-07 9:28 ` Roger Quadros 2016-06-07 9:28 ` Roger Quadros 2016-06-02 11:52 ` Grygorii Strashko 2016-06-02 11:52 ` Grygorii Strashko 2016-06-07 9:34 ` Roger Quadros [this message] 2016-06-07 9:34 ` Roger Quadros 2016-06-07 11:49 ` Grygorii Strashko 2016-06-07 11:49 ` Grygorii Strashko 2016-06-07 12:44 ` Roger Quadros 2016-06-07 12:44 ` Roger Quadros 2016-06-07 13:09 ` Felipe Balbi 2016-06-07 14:05 ` Roger Quadros 2016-06-07 14:05 ` Roger Quadros 2016-06-10 7:56 ` Roger Quadros 2016-06-10 7:56 ` Roger Quadros 2016-06-10 8:02 ` Roger Quadros 2016-06-10 8:02 ` Roger Quadros 2016-06-10 8:04 ` Roger Quadros 2016-06-10 8:04 ` Roger Quadros 2016-06-10 8:18 ` Felipe Balbi 2016-06-10 8:32 ` Roger Quadros 2016-06-10 8:32 ` Roger Quadros 2016-06-10 9:18 ` Felipe Balbi 2016-06-10 8:11 ` Felipe Balbi 2016-06-10 9:56 ` [PATCH v10 " Roger Quadros 2016-06-10 9:56 ` Roger Quadros 2016-06-10 10:39 ` Sergei Shtylyov 2016-06-10 11:35 ` Roger Quadros 2016-06-10 11:35 ` Roger Quadros 2016-06-10 11:44 ` Sergei Shtylyov 2016-06-10 11:46 ` Roger Quadros 2016-06-10 11:46 ` Roger Quadros 2016-06-10 12:22 ` Sergei Shtylyov 2016-06-10 11:48 ` [PATCH v11 " Roger Quadros 2016-06-10 11:48 ` Roger Quadros
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=57569543.4090007@ti.com \ --to=rogerq@ti.com \ --cc=Joao.Pinto@synopsys.com \ --cc=b-liu@ti.com \ --cc=balbi@kernel.org \ --cc=grygorii.strashko@ti.com \ --cc=jun.li@freescale.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=nsekhar@ti.com \ --cc=peter.chen@freescale.com \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=tony@atomide.com \ --cc=yoshihiro.shimoda.uh@renesas.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.