aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip
diff options
context:
space:
mode:
authorGrant Grundler <grundler@parisc-linux.org>2006-09-08 14:15:37 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-11 09:05:37 -0400
commit40c0d87948ab635e814f45664259d4cc193651a1 (patch)
tree24c3c8e62eef0db500466540a7338d161c7ce5d7 /drivers/net/tulip
parentb892de0bd79d534ff4dcbae7aa2ad5b63e23e9fd (diff)
[PATCH] Flush MMIO writes in reset sequence
The obvious safe registers to read is one from PCI config space. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org> Signed-off-by: Valerie Henson <val_henson@linux.intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r--drivers/net/tulip/tulip_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 2f181809bde2..6a7ca8695ff2 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -295,12 +295,14 @@ static void tulip_up(struct net_device *dev)
295 295
296 /* Reset the chip, holding bit 0 set at least 50 PCI cycles. */ 296 /* Reset the chip, holding bit 0 set at least 50 PCI cycles. */
297 iowrite32(0x00000001, ioaddr + CSR0); 297 iowrite32(0x00000001, ioaddr + CSR0);
298 pci_read_config_dword(tp->pdev, PCI_COMMAND, &i); /* flush write */
298 udelay(100); 299 udelay(100);
299 300
300 /* Deassert reset. 301 /* Deassert reset.
301 Wait the specified 50 PCI cycles after a reset by initializing 302 Wait the specified 50 PCI cycles after a reset by initializing
302 Tx and Rx queues and the address filter list. */ 303 Tx and Rx queues and the address filter list. */
303 iowrite32(tp->csr0, ioaddr + CSR0); 304 iowrite32(tp->csr0, ioaddr + CSR0);
305 pci_read_config_dword(tp->pdev, PCI_COMMAND, &i); /* flush write */
304 udelay(100); 306 udelay(100);
305 307
306 if (tulip_debug > 1) 308 if (tulip_debug > 1)