Skip to contentSkip to conversation

ulpi patch in uboot

U-Boot Stefano Babic 3 participants 6 messages May 16, 2013 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 2 lines · Michael Trimarchi

Hi a;;,

Hi Michael,

(I posted also to u-boot ML to check if someone else had issues)

Quoted 5 lines

I think that this patch could be wrong for omap4 and omap3. The opcode shift shuld be 22 and not 21. And are you sure that are you using the bit 31 in the correct way?

Stefano, are you sure about your testing?

Well, it happened more as one year ago, but I tested again this morning with the AM3517 I used for testing, using a version 2013.04-rc1

twister => usb start
(Re)start USB...
USB0: USB EHCI 1.00
scanning bus 0 for devices... 3 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
twister => fatls usb 0

            .disk/

So it seems working - I have not yet checked in manual, but if the shift is wrong, it seems it has no drawbacks on my board ;-(

Best regards,
Stefano

Quoted 23 lines

Michael

commit 928c4bdf9b069be218436d25b96721395c4d671f

Author: Govindraj.R <[email protected]>
Date:   Mon Feb 6 03:55:32 2012 +0000

usb: ulpi: Add omap-ulpi-view port support

Based on discussion from this thread [1].
Adding omap-view port that helps us in using the generic ulpi framework for any ulpi phy ops using the INSNREG05_ULPI viewport reg available on omap platform.

Currently ehci ports are available on omap3/4 platforms so enable the same for beagle and panda, patch is tested on the same boards.

Thanks to Igor Grinberg <[email protected]> for reviewing the omap-ehci patches and suggesting this approach.

[1]: http://www.mail-archive.com/u-boot at lists.denx.de/msg76076.html

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#2 lore raw

Hi Stefano

Quoted 17 lines · Stefano Babic
Quoted 2 lines · Michael Trimarchi

Hi a;;,

Hi Michael,

(I posted also to u-boot ML to check if someone else had issues)

Quoted 5 lines

I think that this patch could be wrong for omap4 and omap3. The opcode shift shuld be 22 and not 21. And are you sure that are you using the bit 31 in the correct way?

Stefano, are you sure about your testing?

Well, it happened more as one year ago, but I tested again this morning with the AM3517 I used for testing, using a version 2013.04-rc1

Quoted 8 lines

twister => usb start
(Re)start USB...
USB0: USB EHCI 1.00
scanning bus 0 for devices... 3 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
twister => fatls usb 0

            .disk/

Sorry this does not show nothing. The phy use reset value.
Read and write command are wrong, the shift is wrong and the timeout condition is wrong look at documentation. If I use the documentation the ulpi always timeout. In order to have a proof of concept you need to read and print vendor id and product id.

Michael

Quoted 31 lines

So it seems working - I have not yet checked in manual, but if the shift is wrong, it seems it has no drawbacks on my board ;-(

Best regards,
Stefano

Quoted 23 lines

Michael

commit 928c4bdf9b069be218436d25b96721395c4d671f

Author: Govindraj.R <[email protected]>
Date:   Mon Feb 6 03:55:32 2012 +0000

usb: ulpi: Add omap-ulpi-view port support

Based on discussion from this thread [1].
Adding omap-view port that helps us in using the generic ulpi framework for any ulpi phy ops using the INSNREG05_ULPI viewport reg available on omap platform.

Currently ehci ports are available on omap3/4 platforms so enable the same for beagle and panda, patch is tested on the same boards.

Thanks to Igor Grinberg <[email protected]> for reviewing the omap-ehci patches and suggesting this approach.

[1]: http://www.mail-archive.com/u-boot at lists.denx.de/msg76076.html

#3 lore raw
In reply to Stefano Babic

Hi

Quoted 25 lines · Stefano Babic
Quoted 2 lines · Michael Trimarchi

Hi a;;,

Hi Michael,

(I posted also to u-boot ML to check if someone else had issues)

Quoted 5 lines

I think that this patch could be wrong for omap4 and omap3. The opcode shift shuld be 22 and not 21. And are you sure that are you using the bit 31 in the correct way?

Stefano, are you sure about your testing?

Well, it happened more as one year ago, but I tested again this morning with the AM3517 I used for testing, using a version 2013.04-rc1

twister => usb start
(Re)start USB...
USB0: USB EHCI 1.00
scanning bus 0 for devices... 3 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
twister => fatls usb 0

            .disk/
Reviewed-by
#4 lore raw

Cc'ed Marek and Govindraj.

Quoted 1 line · Michael Trimarchi

Hi

[...]

Thanks for the patch, it looks like a correct fix. I'd like to hear that it works on an actual hardware.

Quoted 6 lines
Quoted 2 lines

From 7e99dcbe83e26fff3a0168105eec99003650b744 Mon Sep 17 00:00:00 2001

From: Michael Trimarchi <[email protected]>
Date: Thu, 16 May 2013 15:16:17 +0200
Subject: [PATCH] omap-ulpi: Fix the omap3/4 access function to the bus

Please, add explanation what that patch does (not just the subject).

Quoted 1 line

Apart from the commit message:

Quoted 67 lines
---
 drivers/usb/ulpi/omap-ulpi-viewport.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/usb/ulpi/omap-ulpi-viewport.c +7 -9
index 3c1ea1a..f849733 100644
@@ -22,7 +22,8 @@
 #include <asm/io.h>
 #include <usb/ulpi.h>
 
-#define OMAP_ULPI_WR_OPSEL	(3 << 21)
+#define OMAP_ULPI_WR_OPSEL	(2 << 22)
+#define OMAP_ULPI_RD_OPSEL	(3 << 22)
 #define OMAP_ULPI_ACCESS	(1 << 31)
 
 /*
@@ -33,7 +34,7 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask)
 	int timeout = CONFIG_USB_ULPI_TIMEOUT;
 
 	while (--timeout) {
-		if ((readl(ulpi_vp->viewport_addr) & mask))
+		if (!(readl(ulpi_vp->viewport_addr) & mask))
 			return 0;
 
 		udelay(1);
@@ -47,18 +48,15 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask)
  *
  * returns 0 on success.
  */
-static int ulpi_wakeup(struct ulpi_viewport *ulpi_vp)
+static int ulpi_start(struct ulpi_viewport *ulpi_vp)
 {
 	int err;
 
-	if (readl(ulpi_vp->viewport_addr) & OMAP_ULPI_ACCESS)
-		return 0; /* already awake */
-
 	writel(OMAP_ULPI_ACCESS, ulpi_vp->viewport_addr);
 
 	err = ulpi_wait(ulpi_vp, OMAP_ULPI_ACCESS);
 	if (err)
-		debug("ULPI wakeup timed out\n");
+		debug("ULPI start timed out\n");
 
 	return err;
 }
@@ -70,7 +68,7 @@ static int ulpi_request(struct ulpi_viewport *ulpi_vp, u32 value)
 {
 	int err;
 
-	err = ulpi_wakeup(ulpi_vp);
+	err = ulpi_start(ulpi_vp);
 	if (err)
 		return err;
 
@@ -95,7 +93,7 @@ u32 ulpi_read(struct ulpi_viewport *ulpi_vp, u8 *reg)
 {
 	int err;
 	u32 val = ((ulpi_vp->port_num & 0xf) << 24) |
-			 OMAP_ULPI_WR_OPSEL | ((u32)reg << 16);
+			 OMAP_ULPI_RD_OPSEL | ((u32)reg << 16);
 
 	err = ulpi_request(ulpi_vp, val);
 	if (err)
Signature · 2 lines
Regards,
Igor.
#5 lore raw
In reply to Michael Trimarchi

On 16/05/2013 15:19, Michael Trimarchi wrote:

Hi Michael,

Quoted 65 lines

From 7e99dcbe83e26fff3a0168105eec99003650b744 Mon Sep 17 00:00:00 2001
From: Michael Trimarchi <[email protected]>
Date: Thu, 16 May 2013 15:16:17 +0200
Subject: [PATCH] omap-ulpi: Fix the omap3/4 access function to the bus

---
 drivers/usb/ulpi/omap-ulpi-viewport.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/usb/ulpi/omap-ulpi-viewport.c +6 -8
index 3c1ea1a..f849733 100644
@@ -22,7 +22,8 @@
 #include <asm/io.h>
 #include <usb/ulpi.h>
 
-#define OMAP_ULPI_WR_OPSEL	(3 << 21)
+#define OMAP_ULPI_WR_OPSEL	(2 << 22)
+#define OMAP_ULPI_RD_OPSEL	(3 << 22)
 #define OMAP_ULPI_ACCESS	(1 << 31)
 
 /*
@@ -33,7 +34,7 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask)
 	int timeout = CONFIG_USB_ULPI_TIMEOUT;
 
 	while (--timeout) {
-		if ((readl(ulpi_vp->viewport_addr) & mask))
+		if (!(readl(ulpi_vp->viewport_addr) & mask))
 			return 0;
 
 		udelay(1);
@@ -47,18 +48,15 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask)
  *
  * returns 0 on success.
  */
-static int ulpi_wakeup(struct ulpi_viewport *ulpi_vp)
+static int ulpi_start(struct ulpi_viewport *ulpi_vp)
 {
 	int err;
 
-	if (readl(ulpi_vp->viewport_addr) & OMAP_ULPI_ACCESS)
-		return 0; /* already awake */
-
 	writel(OMAP_ULPI_ACCESS, ulpi_vp->viewport_addr);
 
 	err = ulpi_wait(ulpi_vp, OMAP_ULPI_ACCESS);
 	if (err)
-		debug("ULPI wakeup timed out\n");
+		debug("ULPI start timed out\n");
 
 	return err;
 }
@@ -70,7 +68,7 @@ static int ulpi_request(struct ulpi_viewport *ulpi_vp, u32 value)
 {
 	int err;
 
-	err = ulpi_wakeup(ulpi_vp);
+	err = ulpi_start(ulpi_vp);
 	if (err)
 		return err;
 

drivers/usb/ulpi/omap-ulpi-viewport.c u32 ulpi_read(struct ulpi_viewport *ulpi_vp, u8 *reg) · line 99

Quoted 8 lines
drivers/usb/ulpi/omap-ulpi-viewport.c +1 -1
@@ -95,7 +93,7 @@ u32 ulpi_read(struct ulpi_viewport *ulpi_vp, u8 *reg)
 {
 	int err;
 	u32 val = ((ulpi_vp->port_num & 0xf) << 24) |
-			 OMAP_ULPI_WR_OPSEL | ((u32)reg << 16);
+			 OMAP_ULPI_RD_OPSEL | ((u32)reg << 16);
 
 	err = ulpi_request(ulpi_vp, val);
 	if (err)

Thanks for the patch. Could you please sent it again with a right subject-id in the e-mail to allow to be included automatically by patchworks ? Please also put in CC Tom Rini (trini at ti.com, U-Boot maintainer) and Marek Vasut (marex at denx.de, USB custodian).

Thanks,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#6 lore raw

Hi

Quoted 84 lines · Stefano Babic

On 16/05/2013 15:19, Michael Trimarchi wrote:

Hi Michael,

Quoted 65 lines

From 7e99dcbe83e26fff3a0168105eec99003650b744 Mon Sep 17 00:00:00 2001
From: Michael Trimarchi <[email protected]>
Date: Thu, 16 May 2013 15:16:17 +0200
Subject: [PATCH] omap-ulpi: Fix the omap3/4 access function to the bus

---
 drivers/usb/ulpi/omap-ulpi-viewport.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/usb/ulpi/omap-ulpi-viewport.c +6 -8
index 3c1ea1a..f849733 100644
@@ -22,7 +22,8 @@
 #include <asm/io.h>
 #include <usb/ulpi.h>
 
-#define OMAP_ULPI_WR_OPSEL	(3 << 21)
+#define OMAP_ULPI_WR_OPSEL	(2 << 22)
+#define OMAP_ULPI_RD_OPSEL	(3 << 22)
 #define OMAP_ULPI_ACCESS	(1 << 31)
 
 /*
@@ -33,7 +34,7 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask)
 	int timeout = CONFIG_USB_ULPI_TIMEOUT;
 
 	while (--timeout) {
-		if ((readl(ulpi_vp->viewport_addr) & mask))
+		if (!(readl(ulpi_vp->viewport_addr) & mask))
 			return 0;
 
 		udelay(1);
@@ -47,18 +48,15 @@ static int ulpi_wait(struct ulpi_viewport *ulpi_vp, u32 mask)
  *
  * returns 0 on success.
  */
-static int ulpi_wakeup(struct ulpi_viewport *ulpi_vp)
+static int ulpi_start(struct ulpi_viewport *ulpi_vp)
 {
 	int err;
 
-	if (readl(ulpi_vp->viewport_addr) & OMAP_ULPI_ACCESS)
-		return 0; /* already awake */
-
 	writel(OMAP_ULPI_ACCESS, ulpi_vp->viewport_addr);
 
 	err = ulpi_wait(ulpi_vp, OMAP_ULPI_ACCESS);
 	if (err)
-		debug("ULPI wakeup timed out\n");
+		debug("ULPI start timed out\n");
 
 	return err;
 }
@@ -70,7 +68,7 @@ static int ulpi_request(struct ulpi_viewport *ulpi_vp, u32 value)
 {
 	int err;
 
-	err = ulpi_wakeup(ulpi_vp);
+	err = ulpi_start(ulpi_vp);
 	if (err)
 		return err;
 

drivers/usb/ulpi/omap-ulpi-viewport.c u32 ulpi_read(struct ulpi_viewport *ulpi_vp, u8 *reg) · line 99

Quoted 8 lines
drivers/usb/ulpi/omap-ulpi-viewport.c +1 -1
@@ -95,7 +93,7 @@ u32 ulpi_read(struct ulpi_viewport *ulpi_vp, u8 *reg)
 {
 	int err;
 	u32 val = ((ulpi_vp->port_num & 0xf) << 24) |
-			 OMAP_ULPI_WR_OPSEL | ((u32)reg << 16);
+			 OMAP_ULPI_RD_OPSEL | ((u32)reg << 16);
 
 	err = ulpi_request(ulpi_vp, val);
 	if (err)

Thanks for the patch. Could you please sent it again with a right subject-id in the e-mail to allow to be included automatically by patchworks ? Please also put in CC Tom Rini (trini at ti.com, U-Boot maintainer) and Marek Vasut (marex at denx.de, USB custodian).

Quoted 2 lines

Thanks,
Stefano

I have done it better. Give me some time to do a better commit message ;)

Michael