| Message ID | 6fbe1c856415aff0b1cf507a4687fe94cb9a384b.1331814082.git.romieu@fr.zoreil.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Mar 15, 2012 at 6:57 AM, Francois Romieu <romieu@fr.zoreil.com> wrote: > This is a pure PCI driver, no ISA here. > > Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> > Cc: Grant Grundler <grundler@parisc-linux.org> > --- > drivers/net/ethernet/dec/tulip/dmfe.c | 174 ++++++++++++++++++--------------- > 1 files changed, 95 insertions(+), 79 deletions(-) > > diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c > index 1eccf49..a1b5914 100644 > --- a/drivers/net/ethernet/dec/tulip/dmfe.c > +++ b/drivers/net/ethernet/dec/tulip/dmfe.c > @@ -178,6 +178,12 @@ > > #define SROM_V41_CODE 0x14 > > +#define outl iowrite32 > +#define outw iowrite16 > +#define inl ioread32 > +#define inw ioread16 > +#define inb ioread8 Hi Francois, is there any reason you didn't want to directly use iowrite/ioread routines? There is a semantic difference between outl and iowrite. Having "outl()" source but instead generate an MMIO transaction could lead to misunderstanding/bugs about posted MMIO writes. So I'd rather see a direct transition to iowrite and just ditch all the inb/outb stuff. I'm still suffering from jetlag right now and am not able to review the rest of the patch now. I'll try to take a look at it tomorrow. thanks, grant > + > #define SROM_CLK_WRITE(data, ioaddr) \ > outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr); \ > udelay(5); \ > @@ -213,11 +219,11 @@ struct rx_desc { > struct dmfe_board_info { > u32 chip_id; /* Chip vendor/Device ID */ > u8 chip_revision; /* Chip revision */ > - struct DEVICE *next_dev; /* next device */ > + struct net_device *next_dev; /* next device */ > struct pci_dev *pdev; /* PCI device */ > spinlock_t lock; > > - long ioaddr; /* I/O base address */ > + void __iomem *ioaddr; /* I/O base address */ > u32 cr0_data; > u32 cr5_data; > u32 cr6_data; > @@ -320,20 +326,20 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *, struct DEVICE *); > static int dmfe_stop(struct DEVICE *); > static void dmfe_set_filter_mode(struct DEVICE *); > static const struct ethtool_ops netdev_ethtool_ops; > -static u16 read_srom_word(long ,int); > +static u16 read_srom_word(void __iomem *, int); > static irqreturn_t dmfe_interrupt(int , void *); > #ifdef CONFIG_NET_POLL_CONTROLLER > static void poll_dmfe (struct net_device *dev); > #endif > -static void dmfe_descriptor_init(struct net_device *, unsigned long); > +static void dmfe_descriptor_init(struct net_device *); > static void allocate_rx_buffer(struct net_device *); > -static void update_cr6(u32, unsigned long); > +static void update_cr6(u32, void __iomem *); > static void send_filter_frame(struct DEVICE *); > static void dm9132_id_table(struct DEVICE *); > -static u16 phy_read(unsigned long, u8, u8, u32); > -static void phy_write(unsigned long, u8, u8, u16, u32); > -static void phy_write_1bit(unsigned long, u32); > -static u16 phy_read_1bit(unsigned long); > +static u16 phy_read(void __iomem *, u8, u8, u32); > +static void phy_write(void __iomem *, u8, u8, u16, u32); > +static void phy_write_1bit(void __iomem *, u32); > +static u16 phy_read_1bit(void __iomem *); > static u8 dmfe_sense_speed(struct dmfe_board_info *); > static void dmfe_process_mode(struct dmfe_board_info *); > static void dmfe_timer(unsigned long); > @@ -462,14 +468,16 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, > db->buf_pool_dma_start = db->buf_pool_dma_ptr; > > db->chip_id = ent->driver_data; > - db->ioaddr = pci_resource_start(pdev, 0); > + /* IO type range. */ > + db->ioaddr = pci_iomap(pdev, 0, 0); > + if (!db->ioaddr) > + goto err_out_free_buf; > + > db->chip_revision = pdev->revision; > db->wol_mode = 0; > > db->pdev = pdev; > > - dev->base_addr = db->ioaddr; > - dev->irq = pdev->irq; > pci_set_drvdata(pdev, dev); > dev->netdev_ops = &netdev_ops; > dev->ethtool_ops = &netdev_ethtool_ops; > @@ -484,9 +492,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, > db->chip_type = 0; > > /* read 64 word srom data */ > - for (i = 0; i < 64; i++) > + for (i = 0; i < 64; i++) { > ((__le16 *) db->srom)[i] = > cpu_to_le16(read_srom_word(db->ioaddr, i)); > + } > > /* Set Node address */ > for (i = 0; i < 6; i++) > @@ -494,16 +503,18 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, > > err = register_netdev (dev); > if (err) > - goto err_out_free_buf; > + goto err_out_unmap; > > dev_info(&dev->dev, "Davicom DM%04lx at pci%s, %pM, irq %d\n", > ent->driver_data >> 16, > - pci_name(pdev), dev->dev_addr, dev->irq); > + pci_name(pdev), dev->dev_addr, pdev->irq); > > pci_set_master(pdev); > > return 0; > > +err_out_unmap: > + pci_iounmap(pdev, db->ioaddr); > err_out_free_buf: > pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, > db->buf_pool_ptr, db->buf_pool_dma_ptr); > @@ -532,7 +543,7 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev) > if (dev) { > > unregister_netdev(dev); > - > + pci_iounmap(db->pdev, db->ioaddr); > pci_free_consistent(db->pdev, sizeof(struct tx_desc) * > DESC_ALL_CNT + 0x20, db->desc_pool_ptr, > db->desc_pool_dma_ptr); > @@ -555,13 +566,13 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev) > > static int dmfe_open(struct DEVICE *dev) > { > - int ret; > struct dmfe_board_info *db = netdev_priv(dev); > + const int irq = db->pdev->irq; > + int ret; > > DMFE_DBUG(0, "dmfe_open", 0); > > - ret = request_irq(dev->irq, dmfe_interrupt, > - IRQF_SHARED, dev->name, dev); > + ret = request_irq(irq, dmfe_interrupt, IRQF_SHARED, dev->name, dev); > if (ret) > return ret; > > @@ -615,7 +626,7 @@ static int dmfe_open(struct DEVICE *dev) > static void dmfe_init_dm910x(struct DEVICE *dev) > { > struct dmfe_board_info *db = netdev_priv(dev); > - unsigned long ioaddr = db->ioaddr; > + void __iomem *ioaddr = db->ioaddr; > > DMFE_DBUG(0, "dmfe_init_dm910x()", 0); > > @@ -649,7 +660,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev) > db->op_mode = db->media_mode; /* Force Mode */ > > /* Initialize Transmit/Receive decriptor and CR3/4 */ > - dmfe_descriptor_init(dev, ioaddr); > + dmfe_descriptor_init(dev); > > /* Init CR6 to program DM910x operation */ > update_cr6(db->cr6_data, ioaddr); > @@ -682,6 +693,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, > struct DEVICE *dev) > { > struct dmfe_board_info *db = netdev_priv(dev); > + void __iomem *ioaddr = db->ioaddr; > struct tx_desc *txptr; > unsigned long flags; > > @@ -707,7 +719,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, > } > > /* Disable NIC interrupt */ > - outl(0, dev->base_addr + DCR7); > + outl(0, ioaddr + DCR7); > > /* transmit this packet */ > txptr = db->tx_insert_ptr; > @@ -721,11 +733,11 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, > if ( (!db->tx_queue_cnt) && (db->tx_packet_cnt < TX_MAX_SEND_CNT) ) { > txptr->tdes0 = cpu_to_le32(0x80000000); /* Set owner bit */ > db->tx_packet_cnt++; /* Ready to send */ > - outl(0x1, dev->base_addr + DCR1); /* Issue Tx polling */ > + outl(0x1, ioaddr + DCR1); /* Issue Tx polling */ > dev->trans_start = jiffies; /* saved time stamp */ > } else { > db->tx_queue_cnt++; /* queue TX packet */ > - outl(0x1, dev->base_addr + DCR1); /* Issue Tx polling */ > + outl(0x1, ioaddr + DCR1); /* Issue Tx polling */ > } > > /* Tx resource check */ > @@ -734,7 +746,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, > > /* Restore CR7 to enable interrupt */ > spin_unlock_irqrestore(&db->lock, flags); > - outl(db->cr7_data, dev->base_addr + DCR7); > + outl(db->cr7_data, ioaddr + DCR7); > > /* free this SKB */ > dev_kfree_skb(skb); > @@ -751,7 +763,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, > static int dmfe_stop(struct DEVICE *dev) > { > struct dmfe_board_info *db = netdev_priv(dev); > - unsigned long ioaddr = dev->base_addr; > + void __iomem *ioaddr = db->ioaddr; > > DMFE_DBUG(0, "dmfe_stop", 0); > > @@ -764,10 +776,10 @@ static int dmfe_stop(struct DEVICE *dev) > /* Reset & stop DM910X board */ > outl(DM910X_RESET, ioaddr + DCR0); > udelay(5); > - phy_write(db->ioaddr, db->phy_addr, 0, 0x8000, db->chip_id); > + phy_write(ioaddr, db->phy_addr, 0, 0x8000, db->chip_id); > > /* free interrupt */ > - free_irq(dev->irq, dev); > + free_irq(db->pdev->irq, dev); > > /* free allocated rx buffer */ > dmfe_free_rxbuffer(db); > @@ -794,7 +806,7 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id) > { > struct DEVICE *dev = dev_id; > struct dmfe_board_info *db = netdev_priv(dev); > - unsigned long ioaddr = dev->base_addr; > + void __iomem *ioaddr = db->ioaddr; > unsigned long flags; > > DMFE_DBUG(0, "dmfe_interrupt()", 0); > @@ -838,7 +850,7 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id) > if (db->dm910x_chk_mode & 0x2) { > db->dm910x_chk_mode = 0x4; > db->cr6_data |= 0x100; > - update_cr6(db->cr6_data, db->ioaddr); > + update_cr6(db->cr6_data, ioaddr); > } > > /* Restore CR7 to enable interrupt mask */ > @@ -858,11 +870,14 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id) > > static void poll_dmfe (struct net_device *dev) > { > + struct dmfe_board_info *db = netdev_priv(dev); > + const int irq = db->pdev->irq; > + > /* disable_irq here is not very nice, but with the lockless > interrupt handler we have no other choice. */ > - disable_irq(dev->irq); > - dmfe_interrupt (dev->irq, dev); > - enable_irq(dev->irq); > + disable_irq(irq); > + dmfe_interrupt (irq, dev); > + enable_irq(irq); > } > #endif > > @@ -873,7 +888,7 @@ static void poll_dmfe (struct net_device *dev) > static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) > { > struct tx_desc *txptr; > - unsigned long ioaddr = dev->base_addr; > + void __iomem *ioaddr = db->ioaddr; > u32 tdes0; > > txptr = db->tx_remove_ptr; > @@ -897,7 +912,7 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) > db->tx_fifo_underrun++; > if ( !(db->cr6_data & CR6_SFT) ) { > db->cr6_data = db->cr6_data | CR6_SFT; > - update_cr6(db->cr6_data, db->ioaddr); > + update_cr6(db->cr6_data, ioaddr); > } > } > if (tdes0 & 0x0100) > @@ -1087,12 +1102,7 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev, > > strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); > strlcpy(info->version, DRV_VERSION, sizeof(info->version)); > - if (np->pdev) > - strlcpy(info->bus_info, pci_name(np->pdev), > - sizeof(info->bus_info)); > - else > - sprintf(info->bus_info, "EISA 0x%lx %d", > - dev->base_addr, dev->irq); > + strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info)); > } > > static int dmfe_ethtool_set_wol(struct net_device *dev, > @@ -1132,10 +1142,11 @@ static const struct ethtool_ops netdev_ethtool_ops = { > > static void dmfe_timer(unsigned long data) > { > + struct net_device *dev = (struct net_device *)data; > + struct dmfe_board_info *db = netdev_priv(dev); > + void __iomem *ioaddr = db->ioaddr; > u32 tmp_cr8; > unsigned char tmp_cr12; > - struct DEVICE *dev = (struct DEVICE *) data; > - struct dmfe_board_info *db = netdev_priv(dev); > unsigned long flags; > > int link_ok, link_ok_phy; > @@ -1148,11 +1159,10 @@ static void dmfe_timer(unsigned long data) > db->first_in_callback = 1; > if (db->chip_type && (db->chip_id==PCI_DM9102_ID)) { > db->cr6_data &= ~0x40000; > - update_cr6(db->cr6_data, db->ioaddr); > - phy_write(db->ioaddr, > - db->phy_addr, 0, 0x1000, db->chip_id); > + update_cr6(db->cr6_data, ioaddr); > + phy_write(ioaddr, db->phy_addr, 0, 0x1000, db->chip_id); > db->cr6_data |= 0x40000; > - update_cr6(db->cr6_data, db->ioaddr); > + update_cr6(db->cr6_data, ioaddr); > db->timer.expires = DMFE_TIMER_WUT + HZ * 2; > add_timer(&db->timer); > spin_unlock_irqrestore(&db->lock, flags); > @@ -1177,7 +1187,7 @@ static void dmfe_timer(unsigned long data) > /* TX polling kick monitor */ > if ( db->tx_packet_cnt && > time_after(jiffies, dev_trans_start(dev) + DMFE_TX_KICK) ) { > - outl(0x1, dev->base_addr + DCR1); /* Tx polling again */ > + outl(0x1, ioaddr + DCR1); /* Tx polling again */ > > /* TX Timeout */ > if (time_after(jiffies, dev_trans_start(dev) + DMFE_TX_TIMEOUT) ) { > @@ -1251,7 +1261,7 @@ static void dmfe_timer(unsigned long data) > /* 10/100M link failed, used 1M Home-Net */ > db->cr6_data|=0x00040000; /* bit18=1, MII */ > db->cr6_data&=~0x00000200; /* bit9=0, HD mode */ > - update_cr6(db->cr6_data, db->ioaddr); > + update_cr6(db->cr6_data, ioaddr); > } > } else if (!netif_carrier_ok(dev)) { > > @@ -1288,17 +1298,18 @@ static void dmfe_timer(unsigned long data) > * Re-initialize DM910X board > */ > > -static void dmfe_dynamic_reset(struct DEVICE *dev) > +static void dmfe_dynamic_reset(struct net_device *dev) > { > struct dmfe_board_info *db = netdev_priv(dev); > + void __iomem *ioaddr = db->ioaddr; > > DMFE_DBUG(0, "dmfe_dynamic_reset()", 0); > > /* Sopt MAC controller */ > db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */ > - update_cr6(db->cr6_data, dev->base_addr); > - outl(0, dev->base_addr + DCR7); /* Disable Interrupt */ > - outl(inl(dev->base_addr + DCR5), dev->base_addr + DCR5); > + update_cr6(db->cr6_data, ioaddr); > + outl(0, ioaddr + DCR7); /* Disable Interrupt */ > + outl(inl(ioaddr + DCR5), ioaddr + DCR5); > > /* Disable upper layer interface */ > netif_stop_queue(dev); > @@ -1364,9 +1375,10 @@ static void dmfe_reuse_skb(struct dmfe_board_info *db, struct sk_buff * skb) > * Using Chain structure, and allocate Tx/Rx buffer > */ > > -static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr) > +static void dmfe_descriptor_init(struct net_device *dev) > { > struct dmfe_board_info *db = netdev_priv(dev); > + void __iomem *ioaddr = db->ioaddr; > struct tx_desc *tmp_tx; > struct rx_desc *tmp_rx; > unsigned char *tmp_buf; > @@ -1431,7 +1443,7 @@ static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr) > * Firstly stop DM910X , then written value and start > */ > > -static void update_cr6(u32 cr6_data, unsigned long ioaddr) > +static void update_cr6(u32 cr6_data, void __iomem *ioaddr) > { > u32 cr6_tmp; > > @@ -1448,11 +1460,12 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr) > * This setup frame initialize DM910X address filter mode > */ > > -static void dm9132_id_table(struct DEVICE *dev) > +static void dm9132_id_table(struct net_device *dev) > { > + struct dmfe_board_info *db = netdev_priv(dev); > + void __iomem *ioaddr = db->ioaddr + 0xc0; /* ID Table */ > struct netdev_hw_addr *ha; > u16 * addrptr; > - unsigned long ioaddr = dev->base_addr+0xc0; /* ID Table */ > u32 hash_val; > u16 i, hash_table[4]; > > @@ -1490,7 +1503,7 @@ static void dm9132_id_table(struct DEVICE *dev) > * This setup frame initialize DM910X address filter mode > */ > > -static void send_filter_frame(struct DEVICE *dev) > +static void send_filter_frame(struct net_device *dev) > { > struct dmfe_board_info *db = netdev_priv(dev); > struct netdev_hw_addr *ha; > @@ -1535,12 +1548,14 @@ static void send_filter_frame(struct DEVICE *dev) > > /* Resource Check and Send the setup packet */ > if (!db->tx_packet_cnt) { > + void __iomem *ioaddr = db->ioaddr; > + > /* Resource Empty */ > db->tx_packet_cnt++; > txptr->tdes0 = cpu_to_le32(0x80000000); > - update_cr6(db->cr6_data | 0x2000, dev->base_addr); > - outl(0x1, dev->base_addr + DCR1); /* Issue Tx polling */ > - update_cr6(db->cr6_data, dev->base_addr); > + update_cr6(db->cr6_data | 0x2000, ioaddr); > + outl(0x1, ioaddr + DCR1); /* Issue Tx polling */ > + update_cr6(db->cr6_data, ioaddr); > dev->trans_start = jiffies; > } else > db->tx_queue_cnt++; /* Put in TX queue */ > @@ -1580,11 +1595,11 @@ static void allocate_rx_buffer(struct net_device *dev) > * Read one word data from the serial ROM > */ > > -static u16 read_srom_word(long ioaddr, int offset) > +static u16 read_srom_word(void __iomem *ioaddr, int offset) > { > + void __iomem *cr9_ioaddr = ioaddr + DCR9; > int i; > u16 srom_data = 0; > - long cr9_ioaddr = ioaddr + DCR9; > > outl(CR9_SROM_READ, cr9_ioaddr); > outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr); > @@ -1620,13 +1635,14 @@ static u16 read_srom_word(long ioaddr, int offset) > * Auto sense the media mode > */ > > -static u8 dmfe_sense_speed(struct dmfe_board_info * db) > +static u8 dmfe_sense_speed(struct dmfe_board_info *db) > { > + void __iomem *ioaddr = db->ioaddr; > u8 ErrFlag = 0; > u16 phy_mode; > > /* CR6 bit18=0, select 10/100M */ > - update_cr6( (db->cr6_data & ~0x40000), db->ioaddr); > + update_cr6(db->cr6_data & ~0x40000, ioaddr); > > phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id); > phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id); > @@ -1665,11 +1681,12 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db) > > static void dmfe_set_phyxcer(struct dmfe_board_info *db) > { > + void __iomem *ioaddr = db->ioaddr; > u16 phy_reg; > > /* Select 10/100M phyxcer */ > db->cr6_data &= ~0x40000; > - update_cr6(db->cr6_data, db->ioaddr); > + update_cr6(db->cr6_data, ioaddr); > > /* DM9009 Chip: Phyxcer reg18 bit12=0 */ > if (db->chip_id == PCI_DM9009_ID) { > @@ -1765,18 +1782,16 @@ static void dmfe_process_mode(struct dmfe_board_info *db) > * Write a word to Phy register > */ > > -static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, > +static void phy_write(void __iomem *iobase, u8 phy_addr, u8 offset, > u16 phy_data, u32 chip_id) > { > u16 i; > - unsigned long ioaddr; > > if (chip_id == PCI_DM9132_ID) { > - ioaddr = iobase + 0x80 + offset * 4; > - outw(phy_data, ioaddr); > + outw(phy_data, iobase + 0x80 + offset * 4); > } else { > /* DM9102/DM9102A Chip */ > - ioaddr = iobase + DCR9; > + void __iomem *ioaddr = iobase + DCR9; > > /* Send 33 synchronization clock to Phy controller */ > for (i = 0; i < 35; i++) > @@ -1816,11 +1831,11 @@ static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, > * Read a word data from phy register > */ > > -static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id) > +static u16 phy_read(void __iomem *iobase, u8 phy_addr, u8 offset, u32 chip_id) > { > + void __iomem *ioaddr; > int i; > u16 phy_data; > - unsigned long ioaddr; > > if (chip_id == PCI_DM9132_ID) { > /* DM9132 Chip */ > @@ -1870,7 +1885,7 @@ static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id) > * Write one bit data to Phy Controller > */ > > -static void phy_write_1bit(unsigned long ioaddr, u32 phy_data) > +static void phy_write_1bit(void __iomem *ioaddr, u32 phy_data) > { > outl(phy_data, ioaddr); /* MII Clock Low */ > udelay(1); > @@ -1885,7 +1900,7 @@ static void phy_write_1bit(unsigned long ioaddr, u32 phy_data) > * Read one bit phy data from PHY controller > */ > > -static u16 phy_read_1bit(unsigned long ioaddr) > +static u16 phy_read_1bit(void __iomem *ioaddr) > { > u16 phy_data; > > @@ -1978,7 +1993,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db) > > /* Check DM9801 or DM9802 present or not */ > db->HPNA_present = 0; > - update_cr6(db->cr6_data|0x40000, db->ioaddr); > + update_cr6(db->cr6_data | 0x40000, db->ioaddr); > tmp_reg = phy_read(db->ioaddr, db->phy_addr, 3, db->chip_id); > if ( ( tmp_reg & 0xfff0 ) == 0xb900 ) { > /* DM9801 or DM9802 present */ > @@ -2095,6 +2110,7 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) > { > struct net_device *dev = pci_get_drvdata(pci_dev); > struct dmfe_board_info *db = netdev_priv(dev); > + void __iomem *ioaddr = db->ioaddr; > u32 tmp; > > /* Disable upper layer interface */ > @@ -2102,11 +2118,11 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) > > /* Disable Tx/Rx */ > db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); > - update_cr6(db->cr6_data, dev->base_addr); > + update_cr6(db->cr6_data, ioaddr); > > /* Disable Interrupt */ > - outl(0, dev->base_addr + DCR7); > - outl(inl (dev->base_addr + DCR5), dev->base_addr + DCR5); > + outl(0, ioaddr + DCR7); > + outl(inl(ioaddr + DCR5), ioaddr + DCR5); > > /* Fre RX buffers */ > dmfe_free_rxbuffer(db); > -- > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Grant Grundler <grantgrundler@gmail.com> : [...] > is there any reason you didn't want to directly use iowrite/ioread routines? I wanted to keep this patch small and easy to review. David suggested doing the right thing from the start. I'll send an updated version. > There is a semantic difference between outl and iowrite. Having > "outl()" source but instead generate an MMIO transaction could lead to > misunderstanding/bugs about posted MMIO writes. So I'd rather see a > direct transition to iowrite and just ditch all the inb/outb stuff. Ok. > I'm still suffering from jetlag right now and am not able to review > the rest of the patch now. I'll try to take a look at it tomorrow. Thanks. No need to hurry until I send an update though.
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c index 1eccf49..a1b5914 100644 --- a/drivers/net/ethernet/dec/tulip/dmfe.c +++ b/drivers/net/ethernet/dec/tulip/dmfe.c @@ -178,6 +178,12 @@ #define SROM_V41_CODE 0x14 +#define outl iowrite32 +#define outw iowrite16 +#define inl ioread32 +#define inw ioread16 +#define inb ioread8 + #define SROM_CLK_WRITE(data, ioaddr) \ outl(data|CR9_SROM_READ|CR9_SRCS,ioaddr); \ udelay(5); \ @@ -213,11 +219,11 @@ struct rx_desc { struct dmfe_board_info { u32 chip_id; /* Chip vendor/Device ID */ u8 chip_revision; /* Chip revision */ - struct DEVICE *next_dev; /* next device */ + struct net_device *next_dev; /* next device */ struct pci_dev *pdev; /* PCI device */ spinlock_t lock; - long ioaddr; /* I/O base address */ + void __iomem *ioaddr; /* I/O base address */ u32 cr0_data; u32 cr5_data; u32 cr6_data; @@ -320,20 +326,20 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *, struct DEVICE *); static int dmfe_stop(struct DEVICE *); static void dmfe_set_filter_mode(struct DEVICE *); static const struct ethtool_ops netdev_ethtool_ops; -static u16 read_srom_word(long ,int); +static u16 read_srom_word(void __iomem *, int); static irqreturn_t dmfe_interrupt(int , void *); #ifdef CONFIG_NET_POLL_CONTROLLER static void poll_dmfe (struct net_device *dev); #endif -static void dmfe_descriptor_init(struct net_device *, unsigned long); +static void dmfe_descriptor_init(struct net_device *); static void allocate_rx_buffer(struct net_device *); -static void update_cr6(u32, unsigned long); +static void update_cr6(u32, void __iomem *); static void send_filter_frame(struct DEVICE *); static void dm9132_id_table(struct DEVICE *); -static u16 phy_read(unsigned long, u8, u8, u32); -static void phy_write(unsigned long, u8, u8, u16, u32); -static void phy_write_1bit(unsigned long, u32); -static u16 phy_read_1bit(unsigned long); +static u16 phy_read(void __iomem *, u8, u8, u32); +static void phy_write(void __iomem *, u8, u8, u16, u32); +static void phy_write_1bit(void __iomem *, u32); +static u16 phy_read_1bit(void __iomem *); static u8 dmfe_sense_speed(struct dmfe_board_info *); static void dmfe_process_mode(struct dmfe_board_info *); static void dmfe_timer(unsigned long); @@ -462,14 +468,16 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, db->buf_pool_dma_start = db->buf_pool_dma_ptr; db->chip_id = ent->driver_data; - db->ioaddr = pci_resource_start(pdev, 0); + /* IO type range. */ + db->ioaddr = pci_iomap(pdev, 0, 0); + if (!db->ioaddr) + goto err_out_free_buf; + db->chip_revision = pdev->revision; db->wol_mode = 0; db->pdev = pdev; - dev->base_addr = db->ioaddr; - dev->irq = pdev->irq; pci_set_drvdata(pdev, dev); dev->netdev_ops = &netdev_ops; dev->ethtool_ops = &netdev_ethtool_ops; @@ -484,9 +492,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, db->chip_type = 0; /* read 64 word srom data */ - for (i = 0; i < 64; i++) + for (i = 0; i < 64; i++) { ((__le16 *) db->srom)[i] = cpu_to_le16(read_srom_word(db->ioaddr, i)); + } /* Set Node address */ for (i = 0; i < 6; i++) @@ -494,16 +503,18 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, err = register_netdev (dev); if (err) - goto err_out_free_buf; + goto err_out_unmap; dev_info(&dev->dev, "Davicom DM%04lx at pci%s, %pM, irq %d\n", ent->driver_data >> 16, - pci_name(pdev), dev->dev_addr, dev->irq); + pci_name(pdev), dev->dev_addr, pdev->irq); pci_set_master(pdev); return 0; +err_out_unmap: + pci_iounmap(pdev, db->ioaddr); err_out_free_buf: pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, db->buf_pool_ptr, db->buf_pool_dma_ptr); @@ -532,7 +543,7 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev) if (dev) { unregister_netdev(dev); - + pci_iounmap(db->pdev, db->ioaddr); pci_free_consistent(db->pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, db->desc_pool_ptr, db->desc_pool_dma_ptr); @@ -555,13 +566,13 @@ static void __devexit dmfe_remove_one (struct pci_dev *pdev) static int dmfe_open(struct DEVICE *dev) { - int ret; struct dmfe_board_info *db = netdev_priv(dev); + const int irq = db->pdev->irq; + int ret; DMFE_DBUG(0, "dmfe_open", 0); - ret = request_irq(dev->irq, dmfe_interrupt, - IRQF_SHARED, dev->name, dev); + ret = request_irq(irq, dmfe_interrupt, IRQF_SHARED, dev->name, dev); if (ret) return ret; @@ -615,7 +626,7 @@ static int dmfe_open(struct DEVICE *dev) static void dmfe_init_dm910x(struct DEVICE *dev) { struct dmfe_board_info *db = netdev_priv(dev); - unsigned long ioaddr = db->ioaddr; + void __iomem *ioaddr = db->ioaddr; DMFE_DBUG(0, "dmfe_init_dm910x()", 0); @@ -649,7 +660,7 @@ static void dmfe_init_dm910x(struct DEVICE *dev) db->op_mode = db->media_mode; /* Force Mode */ /* Initialize Transmit/Receive decriptor and CR3/4 */ - dmfe_descriptor_init(dev, ioaddr); + dmfe_descriptor_init(dev); /* Init CR6 to program DM910x operation */ update_cr6(db->cr6_data, ioaddr); @@ -682,6 +693,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, struct DEVICE *dev) { struct dmfe_board_info *db = netdev_priv(dev); + void __iomem *ioaddr = db->ioaddr; struct tx_desc *txptr; unsigned long flags; @@ -707,7 +719,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, } /* Disable NIC interrupt */ - outl(0, dev->base_addr + DCR7); + outl(0, ioaddr + DCR7); /* transmit this packet */ txptr = db->tx_insert_ptr; @@ -721,11 +733,11 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, if ( (!db->tx_queue_cnt) && (db->tx_packet_cnt < TX_MAX_SEND_CNT) ) { txptr->tdes0 = cpu_to_le32(0x80000000); /* Set owner bit */ db->tx_packet_cnt++; /* Ready to send */ - outl(0x1, dev->base_addr + DCR1); /* Issue Tx polling */ + outl(0x1, ioaddr + DCR1); /* Issue Tx polling */ dev->trans_start = jiffies; /* saved time stamp */ } else { db->tx_queue_cnt++; /* queue TX packet */ - outl(0x1, dev->base_addr + DCR1); /* Issue Tx polling */ + outl(0x1, ioaddr + DCR1); /* Issue Tx polling */ } /* Tx resource check */ @@ -734,7 +746,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, /* Restore CR7 to enable interrupt */ spin_unlock_irqrestore(&db->lock, flags); - outl(db->cr7_data, dev->base_addr + DCR7); + outl(db->cr7_data, ioaddr + DCR7); /* free this SKB */ dev_kfree_skb(skb); @@ -751,7 +763,7 @@ static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb, static int dmfe_stop(struct DEVICE *dev) { struct dmfe_board_info *db = netdev_priv(dev); - unsigned long ioaddr = dev->base_addr; + void __iomem *ioaddr = db->ioaddr; DMFE_DBUG(0, "dmfe_stop", 0); @@ -764,10 +776,10 @@ static int dmfe_stop(struct DEVICE *dev) /* Reset & stop DM910X board */ outl(DM910X_RESET, ioaddr + DCR0); udelay(5); - phy_write(db->ioaddr, db->phy_addr, 0, 0x8000, db->chip_id); + phy_write(ioaddr, db->phy_addr, 0, 0x8000, db->chip_id); /* free interrupt */ - free_irq(dev->irq, dev); + free_irq(db->pdev->irq, dev); /* free allocated rx buffer */ dmfe_free_rxbuffer(db); @@ -794,7 +806,7 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id) { struct DEVICE *dev = dev_id; struct dmfe_board_info *db = netdev_priv(dev); - unsigned long ioaddr = dev->base_addr; + void __iomem *ioaddr = db->ioaddr; unsigned long flags; DMFE_DBUG(0, "dmfe_interrupt()", 0); @@ -838,7 +850,7 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id) if (db->dm910x_chk_mode & 0x2) { db->dm910x_chk_mode = 0x4; db->cr6_data |= 0x100; - update_cr6(db->cr6_data, db->ioaddr); + update_cr6(db->cr6_data, ioaddr); } /* Restore CR7 to enable interrupt mask */ @@ -858,11 +870,14 @@ static irqreturn_t dmfe_interrupt(int irq, void *dev_id) static void poll_dmfe (struct net_device *dev) { + struct dmfe_board_info *db = netdev_priv(dev); + const int irq = db->pdev->irq; + /* disable_irq here is not very nice, but with the lockless interrupt handler we have no other choice. */ - disable_irq(dev->irq); - dmfe_interrupt (dev->irq, dev); - enable_irq(dev->irq); + disable_irq(irq); + dmfe_interrupt (irq, dev); + enable_irq(irq); } #endif @@ -873,7 +888,7 @@ static void poll_dmfe (struct net_device *dev) static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) { struct tx_desc *txptr; - unsigned long ioaddr = dev->base_addr; + void __iomem *ioaddr = db->ioaddr; u32 tdes0; txptr = db->tx_remove_ptr; @@ -897,7 +912,7 @@ static void dmfe_free_tx_pkt(struct DEVICE *dev, struct dmfe_board_info * db) db->tx_fifo_underrun++; if ( !(db->cr6_data & CR6_SFT) ) { db->cr6_data = db->cr6_data | CR6_SFT; - update_cr6(db->cr6_data, db->ioaddr); + update_cr6(db->cr6_data, ioaddr); } } if (tdes0 & 0x0100) @@ -1087,12 +1102,7 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev, strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); strlcpy(info->version, DRV_VERSION, sizeof(info->version)); - if (np->pdev) - strlcpy(info->bus_info, pci_name(np->pdev), - sizeof(info->bus_info)); - else - sprintf(info->bus_info, "EISA 0x%lx %d", - dev->base_addr, dev->irq); + strlcpy(info->bus_info, pci_name(np->pdev), sizeof(info->bus_info)); } static int dmfe_ethtool_set_wol(struct net_device *dev, @@ -1132,10 +1142,11 @@ static const struct ethtool_ops netdev_ethtool_ops = { static void dmfe_timer(unsigned long data) { + struct net_device *dev = (struct net_device *)data; + struct dmfe_board_info *db = netdev_priv(dev); + void __iomem *ioaddr = db->ioaddr; u32 tmp_cr8; unsigned char tmp_cr12; - struct DEVICE *dev = (struct DEVICE *) data; - struct dmfe_board_info *db = netdev_priv(dev); unsigned long flags; int link_ok, link_ok_phy; @@ -1148,11 +1159,10 @@ static void dmfe_timer(unsigned long data) db->first_in_callback = 1; if (db->chip_type && (db->chip_id==PCI_DM9102_ID)) { db->cr6_data &= ~0x40000; - update_cr6(db->cr6_data, db->ioaddr); - phy_write(db->ioaddr, - db->phy_addr, 0, 0x1000, db->chip_id); + update_cr6(db->cr6_data, ioaddr); + phy_write(ioaddr, db->phy_addr, 0, 0x1000, db->chip_id); db->cr6_data |= 0x40000; - update_cr6(db->cr6_data, db->ioaddr); + update_cr6(db->cr6_data, ioaddr); db->timer.expires = DMFE_TIMER_WUT + HZ * 2; add_timer(&db->timer); spin_unlock_irqrestore(&db->lock, flags); @@ -1177,7 +1187,7 @@ static void dmfe_timer(unsigned long data) /* TX polling kick monitor */ if ( db->tx_packet_cnt && time_after(jiffies, dev_trans_start(dev) + DMFE_TX_KICK) ) { - outl(0x1, dev->base_addr + DCR1); /* Tx polling again */ + outl(0x1, ioaddr + DCR1); /* Tx polling again */ /* TX Timeout */ if (time_after(jiffies, dev_trans_start(dev) + DMFE_TX_TIMEOUT) ) { @@ -1251,7 +1261,7 @@ static void dmfe_timer(unsigned long data) /* 10/100M link failed, used 1M Home-Net */ db->cr6_data|=0x00040000; /* bit18=1, MII */ db->cr6_data&=~0x00000200; /* bit9=0, HD mode */ - update_cr6(db->cr6_data, db->ioaddr); + update_cr6(db->cr6_data, ioaddr); } } else if (!netif_carrier_ok(dev)) { @@ -1288,17 +1298,18 @@ static void dmfe_timer(unsigned long data) * Re-initialize DM910X board */ -static void dmfe_dynamic_reset(struct DEVICE *dev) +static void dmfe_dynamic_reset(struct net_device *dev) { struct dmfe_board_info *db = netdev_priv(dev); + void __iomem *ioaddr = db->ioaddr; DMFE_DBUG(0, "dmfe_dynamic_reset()", 0); /* Sopt MAC controller */ db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */ - update_cr6(db->cr6_data, dev->base_addr); - outl(0, dev->base_addr + DCR7); /* Disable Interrupt */ - outl(inl(dev->base_addr + DCR5), dev->base_addr + DCR5); + update_cr6(db->cr6_data, ioaddr); + outl(0, ioaddr + DCR7); /* Disable Interrupt */ + outl(inl(ioaddr + DCR5), ioaddr + DCR5); /* Disable upper layer interface */ netif_stop_queue(dev); @@ -1364,9 +1375,10 @@ static void dmfe_reuse_skb(struct dmfe_board_info *db, struct sk_buff * skb) * Using Chain structure, and allocate Tx/Rx buffer */ -static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr) +static void dmfe_descriptor_init(struct net_device *dev) { struct dmfe_board_info *db = netdev_priv(dev); + void __iomem *ioaddr = db->ioaddr; struct tx_desc *tmp_tx; struct rx_desc *tmp_rx; unsigned char *tmp_buf; @@ -1431,7 +1443,7 @@ static void dmfe_descriptor_init(struct net_device *dev, unsigned long ioaddr) * Firstly stop DM910X , then written value and start */ -static void update_cr6(u32 cr6_data, unsigned long ioaddr) +static void update_cr6(u32 cr6_data, void __iomem *ioaddr) { u32 cr6_tmp; @@ -1448,11 +1460,12 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr) * This setup frame initialize DM910X address filter mode */ -static void dm9132_id_table(struct DEVICE *dev) +static void dm9132_id_table(struct net_device *dev) { + struct dmfe_board_info *db = netdev_priv(dev); + void __iomem *ioaddr = db->ioaddr + 0xc0; /* ID Table */ struct netdev_hw_addr *ha; u16 * addrptr; - unsigned long ioaddr = dev->base_addr+0xc0; /* ID Table */ u32 hash_val; u16 i, hash_table[4]; @@ -1490,7 +1503,7 @@ static void dm9132_id_table(struct DEVICE *dev) * This setup frame initialize DM910X address filter mode */ -static void send_filter_frame(struct DEVICE *dev) +static void send_filter_frame(struct net_device *dev) { struct dmfe_board_info *db = netdev_priv(dev); struct netdev_hw_addr *ha; @@ -1535,12 +1548,14 @@ static void send_filter_frame(struct DEVICE *dev) /* Resource Check and Send the setup packet */ if (!db->tx_packet_cnt) { + void __iomem *ioaddr = db->ioaddr; + /* Resource Empty */ db->tx_packet_cnt++; txptr->tdes0 = cpu_to_le32(0x80000000); - update_cr6(db->cr6_data | 0x2000, dev->base_addr); - outl(0x1, dev->base_addr + DCR1); /* Issue Tx polling */ - update_cr6(db->cr6_data, dev->base_addr); + update_cr6(db->cr6_data | 0x2000, ioaddr); + outl(0x1, ioaddr + DCR1); /* Issue Tx polling */ + update_cr6(db->cr6_data, ioaddr); dev->trans_start = jiffies; } else db->tx_queue_cnt++; /* Put in TX queue */ @@ -1580,11 +1595,11 @@ static void allocate_rx_buffer(struct net_device *dev) * Read one word data from the serial ROM */ -static u16 read_srom_word(long ioaddr, int offset) +static u16 read_srom_word(void __iomem *ioaddr, int offset) { + void __iomem *cr9_ioaddr = ioaddr + DCR9; int i; u16 srom_data = 0; - long cr9_ioaddr = ioaddr + DCR9; outl(CR9_SROM_READ, cr9_ioaddr); outl(CR9_SROM_READ | CR9_SRCS, cr9_ioaddr); @@ -1620,13 +1635,14 @@ static u16 read_srom_word(long ioaddr, int offset) * Auto sense the media mode */ -static u8 dmfe_sense_speed(struct dmfe_board_info * db) +static u8 dmfe_sense_speed(struct dmfe_board_info *db) { + void __iomem *ioaddr = db->ioaddr; u8 ErrFlag = 0; u16 phy_mode; /* CR6 bit18=0, select 10/100M */ - update_cr6( (db->cr6_data & ~0x40000), db->ioaddr); + update_cr6(db->cr6_data & ~0x40000, ioaddr); phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id); phy_mode = phy_read(db->ioaddr, db->phy_addr, 1, db->chip_id); @@ -1665,11 +1681,12 @@ static u8 dmfe_sense_speed(struct dmfe_board_info * db) static void dmfe_set_phyxcer(struct dmfe_board_info *db) { + void __iomem *ioaddr = db->ioaddr; u16 phy_reg; /* Select 10/100M phyxcer */ db->cr6_data &= ~0x40000; - update_cr6(db->cr6_data, db->ioaddr); + update_cr6(db->cr6_data, ioaddr); /* DM9009 Chip: Phyxcer reg18 bit12=0 */ if (db->chip_id == PCI_DM9009_ID) { @@ -1765,18 +1782,16 @@ static void dmfe_process_mode(struct dmfe_board_info *db) * Write a word to Phy register */ -static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, +static void phy_write(void __iomem *iobase, u8 phy_addr, u8 offset, u16 phy_data, u32 chip_id) { u16 i; - unsigned long ioaddr; if (chip_id == PCI_DM9132_ID) { - ioaddr = iobase + 0x80 + offset * 4; - outw(phy_data, ioaddr); + outw(phy_data, iobase + 0x80 + offset * 4); } else { /* DM9102/DM9102A Chip */ - ioaddr = iobase + DCR9; + void __iomem *ioaddr = iobase + DCR9; /* Send 33 synchronization clock to Phy controller */ for (i = 0; i < 35; i++) @@ -1816,11 +1831,11 @@ static void phy_write(unsigned long iobase, u8 phy_addr, u8 offset, * Read a word data from phy register */ -static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id) +static u16 phy_read(void __iomem *iobase, u8 phy_addr, u8 offset, u32 chip_id) { + void __iomem *ioaddr; int i; u16 phy_data; - unsigned long ioaddr; if (chip_id == PCI_DM9132_ID) { /* DM9132 Chip */ @@ -1870,7 +1885,7 @@ static u16 phy_read(unsigned long iobase, u8 phy_addr, u8 offset, u32 chip_id) * Write one bit data to Phy Controller */ -static void phy_write_1bit(unsigned long ioaddr, u32 phy_data) +static void phy_write_1bit(void __iomem *ioaddr, u32 phy_data) { outl(phy_data, ioaddr); /* MII Clock Low */ udelay(1); @@ -1885,7 +1900,7 @@ static void phy_write_1bit(unsigned long ioaddr, u32 phy_data) * Read one bit phy data from PHY controller */ -static u16 phy_read_1bit(unsigned long ioaddr) +static u16 phy_read_1bit(void __iomem *ioaddr) { u16 phy_data; @@ -1978,7 +1993,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db) /* Check DM9801 or DM9802 present or not */ db->HPNA_present = 0; - update_cr6(db->cr6_data|0x40000, db->ioaddr); + update_cr6(db->cr6_data | 0x40000, db->ioaddr); tmp_reg = phy_read(db->ioaddr, db->phy_addr, 3, db->chip_id); if ( ( tmp_reg & 0xfff0 ) == 0xb900 ) { /* DM9801 or DM9802 present */ @@ -2095,6 +2110,7 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) { struct net_device *dev = pci_get_drvdata(pci_dev); struct dmfe_board_info *db = netdev_priv(dev); + void __iomem *ioaddr = db->ioaddr; u32 tmp; /* Disable upper layer interface */ @@ -2102,11 +2118,11 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) /* Disable Tx/Rx */ db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); - update_cr6(db->cr6_data, dev->base_addr); + update_cr6(db->cr6_data, ioaddr); /* Disable Interrupt */ - outl(0, dev->base_addr + DCR7); - outl(inl (dev->base_addr + DCR5), dev->base_addr + DCR5); + outl(0, ioaddr + DCR7); + outl(inl(ioaddr + DCR5), ioaddr + DCR5); /* Fre RX buffers */ dmfe_free_rxbuffer(db);
This is a pure PCI driver, no ISA here. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Grant Grundler <grundler@parisc-linux.org> --- drivers/net/ethernet/dec/tulip/dmfe.c | 174 ++++++++++++++++++--------------- 1 files changed, 95 insertions(+), 79 deletions(-)