lkml.org 
[lkml]   [2015]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/10] usb:fsl:otg: Add support to add/remove usb host driver
    Date
    Add workqueue to add/remove host driver (outside interrupt context)
    upon each id change

    Signed-off-by: Li Yang <leoli@freescale.com>
    Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
    ---
    drivers/usb/host/ehci-fsl.c | 81 ++++++++++++++++++++++++++++++++++-----------
    drivers/usb/host/ehci-fsl.h | 19 +++++++++++
    2 files changed, 81 insertions(+), 19 deletions(-)

    diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
    index 1fe8ce7..ff39ac6 100644
    --- a/drivers/usb/host/ehci-fsl.c
    +++ b/drivers/usb/host/ehci-fsl.c
    @@ -33,6 +33,33 @@

    #include "ehci-fsl.h"

    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    +static struct ehci_fsl *hcd_to_ehci_fsl(struct usb_hcd *hcd)
    +{
    + return (struct ehci_fsl *)hcd_to_ehci(hcd)->priv;
    +}
    +
    +static void do_change_hcd(struct work_struct *work)
    +{
    + struct ehci_fsl *ehci_fsl = container_of(work, struct ehci_fsl,
    + change_hcd_work);
    + struct usb_hcd *hcd = ehci_fsl->hcd;
    + void __iomem *non_ehci = hcd->regs;
    + int retval;
    +
    + if (ehci_fsl->hcd_add && !ehci_fsl->have_hcd) {
    + writel(USBMODE_CM_HOST, non_ehci + FSL_SOC_USB_USBMODE);
    + /* host, gadget and otg share same int line */
    + retval = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
    + if (retval == 0)
    + ehci_fsl->have_hcd = 1;
    + } else if (!ehci_fsl->hcd_add && ehci_fsl->have_hcd) {
    + usb_remove_hcd(hcd);
    + ehci_fsl->have_hcd = 0;
    + }
    +}
    +#endif
    +
    /* configure so an HC device and id are always provided */
    /* always called with process context; sleeping is OK */

    @@ -126,11 +153,16 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
    goto err2;
    device_wakeup_enable(hcd->self.controller);

    -#ifdef CONFIG_USB_OTG
    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    if (pdata->operating_mode == FSL_USB2_DR_OTG) {
    struct ehci_hcd *ehci = hcd_to_ehci(hcd);
    + struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);

    + ehci_fsl->hcd = hcd;
    hcd->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
    +
    + INIT_WORK(&ehci_fsl->change_hcd_work, do_change_hcd);
    +
    dev_dbg(&pdev->dev, "hcd=0x%p ehci=0x%p, phy=0x%p\n",
    hcd, ehci, hcd->usb_phy);

    @@ -376,15 +408,6 @@ static int ehci_fsl_setup(struct usb_hcd *hcd)
    return retval;
    }

    -struct ehci_fsl {
    - struct ehci_hcd ehci;
    -
    -#ifdef CONFIG_PM
    - /* Saved USB PHY settings, need to restore after deep sleep. */
    - u32 usb_ctrl;
    -#endif
    -};
    -
    #ifdef CONFIG_PM

    #ifdef CONFIG_PPC_MPC512x
    @@ -532,24 +555,30 @@ static inline int ehci_fsl_mpc512x_drv_resume(struct device *dev)
    }
    #endif /* CONFIG_PPC_MPC512x */

    -static struct ehci_fsl *hcd_to_ehci_fsl(struct usb_hcd *hcd)
    -{
    - struct ehci_hcd *ehci = hcd_to_ehci(hcd);
    -
    - return container_of(ehci, struct ehci_fsl, ehci);
    -}
    -
    static int ehci_fsl_drv_suspend(struct device *dev)
    {
    struct usb_hcd *hcd = dev_get_drvdata(dev);
    - struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);
    void __iomem *non_ehci = hcd->regs;
    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    + struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);
    + struct usb_bus host = hcd->self;
    +#endif

    if (of_device_is_compatible(dev->parent->of_node,
    "fsl,mpc5121-usb2-dr")) {
    return ehci_fsl_mpc512x_drv_suspend(dev);
    }

    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    + if (host.is_otg) {
    + /* remove hcd */
    + ehci_fsl->hcd_add = 0;
    + schedule_work(&ehci_fsl->change_hcd_work);
    + host.is_otg = 0;
    + return 0;
    + }
    +#endif
    +
    ehci_prepare_ports_for_controller_suspend(hcd_to_ehci(hcd),
    device_may_wakeup(dev));
    if (!fsl_deep_sleep())
    @@ -562,15 +591,29 @@ static int ehci_fsl_drv_suspend(struct device *dev)
    static int ehci_fsl_drv_resume(struct device *dev)
    {
    struct usb_hcd *hcd = dev_get_drvdata(dev);
    - struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);
    struct ehci_hcd *ehci = hcd_to_ehci(hcd);
    void __iomem *non_ehci = hcd->regs;
    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    + struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);
    + struct usb_bus host = hcd->self;
    +#endif

    if (of_device_is_compatible(dev->parent->of_node,
    "fsl,mpc5121-usb2-dr")) {
    return ehci_fsl_mpc512x_drv_resume(dev);
    }

    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    + if (host.is_otg) {
    + /* add hcd */
    + ehci_fsl->hcd_add = 1;
    + schedule_work(&ehci_fsl->change_hcd_work);
    + usb_hcd_resume_root_hub(hcd);
    + host.is_otg = 0;
    + return 0;
    + }
    +#endif
    +
    ehci_prepare_ports_for_controller_resume(ehci);
    if (!fsl_deep_sleep())
    return 0;
    diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h
    index dbd292e..523714c 100644
    --- a/drivers/usb/host/ehci-fsl.h
    +++ b/drivers/usb/host/ehci-fsl.h
    @@ -62,4 +62,23 @@
    #define UTMI_PHY_EN (1<<9)
    #define ULPI_PHY_CLK_SEL (1<<10)
    #define PHY_CLK_VALID (1<<17)
    +
    +struct ehci_fsl {
    +#ifdef CONFIG_PM
    + /* Saved USB PHY settings, need to restore after deep sleep. */
    + u32 usb_ctrl;
    +#endif
    + struct usb_hcd *hcd;
    +#if defined(CONFIG_FSL_USB2_OTG) || defined(CONFIG_FSL_USB2_OTG_MODULE)
    + struct work_struct change_hcd_work;
    +#endif
    + /* store current hcd state for otg;
    + * have_hcd is true when host drv al already part of otg framework,
    + * otherwise false;
    + * hcd_add is true when otg framework wants to add host
    + * drv as part of otg;flase when it wants to remove it
    + */
    + unsigned have_hcd:1;
    + unsigned hcd_add:1;
    +};
    #endif /* _EHCI_FSL_H */
    --
    1.8.3.1


    \
     
     \ /
      Last update: 2015-05-07 15:01    [W:2.135 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site