Re: [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hi, On 03/09/15 18:48, Felipe Balbi wrote: > Hi, > > On Thu, Sep 03, 2015 at 03:46:43PM +0300, Roger Quadros wrote: >> -BEGIN PGP SIGNED MESSAGE- >> Hash: SHA256 >> >> On 02/09/15 17:34, Felipe Balbi wrote: >>> On Wed, Sep 02, 2015 at 05:24:19PM +0300, Roger Quadros wrote: From: Felipe BalbiAdd support to use interrupt names, Following are the interrupt names Peripheral Interrupt - peripheral HOST Interrupt - host OTG Interrupt - otg [Roger Q] - If any of these are missing we use the first available IRQ resource so that we don't break with older DTBs. >>> >>> this is what original commit did: >>> >>> commit ecd5f71cfd663bcd4efd2f29824acd8b2ba9715d >>> Author: Felipe Balbi >>> Date: Fri Jan 3 13:49:38 2014 -0600 >>> >>> usb: dwc3: cleanup IRQ resources >>> >>> In order to make it easier for the driver to >>> figure out which modes of operation it has, >>> and because some dwc3 integrations have rather >>> fuzzy IRQ routing, we now require three different >>> IRQ numbers (peripheral, host, otg). >>> >>> In order to do that and maintain backwards compatibility, >>> we still maintain support for the old IRQ resource name, >>> but if you *really* want to have proper peripheral/host/otg >>> support, you should make sure your resources are correct. >>> >>> Signed-off-by: Felipe Balbi >> >> This is better since we request the resource only if needed and bail out >> if it is not present. >> >>> >>> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c >>> index 60580a01cdd2..1f01031873b7 100644 >>> --- a/drivers/usb/dwc3/core.c >>> +++ b/drivers/usb/dwc3/core.c >>> @@ -556,10 +556,22 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) >>> static int dwc3_core_init_mode(struct dwc3 *dwc) >>> { >>> struct device *dev = dwc->dev; >>> + struct platform_device *pdev = to_platform_device(dev); >>> int ret; >>> >>> switch (dwc->dr_mode) { >>> case USB_DR_MODE_PERIPHERAL: >>> + dwc->gadget_irq = platform_get_irq_byname(pdev, >>> "dwc3_peripheral"); >> >> Shall we just name it just "peripheral"? > > sure, why not :-) > >>> + if (dwc->gadget_irq < 0) { >>> + dwc->gadget_irq = platform_get_irq_byname(pdev, >>> "dwc_usb3"); >> >> How will this work? Currently we don't have a name for the IRQ in the DT. > > we can just add interrupt-names, right ? Or, the fallback could be what > is already done today: just fetch it by index. > >> >>> + if (dwc->gadget_irq < 0) { >>> + dev_err(dev, "missing IRQ\n"); >>> + return dwc->gadget_irq; >>> + } else { >>> + dev_warn(dev, "dwc_usb3 resource is >>> deprecated\n"); >> >> Do we want to warn about legacy nodes? > > Sure :-) > > Now, do you want me to update it, or will you do it ? BTW, if you decide > to do it, we need to patch all users :-) Would appreciate if you can do it. It is independent of dual-role support and can go in early. BTW omap users are already using the named interrupt property. > >>> @@ -576,6 +604,28 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) >>> } >>> break; >>> case USB_DR_MODE_OTG: >>> + dwc->gadget_irq = platform_get_irq_byname(pdev, >>> "dwc3_peripheral"); >>> + if (dwc->gadget_irq < 0) { >>> + dwc->gadget_irq = platform_get_irq_byname(pdev, >>> "dwc_usb3"); >>> + if (dwc->gadget_irq < 0) { >>> + dev_err(dev, "missing IRQ\n"); >>> + return dwc->gadget_irq; >>> + } else { >>> + dev_warn(dev, "dwc_usb3 resource is >>> deprecated\n"); >>> + } >>> + >>> + dwc->xhci_irq = dwc->gadget_irq; >>> + dwc->otg_irq = dwc->gadget_irq; >>> + } else { >>> + dwc->xhci_irq = platform_get_irq_byname(pdev, >>> "dwc3_host"); >>> + if (dwc->xhci_irq < 0) { >>> + dev_err(dev, "missing Host IRQ\n"); >>> + return dwc->xhci_irq; >>> + } >>> + >>> + dwc->otg_irq = platform_get_irq_byname(pdev, >>> "dwc3_otg"); >> >> need to check if error? > > right > >>> + } >> >> Need to setup xhci_resource[1]? > > isn't it done above ? > It is done in the USB_DR_MODE_HOST case, but that won't be executed for USB_DR_MODE_OTG case, no? I'm talking about this part + dwc->xhci_resources[1].start = dwc->xhci_irq; + dwc->xhci_resources[1].end = dwc->xhci_irq; + dwc->xhci_resources[1].flags = IORESOURCE_IRQ; +
Re: [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts
Hi, On Thu, Sep 03, 2015 at 03:46:43PM +0300, Roger Quadros wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > On 02/09/15 17:34, Felipe Balbi wrote: > > On Wed, Sep 02, 2015 at 05:24:19PM +0300, Roger Quadros wrote: > >> From: Felipe Balbi> >> > >> Add support to use interrupt names, > >> > >> Following are the interrupt names > >> > >> Peripheral Interrupt - peripheral > >> HOST Interrupt - host > >> OTG Interrupt - otg > >> > >> [Roger Q] > >> - If any of these are missing we use the > >> first available IRQ resource so that we don't > >> break with older DTBs. > > > > this is what original commit did: > > > > commit ecd5f71cfd663bcd4efd2f29824acd8b2ba9715d > > Author: Felipe Balbi > > Date: Fri Jan 3 13:49:38 2014 -0600 > > > > usb: dwc3: cleanup IRQ resources > > > > In order to make it easier for the driver to > > figure out which modes of operation it has, > > and because some dwc3 integrations have rather > > fuzzy IRQ routing, we now require three different > > IRQ numbers (peripheral, host, otg). > > > > In order to do that and maintain backwards compatibility, > > we still maintain support for the old IRQ resource name, > > but if you *really* want to have proper peripheral/host/otg > > support, you should make sure your resources are correct. > > > > Signed-off-by: Felipe Balbi > > This is better since we request the resource only if needed and bail out > if it is not present. > > > > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > > index 60580a01cdd2..1f01031873b7 100644 > > --- a/drivers/usb/dwc3/core.c > > +++ b/drivers/usb/dwc3/core.c > > @@ -556,10 +556,22 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) > > static int dwc3_core_init_mode(struct dwc3 *dwc) > > { > > struct device *dev = dwc->dev; > > + struct platform_device *pdev = to_platform_device(dev); > > int ret; > > > > switch (dwc->dr_mode) { > > case USB_DR_MODE_PERIPHERAL: > > + dwc->gadget_irq = platform_get_irq_byname(pdev, > > "dwc3_peripheral"); > > Shall we just name it just "peripheral"? sure, why not :-) > > + if (dwc->gadget_irq < 0) { > > + dwc->gadget_irq = platform_get_irq_byname(pdev, > > "dwc_usb3"); > > How will this work? Currently we don't have a name for the IRQ in the DT. we can just add interrupt-names, right ? Or, the fallback could be what is already done today: just fetch it by index. > > > + if (dwc->gadget_irq < 0) { > > + dev_err(dev, "missing IRQ\n"); > > + return dwc->gadget_irq; > > + } else { > > + dev_warn(dev, "dwc_usb3 resource is > > deprecated\n"); > > Do we want to warn about legacy nodes? Sure :-) Now, do you want me to update it, or will you do it ? BTW, if you decide to do it, we need to patch all users :-) > > @@ -576,6 +604,28 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) > > } > > break; > > case USB_DR_MODE_OTG: > > + dwc->gadget_irq = platform_get_irq_byname(pdev, > > "dwc3_peripheral"); > > + if (dwc->gadget_irq < 0) { > > + dwc->gadget_irq = platform_get_irq_byname(pdev, > > "dwc_usb3"); > > + if (dwc->gadget_irq < 0) { > > + dev_err(dev, "missing IRQ\n"); > > + return dwc->gadget_irq; > > + } else { > > + dev_warn(dev, "dwc_usb3 resource is > > deprecated\n"); > > + } > > + > > + dwc->xhci_irq = dwc->gadget_irq; > > + dwc->otg_irq = dwc->gadget_irq; > > + } else { > > + dwc->xhci_irq = platform_get_irq_byname(pdev, > > "dwc3_host"); > > + if (dwc->xhci_irq < 0) { > > + dev_err(dev, "missing Host IRQ\n"); > > + return dwc->xhci_irq; > > + } > > + > > + dwc->otg_irq = platform_get_irq_byname(pdev, > > "dwc3_otg"); > > need to check if error? right > > + } > > Need to setup xhci_resource[1]? isn't it done above ? -- balbi signature.asc Description: Digital signature
Re: [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 02/09/15 17:34, Felipe Balbi wrote: > On Wed, Sep 02, 2015 at 05:24:19PM +0300, Roger Quadros wrote: >> From: Felipe Balbi>> >> Add support to use interrupt names, >> >> Following are the interrupt names >> >> Peripheral Interrupt - peripheral >> HOST Interrupt - host >> OTG Interrupt - otg >> >> [Roger Q] >> - If any of these are missing we use the >> first available IRQ resource so that we don't >> break with older DTBs. > > this is what original commit did: > > commit ecd5f71cfd663bcd4efd2f29824acd8b2ba9715d > Author: Felipe Balbi > Date: Fri Jan 3 13:49:38 2014 -0600 > > usb: dwc3: cleanup IRQ resources > > In order to make it easier for the driver to > figure out which modes of operation it has, > and because some dwc3 integrations have rather > fuzzy IRQ routing, we now require three different > IRQ numbers (peripheral, host, otg). > > In order to do that and maintain backwards compatibility, > we still maintain support for the old IRQ resource name, > but if you *really* want to have proper peripheral/host/otg > support, you should make sure your resources are correct. > > Signed-off-by: Felipe Balbi This is better since we request the resource only if needed and bail out if it is not present. > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 60580a01cdd2..1f01031873b7 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -556,10 +556,22 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) > static int dwc3_core_init_mode(struct dwc3 *dwc) > { > struct device *dev = dwc->dev; > + struct platform_device *pdev = to_platform_device(dev); > int ret; > > switch (dwc->dr_mode) { > case USB_DR_MODE_PERIPHERAL: > + dwc->gadget_irq = platform_get_irq_byname(pdev, > "dwc3_peripheral"); Shall we just name it just "peripheral"? > + if (dwc->gadget_irq < 0) { > + dwc->gadget_irq = platform_get_irq_byname(pdev, > "dwc_usb3"); How will this work? Currently we don't have a name for the IRQ in the DT. > + if (dwc->gadget_irq < 0) { > + dev_err(dev, "missing IRQ\n"); > + return dwc->gadget_irq; > + } else { > + dev_warn(dev, "dwc_usb3 resource is > deprecated\n"); Do we want to warn about legacy nodes? > + } > + } > + > dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); > ret = dwc3_gadget_init(dwc); > if (ret) { > @@ -568,6 +580,22 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) > } > break; > case USB_DR_MODE_HOST: > + dwc->xhci_irq = platform_get_irq_byname(pdev, "dwc3_host"); > + if (dwc->xhci_irq < 0) { > + dwc->xhci_irq = platform_get_irq_byname(pdev, > "dwc_usb3"); > + if (dwc->xhci_irq < 0) { > + dev_err(dev, "missing Host IRQ\n"); > + return dwc->xhci_irq; > + } else { > + dev_warn(dev, "dwc_usb3 resource is > deprecated\n"); > + } > + > + dwc->xhci_resources[1].start = dwc->xhci_irq; > + dwc->xhci_resources[1].end = dwc->xhci_irq; > + dwc->xhci_resources[1].flags = IORESOURCE_IRQ; > + dwc->xhci_resources[1].name = "xhci"; > + } > + > dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST); > ret = dwc3_host_init(dwc); > if (ret) { > @@ -576,6 +604,28 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) > } > break; > case USB_DR_MODE_OTG: > + dwc->gadget_irq = platform_get_irq_byname(pdev, > "dwc3_peripheral"); > + if (dwc->gadget_irq < 0) { > + dwc->gadget_irq = platform_get_irq_byname(pdev, > "dwc_usb3"); > + if (dwc->gadget_irq < 0) { > + dev_err(dev, "missing IRQ\n"); > + return dwc->gadget_irq; > + } else { > + dev_warn(dev, "dwc_usb3 resource is > deprecated\n"); > + } > + > + dwc->xhci_irq = dwc->gadget_irq; > + dwc->otg_irq = dwc->gadget_irq; > + } else { > + dwc->xhci_irq = platform_get_irq_byname(pdev, > "dwc3_host"); > + if (dwc->xhci_irq < 0) { > + dev_err(dev, "missing Host IRQ\n"); > + return dwc->xhci_irq; > + } > + > + dwc->otg_irq = platform_get_irq_byname(pdev, >
Re: [PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts
On Wed, Sep 02, 2015 at 05:24:19PM +0300, Roger Quadros wrote: > From: Felipe Balbi> > Add support to use interrupt names, > > Following are the interrupt names > > Peripheral Interrupt - peripheral > HOST Interrupt - host > OTG Interrupt - otg > > [Roger Q] > - If any of these are missing we use the > first available IRQ resource so that we don't > break with older DTBs. this is what original commit did: commit ecd5f71cfd663bcd4efd2f29824acd8b2ba9715d Author: Felipe Balbi Date: Fri Jan 3 13:49:38 2014 -0600 usb: dwc3: cleanup IRQ resources In order to make it easier for the driver to figure out which modes of operation it has, and because some dwc3 integrations have rather fuzzy IRQ routing, we now require three different IRQ numbers (peripheral, host, otg). In order to do that and maintain backwards compatibility, we still maintain support for the old IRQ resource name, but if you *really* want to have proper peripheral/host/otg support, you should make sure your resources are correct. Signed-off-by: Felipe Balbi diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 60580a01cdd2..1f01031873b7 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -556,10 +556,22 @@ static int dwc3_core_get_phy(struct dwc3 *dwc) static int dwc3_core_init_mode(struct dwc3 *dwc) { struct device *dev = dwc->dev; + struct platform_device *pdev = to_platform_device(dev); int ret; switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + dwc->gadget_irq = platform_get_irq_byname(pdev, "dwc3_peripheral"); + if (dwc->gadget_irq < 0) { + dwc->gadget_irq = platform_get_irq_byname(pdev, "dwc_usb3"); + if (dwc->gadget_irq < 0) { + dev_err(dev, "missing IRQ\n"); + return dwc->gadget_irq; + } else { + dev_warn(dev, "dwc_usb3 resource is deprecated\n"); + } + } + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); ret = dwc3_gadget_init(dwc); if (ret) { @@ -568,6 +580,22 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) } break; case USB_DR_MODE_HOST: + dwc->xhci_irq = platform_get_irq_byname(pdev, "dwc3_host"); + if (dwc->xhci_irq < 0) { + dwc->xhci_irq = platform_get_irq_byname(pdev, "dwc_usb3"); + if (dwc->xhci_irq < 0) { + dev_err(dev, "missing Host IRQ\n"); + return dwc->xhci_irq; + } else { + dev_warn(dev, "dwc_usb3 resource is deprecated\n"); + } + + dwc->xhci_resources[1].start = dwc->xhci_irq; + dwc->xhci_resources[1].end = dwc->xhci_irq; + dwc->xhci_resources[1].flags = IORESOURCE_IRQ; + dwc->xhci_resources[1].name = "xhci"; + } + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST); ret = dwc3_host_init(dwc); if (ret) { @@ -576,6 +604,28 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) } break; case USB_DR_MODE_OTG: + dwc->gadget_irq = platform_get_irq_byname(pdev, "dwc3_peripheral"); + if (dwc->gadget_irq < 0) { + dwc->gadget_irq = platform_get_irq_byname(pdev, "dwc_usb3"); + if (dwc->gadget_irq < 0) { + dev_err(dev, "missing IRQ\n"); + return dwc->gadget_irq; + } else { + dev_warn(dev, "dwc_usb3 resource is deprecated\n"); + } + + dwc->xhci_irq = dwc->gadget_irq; + dwc->otg_irq = dwc->gadget_irq; + } else { + dwc->xhci_irq = platform_get_irq_byname(pdev, "dwc3_host"); + if (dwc->xhci_irq < 0) { + dev_err(dev, "missing Host IRQ\n"); + return dwc->xhci_irq; + } + + dwc->otg_irq = platform_get_irq_byname(pdev, "dwc3_otg"); + } + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); ret = dwc3_otg_init(dwc); if (ret) { @@ -647,18 +697,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; -
[PATCH v4 4/9] usb: dwc3: core: Adapt to named interrupts
From: Felipe BalbiAdd support to use interrupt names, Following are the interrupt names Peripheral Interrupt - peripheral HOST Interrupt - host OTG Interrupt - otg [Roger Q] - If any of these are missing we use the first available IRQ resource so that we don't break with older DTBs. - Use gadget_irq in gadget driver. Signed-off-by: Felipe Balbi Signed-off-by: Roger Quadros --- drivers/usb/dwc3/core.c | 12 drivers/usb/dwc3/core.h | 7 +++ drivers/usb/dwc3/gadget.c | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 2e36a9b..38b31df 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -958,6 +958,18 @@ static int dwc3_probe(struct platform_device *pdev) dwc->xhci_resources[1].flags = res->flags; dwc->xhci_resources[1].name = res->name; + dwc->otg_irq = platform_get_irq_byname(pdev, "otg"); + if (dwc->otg_irq < 0) + dwc->otg_irq = res->start; + + dwc->gadget_irq = platform_get_irq_byname(pdev, "peripheral"); + if (dwc->gadget_irq < 0) + dwc->gadget_irq = res->start; + + dwc->xhci_irq = platform_get_irq_byname(pdev, "host"); + if (dwc->xhci_irq < 0) + dwc->xhci_irq = res->start; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(dev, "missing memory resource\n"); diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 4b85330..bd32cb2 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -742,6 +742,9 @@ struct dwc3_scratchpad_array { * @maximum_speed: maximum speed requested (mainly for testing purposes) * @revision: revision register contents * @dr_mode: requested mode of operation + * @xhci_irq: IRQ number for XHCI IRQs + * @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 @@ -847,6 +850,10 @@ struct dwc3 { enum usb_dr_modedr_mode; + int gadget_irq; + int xhci_irq; + int otg_irq; + /* used for suspend/resume */ u32 dcfg; u32 gctl; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 0c25704..1148ec8 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1533,7 +1533,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); if (ret) { -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html