[PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Keshava Munegowda]

From: Keshava Munegowda <Keshava_mgowda@ti.com>

It is observed that the echi ports of 3430 sdp board
are not working due to the random timing of programming
the associated GPIOs of the ULPI PHYs of the EHCI for reset.
If the PHYs are reset at during usbhs core driver, host ports will
not work because EHCI driver is loaded after the resetting PHYs.
The PHYs should be in reset state while initializing the EHCI
controller.
The code which does the GPIO pins associated with the PHYs
are programmed to reset is moved from the USB host core driver
to EHCI driver.

Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
Reviewed-by: Partha Basak <parthab@india.ti.com>
---
 drivers/mfd/omap-usb-host.c  |   44 ------------------------------------------
 drivers/usb/host/ehci-omap.c |   39 +++++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 68ac2c5..9927129 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -25,7 +25,6 @@
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
-#include <linux/gpio.h>
 #include <plat/usb.h>
 #include <linux/pm_runtime.h>
 
@@ -502,19 +501,6 @@ static void omap_usbhs_init(struct device *dev)
 	pm_runtime_get_sync(dev);
 	spin_lock_irqsave(&omap->lock, flags);
 
-	if (pdata->ehci_data->phy_reset) {
-		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
-			gpio_request_one(pdata->ehci_data->reset_gpio_port[0],
-					 GPIOF_OUT_INIT_LOW, "USB1 PHY reset");
-
-		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
-			gpio_request_one(pdata->ehci_data->reset_gpio_port[1],
-					 GPIOF_OUT_INIT_LOW, "USB2 PHY reset");
-
-		/* Hold the PHY in RESET for enough time till DIR is high */
-		udelay(10);
-	}
-
 	omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION);
 	dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap->usbhs_rev);
 
@@ -593,39 +579,10 @@ static void omap_usbhs_init(struct device *dev)
 			usbhs_omap_tll_init(dev, OMAP_TLL_CHANNEL_COUNT);
 	}
 
-	if (pdata->ehci_data->phy_reset) {
-		/* Hold the PHY in RESET for enough time till
-		 * PHY is settled and ready
-		 */
-		udelay(10);
-
-		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
-			gpio_set_value
-				(pdata->ehci_data->reset_gpio_port[0], 1);
-
-		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
-			gpio_set_value
-				(pdata->ehci_data->reset_gpio_port[1], 1);
-	}
-
 	spin_unlock_irqrestore(&omap->lock, flags);
 	pm_runtime_put_sync(dev);
 }
 
-static void omap_usbhs_deinit(struct device *dev)
-{
-	struct usbhs_hcd_omap		*omap = dev_get_drvdata(dev);
-	struct usbhs_omap_platform_data	*pdata = &omap->platdata;
-
-	if (pdata->ehci_data->phy_reset) {
-		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
-			gpio_free(pdata->ehci_data->reset_gpio_port[0]);
-
-		if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
-			gpio_free(pdata->ehci_data->reset_gpio_port[1]);
-	}
-}
-
 
 /**
  * usbhs_omap_probe - initialize TI-based HCDs
@@ -861,7 +818,6 @@ static int __devexit usbhs_omap_remove(struct platform_device *pdev)
 {
 	struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
 
-	omap_usbhs_deinit(&pdev->dev);
 	iounmap(omap->tll_base);
 	iounmap(omap->uhh_base);
 	clk_put(omap->init_60m_fclk);
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index bba9850..5c78f9e 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -42,6 +42,7 @@
 #include <plat/usb.h>
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
+#include <linux/gpio.h>
 
 /* EHCI Register Set */
 #define EHCI_INSNREG04					(0xA0)
@@ -191,6 +192,19 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 		}
 	}
 
+	if (pdata->phy_reset) {
+		if (gpio_is_valid(pdata->reset_gpio_port[0]))
+			gpio_request_one(pdata->reset_gpio_port[0],
+					 GPIOF_OUT_INIT_LOW, "USB1 PHY reset");
+
+		if (gpio_is_valid(pdata->reset_gpio_port[1]))
+			gpio_request_one(pdata->reset_gpio_port[1],
+					 GPIOF_OUT_INIT_LOW, "USB2 PHY reset");
+
+		/* Hold the PHY in RESET for enough time till DIR is high */
+		udelay(10);
+	}
+
 	pm_runtime_enable(dev);
 	pm_runtime_get_sync(dev);
 
@@ -237,6 +251,19 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 	/* root ports should always stay powered */
 	ehci_port_power(omap_ehci, 1);
 
+	if (pdata->phy_reset) {
+		/* Hold the PHY in RESET for enough time till
+		 * PHY is settled and ready
+		 */
+		udelay(10);
+
+		if (gpio_is_valid(pdata->reset_gpio_port[0]))
+			gpio_set_value(pdata->reset_gpio_port[0], 1);
+
+		if (gpio_is_valid(pdata->reset_gpio_port[1]))
+			gpio_set_value(pdata->reset_gpio_port[1], 1);
+	}
+
 	return 0;
 
 err_add_hcd:
@@ -259,8 +286,9 @@ err_io:
  */
 static int ehci_hcd_omap_remove(struct platform_device *pdev)
 {
-	struct device *dev	= &pdev->dev;
-	struct usb_hcd *hcd	= dev_get_drvdata(dev);
+	struct device *dev				= &pdev->dev;
+	struct usb_hcd *hcd				= dev_get_drvdata(dev);
+	struct ehci_hcd_omap_platform_data *pdata	= dev->platform_data;
 
 	usb_remove_hcd(hcd);
 	disable_put_regulator(dev->platform_data);
@@ -269,6 +297,13 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
 	pm_runtime_put_sync(dev);
 	pm_runtime_disable(dev);
 
+	if (pdata->phy_reset) {
+		if (gpio_is_valid(pdata->reset_gpio_port[0]))
+			gpio_free(pdata->reset_gpio_port[0]);
+
+		if (gpio_is_valid(pdata->reset_gpio_port[1]))
+			gpio_free(pdata->reset_gpio_port[1]);
+	}
 	return 0;
 }
 
-- 
1.6.0.4

Re: [PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]

Hi,

On Fri, Feb 24, 2012 at 03:36:15PM +0530, Keshava Munegowda wrote:
> From: Keshava Munegowda <Keshava_mgowda@ti.com>
> 
> It is observed that the echi ports of 3430 sdp board
> are not working due to the random timing of programming
> the associated GPIOs of the ULPI PHYs of the EHCI for reset.
> If the PHYs are reset at during usbhs core driver, host ports will
> not work because EHCI driver is loaded after the resetting PHYs.
> The PHYs should be in reset state while initializing the EHCI
> controller.
> The code which does the GPIO pins associated with the PHYs
> are programmed to reset is moved from the USB host core driver
> to EHCI driver.
> 
> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
> Reviewed-by: Partha Basak <parthab@india.ti.com>

won't this cause issues with EHCI/OHCI interactions ? I mean, what if
you connect a FS/LS device and port is handed over to OHCI, does OHCI
have any needs to reset the PHY or something similar ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Munegowda, Keshava]

On Fri, Feb 24, 2012 at 3:46 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Fri, Feb 24, 2012 at 03:36:15PM +0530, Keshava Munegowda wrote:
>> From: Keshava Munegowda <Keshava_mgowda@ti.com>
>>
>> It is observed that the echi ports of 3430 sdp board
>> are not working due to the random timing of programming
>> the associated GPIOs of the ULPI PHYs of the EHCI for reset.
>> If the PHYs are reset at during usbhs core driver, host ports will
>> not work because EHCI driver is loaded after the resetting PHYs.
>> The PHYs should be in reset state while initializing the EHCI
>> controller.
>> The code which does the GPIO pins associated with the PHYs
>> are programmed to reset is moved from the USB host core driver
>> to EHCI driver.
>>
>> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
>> Reviewed-by: Partha Basak <parthab@india.ti.com>
>
> won't this cause issues with EHCI/OHCI interactions ? I mean, what if
> you connect a FS/LS device and port is handed over to OHCI, does OHCI
> have any needs to reset the PHY or something similar ?

No, it will not cause any issues with EHCI-OHCI issues.
But its difficult to comment on this because we don't have port
handoff supported
in hardware.

regards
keshava

Re: [PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Munegowda, Keshava]

On Fri, Feb 24, 2012 at 5:14 PM, Munegowda, Keshava
<keshava_mgowda@ti.com> wrote:
> On Fri, Feb 24, 2012 at 3:46 PM, Felipe Balbi <balbi@ti.com> wrote:
>> Hi,
>>
>> On Fri, Feb 24, 2012 at 03:36:15PM +0530, Keshava Munegowda wrote:
>>> From: Keshava Munegowda <Keshava_mgowda@ti.com>
>>>
>>> It is observed that the echi ports of 3430 sdp board
>>> are not working due to the random timing of programming
>>> the associated GPIOs of the ULPI PHYs of the EHCI for reset.
>>> If the PHYs are reset at during usbhs core driver, host ports will
>>> not work because EHCI driver is loaded after the resetting PHYs.
>>> The PHYs should be in reset state while initializing the EHCI
>>> controller.
>>> The code which does the GPIO pins associated with the PHYs
>>> are programmed to reset is moved from the USB host core driver
>>> to EHCI driver.
>>>
>>> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
>>> Reviewed-by: Partha Basak <parthab@india.ti.com>
>>
>> won't this cause issues with EHCI/OHCI interactions ? I mean, what if
>> you connect a FS/LS device and port is handed over to OHCI, does OHCI
>> have any needs to reset the PHY or something similar ?
>
> No, it will not cause any issues with EHCI-OHCI issues.
> But its difficult to comment on this because we don't have port
> handoff supported
> in hardware.
>
> regards
> keshava

Hi Samuel
        please let me know if you have any comments on this patch.
This is required patch for omap3 ehci enumeration instabilities.

Regards
Keshava

Re: [PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Munegowda, Keshava]

On Fri, Mar 2, 2012 at 7:36 PM, Munegowda, Keshava
<keshava_mgowda@ti.com> wrote:
> On Fri, Feb 24, 2012 at 5:14 PM, Munegowda, Keshava
> <keshava_mgowda@ti.com> wrote:
>> On Fri, Feb 24, 2012 at 3:46 PM, Felipe Balbi <balbi@ti.com> wrote:
>>> Hi,
>>>
>>> On Fri, Feb 24, 2012 at 03:36:15PM +0530, Keshava Munegowda wrote:
>>>> From: Keshava Munegowda <Keshava_mgowda@ti.com>
>>>>
>>>> It is observed that the echi ports of 3430 sdp board
>>>> are not working due to the random timing of programming
>>>> the associated GPIOs of the ULPI PHYs of the EHCI for reset.
>>>> If the PHYs are reset at during usbhs core driver, host ports will
>>>> not work because EHCI driver is loaded after the resetting PHYs.
>>>> The PHYs should be in reset state while initializing the EHCI
>>>> controller.
>>>> The code which does the GPIO pins associated with the PHYs
>>>> are programmed to reset is moved from the USB host core driver
>>>> to EHCI driver.
>>>>
>>>> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
>>>> Reviewed-by: Partha Basak <parthab@india.ti.com>
>>>
>>> won't this cause issues with EHCI/OHCI interactions ? I mean, what if
>>> you connect a FS/LS device and port is handed over to OHCI, does OHCI
>>> have any needs to reset the PHY or something similar ?
>>
>> No, it will not cause any issues with EHCI-OHCI issues.
>> But its difficult to comment on this because we don't have port
>> handoff supported
>> in hardware.
>>
>> regards
>> keshava
>
> Hi Samuel
>        please let me know if you have any comments on this patch.
> This is required patch for omap3 ehci enumeration instabilities.
>
> Regards
> Keshava

Hi Samuel
      do you have any comments on this patch?
Felipe has reviewed this patch and he is agreed for this patch.
there are no comments from your side, requesting to push this change
to mainline.

regards
keshava
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Samuel Ortiz]

Hi Keshava,

On Thu, Mar 08, 2012 at 08:30:21PM +0530, Munegowda, Keshava wrote:
> On Fri, Mar 2, 2012 at 7:36 PM, Munegowda, Keshava
> <keshava_mgowda@ti.com> wrote:
> > On Fri, Feb 24, 2012 at 5:14 PM, Munegowda, Keshava
> > <keshava_mgowda@ti.com> wrote:
> >> On Fri, Feb 24, 2012 at 3:46 PM, Felipe Balbi <balbi@ti.com> wrote:
> >>> Hi,
> >>>
> >>> On Fri, Feb 24, 2012 at 03:36:15PM +0530, Keshava Munegowda wrote:
> >>>> From: Keshava Munegowda <Keshava_mgowda@ti.com>
> >>>>
> >>>> It is observed that the echi ports of 3430 sdp board
> >>>> are not working due to the random timing of programming
> >>>> the associated GPIOs of the ULPI PHYs of the EHCI for reset.
> >>>> If the PHYs are reset at during usbhs core driver, host ports will
> >>>> not work because EHCI driver is loaded after the resetting PHYs.
> >>>> The PHYs should be in reset state while initializing the EHCI
> >>>> controller.
> >>>> The code which does the GPIO pins associated with the PHYs
> >>>> are programmed to reset is moved from the USB host core driver
> >>>> to EHCI driver.
> >>>>
> >>>> Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
> >>>> Reviewed-by: Partha Basak <parthab@india.ti.com>
> >>>
> >>> won't this cause issues with EHCI/OHCI interactions ? I mean, what if
> >>> you connect a FS/LS device and port is handed over to OHCI, does OHCI
> >>> have any needs to reset the PHY or something similar ?
> >>
> >> No, it will not cause any issues with EHCI-OHCI issues.
> >> But its difficult to comment on this because we don't have port
> >> handoff supported
> >> in hardware.
> >>
> >> regards
> >> keshava
> >
> > Hi Samuel
> >        please let me know if you have any comments on this patch.
> > This is required patch for omap3 ehci enumeration instabilities.
> >
> > Regards
> > Keshava
> 
> Hi Samuel
>       do you have any comments on this patch?
I actually never received the actual patch, I think.


> Felipe has reviewed this patch and he is agreed for this patch.
> there are no comments from your side, requesting to push this change
> to mainline.
I looked at it on gmame, and it seems fine to me. If you want me to push this
patch, then please (re-)send it to me, even privately.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue

[Munegowda, Keshava]

On Fri, Mar 16, 2012 at 9:50 PM, Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> wrote:
> Hi Keshava,
>
> On Thu, Mar 08, 2012 at 08:30:21PM +0530, Munegowda, Keshava wrote:
>> On Fri, Mar 2, 2012 at 7:36 PM, Munegowda, Keshava
>> <keshava_mgowda-l0cyMroinI0@public.gmane.org> wrote:
>> > On Fri, Feb 24, 2012 at 5:14 PM, Munegowda, Keshava
>> > <keshava_mgowda-l0cyMroinI0@public.gmane.org> wrote:
>> >> On Fri, Feb 24, 2012 at 3:46 PM, Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> wrote:
>> >>> Hi,
>> >>>
>> >>> On Fri, Feb 24, 2012 at 03:36:15PM +0530, Keshava Munegowda wrote:
>> >>>> From: Keshava Munegowda <Keshava_mgowda-l0cyMroinI0@public.gmane.org>
>> >>>>
>> >>>> It is observed that the echi ports of 3430 sdp board
>> >>>> are not working due to the random timing of programming
>> >>>> the associated GPIOs of the ULPI PHYs of the EHCI for reset.
>> >>>> If the PHYs are reset at during usbhs core driver, host ports will
>> >>>> not work because EHCI driver is loaded after the resetting PHYs.
>> >>>> The PHYs should be in reset state while initializing the EHCI
>> >>>> controller.
>> >>>> The code which does the GPIO pins associated with the PHYs
>> >>>> are programmed to reset is moved from the USB host core driver
>> >>>> to EHCI driver.
>> >>>>
>> >>>> Signed-off-by: Keshava Munegowda <keshava_mgowda-l0cyMroinI0@public.gmane.org>
>> >>>> Reviewed-by: Partha Basak <parthab-PpE0FKYn9XJWk0Htik3J/w@public.gmane.org>
>> >>>
>> >>> won't this cause issues with EHCI/OHCI interactions ? I mean, what if
>> >>> you connect a FS/LS device and port is handed over to OHCI, does OHCI
>> >>> have any needs to reset the PHY or something similar ?
>> >>
>> >> No, it will not cause any issues with EHCI-OHCI issues.
>> >> But its difficult to comment on this because we don't have port
>> >> handoff supported
>> >> in hardware.
>> >>
>> >> regards
>> >> keshava
>> >
>> > Hi Samuel
>> >        please let me know if you have any comments on this patch.
>> > This is required patch for omap3 ehci enumeration instabilities.
>> >
>> > Regards
>> > Keshava
>>
>> Hi Samuel
>>       do you have any comments on this patch?
> I actually never received the actual patch, I think.
>
>
>> Felipe has reviewed this patch and he is agreed for this patch.
>> there are no comments from your side, requesting to push this change
>> to mainline.
> I looked at it on gmame, and it seems fine to me. If you want me to push this
> patch, then please (re-)send it to me, even privately.
>
> Cheers,
> Samuel.
>

Thanks Samuel
           yes, I will resend this ASAP.


regards
keshava
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html