Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4feee89 authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller
Browse files

gianfar: Replace spin_event_timeout() with arch independent 



Use arch independent code to replace the powerpc dependent
spin_event_timeout() from gfar_halt_nodisable().
Added GRS/GTS read accessors to clean-up the implementation
of gfar_halt_nodisable().

Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83bfc3c4

drivers/net/ethernet/freescale/gianfar.c

+19 −13
Original line number Diff line number Diff line
@@ -1762,26 +1762,32 @@ static void gfar_halt_nodisable(struct gfar_private *priv) 
{

	struct gfar __iomem *regs = priv->gfargrp[0].regs;

	u32 tempval;

	unsigned int timeout;

	int stopped;



	gfar_ints_disable(priv);



	if (gfar_is_dma_stopped(priv))

		return;



	/* Stop the DMA, and wait for it to stop */

	tempval = gfar_read(&regs->dmactrl);

	if ((tempval & (DMACTRL_GRS | DMACTRL_GTS)) !=

	    (DMACTRL_GRS | DMACTRL_GTS)) {

		int ret;



	tempval |= (DMACTRL_GRS | DMACTRL_GTS);

	gfar_write(&regs->dmactrl, tempval);



		do {

			ret = spin_event_timeout(((gfar_read(&regs->ievent) &

				 (IEVENT_GRSC | IEVENT_GTSC)) ==

				 (IEVENT_GRSC | IEVENT_GTSC)), 1000000, 0);

			if (!ret && !(gfar_read(&regs->ievent) & IEVENT_GRSC))

				ret = __gfar_is_rx_idle(priv);

		} while (!ret);

retry:

	timeout = 1000;

	while (!(stopped = gfar_is_dma_stopped(priv)) && timeout) {

		cpu_relax();

		timeout--;

	}



	if (!timeout)

		stopped = gfar_is_dma_stopped(priv);



	if (!stopped && !gfar_is_rx_dma_stopped(priv) &&

	    !__gfar_is_rx_idle(priv))

		goto retry;

}



/* Halt the receive and transmit queues */

drivers/net/ethernet/freescale/gianfar.h

+15 −0
Original line number Diff line number Diff line
@@ -1226,6 +1226,21 @@ static inline void gfar_write_isrg(struct gfar_private *priv) 
	}

}



static inline int gfar_is_dma_stopped(struct gfar_private *priv)

{

	struct gfar __iomem *regs = priv->gfargrp[0].regs;



	return ((gfar_read(&regs->ievent) & (IEVENT_GRSC | IEVENT_GTSC)) ==

	       (IEVENT_GRSC | IEVENT_GTSC));

}



static inline int gfar_is_rx_dma_stopped(struct gfar_private *priv)

{

	struct gfar __iomem *regs = priv->gfargrp[0].regs;



	return gfar_read(&regs->ievent) & IEVENT_GRSC;

}



irqreturn_t gfar_receive(int irq, void *dev_id);

int startup_gfar(struct net_device *dev);

void stop_gfar(struct net_device *dev);