Commit a510996b authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller
Browse files

sky2: Move tx reset functionality to sky2_tx_reset() 



This is pure refactoring.

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b289c33

drivers/net/sky2.c

+26 −18
Original line number Diff line number Diff line
@@ -1811,6 +1811,31 @@ static void sky2_tx_clean(struct net_device *dev) 
	netif_tx_unlock_bh(dev);

}



static void sky2_tx_reset(struct sky2_port* sky2)

{

	unsigned port = sky2->port;

	struct sky2_hw *hw = sky2->hw;



	/* Disable Force Sync bit and Enable Alloc bit */

	sky2_write8(hw, SK_REG(port, TXA_CTRL),

		    TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);



	/* Stop Interval Timer and Limit Counter of Tx Arbiter */

	sky2_write32(hw, SK_REG(port, TXA_ITI_INI), 0L);

	sky2_write32(hw, SK_REG(port, TXA_LIM_INI), 0L);



	/* Reset the PCI FIFO of the async Tx queue */

	sky2_write32(hw, Q_ADDR(txqaddr[port], Q_CSR),

		     BMU_RST_SET | BMU_FIFO_RST);



	/* Reset the Tx prefetch units */

	sky2_write32(hw, Y2_QADDR(txqaddr[port], PREF_UNIT_CTRL),

		     PREF_UNIT_RST_SET);



	sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);

	sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);

}



/* Network shutdown */

static int sky2_down(struct net_device *dev)

{
@@ -1852,26 +1877,9 @@ static int sky2_down(struct net_device *dev) 
	      && port == 0 && hw->dev[1] && netif_running(hw->dev[1])))

		sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_RST_SET);



	/* Disable Force Sync bit and Enable Alloc bit */

	sky2_write8(hw, SK_REG(port, TXA_CTRL),

		    TXA_DIS_FSYNC | TXA_DIS_ALLOC | TXA_STOP_RC);



	/* Stop Interval Timer and Limit Counter of Tx Arbiter */

	sky2_write32(hw, SK_REG(port, TXA_ITI_INI), 0L);

	sky2_write32(hw, SK_REG(port, TXA_LIM_INI), 0L);



	/* Reset the PCI FIFO of the async Tx queue */

	sky2_write32(hw, Q_ADDR(txqaddr[port], Q_CSR),

		     BMU_RST_SET | BMU_FIFO_RST);



	/* Reset the Tx prefetch units */

	sky2_write32(hw, Y2_QADDR(txqaddr[port], PREF_UNIT_CTRL),

		     PREF_UNIT_RST_SET);



	sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);

	sky2_tx_reset(sky2);



	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);

	sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);



	/* Force any delayed status interrrupt and NAPI */

	sky2_write32(hw, STAT_LEV_TIMER_CNT, 0);