diff mbox

[U-Boot,v3,5/5] net: zynq_gem: Use shared wait_for_bit

Message ID 1451237293-24497-6-git-send-email-mateusz.kulikowski@gmail.com
State Superseded
Delegated to: Joe Hershberger
Headers show

Commit Message

Mateusz Kulikowski Dec. 27, 2015, 5:28 p.m. UTC 
Use existing library function to poll bit(s).
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---

 drivers/net/zynq_gem.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

Comments

Tom Rini Jan. 14, 2016, 8:08 p.m. UTC | #1 
On Sun, Dec 27, 2015 at 06:28:12PM +0100, Mateusz Kulikowski wrote:

> Use existing library function to poll bit(s).
> Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Moritz Fischer Jan. 15, 2016, 9:31 p.m. UTC | #2 
On Thu, Jan 14, 2016 at 12:08 PM, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Dec 27, 2015 at 06:28:12PM +0100, Mateusz Kulikowski wrote:
>
>> Use existing library function to poll bit(s).
>> Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>

Cheers,

Moritz
diff mbox

Patch

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 7059c84..97e30f3 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -19,6 +19,7 @@ 
 #include <asm/io.h>
 #include <phy.h>
 #include <miiphy.h>
+#include <wait_bit.h>
 #include <watchdog.h>
 #include <asm/system.h>
 #include <asm/arch/hardware.h>
@@ -448,38 +449,6 @@  static int zynq_gem_init(struct udevice *dev)
 	return 0;
 }
 
-static int wait_for_bit(const char *func, u32 *reg, const u32 mask,
-			bool set, unsigned int timeout)
-{
-	u32 val;
-	unsigned long start = get_timer(0);
-
-	while (1) {
-		val = readl(reg);
-
-		if (!set)
-			val = ~val;
-
-		if ((val & mask) == mask)
-			return 0;
-
-		if (get_timer(start) > timeout)
-			break;
-
-		if (ctrlc()) {
-			puts("Abort\n");
-			return -EINTR;
-		}
-
-		udelay(1);
-	}
-
-	debug("%s: Timeout (reg=%p mask=%08x wait_set=%i)\n",
-	      func, reg, mask, set);
-
-	return -ETIMEDOUT;
-}
-
 static int zynq_gem_send(struct udevice *dev, void *ptr, int len)
 {
 	u32 addr, size;
@@ -521,7 +490,7 @@  static int zynq_gem_send(struct udevice *dev, void *ptr, int len)
 		printf("TX buffers exhausted in mid frame\n");
 
 	return wait_for_bit(__func__, &regs->txsr, ZYNQ_GEM_TSR_DONE,
-			    true, 20000);
+			    true, 20000, true);
 }
 
 /* Do not check frame_recd flag in rx_status register 0x20 - just poll BD */