* RE: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-29 13:01 ` [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda Roger Quadros
@ 2013-11-29 13:17 ` David Laight
2013-12-02 8:39 ` Roger Quadros
2013-11-29 15:32 ` Michael Trimarchi
2013-11-30 4:48 ` Michael Trimarchi
2 siblings, 1 reply; 13+ messages in thread
From: David Laight @ 2013-11-29 13:17 UTC (permalink / raw)
To: Roger Quadros, lee.jones, sameo
Cc: tomi.valkeinen, balbi, sr, ljkenny.mailinglists, linux-omap,
linux-usb, linux-kernel, stable
> From: Of Roger Quadros
> With u-boot 2013.10, USB devices are sometimes not detected
> on OMAP4 Panda. To make us independent of what bootloader does
> with the USB Host module, we must RESET it to get it to a known
> good state. This patch Soft RESETs the USB Host module.
...
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -43,14 +43,18 @@
> /* UHH Register Set */
> #define OMAP_UHH_REVISION (0x00)
> #define OMAP_UHH_SYSCONFIG (0x10)
> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
(tab/space issue)
Wouldn't it be clearer to define these in the opposite order with:
+#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << OMAP_UHH_SYSCONFIG_MIDLESHIFT)
...
> +static void omap_usbhs_rev1_reset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> + u32 reg;
> + unsigned long timeout;
> +
> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
> +
> + /* Soft Reset */
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
> +
> + timeout = jiffies + msecs_to_jiffies(100);
> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
> + cpu_relax();
> +
> + if (time_after(jiffies, timeout)) {
> + dev_err(dev, "Soft RESET operation timed out\n");
> + break;
> + }
> + }
> +
> + /* Set No-Standby */
> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
> +
> + /* Set No-Idle */
> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
Why not pass in the mask and value and avoid replicating the
entire function. I can't see any other significant differences,
the udelay(2) won't be significant.
I'm not sure of the context this code runs in, but if the reset
is likely to take a significant portion of the 100ms timeout
period, why not just sleep for a few ms between status polls.
David
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-29 13:17 ` David Laight
@ 2013-12-02 8:39 ` Roger Quadros
2013-12-02 16:28 ` David Laight
0 siblings, 1 reply; 13+ messages in thread
From: Roger Quadros @ 2013-12-02 8:39 UTC (permalink / raw)
To: David Laight, lee.jones, sameo
Cc: tomi.valkeinen, balbi, sr, ljkenny.mailinglists, linux-omap,
linux-usb, linux-kernel, stable
Hi David,
On 11/29/2013 03:17 PM, David Laight wrote:
>> From: Of Roger Quadros
>> With u-boot 2013.10, USB devices are sometimes not detected
>> on OMAP4 Panda. To make us independent of what bootloader does
>> with the USB Host module, we must RESET it to get it to a known
>> good state. This patch Soft RESETs the USB Host module.
> ...
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -43,14 +43,18 @@
>> /* UHH Register Set */
>> #define OMAP_UHH_REVISION (0x00)
>> #define OMAP_UHH_SYSCONFIG (0x10)
>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>
> (tab/space issue)
Weird, original code seems to use a tab instead of space after #define.
>
> Wouldn't it be clearer to define these in the opposite order with:
> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << OMAP_UHH_SYSCONFIG_MIDLESHIFT)
Right.
>
> ...
>> +static void omap_usbhs_rev1_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + timeout = jiffies + msecs_to_jiffies(100);
>> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
>> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
>> + cpu_relax();
You mean use msleep(1) here instead of cpu_relax()?
Shouldn't be a problem IMO, but can you please tell me why that is better
as the reset seems to complete usually in the first iteration.
>> +
>> + if (time_after(jiffies, timeout)) {
>> + dev_err(dev, "Soft RESET operation timed out\n");
>> + break;
>> + }
>> + }
>> +
>> + /* Set No-Standby */
>> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
>> +
>> + /* Set No-Idle */
>> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
>
> Why not pass in the mask and value and avoid replicating the
> entire function. I can't see any other significant differences,
> the udelay(2) won't be significant.
OK, I can pass the mask and value, but still there is a difference
in the way reset complete is checked between v1 and v2. But that
be in omap_usbhs_softreset() and the individual reset functions can be
replaced by a single omap_usbhs_set_sysconfig().
It seems the udelay() is not required for the USB Host module, so I'll
get rid of that.
>
> I'm not sure of the context this code runs in, but if the reset
> is likely to take a significant portion of the 100ms timeout
> period, why not just sleep for a few ms between status polls.
covered in the related code above.
cheers,
-roger
^ permalink raw reply [flat|nested] 13+ messages in thread* RE: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-12-02 8:39 ` Roger Quadros
@ 2013-12-02 16:28 ` David Laight
0 siblings, 0 replies; 13+ messages in thread
From: David Laight @ 2013-12-02 16:28 UTC (permalink / raw)
To: Roger Quadros, lee.jones, sameo
Cc: tomi.valkeinen, balbi, sr, ljkenny.mailinglists, linux-omap,
linux-usb, linux-kernel, stable
> From: Roger Quadros [mailto:rogerq@ti.com]
> On 11/29/2013 03:17 PM, David Laight wrote:
...
> >> + timeout = jiffies + msecs_to_jiffies(100);
> >> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
> >> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
> >> + cpu_relax();
>
> You mean use msleep(1) here instead of cpu_relax()?
> Shouldn't be a problem IMO, but can you please tell me why that is better
> as the reset seems to complete usually in the first iteration.
If it doesn't finish in the first iteration you don't want to
spin the cpu for 100ms.
If it hasn't finished in the first millisecond, you probably expect
it to actually time out - so you might as well look (say) every 10ms.
David
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-29 13:01 ` [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda Roger Quadros
2013-11-29 13:17 ` David Laight
@ 2013-11-29 15:32 ` Michael Trimarchi
2013-12-02 9:41 ` Roger Quadros
2013-11-30 4:48 ` Michael Trimarchi
2 siblings, 1 reply; 13+ messages in thread
From: Michael Trimarchi @ 2013-11-29 15:32 UTC (permalink / raw)
To: Roger Quadros
Cc: lee.jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable
Hi Roger
On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
> With u-boot 2013.10, USB devices are sometimes not detected
> on OMAP4 Panda. To make us independent of what bootloader does
> with the USB Host module, we must RESET it to get it to a known
> good state. This patch Soft RESETs the USB Host module.
>
Do you think that we need something similar of usb musb?
I have seen the OTG_SYSCONFIG is touched in uboot and
only readed in omap2430.c.
Michael
> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: <stable@vger.kernel.org> # 3.10+
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 109 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 142650f..d4bd464 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -43,14 +43,18 @@
> /* UHH Register Set */
> #define OMAP_UHH_REVISION (0x00)
> #define OMAP_UHH_SYSCONFIG (0x10)
> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>
> #define OMAP_UHH_SYSSTATUS (0x14)
> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
> +
> #define OMAP_UHH_HOSTCONFIG (0x40)
> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
> @@ -66,10 +70,10 @@
> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>
> /* OMAP4-specific defines */
> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>
> #define OMAP4_P1_MODE_CLEAR (3 << 16)
> @@ -81,6 +85,12 @@
>
> #define OMAP_UHH_DEBUG_CSR (0x44)
>
> +/* MIDLE modes */
> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
> +
> +/* SIDLE modes */
> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
> +
> /* Values of UHH_REVISION - Note: these are not given in the TRM */
> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
> return reg;
> }
>
> +static void omap_usbhs_rev1_reset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> + u32 reg;
> + unsigned long timeout;
> +
> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
> +
> + /* Soft Reset */
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
> +
> + timeout = jiffies + msecs_to_jiffies(100);
> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
> + cpu_relax();
> +
> + if (time_after(jiffies, timeout)) {
> + dev_err(dev, "Soft RESET operation timed out\n");
> + break;
> + }
> + }
> +
> + /* Set No-Standby */
> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
> +
> + /* Set No-Idle */
> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
> +
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
> +}
> +
> +static void omap_usbhs_rev2_reset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> + u32 reg;
> + unsigned long timeout;
> +
> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
> +
> + /* Soft Reset */
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
> +
> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
> + udelay(2);
> + timeout = jiffies + msecs_to_jiffies(100);
> +
> + /* SOFTRESET bit clears when RESET completes */
> + while (usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG)
> + & OMAP4_UHH_SYSCONFIG_SOFTRESET) {
> + cpu_relax();
> +
> + if (time_after(jiffies, timeout)) {
> + dev_err(dev, "Soft RESET operation timed out\n");
> + break;
> + }
> + }
> +
> + /* Set No-Standby */
> + reg &= ~OMAP4_UHH_SYSCONFIG_MIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
> + << OMAP4_UHH_SYSCONFIG_MIDLESHIFT;
> +
> + /* Set No-Idle */
> + reg &= ~OMAP4_UHH_SYSCONFIG_SIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
> + << OMAP4_UHH_SYSCONFIG_SIDLESHIFT;
> +
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
> +}
> +
> +static void omap_usbhs_softreset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> +
> + switch (omap->usbhs_rev) {
> + case OMAP_USBHS_REV1:
> + omap_usbhs_rev1_reset(dev);
> + break;
> +
> + default: /* Rev 2 onwards */
> + omap_usbhs_rev2_reset(dev);
> + break;
> + }
> +}
> +
> static void omap_usbhs_init(struct device *dev)
> {
> struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> @@ -483,6 +584,8 @@ static void omap_usbhs_init(struct device *dev)
>
> pm_runtime_get_sync(dev);
>
> + omap_usbhs_softreset(dev);
> +
> reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
> /* setup ULPI bypass and burst configurations */
> reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
> --
> 1.8.3.2
>
> --
> 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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-29 15:32 ` Michael Trimarchi
@ 2013-12-02 9:41 ` Roger Quadros
0 siblings, 0 replies; 13+ messages in thread
From: Roger Quadros @ 2013-12-02 9:41 UTC (permalink / raw)
To: Michael Trimarchi, Felipe Balbi, Sebastian Andrzej Siewior
Cc: lee.jones, sameo, tomi.valkeinen, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable
Michael,
On 11/29/2013 05:32 PM, Michael Trimarchi wrote:
> Hi Roger
>
> On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
>> With u-boot 2013.10, USB devices are sometimes not detected
>> on OMAP4 Panda. To make us independent of what bootloader does
>> with the USB Host module, we must RESET it to get it to a known
>> good state. This patch Soft RESETs the USB Host module.
>>
>
> Do you think that we need something similar of usb musb?
> I have seen the OTG_SYSCONFIG is touched in uboot and
> only readed in omap2430.c.
I'm not sure about musb. Maybe Sebastian/Felipe have better idea.
In general I believe that all modules must be reset by the kernel.
cheers,
-roger
>
>> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> Cc: <stable@vger.kernel.org> # 3.10+
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
>> 1 file changed, 109 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>> index 142650f..d4bd464 100644
>> --- a/drivers/mfd/omap-usb-host.c
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -43,14 +43,18 @@
>> /* UHH Register Set */
>> #define OMAP_UHH_REVISION (0x00)
>> #define OMAP_UHH_SYSCONFIG (0x10)
>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
>> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
>> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
>> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
>> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
>> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
>> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>>
>> #define OMAP_UHH_SYSSTATUS (0x14)
>> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
>> +
>> #define OMAP_UHH_HOSTCONFIG (0x40)
>> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
>> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
>> @@ -66,10 +70,10 @@
>> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>>
>> /* OMAP4-specific defines */
>> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
>> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
>> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
>> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
>> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
>> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
>> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
>> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
>> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>>
>> #define OMAP4_P1_MODE_CLEAR (3 << 16)
>> @@ -81,6 +85,12 @@
>>
>> #define OMAP_UHH_DEBUG_CSR (0x44)
>>
>> +/* MIDLE modes */
>> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
>> +
>> +/* SIDLE modes */
>> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
>> +
>> /* Values of UHH_REVISION - Note: these are not given in the TRM */
>> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
>> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
>> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
>> return reg;
>> }
>>
>> +static void omap_usbhs_rev1_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + timeout = jiffies + msecs_to_jiffies(100);
>> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
>> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
>> + cpu_relax();
>> +
>> + if (time_after(jiffies, timeout)) {
>> + dev_err(dev, "Soft RESET operation timed out\n");
>> + break;
>> + }
>> + }
>> +
>> + /* Set No-Standby */
>> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
>> +
>> + /* Set No-Idle */
>> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
>> +
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>> +}
>> +
>> +static void omap_usbhs_rev2_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
>> + udelay(2);
>> + timeout = jiffies + msecs_to_jiffies(100);
>> +
>> + /* SOFTRESET bit clears when RESET completes */
>> + while (usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG)
>> + & OMAP4_UHH_SYSCONFIG_SOFTRESET) {
>> + cpu_relax();
>> +
>> + if (time_after(jiffies, timeout)) {
>> + dev_err(dev, "Soft RESET operation timed out\n");
>> + break;
>> + }
>> + }
>> +
>> + /* Set No-Standby */
>> + reg &= ~OMAP4_UHH_SYSCONFIG_MIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>> + << OMAP4_UHH_SYSCONFIG_MIDLESHIFT;
>> +
>> + /* Set No-Idle */
>> + reg &= ~OMAP4_UHH_SYSCONFIG_SIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>> + << OMAP4_UHH_SYSCONFIG_SIDLESHIFT;
>> +
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>> +}
>> +
>> +static void omap_usbhs_softreset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> +
>> + switch (omap->usbhs_rev) {
>> + case OMAP_USBHS_REV1:
>> + omap_usbhs_rev1_reset(dev);
>> + break;
>> +
>> + default: /* Rev 2 onwards */
>> + omap_usbhs_rev2_reset(dev);
>> + break;
>> + }
>> +}
>> +
>> static void omap_usbhs_init(struct device *dev)
>> {
>> struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> @@ -483,6 +584,8 @@ static void omap_usbhs_init(struct device *dev)
>>
>> pm_runtime_get_sync(dev);
>>
>> + omap_usbhs_softreset(dev);
>> +
>> reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
>> /* setup ULPI bypass and burst configurations */
>> reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
>> --
>> 1.8.3.2
>>
>> --
>> 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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-29 13:01 ` [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda Roger Quadros
2013-11-29 13:17 ` David Laight
2013-11-29 15:32 ` Michael Trimarchi
@ 2013-11-30 4:48 ` Michael Trimarchi
2013-11-30 5:10 ` Michael Trimarchi
2013-12-02 9:39 ` Roger Quadros
2 siblings, 2 replies; 13+ messages in thread
From: Michael Trimarchi @ 2013-11-30 4:48 UTC (permalink / raw)
To: Roger Quadros
Cc: Lee Jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable
Hi Roger
On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
> With u-boot 2013.10, USB devices are sometimes not detected
> on OMAP4 Panda. To make us independent of what bootloader does
> with the USB Host module, we must RESET it to get it to a known
> good state. This patch Soft RESETs the USB Host module.
>
> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: <stable@vger.kernel.org> # 3.10+
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 109 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 142650f..d4bd464 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -43,14 +43,18 @@
> /* UHH Register Set */
> #define OMAP_UHH_REVISION (0x00)
> #define OMAP_UHH_SYSCONFIG (0x10)
> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>
> #define OMAP_UHH_SYSSTATUS (0x14)
> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
> +
> #define OMAP_UHH_HOSTCONFIG (0x40)
> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
> @@ -66,10 +70,10 @@
> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>
> /* OMAP4-specific defines */
> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>
> #define OMAP4_P1_MODE_CLEAR (3 << 16)
> @@ -81,6 +85,12 @@
>
> #define OMAP_UHH_DEBUG_CSR (0x44)
>
> +/* MIDLE modes */
> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
> +
> +/* SIDLE modes */
> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
> +
> /* Values of UHH_REVISION - Note: these are not given in the TRM */
> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
> return reg;
> }
>
I'm digging in the code but as I understand this should be done by
omap_hwmod and
i660 avoid reset of the ehci module. This is done by ocp_softreset?
> +static void omap_usbhs_rev1_reset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> + u32 reg;
> + unsigned long timeout;
> +
> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
> +
> + /* Soft Reset */
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
> +
> + timeout = jiffies + msecs_to_jiffies(100);
> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
> + cpu_relax();
> +
> + if (time_after(jiffies, timeout)) {
> + dev_err(dev, "Soft RESET operation timed out\n");
> + break;
> + }
> + }
> +
> + /* Set No-Standby */
> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
> +
> + /* Set No-Idle */
> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
> +
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
> +}
> +
> +static void omap_usbhs_rev2_reset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> + u32 reg;
> + unsigned long timeout;
> +
> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
> +
> + /* Soft Reset */
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
> +
> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
> + udelay(2);
is this the srst_udelay?
Michael
> + timeout = jiffies + msecs_to_jiffies(100);
> +
> + /* SOFTRESET bit clears when RESET completes */
> + while (usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG)
> + & OMAP4_UHH_SYSCONFIG_SOFTRESET) {
> + cpu_relax();
> +
> + if (time_after(jiffies, timeout)) {
> + dev_err(dev, "Soft RESET operation timed out\n");
> + break;
> + }
> + }
> +
> + /* Set No-Standby */
> + reg &= ~OMAP4_UHH_SYSCONFIG_MIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
> + << OMAP4_UHH_SYSCONFIG_MIDLESHIFT;
> +
> + /* Set No-Idle */
> + reg &= ~OMAP4_UHH_SYSCONFIG_SIDLEMASK;
> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
> + << OMAP4_UHH_SYSCONFIG_SIDLESHIFT;
> +
> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
> +}
> +
> +static void omap_usbhs_softreset(struct device *dev)
> +{
> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> +
> + switch (omap->usbhs_rev) {
> + case OMAP_USBHS_REV1:
> + omap_usbhs_rev1_reset(dev);
> + break;
> +
> + default: /* Rev 2 onwards */
> + omap_usbhs_rev2_reset(dev);
> + break;
> + }
> +}
> +
> static void omap_usbhs_init(struct device *dev)
> {
> struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
> @@ -483,6 +584,8 @@ static void omap_usbhs_init(struct device *dev)
>
> pm_runtime_get_sync(dev);
>
> + omap_usbhs_softreset(dev);
> +
> reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
> /* setup ULPI bypass and burst configurations */
> reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
> --
> 1.8.3.2
>
> --
> 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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-30 4:48 ` Michael Trimarchi
@ 2013-11-30 5:10 ` Michael Trimarchi
2013-12-01 3:14 ` Michael Trimarchi
2013-12-02 9:39 ` Roger Quadros
1 sibling, 1 reply; 13+ messages in thread
From: Michael Trimarchi @ 2013-11-30 5:10 UTC (permalink / raw)
To: Roger Quadros
Cc: Lee Jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable
Hi
On Sat, Nov 30, 2013 at 5:48 AM, Michael Trimarchi
<michael@amarulasolutions.com> wrote:
> Hi Roger
>
> On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
>> With u-boot 2013.10, USB devices are sometimes not detected
>> on OMAP4 Panda. To make us independent of what bootloader does
>> with the USB Host module, we must RESET it to get it to a known
>> good state. This patch Soft RESETs the USB Host module.
>>
>> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> Cc: <stable@vger.kernel.org> # 3.10+
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
>> 1 file changed, 109 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>> index 142650f..d4bd464 100644
>> --- a/drivers/mfd/omap-usb-host.c
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -43,14 +43,18 @@
>> /* UHH Register Set */
>> #define OMAP_UHH_REVISION (0x00)
>> #define OMAP_UHH_SYSCONFIG (0x10)
>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
>> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
>> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
>> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
>> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
>> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
>> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>>
>> #define OMAP_UHH_SYSSTATUS (0x14)
>> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
>> +
>> #define OMAP_UHH_HOSTCONFIG (0x40)
>> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
>> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
>> @@ -66,10 +70,10 @@
>> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>>
>> /* OMAP4-specific defines */
>> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
>> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
>> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
>> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
>> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
>> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
>> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
>> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
>> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>>
>> #define OMAP4_P1_MODE_CLEAR (3 << 16)
>> @@ -81,6 +85,12 @@
>>
>> #define OMAP_UHH_DEBUG_CSR (0x44)
>>
>> +/* MIDLE modes */
>> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
>> +
>> +/* SIDLE modes */
>> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
>> +
>> /* Values of UHH_REVISION - Note: these are not given in the TRM */
>> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
>> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
>> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
>> return reg;
>> }
>>
>
> I'm digging in the code but as I understand this should be done by
> omap_hwmod and
> i660 avoid reset of the ehci module. This is done by ocp_softreset?
>
>
>> +static void omap_usbhs_rev1_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + timeout = jiffies + msecs_to_jiffies(100);
>> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
>> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
>> + cpu_relax();
>> +
>> + if (time_after(jiffies, timeout)) {
>> + dev_err(dev, "Soft RESET operation timed out\n");
>> + break;
>> + }
>> + }
>> +
>> + /* Set No-Standby */
>> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
>> +
>> + /* Set No-Idle */
>> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
>> +
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>> +}
>> +
>> +static void omap_usbhs_rev2_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
>> + udelay(2);
>
> is this the srst_udelay?
>
In omap_hwmod.c
_write_sysconfig_raw(v, oh);
is done after ask a reset
if (oh->class->sysc->srst_udelay)
udelay(oh->class->sysc->srst_udelay);
Should be done after the reset completion?
Michael
> Michael
>
>> + timeout = jiffies + msecs_to_jiffies(100);
>> +
>> + /* SOFTRESET bit clears when RESET completes */
>> + while (usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG)
>> + & OMAP4_UHH_SYSCONFIG_SOFTRESET) {
>> + cpu_relax();
>> +
>> + if (time_after(jiffies, timeout)) {
>> + dev_err(dev, "Soft RESET operation timed out\n");
>> + break;
>> + }
>> + }
>> +
>> + /* Set No-Standby */
>> + reg &= ~OMAP4_UHH_SYSCONFIG_MIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>> + << OMAP4_UHH_SYSCONFIG_MIDLESHIFT;
>> +
>> + /* Set No-Idle */
>> + reg &= ~OMAP4_UHH_SYSCONFIG_SIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>> + << OMAP4_UHH_SYSCONFIG_SIDLESHIFT;
>> +
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>> +}
>> +
>> +static void omap_usbhs_softreset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> +
>> + switch (omap->usbhs_rev) {
>> + case OMAP_USBHS_REV1:
>> + omap_usbhs_rev1_reset(dev);
>> + break;
>> +
>> + default: /* Rev 2 onwards */
>> + omap_usbhs_rev2_reset(dev);
>> + break;
>> + }
>> +}
>> +
>> static void omap_usbhs_init(struct device *dev)
>> {
>> struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> @@ -483,6 +584,8 @@ static void omap_usbhs_init(struct device *dev)
>>
>> pm_runtime_get_sync(dev);
>>
>> + omap_usbhs_softreset(dev);
>> +
>> reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
>> /* setup ULPI bypass and burst configurations */
>> reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
>> --
>> 1.8.3.2
>>
>> --
>> 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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-30 5:10 ` Michael Trimarchi
@ 2013-12-01 3:14 ` Michael Trimarchi
0 siblings, 0 replies; 13+ messages in thread
From: Michael Trimarchi @ 2013-12-01 3:14 UTC (permalink / raw)
To: Roger Quadros
Cc: Lee Jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable
Hi
On Sat, Nov 30, 2013 at 6:10 AM, Michael Trimarchi
<michael@amarulasolutions.com> wrote:
> Hi
>
> On Sat, Nov 30, 2013 at 5:48 AM, Michael Trimarchi
> <michael@amarulasolutions.com> wrote:
>> Hi Roger
>>
>> On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
>>> With u-boot 2013.10, USB devices are sometimes not detected
>>> on OMAP4 Panda. To make us independent of what bootloader does
>>> with the USB Host module, we must RESET it to get it to a known
>>> good state. This patch Soft RESETs the USB Host module.
>>>
>>> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>>> Cc: <stable@vger.kernel.org> # 3.10+
>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>> ---
>>> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
>>> 1 file changed, 109 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>>> index 142650f..d4bd464 100644
>>> --- a/drivers/mfd/omap-usb-host.c
>>> +++ b/drivers/mfd/omap-usb-host.c
>>> @@ -43,14 +43,18 @@
>>> /* UHH Register Set */
>>> #define OMAP_UHH_REVISION (0x00)
>>> #define OMAP_UHH_SYSCONFIG (0x10)
>>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>>> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
>>> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
>>> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
>>> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
>>> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
>>> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
>>> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>>>
>>> #define OMAP_UHH_SYSSTATUS (0x14)
>>> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
>>> +
>>> #define OMAP_UHH_HOSTCONFIG (0x40)
>>> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
>>> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
>>> @@ -66,10 +70,10 @@
>>> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>>>
>>> /* OMAP4-specific defines */
>>> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
>>> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
>>> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
>>> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
>>> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
>>> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
>>> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
>>> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
>>> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>>>
>>> #define OMAP4_P1_MODE_CLEAR (3 << 16)
>>> @@ -81,6 +85,12 @@
>>>
>>> #define OMAP_UHH_DEBUG_CSR (0x44)
>>>
>>> +/* MIDLE modes */
>>> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
>>> +
>>> +/* SIDLE modes */
>>> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
>>> +
>>> /* Values of UHH_REVISION - Note: these are not given in the TRM */
>>> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
>>> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
>>> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
>>> return reg;
>>> }
>>>
>>
>> I'm digging in the code but as I understand this should be done by
>> omap_hwmod and
>> i660 avoid reset of the ehci module. This is done by ocp_softreset?
>>
>>
>>> +static void omap_usbhs_rev1_reset(struct device *dev)
>>> +{
>>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>>> + u32 reg;
>>> + unsigned long timeout;
>>> +
>>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>>> +
>>> + /* Soft Reset */
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>>> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
>>> +
>>> + timeout = jiffies + msecs_to_jiffies(100);
>>> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
>>> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
>>> + cpu_relax();
>>> +
>>> + if (time_after(jiffies, timeout)) {
>>> + dev_err(dev, "Soft RESET operation timed out\n");
>>> + break;
>>> + }
>>> + }
>>> +
>>> + /* Set No-Standby */
>>> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
>>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>>> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
>>> +
>>> + /* Set No-Idle */
>>> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
>>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>>> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
>>> +
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>>> +}
>>> +
>>> +static void omap_usbhs_rev2_reset(struct device *dev)
>>> +{
>>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>>> + u32 reg;
>>> + unsigned long timeout;
>>> +
>>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>>> +
>>> + /* Soft Reset */
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>>> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
>>> +
>>> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
>>> + udelay(2);
>>
>> is this the srst_udelay?
>>
>
> In omap_hwmod.c
>
> _write_sysconfig_raw(v, oh);
>
> is done after ask a reset
>
> if (oh->class->sysc->srst_udelay)
> udelay(oh->class->sysc->srst_udelay);
>
> Should be done after the reset completion?
>
My apologize _set_softreset not set nothing but just prepare it.
Forget about it
> Michael
>
>> Michael
>>
>>> + timeout = jiffies + msecs_to_jiffies(100);
>>> +
>>> + /* SOFTRESET bit clears when RESET completes */
>>> + while (usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG)
>>> + & OMAP4_UHH_SYSCONFIG_SOFTRESET) {
>>> + cpu_relax();
>>> +
>>> + if (time_after(jiffies, timeout)) {
>>> + dev_err(dev, "Soft RESET operation timed out\n");
>>> + break;
>>> + }
>>> + }
>>> +
>>> + /* Set No-Standby */
>>> + reg &= ~OMAP4_UHH_SYSCONFIG_MIDLEMASK;
>>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>>> + << OMAP4_UHH_SYSCONFIG_MIDLESHIFT;
>>> +
>>> + /* Set No-Idle */
>>> + reg &= ~OMAP4_UHH_SYSCONFIG_SIDLEMASK;
>>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>>> + << OMAP4_UHH_SYSCONFIG_SIDLESHIFT;
>>> +
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>>> +}
>>> +
>>> +static void omap_usbhs_softreset(struct device *dev)
>>> +{
>>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>>> +
>>> + switch (omap->usbhs_rev) {
>>> + case OMAP_USBHS_REV1:
>>> + omap_usbhs_rev1_reset(dev);
>>> + break;
>>> +
>>> + default: /* Rev 2 onwards */
>>> + omap_usbhs_rev2_reset(dev);
>>> + break;
>>> + }
>>> +}
>>> +
>>> static void omap_usbhs_init(struct device *dev)
>>> {
>>> struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>>> @@ -483,6 +584,8 @@ static void omap_usbhs_init(struct device *dev)
>>>
>>> pm_runtime_get_sync(dev);
>>>
>>> + omap_usbhs_softreset(dev);
>>> +
>>> reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
>>> /* setup ULPI bypass and burst configurations */
>>> reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
>>> --
>>> 1.8.3.2
>>>
>>> --
>>> 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-11-30 4:48 ` Michael Trimarchi
2013-11-30 5:10 ` Michael Trimarchi
@ 2013-12-02 9:39 ` Roger Quadros
2013-12-02 9:51 ` Michael Trimarchi
2013-12-02 15:00 ` Paul Walmsley
1 sibling, 2 replies; 13+ messages in thread
From: Roger Quadros @ 2013-12-02 9:39 UTC (permalink / raw)
To: Michael Trimarchi
Cc: Lee Jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable, Benoit Cousson, tony@atomide.com,
Paul Walmsley
+Benoit, Tony, Paul.
Hi Michael,
On 11/30/2013 06:48 AM, Michael Trimarchi wrote:
> Hi Roger
>
> On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
>> With u-boot 2013.10, USB devices are sometimes not detected
>> on OMAP4 Panda. To make us independent of what bootloader does
>> with the USB Host module, we must RESET it to get it to a known
>> good state. This patch Soft RESETs the USB Host module.
>>
>> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>> Cc: <stable@vger.kernel.org> # 3.10+
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
>> 1 file changed, 109 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>> index 142650f..d4bd464 100644
>> --- a/drivers/mfd/omap-usb-host.c
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -43,14 +43,18 @@
>> /* UHH Register Set */
>> #define OMAP_UHH_REVISION (0x00)
>> #define OMAP_UHH_SYSCONFIG (0x10)
>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
>> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
>> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
>> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
>> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
>> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
>> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>>
>> #define OMAP_UHH_SYSSTATUS (0x14)
>> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
>> +
>> #define OMAP_UHH_HOSTCONFIG (0x40)
>> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
>> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
>> @@ -66,10 +70,10 @@
>> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>>
>> /* OMAP4-specific defines */
>> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
>> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
>> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
>> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
>> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
>> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
>> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
>> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
>> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>>
>> #define OMAP4_P1_MODE_CLEAR (3 << 16)
>> @@ -81,6 +85,12 @@
>>
>> #define OMAP_UHH_DEBUG_CSR (0x44)
>>
>> +/* MIDLE modes */
>> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
>> +
>> +/* SIDLE modes */
>> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
>> +
>> /* Values of UHH_REVISION - Note: these are not given in the TRM */
>> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
>> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
>> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
>> return reg;
>> }
>>
>
> I'm digging in the code but as I understand this should be done by
> omap_hwmod and
> i660 avoid reset of the ehci module. This is done by ocp_softreset?
>
It won't be done by omap_hwmod as we set HWMOD_INIT_NO_RESET flag in the hwmod data [1].
Question is do we do it in the driver of leave it to hwmod?
The other concern about i660 is in this comment [1]
/*
* During system boot; If the hwmod framework resets the module
* the module will have smart idle settings; which can lead to deadlock
* (above Errata Id:i660); so, dont reset the module during boot;
* Use HWMOD_INIT_NO_RESET.
*/
But if you look at the errata document [2], Advisory 1.108, it doesn't say that we can't be in smart-idle, but
only that we should put the module in force-idle, before cutting the module's functional clock. It also states
that the only way to recover from a lockup condition is to soft reset the module. So I'm not sure if the above comment
in the code is really valid. What if the lockup happens in the bootloader? In that case we will have to reset the module in
the kernel.
Doing the reset in probe does solve a problem for now i.e. eliminates dependency on bootloader.
[1] - http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c#n2024
[2] - http://www.ti.com/litv/pdf/sprz318e
>
>> +static void omap_usbhs_rev1_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + timeout = jiffies + msecs_to_jiffies(100);
>> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
>> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
>> + cpu_relax();
>> +
>> + if (time_after(jiffies, timeout)) {
>> + dev_err(dev, "Soft RESET operation timed out\n");
>> + break;
>> + }
>> + }
>> +
>> + /* Set No-Standby */
>> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
>> +
>> + /* Set No-Idle */
>> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
>> +
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>> +}
>> +
>> +static void omap_usbhs_rev2_reset(struct device *dev)
>> +{
>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>> + u32 reg;
>> + unsigned long timeout;
>> +
>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>> +
>> + /* Soft Reset */
>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
>> +
>> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
>> + udelay(2);
>
> is this the srst_udelay?
It was supposed to be, but it doesn't seem to be necessary for the UHH module. So I'll get rid of that.
cheers,
-roger
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-12-02 9:39 ` Roger Quadros
@ 2013-12-02 9:51 ` Michael Trimarchi
2013-12-02 12:05 ` Roger Quadros
2013-12-02 15:00 ` Paul Walmsley
1 sibling, 1 reply; 13+ messages in thread
From: Michael Trimarchi @ 2013-12-02 9:51 UTC (permalink / raw)
To: Roger Quadros
Cc: Lee Jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable, Benoit Cousson, tony@atomide.com,
Paul Walmsley
Hi Roger
On Mon, Dec 2, 2013 at 10:39 AM, Roger Quadros <rogerq@ti.com> wrote:
> +Benoit, Tony, Paul.
>
> Hi Michael,
>
> On 11/30/2013 06:48 AM, Michael Trimarchi wrote:
>> Hi Roger
>>
>> On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
>>> With u-boot 2013.10, USB devices are sometimes not detected
>>> on OMAP4 Panda. To make us independent of what bootloader does
>>> with the USB Host module, we must RESET it to get it to a known
>>> good state. This patch Soft RESETs the USB Host module.
>>>
>>> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>>> Cc: <stable@vger.kernel.org> # 3.10+
>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>> ---
>>> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
>>> 1 file changed, 109 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>>> index 142650f..d4bd464 100644
>>> --- a/drivers/mfd/omap-usb-host.c
>>> +++ b/drivers/mfd/omap-usb-host.c
>>> @@ -43,14 +43,18 @@
>>> /* UHH Register Set */
>>> #define OMAP_UHH_REVISION (0x00)
>>> #define OMAP_UHH_SYSCONFIG (0x10)
>>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>>> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
>>> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
>>> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
>>> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
>>> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
>>> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
>>> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>>>
>>> #define OMAP_UHH_SYSSTATUS (0x14)
>>> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
>>> +
>>> #define OMAP_UHH_HOSTCONFIG (0x40)
>>> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
>>> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
>>> @@ -66,10 +70,10 @@
>>> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>>>
>>> /* OMAP4-specific defines */
>>> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
>>> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
>>> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
>>> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
>>> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
>>> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
>>> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
>>> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
>>> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>>>
>>> #define OMAP4_P1_MODE_CLEAR (3 << 16)
>>> @@ -81,6 +85,12 @@
>>>
>>> #define OMAP_UHH_DEBUG_CSR (0x44)
>>>
>>> +/* MIDLE modes */
>>> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
>>> +
>>> +/* SIDLE modes */
>>> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
>>> +
>>> /* Values of UHH_REVISION - Note: these are not given in the TRM */
>>> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
>>> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
>>> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
>>> return reg;
>>> }
>>>
>>
>> I'm digging in the code but as I understand this should be done by
>> omap_hwmod and
>> i660 avoid reset of the ehci module. This is done by ocp_softreset?
>>
>
> It won't be done by omap_hwmod as we set HWMOD_INIT_NO_RESET flag in the hwmod data [1].
>
> Question is do we do it in the driver of leave it to hwmod?
>
> The other concern about i660 is in this comment [1]
>
I don't find any description of this errata for omap4. Is this errata valid?
My change was to remove the NO_INIT and add 2uS as you have done
> /*
> * During system oot; If the hwmod framework resets the module
> * the module will have smart idle settings; which can lead to deadlock
> * (above Errata Id:i660); so, dont reset the module during boot;
> * Use HWMOD_INIT_NO_RESET.
> */
>
> But if you look at the errata document [2], Advisory 1.108, it doesn't say that we can't be in smart-idle, but
> only that we should put the module in force-idle, before cutting the module's functional clock. It also states
> that the only way to recover from a lockup condition is to soft reset the module. So I'm not sure if the above comment
> in the code is really valid. What if the lockup happens in the bootloader? In that case we will have to reset the module in
> the kernel.
Michael
>
> Doing the reset in probe does solve a problem for now i.e. eliminates dependency on bootloader.
>
> [1] - http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c#n2024
> [2] - http://www.ti.com/litv/pdf/sprz318e
>
>>
>>> +static void omap_usbhs_rev1_reset(struct device *dev)
>>> +{
>>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>>> + u32 reg;
>>> + unsigned long timeout;
>>> +
>>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>>> +
>>> + /* Soft Reset */
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>>> + reg | OMAP_UHH_SYSCONFIG_SOFTRESET);
>>> +
>>> + timeout = jiffies + msecs_to_jiffies(100);
>>> + while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
>>> + & OMAP_UHH_SYSSTATUS_RESETDONE)) {
>>> + cpu_relax();
>>> +
>>> + if (time_after(jiffies, timeout)) {
>>> + dev_err(dev, "Soft RESET operation timed out\n");
>>> + break;
>>> + }
>>> + }
>>> +
>>> + /* Set No-Standby */
>>> + reg &= ~OMAP_UHH_SYSCONFIG_MIDLEMASK;
>>> + reg |= OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY
>>> + << OMAP_UHH_SYSCONFIG_MIDLESHIFT;
>>> +
>>> + /* Set No-Idle */
>>> + reg &= ~OMAP_UHH_SYSCONFIG_SIDLEMASK;
>>> + reg |= OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE
>>> + << OMAP_UHH_SYSCONFIG_SIDLESHIFT;
>>> +
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
>>> +}
>>> +
>>> +static void omap_usbhs_rev2_reset(struct device *dev)
>>> +{
>>> + struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
>>> + u32 reg;
>>> + unsigned long timeout;
>>> +
>>> + reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
>>> +
>>> + /* Soft Reset */
>>> + usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
>>> + reg | OMAP4_UHH_SYSCONFIG_SOFTRESET);
>>> +
>>> + /* OMAP4: Need to wait before SYSCONFIG can be accessed */
>>> + udelay(2);
>>
>> is this the srst_udelay?
>
> It was supposed to be, but it doesn't seem to be necessary for the UHH module. So I'll get rid of that.
>
Ok
> cheers,
> -roger
>
Michael
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-12-02 9:51 ` Michael Trimarchi
@ 2013-12-02 12:05 ` Roger Quadros
0 siblings, 0 replies; 13+ messages in thread
From: Roger Quadros @ 2013-12-02 12:05 UTC (permalink / raw)
To: Michael Trimarchi
Cc: Lee Jones, sameo, tomi.valkeinen, Felipe Balbi, Stefan Roese,
ljkenny.mailinglists, Linux OMAP Mailing List, USB list,
linux-kernel, stable, Benoit Cousson, tony@atomide.com,
Paul Walmsley
Michael,
On 12/02/2013 11:51 AM, Michael Trimarchi wrote:
> Hi Roger
>
> On Mon, Dec 2, 2013 at 10:39 AM, Roger Quadros <rogerq@ti.com> wrote:
>> +Benoit, Tony, Paul.
>>
>> Hi Michael,
>>
>> On 11/30/2013 06:48 AM, Michael Trimarchi wrote:
>>> Hi Roger
>>>
>>> On Fri, Nov 29, 2013 at 2:01 PM, Roger Quadros <rogerq@ti.com> wrote:
>>>> With u-boot 2013.10, USB devices are sometimes not detected
>>>> on OMAP4 Panda. To make us independent of what bootloader does
>>>> with the USB Host module, we must RESET it to get it to a known
>>>> good state. This patch Soft RESETs the USB Host module.
>>>>
>>>> Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
>>>> Cc: <stable@vger.kernel.org> # 3.10+
>>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>>> ---
>>>> drivers/mfd/omap-usb-host.c | 115 +++++++++++++++++++++++++++++++++++++++++---
>>>> 1 file changed, 109 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>>>> index 142650f..d4bd464 100644
>>>> --- a/drivers/mfd/omap-usb-host.c
>>>> +++ b/drivers/mfd/omap-usb-host.c
>>>> @@ -43,14 +43,18 @@
>>>> /* UHH Register Set */
>>>> #define OMAP_UHH_REVISION (0x00)
>>>> #define OMAP_UHH_SYSCONFIG (0x10)
>>>> -#define OMAP_UHH_SYSCONFIG_MIDLEMODE (1 << 12)
>>>> +#define OMAP_UHH_SYSCONFIG_MIDLEMASK (3 << 12)
>>>> +#define OMAP_UHH_SYSCONFIG_MIDLESHIFT (12)
>>>> #define OMAP_UHH_SYSCONFIG_CACTIVITY (1 << 8)
>>>> -#define OMAP_UHH_SYSCONFIG_SIDLEMODE (1 << 3)
>>>> +#define OMAP_UHH_SYSCONFIG_SIDLEMASK (3 << 3)
>>>> +#define OMAP_UHH_SYSCONFIG_SIDLESHIFT (3)
>>>> #define OMAP_UHH_SYSCONFIG_ENAWAKEUP (1 << 2)
>>>> #define OMAP_UHH_SYSCONFIG_SOFTRESET (1 << 1)
>>>> #define OMAP_UHH_SYSCONFIG_AUTOIDLE (1 << 0)
>>>>
>>>> #define OMAP_UHH_SYSSTATUS (0x14)
>>>> +#define OMAP_UHH_SYSSTATUS_RESETDONE (1 << 0)
>>>> +
>>>> #define OMAP_UHH_HOSTCONFIG (0x40)
>>>> #define OMAP_UHH_HOSTCONFIG_ULPI_BYPASS (1 << 0)
>>>> #define OMAP_UHH_HOSTCONFIG_ULPI_P1_BYPASS (1 << 0)
>>>> @@ -66,10 +70,10 @@
>>>> #define OMAP4_UHH_HOSTCONFIG_APP_START_CLK (1 << 31)
>>>>
>>>> /* OMAP4-specific defines */
>>>> -#define OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR (3 << 2)
>>>> -#define OMAP4_UHH_SYSCONFIG_NOIDLE (1 << 2)
>>>> -#define OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR (3 << 4)
>>>> -#define OMAP4_UHH_SYSCONFIG_NOSTDBY (1 << 4)
>>>> +#define OMAP4_UHH_SYSCONFIG_MIDLEMASK (3 << 2)
>>>> +#define OMAP4_UHH_SYSCONFIG_MIDLESHIFT (2)
>>>> +#define OMAP4_UHH_SYSCONFIG_SIDLEMASK (3 << 4)
>>>> +#define OMAP4_UHH_SYSCONFIG_SIDLESHIFT (4)
>>>> #define OMAP4_UHH_SYSCONFIG_SOFTRESET (1 << 0)
>>>>
>>>> #define OMAP4_P1_MODE_CLEAR (3 << 16)
>>>> @@ -81,6 +85,12 @@
>>>>
>>>> #define OMAP_UHH_DEBUG_CSR (0x44)
>>>>
>>>> +/* MIDLE modes */
>>>> +#define OMAP_UHH_SYSCONFIG_MIDLE_NOSTANDBY (1)
>>>> +
>>>> +/* SIDLE modes */
>>>> +#define OMAP_UHH_SYSCONFIG_SIDLE_NOIDLE (1)
>>>> +
>>>> /* Values of UHH_REVISION - Note: these are not given in the TRM */
>>>> #define OMAP_USBHS_REV1 0x00000010 /* OMAP3 */
>>>> #define OMAP_USBHS_REV2 0x50700100 /* OMAP4 */
>>>> @@ -474,6 +484,97 @@ static unsigned omap_usbhs_rev2_hostconfig(struct usbhs_hcd_omap *omap,
>>>> return reg;
>>>> }
>>>>
>>>
>>> I'm digging in the code but as I understand this should be done by
>>> omap_hwmod and
>>> i660 avoid reset of the ehci module. This is done by ocp_softreset?
>>>
>>
>> It won't be done by omap_hwmod as we set HWMOD_INIT_NO_RESET flag in the hwmod data [1].
>>
>> Question is do we do it in the driver of leave it to hwmod?
>>
>> The other concern about i660 is in this comment [1]
>>
>
> I don't find any description of this errata for omap4. Is this errata valid?
I can't say for sure. You might have to try it out without those flags and see if it works
reliably.
>
> My change was to remove the NO_INIT and add 2uS as you have done
The 2uS delay that I added was my mistake and I don't think it is required.
Just removing HWMOD_INIT_NO_RESET should work.
cheers,
-roger
>
>> /*
>> * During system oot; If the hwmod framework resets the module
>> * the module will have smart idle settings; which can lead to deadlock
>> * (above Errata Id:i660); so, dont reset the module during boot;
>> * Use HWMOD_INIT_NO_RESET.
>> */
>>
>> But if you look at the errata document [2], Advisory 1.108, it doesn't say that we can't be in smart-idle, but
>> only that we should put the module in force-idle, before cutting the module's functional clock. It also states
>> that the only way to recover from a lockup condition is to soft reset the module. So I'm not sure if the above comment
>> in the code is really valid. What if the lockup happens in the bootloader? In that case we will have to reset the module in
>> the kernel.
>
> Michael
>
>>
>> Doing the reset in probe does solve a problem for now i.e. eliminates dependency on bootloader.
>>
>> [1] - http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c#n2024
>> [2] - http://www.ti.com/litv/pdf/sprz318e
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/1] mfd: omap-usb-host: Fix USB device detection problems on OMAP4 Panda
2013-12-02 9:39 ` Roger Quadros
2013-12-02 9:51 ` Michael Trimarchi
@ 2013-12-02 15:00 ` Paul Walmsley
1 sibling, 0 replies; 13+ messages in thread
From: Paul Walmsley @ 2013-12-02 15:00 UTC (permalink / raw)
To: Roger Quadros
Cc: Michael Trimarchi, Lee Jones, sameo, tomi.valkeinen, Felipe Balbi,
Stefan Roese, ljkenny.mailinglists, Linux OMAP Mailing List,
USB list, linux-kernel, stable, Benoit Cousson, tony@atomide.com
On Mon, 2 Dec 2013, Roger Quadros wrote:
> It won't be done by omap_hwmod as we set HWMOD_INIT_NO_RESET flag in the
> hwmod data [1].
>
> Question is do we do it in the driver of leave it to hwmod?
It should be done by hwmod (or more broadly, some OMAP bus code). That
way the device can be brought to a known state even if there's no driver
present (e.g., if the driver was built as a module).
> The other concern about i660 is in this comment [1]
>
> /*
> * During system boot; If the hwmod framework resets the module
> * the module will have smart idle settings; which can lead to deadlock
> * (above Errata Id:i660); so, dont reset the module during boot;
> * Use HWMOD_INIT_NO_RESET.
> */
>
> But if you look at the errata document [2], Advisory 1.108, it doesn't
> say that we can't be in smart-idle, but only that we should put the
> module in force-idle, before cutting the module's functional clock.
Yes, that looks to be correct. There shouldn't be any problem with the
module being in smart-idle mode if the PRCM doesn't try to put it into a
low-power mode. It already has the HWMOD_SWSUP_SIDLE flag set, so seems
to me it should work fine without HWMOD_INIT_NO_RESET, if i660 is the only
issue.
Most of the IP blocks that are marked with HWMOD_INIT_NO_RESET are only
that way due to laziness, or lack of time, etc., and should be closely
reviewed.
- Paul
^ permalink raw reply [flat|nested] 13+ messages in thread