summaryrefslogtreecommitdiff
path: root/drivers/net/tulip/de2104x.c
diff options
context:
space:
mode:
authorMorten H. Larsen <m-larsen@post6.tele.dk>2010-06-15 13:24:58 -0400
committerMatt Turner <mattst88@gmail.com>2010-06-15 14:19:08 -0400
commit84cc1535cb9043ea1921b81cb086138c0f2dc2b9 (patch)
treeecbd1c6f3a341863a33094dafc1a7f5fdecc0efd /drivers/net/tulip/de2104x.c
parent932e0c201d28a728e25d3b641aa95bd28ceb08b4 (diff)
downloadlinux-3.10-84cc1535cb9043ea1921b81cb086138c0f2dc2b9.tar.gz
linux-3.10-84cc1535cb9043ea1921b81cb086138c0f2dc2b9.tar.bz2
linux-3.10-84cc1535cb9043ea1921b81cb086138c0f2dc2b9.zip
alpha: Fix de2104x driver failing to readout MAC address correctly
This patch fixes a missing read memory barrier that is needed for the driver to readout the MAC address correctly from the on-board ROM. Also it replaces the use of the deprecated functions readl()/writel(). Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk> Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'drivers/net/tulip/de2104x.c')
-rw-r--r--drivers/net/tulip/de2104x.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index c0e70006374..06b552fca63 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -367,8 +367,8 @@ static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x6F3F, 0x6F3D, };
static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
-#define dr32(reg) readl(de->regs + (reg))
-#define dw32(reg,val) writel((val), de->regs + (reg))
+#define dr32(reg) ioread32(de->regs + (reg))
+#define dw32(reg, val) iowrite32((val), de->regs + (reg))
static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
@@ -1706,6 +1706,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
int value, boguscnt = 100000;
do {
value = dr32(ROMCmd);
+ rmb();
} while (value < 0 && --boguscnt > 0);
de->dev->dev_addr[i] = value;
udelay(1);