From afe59d46368e3b6f2b4110e3230c03ed84a2c861 Mon Sep 17 00:00:00 2001 From: Thomas Miletich Date: Fri, 27 Feb 2009 13:52:03 -0500 Subject: [sundance] Add reset completion check Following the example of the Linux driver, we add a check and delay to make sure that the NIC has finished resetting before the driver issues any additional commands. Signed-off-by: Marty Connor --- src/drivers/net/sundance.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src') diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c index eb750fb1..119c9778 100644 --- a/src/drivers/net/sundance.c +++ b/src/drivers/net/sundance.c @@ -691,6 +691,22 @@ static int sundance_probe ( struct nic *nic, struct pci_device *pci ) { /* Reset the chip to erase previous misconfiguration */ DBG ( "ASIC Control is %#x\n", inl(BASE + ASICCtrl) ); outw(0x007f, BASE + ASICCtrl + 2); + + /* + * wait for reset to complete + * this is heavily inspired by the linux sundance driver + * according to the linux driver it can take up to 1ms for the reset + * to complete + */ + i = 0; + while(inl(BASE + ASICCtrl) & (ResetBusy << 16)) { + if(i++ >= 10) { + DBG("sundance: NIC reset did not complete.\n"); + break; + } + udelay(100); + } + DBG ( "ASIC Control is now %#x.\n", inl(BASE + ASICCtrl) ); sundance_reset(nic); -- cgit v1.2.3-55-g7522