> From: dingu...@opensource.altera.com [mailto:dingu...@opensource.altera.com]
> Sent: Tuesday, November 11, 2014 9:14 AM
>
> From: Dinh Nguyen <dingu...@opensource.altera.com>
>
> Make dwc2_handle_common_intr call the gadget interrupt function when operating
> in peripheral mode. Remove the spinlock functions in s3c_hsotg_irq as
> dwc2_handle_common_intr() already has the spinlocks.
>
> Move the registeration of the IRQ to common code for platform and PCI.
>
> Remove duplicate interrupt conditions that was in gadget, as those are handled
> by dwc2 common interrupt handler.
>
> Signed-off-by: Dinh Nguyen <dingu...@opensource.altera.com>
> ---
> v7: Use IRQF_SHARED
> v5: remove individual devm_request_irq from gadget and hcd, and place a
> single devm_request_irq in platform and pci.
> v2: Keep interrupt handler for host and peripheral modes separate
> ---
> drivers/usb/dwc2/core.c | 10 ----------
> drivers/usb/dwc2/gadget.c | 46
> +++------------------------------------------
> drivers/usb/dwc2/pci.c | 6 ++++++
> drivers/usb/dwc2/platform.c | 8 ++++++++
> 4 files changed, 17 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
> index d926945..7605850b 100644
> --- a/drivers/usb/dwc2/core.c
> +++ b/drivers/usb/dwc2/core.c
> @@ -458,16 +458,6 @@ int dwc2_core_init(struct dwc2_hsotg *hsotg, bool
> select_phy, int irq)
> /* Clear the SRP success bit for FS-I2c */
> hsotg->srp_success = 0;
>
> - if (irq >= 0) {
> - dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
> - irq);
> - retval = devm_request_irq(hsotg->dev, irq,
> - dwc2_handle_common_intr, IRQF_SHARED,
> - dev_name(hsotg->dev), hsotg);
> - if (retval)
> - return retval;
> - }
> -
> /* Enable common interrupts */
> dwc2_enable_common_interrupts(hsotg);
>
> diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
> index ec85340..37c7916 100644
> --- a/drivers/usb/dwc2/gadget.c
> +++ b/drivers/usb/dwc2/gadget.c
> @@ -2285,33 +2285,12 @@ irq_retry:
>
> gintsts &= gintmsk;
>
> - if (gintsts & GINTSTS_OTGINT) {
> - u32 otgint = readl(hsotg->regs + GOTGINT);
> -
> - dev_info(hsotg->dev, "OTGInt: %08x\n", otgint);
> -
> - writel(otgint, hsotg->regs + GOTGINT);
> - }
> -
> - if (gintsts & GINTSTS_SESSREQINT) {
> - dev_dbg(hsotg->dev, "%s: SessReqInt\n", __func__);
> - writel(GINTSTS_SESSREQINT, hsotg->regs + GINTSTS);
> - }
> -
This hunk will clash with the patch that Marek has just submitted,
which uses the SESSREQINT in the gadget. But I guess you two and
Felipe can resolve that :)
> if (gintsts & GINTSTS_ENUMDONE) {
> writel(GINTSTS_ENUMDONE, hsotg->regs + GINTSTS);
>
> s3c_hsotg_irq_enumdone(hsotg);
> }
>
> - if (gintsts & GINTSTS_CONIDSTSCHNG) {
> - dev_dbg(hsotg->dev, "ConIDStsChg (DSTS=0x%08x, GOTCTL=%08x)\n",
> - readl(hsotg->regs + DSTS),
> - readl(hsotg->regs + GOTGCTL));
> -
> - writel(GINTSTS_CONIDSTSCHNG, hsotg->regs + GINTSTS);
> - }
> -
> if (gintsts & (GINTSTS_OEPINT | GINTSTS_IEPINT)) {
> u32 daint = readl(hsotg->regs + DAINT);
> u32 daintmsk = readl(hsotg->regs + DAINTMSK);
> @@ -2392,25 +2371,6 @@ irq_retry:
> s3c_hsotg_handle_rx(hsotg);
> }
>
> - if (gintsts & GINTSTS_MODEMIS) {
> - dev_warn(hsotg->dev, "warning, mode mismatch triggered\n");
> - writel(GINTSTS_MODEMIS, hsotg->regs + GINTSTS);
> - }
> -
> - if (gintsts & GINTSTS_USBSUSP) {
> - dev_info(hsotg->dev, "GINTSTS_USBSusp\n");
> - writel(GINTSTS_USBSUSP, hsotg->regs + GINTSTS);
> -
> - call_gadget(hsotg, suspend);
> - }
> -
> - if (gintsts & GINTSTS_WKUPINT) {
> - dev_info(hsotg->dev, "GINTSTS_WkUpIn\n");
> - writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS);
> -
> - call_gadget(hsotg, resume);
> - }
> -
> if (gintsts & GINTSTS_ERLYSUSP) {
> dev_dbg(hsotg->dev, "GINTSTS_ErlySusp\n");
> writel(GINTSTS_ERLYSUSP, hsotg->regs + GINTSTS);
> @@ -3510,14 +3470,14 @@ int dwc2_gadget_init(struct dwc2_hsotg *hsotg, int
> irq)
> s3c_hsotg_hw_cfg(hsotg);
> s3c_hsotg_init(hsotg);
>
> - ret = devm_request_irq(dev, irq, s3c_hsotg_irq, 0,
> - dev_name(dev), hsotg);
> + ret = devm_request_irq(hsotg->dev, irq, s3c_hsotg_irq, IRQF_SHARED,
> + dev_name(hsotg->dev), hsotg);
> if (ret < 0) {
> s3c_hsotg_phy_disable(hsotg);
> clk_disable_unprepare(hsotg->clk);
> regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
> hsotg->supplies);
> - dev_err(dev, "cannot claim IRQ\n");
> + dev_err(dev, "cannot claim IRQ for gadget\n");
> goto err_clk;
> }
>
> diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
> index 6d33ecf..a4e724b 100644
> --- a/drivers/usb/dwc2/pci.c
> +++ b/drivers/usb/dwc2/pci.c
> @@ -141,6 +141,12 @@ static int dwc2_driver_probe(struct pci_dev *dev,
>
> pci_set_master(dev);
>
> + retval = devm_request_irq(hsotg->dev, dev->irq,
> + dwc2_handle_common_intr, IRQF_SHARED,
> + dev_name(hsotg->dev), hsotg);
> + if (retval)
> + return retval;
> +
> spin_lock_init(&hsotg->lock);
> retval = dwc2_hcd_init(hsotg, dev->irq, &dwc2_module_params);
> if (retval) {
> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
> index b94867b..3552602 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -196,6 +196,14 @@ static int dwc2_driver_probe(struct platform_device *dev)
> return irq;
> }
>
> + dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
> + irq);
> + retval = devm_request_irq(hsotg->dev, irq,
> + dwc2_handle_common_intr, IRQF_SHARED,
> + dev_name(hsotg->dev), hsotg);
> + if (retval)
> + return retval;
> +
> res = platform_get_resource(dev, IORESOURCE_MEM, 0);
> hsotg->regs = devm_ioremap_resource(&dev->dev, res);
> if (IS_ERR(hsotg->regs))
Acked-by: Paul Zimmerman <pa...@synopsys.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
