X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Ftulip%2Fpnic.c;h=85a521e0d0526c0f879dff6346cea79984480631;hb=refs%2Fheads%2Fvserver;hp=1a0943c68aa224aeee6815cdc99e61da90fe7e97;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c index 1a0943c68..85a521e0d 100644 --- a/drivers/net/tulip/pnic.c +++ b/drivers/net/tulip/pnic.c @@ -1,7 +1,7 @@ /* drivers/net/tulip/pnic.c - Maintained by Jeff Garzik + Maintained by Valerie Henson Copyright 2000,2001 The Linux Kernel Team Written/copyright 1994-2001 by Donald Becker. @@ -15,14 +15,16 @@ */ #include +#include +#include #include "tulip.h" void pnic_do_nway(struct net_device *dev) { struct tulip_private *tp = netdev_priv(dev); - long ioaddr = dev->base_addr; - u32 phy_reg = inl(ioaddr + 0xB8); + void __iomem *ioaddr = tp->base_addr; + u32 phy_reg = ioread32(ioaddr + 0xB8); u32 new_csr6 = tp->csr6 & ~0x40C40200; if (phy_reg & 0x78000000) { /* Ignore baseT4 */ @@ -32,9 +34,9 @@ void pnic_do_nway(struct net_device *dev) else if (phy_reg & 0x08000000) dev->if_port = 0; tp->nwayset = 1; new_csr6 = (dev->if_port & 1) ? 0x01860000 : 0x00420000; - outl(0x32 | (dev->if_port & 1), ioaddr + CSR12); + iowrite32(0x32 | (dev->if_port & 1), ioaddr + CSR12); if (dev->if_port & 1) - outl(0x1F868, ioaddr + 0xB8); + iowrite32(0x1F868, ioaddr + 0xB8); if (phy_reg & 0x30000000) { tp->full_duplex = 1; new_csr6 |= 0x00000200; @@ -54,27 +56,27 @@ void pnic_do_nway(struct net_device *dev) void pnic_lnk_change(struct net_device *dev, int csr5) { struct tulip_private *tp = netdev_priv(dev); - long ioaddr = dev->base_addr; - int phy_reg = inl(ioaddr + 0xB8); + void __iomem *ioaddr = tp->base_addr; + int phy_reg = ioread32(ioaddr + 0xB8); if (tulip_debug > 1) printk(KERN_DEBUG "%s: PNIC link changed state %8.8x, CSR5 %8.8x.\n", dev->name, phy_reg, csr5); - if (inl(ioaddr + CSR5) & TPLnkFail) { - outl((inl(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7); + if (ioread32(ioaddr + CSR5) & TPLnkFail) { + iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkFail) | TPLnkPass, ioaddr + CSR7); /* If we use an external MII, then we mustn't use the * internal negotiation. */ if (tulip_media_cap[dev->if_port] & MediaIsMII) return; - if (! tp->nwayset || jiffies - dev->trans_start > 1*HZ) { + if (! tp->nwayset || time_after(jiffies, dev->trans_start + 1*HZ)) { tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff); - outl(tp->csr6, ioaddr + CSR6); - outl(0x30, ioaddr + CSR12); - outl(0x0201F078, ioaddr + 0xB8); /* Turn on autonegotiation. */ + iowrite32(tp->csr6, ioaddr + CSR6); + iowrite32(0x30, ioaddr + CSR12); + iowrite32(0x0201F078, ioaddr + 0xB8); /* Turn on autonegotiation. */ dev->trans_start = jiffies; } - } else if (inl(ioaddr + CSR5) & TPLnkPass) { + } else if (ioread32(ioaddr + CSR5) & TPLnkPass) { if (tulip_media_cap[dev->if_port] & MediaIsMII) { spin_lock(&tp->lock); tulip_check_duplex(dev); @@ -82,7 +84,7 @@ void pnic_lnk_change(struct net_device *dev, int csr5) } else { pnic_do_nway(dev); } - outl((inl(ioaddr + CSR7) & ~TPLnkPass) | TPLnkFail, ioaddr + CSR7); + iowrite32((ioread32(ioaddr + CSR7) & ~TPLnkPass) | TPLnkFail, ioaddr + CSR7); } } @@ -90,10 +92,10 @@ void pnic_timer(unsigned long data) { struct net_device *dev = (struct net_device *)data; struct tulip_private *tp = netdev_priv(dev); - long ioaddr = dev->base_addr; + void __iomem *ioaddr = tp->base_addr; int next_tick = 60*HZ; - if(!inl(ioaddr + CSR7)) { + if(!ioread32(ioaddr + CSR7)) { /* the timer was called due to a work overflow * in the interrupt handler. Skip the connection * checks, the nic is definitively speaking with @@ -108,17 +110,17 @@ void pnic_timer(unsigned long data) next_tick = 3*HZ; spin_unlock_irq(&tp->lock); } else { - int csr12 = inl(ioaddr + CSR12); + int csr12 = ioread32(ioaddr + CSR12); int new_csr6 = tp->csr6 & ~0x40C40200; - int phy_reg = inl(ioaddr + 0xB8); - int csr5 = inl(ioaddr + CSR5); + int phy_reg = ioread32(ioaddr + 0xB8); + int csr5 = ioread32(ioaddr + CSR5); if (tulip_debug > 1) printk(KERN_DEBUG "%s: PNIC timer PHY status %8.8x, %s " "CSR5 %8.8x.\n", dev->name, phy_reg, medianame[dev->if_port], csr5); if (phy_reg & 0x04000000) { /* Remote link fault */ - outl(0x0201F078, ioaddr + 0xB8); + iowrite32(0x0201F078, ioaddr + 0xB8); next_tick = 1*HZ; tp->nwayset = 0; } else if (phy_reg & 0x78000000) { /* Ignore baseT4 */ @@ -129,21 +131,21 @@ void pnic_timer(unsigned long data) printk(KERN_DEBUG "%s: %s link beat failed, CSR12 %4.4x, " "CSR5 %8.8x, PHY %3.3x.\n", dev->name, medianame[dev->if_port], csr12, - inl(ioaddr + CSR5), inl(ioaddr + 0xB8)); + ioread32(ioaddr + CSR5), ioread32(ioaddr + 0xB8)); next_tick = 3*HZ; if (tp->medialock) { } else if (tp->nwayset && (dev->if_port & 1)) { next_tick = 1*HZ; } else if (dev->if_port == 0) { dev->if_port = 3; - outl(0x33, ioaddr + CSR12); + iowrite32(0x33, ioaddr + CSR12); new_csr6 = 0x01860000; - outl(0x1F868, ioaddr + 0xB8); + iowrite32(0x1F868, ioaddr + 0xB8); } else { dev->if_port = 0; - outl(0x32, ioaddr + CSR12); + iowrite32(0x32, ioaddr + CSR12); new_csr6 = 0x00420000; - outl(0x1F078, ioaddr + 0xB8); + iowrite32(0x1F078, ioaddr + 0xB8); } if (tp->csr6 != new_csr6) { tp->csr6 = new_csr6; @@ -160,12 +162,12 @@ void pnic_timer(unsigned long data) } too_good_connection: mod_timer(&tp->timer, RUN_AT(next_tick)); - if(!inl(ioaddr + CSR7)) { + if(!ioread32(ioaddr + CSR7)) { if (tulip_debug > 1) printk(KERN_INFO "%s: sw timer wakeup.\n", dev->name); disable_irq(dev->irq); tulip_refill_rx(dev); enable_irq(dev->irq); - outl(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7); + iowrite32(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7); } }