lkml.org 
[lkml]   [2016]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v7 5/5] usb: dwc3: core: cleanup IRQ resources
    Date

    Hi,

    Roger Quadros <rogerq@ti.com> 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.

    > 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

    > 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().

    --
    balbi
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2016-05-10 12:21    [W:4.545 / U:1.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site