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

Commit 9a21fb8f authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Relocate tg3_reset_task 



This patch moves tg3_reset_task further down in the file where it makes
more sense to be.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebf3312e

drivers/net/ethernet/broadcom/tg3.c

+45 −47
Original line number Diff line number Diff line
@@ -6303,53 +6303,6 @@ static void tg3_poll_controller(struct net_device *dev) 
}

#endif



static int tg3_init_hw(struct tg3 *, int);

static int tg3_halt(struct tg3 *, int, int);



static void tg3_reset_task(struct work_struct *work)

{

	struct tg3 *tp = container_of(work, struct tg3, reset_task);

	int err;



	tg3_full_lock(tp, 0);



	if (!netif_running(tp->dev)) {

		tg3_flag_clear(tp, RESET_TASK_PENDING);

		tg3_full_unlock(tp);

		return;

	}



	tg3_full_unlock(tp);



	tg3_phy_stop(tp);



	tg3_netif_stop(tp);



	tg3_full_lock(tp, 1);



	if (tg3_flag(tp, TX_RECOVERY_PENDING)) {

		tp->write32_tx_mbox = tg3_write32_tx_mbox;

		tp->write32_rx_mbox = tg3_write_flush_reg32;

		tg3_flag_set(tp, MBOX_WRITE_REORDER);

		tg3_flag_clear(tp, TX_RECOVERY_PENDING);

	}



	tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);

	err = tg3_init_hw(tp, 1);

	if (err)

		goto out;



	tg3_netif_start(tp);



out:

	tg3_full_unlock(tp);



	if (!err)

		tg3_phy_start(tp);



	tg3_flag_clear(tp, RESET_TASK_PENDING);

}



static void tg3_tx_timeout(struct net_device *dev)

{

	struct tg3 *tp = netdev_priv(dev);
@@ -6991,6 +6944,7 @@ static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp, 
}



static int tg3_restart_hw(struct tg3 *tp, int reset_phy);

static int tg3_halt(struct tg3 *, int, int);



static int tg3_change_mtu(struct net_device *dev, int new_mtu)

{
@@ -9137,6 +9091,50 @@ static int tg3_restart_hw(struct tg3 *tp, int reset_phy) 
	return err;

}



static void tg3_reset_task(struct work_struct *work)

{

	struct tg3 *tp = container_of(work, struct tg3, reset_task);

	int err;



	tg3_full_lock(tp, 0);



	if (!netif_running(tp->dev)) {

		tg3_flag_clear(tp, RESET_TASK_PENDING);

		tg3_full_unlock(tp);

		return;

	}



	tg3_full_unlock(tp);



	tg3_phy_stop(tp);



	tg3_netif_stop(tp);



	tg3_full_lock(tp, 1);



	if (tg3_flag(tp, TX_RECOVERY_PENDING)) {

		tp->write32_tx_mbox = tg3_write32_tx_mbox;

		tp->write32_rx_mbox = tg3_write_flush_reg32;

		tg3_flag_set(tp, MBOX_WRITE_REORDER);

		tg3_flag_clear(tp, TX_RECOVERY_PENDING);

	}



	tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);

	err = tg3_init_hw(tp, 1);

	if (err)

		goto out;



	tg3_netif_start(tp);



out:

	tg3_full_unlock(tp);



	if (!err)

		tg3_phy_start(tp);



	tg3_flag_clear(tp, RESET_TASK_PENDING);

}



#define TG3_STAT_ADD32(PSTAT, REG) \

do {	u32 __val = tr32(REG); \

	(PSTAT)->low += __val; \