* [2/4][PATCH 2.6] via-rhine: Rename some symbols
2004-05-23 10:46 [0/4] via-rhine: clean-up for 2.6 Roger Luethi
@ 2004-05-23 10:50 ` Roger Luethi
2004-05-23 10:50 ` [3/4][PATCH 2.6] via-rhine: Whitespace clean-up Roger Luethi
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Roger Luethi @ 2004-05-23 10:50 UTC (permalink / raw)
To: Jeff Garzik, Andrew Morton; +Cc: linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 105 bytes --]
This patch renames symbols:
via_rhine_* -> rhine_*
struct netdev_private *np -> struct rhine_private *rp
[-- Attachment #2: via-rhine-2.6.6-2-names.diff --]
[-- Type: text/plain, Size: 49938 bytes --]
--- linux-2.6.6/drivers/net/via-rhine.c 2004-05-20 18:13:30.000000000 +0200
+++ linux-2.6.6-patch/drivers/net/via-rhine.c 2004-05-23 10:23:00.792437570 +0200
@@ -361,14 +361,14 @@ enum pci_flags_bit {
PCI_ADDR0=0x10<<0, PCI_ADDR1=0x10<<1, PCI_ADDR2=0x10<<2, PCI_ADDR3=0x10<<3,
};
-enum via_rhine_chips {
+enum rhine_chips {
VT86C100A = 0,
VT6102,
VT6105,
VT6105M
};
-struct via_rhine_chip_info {
+struct rhine_chip_info {
const char *name;
u16 pci_flags;
int io_size;
@@ -388,8 +388,8 @@ enum chip_capability_flags {
/* Beware of PCI posted writes */
#define IOSYNC do { readb(dev->base_addr + StationAddr); } while (0)
-/* directly indexed by enum via_rhine_chips, above */
-static struct via_rhine_chip_info via_rhine_chip_info[] __devinitdata =
+/* directly indexed by enum rhine_chips, above */
+static struct rhine_chip_info rhine_chip_info[] __devinitdata =
{
{ "VIA VT86C100A Rhine", RHINE_IOTYPE, 128,
CanHaveMII | ReqTxAlign | HasDavicomPhy },
@@ -401,7 +401,7 @@ static struct via_rhine_chip_info via_rh
CanHaveMII | HasWOL },
};
-static struct pci_device_id via_rhine_pci_tbl[] =
+static struct pci_device_id rhine_pci_tbl[] =
{
{0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT86C100A},
{0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6102},
@@ -409,7 +409,7 @@ static struct pci_device_id via_rhine_pc
{0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6105M},
{0,} /* terminate list */
};
-MODULE_DEVICE_TABLE(pci, via_rhine_pci_tbl);
+MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);
/* Offsets to the device registers. */
@@ -489,7 +489,7 @@ enum chip_cmd_bits {
};
#define MAX_MII_CNT 4
-struct netdev_private {
+struct rhine_private {
/* Descriptor rings */
struct rx_desc *rx_ring;
struct tx_desc *tx_ring;
@@ -535,30 +535,30 @@ struct netdev_private {
static int mdio_read(struct net_device *dev, int phy_id, int location);
static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
-static int via_rhine_open(struct net_device *dev);
-static void via_rhine_check_duplex(struct net_device *dev);
-static void via_rhine_timer(unsigned long data);
-static void via_rhine_tx_timeout(struct net_device *dev);
-static int via_rhine_start_tx(struct sk_buff *skb, struct net_device *dev);
-static irqreturn_t via_rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
-static void via_rhine_tx(struct net_device *dev);
-static void via_rhine_rx(struct net_device *dev);
-static void via_rhine_error(struct net_device *dev, int intr_status);
-static void via_rhine_set_rx_mode(struct net_device *dev);
-static struct net_device_stats *via_rhine_get_stats(struct net_device *dev);
+static int rhine_open(struct net_device *dev);
+static void rhine_check_duplex(struct net_device *dev);
+static void rhine_timer(unsigned long data);
+static void rhine_tx_timeout(struct net_device *dev);
+static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev);
+static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+static void rhine_tx(struct net_device *dev);
+static void rhine_rx(struct net_device *dev);
+static void rhine_error(struct net_device *dev, int intr_status);
+static void rhine_set_rx_mode(struct net_device *dev);
+static struct net_device_stats *rhine_get_stats(struct net_device *dev);
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static struct ethtool_ops netdev_ethtool_ops;
-static int via_rhine_close(struct net_device *dev);
+static int rhine_close(struct net_device *dev);
static inline u32 get_intr_status(struct net_device *dev)
{
long ioaddr = dev->base_addr;
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
u32 intr_status;
intr_status = readw(ioaddr + IntrStatus);
/* On Rhine-II, Bit 3 indicates Tx descriptor write-back race. */
- if (np->chip_id == VT6102)
+ if (rp->chip_id == VT6102)
intr_status |= readb(ioaddr + IntrStatus2) << 16;
return intr_status;
}
@@ -616,19 +616,19 @@ static void __devinit reload_eeprom(long
}
#ifdef CONFIG_NET_POLL_CONTROLLER
-static void via_rhine_poll(struct net_device *dev)
+static void rhine_poll(struct net_device *dev)
{
disable_irq(dev->irq);
- via_rhine_interrupt(dev->irq, (void *)dev, NULL);
+ rhine_interrupt(dev->irq, (void *)dev, NULL);
enable_irq(dev->irq);
}
#endif
-static int __devinit via_rhine_init_one (struct pci_dev *pdev,
+static int __devinit rhine_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *dev;
- struct netdev_private *np;
+ struct rhine_private *rp;
int i, option;
int chip_id = (int) ent->driver_data;
static int card_idx = -1;
@@ -649,8 +649,8 @@ static int __devinit via_rhine_init_one
card_idx++;
option = card_idx < MAX_UNITS ? options[card_idx] : 0;
- io_size = via_rhine_chip_info[chip_id].io_size;
- pci_flags = via_rhine_chip_info[chip_id].pci_flags;
+ io_size = rhine_chip_info[chip_id].io_size;
+ pci_flags = rhine_chip_info[chip_id].pci_flags;
if (pci_enable_device (pdev))
goto err_out;
@@ -674,7 +674,7 @@ static int __devinit via_rhine_init_one
if (pci_flags & PCI_USES_MASTER)
pci_set_master (pdev);
- dev = alloc_etherdev(sizeof(*np));
+ dev = alloc_etherdev(sizeof(*rp));
if (dev == NULL) {
printk (KERN_ERR "init_ethernet failed for card #%d\n", card_idx);
goto err_out;
@@ -711,7 +711,7 @@ static int __devinit via_rhine_init_one
#endif
/* D-Link provided reset code (with comment additions) */
- if (via_rhine_chip_info[chip_id].drv_flags & HasWOL) {
+ if (rhine_chip_info[chip_id].drv_flags & HasWOL) {
unsigned char byOrgValue;
/* clear sticky bit before reset & read ethernet address */
@@ -769,34 +769,34 @@ static int __devinit via_rhine_init_one
dev->irq = pdev->irq;
- np = dev->priv;
- spin_lock_init (&np->lock);
- np->chip_id = chip_id;
- np->drv_flags = via_rhine_chip_info[chip_id].drv_flags;
- np->pdev = pdev;
- np->mii_if.dev = dev;
- np->mii_if.mdio_read = mdio_read;
- np->mii_if.mdio_write = mdio_write;
- np->mii_if.phy_id_mask = 0x1f;
- np->mii_if.reg_num_mask = 0x1f;
+ rp = dev->priv;
+ spin_lock_init (&rp->lock);
+ rp->chip_id = chip_id;
+ rp->drv_flags = rhine_chip_info[chip_id].drv_flags;
+ rp->pdev = pdev;
+ rp->mii_if.dev = dev;
+ rp->mii_if.mdio_read = mdio_read;
+ rp->mii_if.mdio_write = mdio_write;
+ rp->mii_if.phy_id_mask = 0x1f;
+ rp->mii_if.reg_num_mask = 0x1f;
if (dev->mem_start)
option = dev->mem_start;
/* The chip-specific entries in the device structure. */
- dev->open = via_rhine_open;
- dev->hard_start_xmit = via_rhine_start_tx;
- dev->stop = via_rhine_close;
- dev->get_stats = via_rhine_get_stats;
- dev->set_multicast_list = via_rhine_set_rx_mode;
+ dev->open = rhine_open;
+ dev->hard_start_xmit = rhine_start_tx;
+ dev->stop = rhine_close;
+ dev->get_stats = rhine_get_stats;
+ dev->set_multicast_list = rhine_set_rx_mode;
dev->do_ioctl = netdev_ioctl;
dev->ethtool_ops = &netdev_ethtool_ops;
- dev->tx_timeout = via_rhine_tx_timeout;
+ dev->tx_timeout = rhine_tx_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = via_rhine_poll;
+ dev->poll_controller = rhine_poll;
#endif
- if (np->drv_flags & ReqTxAlign)
+ if (rp->drv_flags & ReqTxAlign)
dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
/* dev->name not defined before register_netdev()! */
@@ -807,20 +807,20 @@ static int __devinit via_rhine_init_one
/* The lower four bits are the media type. */
if (option > 0) {
if (option & 0x220)
- np->mii_if.full_duplex = 1;
- np->default_port = option & 15;
+ rp->mii_if.full_duplex = 1;
+ rp->default_port = option & 15;
}
if (card_idx < MAX_UNITS && full_duplex[card_idx] > 0)
- np->mii_if.full_duplex = 1;
+ rp->mii_if.full_duplex = 1;
- if (np->mii_if.full_duplex) {
+ if (rp->mii_if.full_duplex) {
printk(KERN_INFO "%s: Set to forced full duplex, autonegotiation"
" disabled.\n", dev->name);
- np->mii_if.force_media = 1;
+ rp->mii_if.force_media = 1;
}
printk(KERN_INFO "%s: %s at 0x%lx, ",
- dev->name, via_rhine_chip_info[chip_id].name,
+ dev->name, rhine_chip_info[chip_id].name,
(pci_flags & PCI_USES_IO) ? ioaddr : memaddr);
for (i = 0; i < 5; i++)
@@ -829,17 +829,17 @@ static int __devinit via_rhine_init_one
pci_set_drvdata(pdev, dev);
- if (np->drv_flags & CanHaveMII) {
+ if (rp->drv_flags & CanHaveMII) {
int phy, phy_idx = 0;
- np->phys[0] = 1; /* Standard for this chip. */
+ rp->phys[0] = 1; /* Standard for this chip. */
for (phy = 1; phy < 32 && phy_idx < MAX_MII_CNT; phy++) {
int mii_status = mdio_read(dev, phy, 1);
if (mii_status != 0xffff && mii_status != 0x0000) {
- np->phys[phy_idx++] = phy;
- np->mii_if.advertising = mdio_read(dev, phy, 4);
+ rp->phys[phy_idx++] = phy;
+ rp->mii_if.advertising = mdio_read(dev, phy, 4);
printk(KERN_INFO "%s: MII PHY found at address %d, status "
"0x%4.4x advertising %4.4x Link %4.4x.\n",
- dev->name, phy, mii_status, np->mii_if.advertising,
+ dev->name, phy, mii_status, rp->mii_if.advertising,
mdio_read(dev, phy, 5));
/* set IFF_RUNNING */
@@ -851,23 +851,23 @@ static int __devinit via_rhine_init_one
break;
}
}
- np->mii_cnt = phy_idx;
- np->mii_if.phy_id = np->phys[0];
+ rp->mii_cnt = phy_idx;
+ rp->mii_if.phy_id = rp->phys[0];
}
/* Allow forcing the media type. */
if (option > 0) {
if (option & 0x220)
- np->mii_if.full_duplex = 1;
- np->default_port = option & 0x3ff;
+ rp->mii_if.full_duplex = 1;
+ rp->default_port = option & 0x3ff;
if (option & 0x330) {
/* FIXME: shouldn't someone check this variable? */
- /* np->medialock = 1; */
+ /* rp->medialock = 1; */
printk(KERN_INFO " Forcing %dMbs %s-duplex operation.\n",
(option & 0x300 ? 100 : 10),
(option & 0x220 ? "full" : "half"));
- if (np->mii_cnt)
- mdio_write(dev, np->phys[0], MII_BMCR,
+ if (rp->mii_cnt)
+ mdio_write(dev, rp->phys[0], MII_BMCR,
((option & 0x300) ? 0x2000 : 0) | /* 100mbps? */
((option & 0x220) ? 0x0100 : 0)); /* Full duplex? */
}
@@ -889,11 +889,11 @@ err_out:
static int alloc_ring(struct net_device* dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
void *ring;
dma_addr_t ring_dma;
- ring = pci_alloc_consistent(np->pdev,
+ ring = pci_alloc_consistent(rp->pdev,
RX_RING_SIZE * sizeof(struct rx_desc) +
TX_RING_SIZE * sizeof(struct tx_desc),
&ring_dma);
@@ -901,11 +901,11 @@ static int alloc_ring(struct net_device*
printk(KERN_ERR "Could not allocate DMA memory.\n");
return -ENOMEM;
}
- if (np->drv_flags & ReqTxAlign) {
- np->tx_bufs = pci_alloc_consistent(np->pdev, PKT_BUF_SZ * TX_RING_SIZE,
- &np->tx_bufs_dma);
- if (np->tx_bufs == NULL) {
- pci_free_consistent(np->pdev,
+ if (rp->drv_flags & ReqTxAlign) {
+ rp->tx_bufs = pci_alloc_consistent(rp->pdev, PKT_BUF_SZ * TX_RING_SIZE,
+ &rp->tx_bufs_dma);
+ if (rp->tx_bufs == NULL) {
+ pci_free_consistent(rp->pdev,
RX_RING_SIZE * sizeof(struct rx_desc) +
TX_RING_SIZE * sizeof(struct tx_desc),
ring, ring_dma);
@@ -913,137 +913,137 @@ static int alloc_ring(struct net_device*
}
}
- np->rx_ring = ring;
- np->tx_ring = ring + RX_RING_SIZE * sizeof(struct rx_desc);
- np->rx_ring_dma = ring_dma;
- np->tx_ring_dma = ring_dma + RX_RING_SIZE * sizeof(struct rx_desc);
+ rp->rx_ring = ring;
+ rp->tx_ring = ring + RX_RING_SIZE * sizeof(struct rx_desc);
+ rp->rx_ring_dma = ring_dma;
+ rp->tx_ring_dma = ring_dma + RX_RING_SIZE * sizeof(struct rx_desc);
return 0;
}
void free_ring(struct net_device* dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
- pci_free_consistent(np->pdev,
+ pci_free_consistent(rp->pdev,
RX_RING_SIZE * sizeof(struct rx_desc) +
TX_RING_SIZE * sizeof(struct tx_desc),
- np->rx_ring, np->rx_ring_dma);
- np->tx_ring = NULL;
+ rp->rx_ring, rp->rx_ring_dma);
+ rp->tx_ring = NULL;
- if (np->tx_bufs)
- pci_free_consistent(np->pdev, PKT_BUF_SZ * TX_RING_SIZE,
- np->tx_bufs, np->tx_bufs_dma);
+ if (rp->tx_bufs)
+ pci_free_consistent(rp->pdev, PKT_BUF_SZ * TX_RING_SIZE,
+ rp->tx_bufs, rp->tx_bufs_dma);
- np->tx_bufs = NULL;
+ rp->tx_bufs = NULL;
}
static void alloc_rbufs(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
dma_addr_t next;
int i;
- np->dirty_rx = np->cur_rx = 0;
+ rp->dirty_rx = rp->cur_rx = 0;
- np->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
- np->rx_head_desc = &np->rx_ring[0];
- next = np->rx_ring_dma;
+ rp->rx_buf_sz = (dev->mtu <= 1500 ? PKT_BUF_SZ : dev->mtu + 32);
+ rp->rx_head_desc = &rp->rx_ring[0];
+ next = rp->rx_ring_dma;
/* Init the ring entries */
for (i = 0; i < RX_RING_SIZE; i++) {
- np->rx_ring[i].rx_status = 0;
- np->rx_ring[i].desc_length = cpu_to_le32(np->rx_buf_sz);
+ rp->rx_ring[i].rx_status = 0;
+ rp->rx_ring[i].desc_length = cpu_to_le32(rp->rx_buf_sz);
next += sizeof(struct rx_desc);
- np->rx_ring[i].next_desc = cpu_to_le32(next);
- np->rx_skbuff[i] = 0;
+ rp->rx_ring[i].next_desc = cpu_to_le32(next);
+ rp->rx_skbuff[i] = 0;
}
/* Mark the last entry as wrapping the ring. */
- np->rx_ring[i-1].next_desc = cpu_to_le32(np->rx_ring_dma);
+ rp->rx_ring[i-1].next_desc = cpu_to_le32(rp->rx_ring_dma);
/* Fill in the Rx buffers. Handle allocation failure gracefully. */
for (i = 0; i < RX_RING_SIZE; i++) {
- struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
- np->rx_skbuff[i] = skb;
+ struct sk_buff *skb = dev_alloc_skb(rp->rx_buf_sz);
+ rp->rx_skbuff[i] = skb;
if (skb == NULL)
break;
skb->dev = dev; /* Mark as being used by this device. */
- np->rx_skbuff_dma[i] =
- pci_map_single(np->pdev, skb->tail, np->rx_buf_sz,
+ rp->rx_skbuff_dma[i] =
+ pci_map_single(rp->pdev, skb->tail, rp->rx_buf_sz,
PCI_DMA_FROMDEVICE);
- np->rx_ring[i].addr = cpu_to_le32(np->rx_skbuff_dma[i]);
- np->rx_ring[i].rx_status = cpu_to_le32(DescOwn);
+ rp->rx_ring[i].addr = cpu_to_le32(rp->rx_skbuff_dma[i]);
+ rp->rx_ring[i].rx_status = cpu_to_le32(DescOwn);
}
- np->dirty_rx = (unsigned int)(i - RX_RING_SIZE);
+ rp->dirty_rx = (unsigned int)(i - RX_RING_SIZE);
}
static void free_rbufs(struct net_device* dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
int i;
/* Free all the skbuffs in the Rx queue. */
for (i = 0; i < RX_RING_SIZE; i++) {
- np->rx_ring[i].rx_status = 0;
- np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
- if (np->rx_skbuff[i]) {
- pci_unmap_single(np->pdev,
- np->rx_skbuff_dma[i],
- np->rx_buf_sz, PCI_DMA_FROMDEVICE);
- dev_kfree_skb(np->rx_skbuff[i]);
+ rp->rx_ring[i].rx_status = 0;
+ rp->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
+ if (rp->rx_skbuff[i]) {
+ pci_unmap_single(rp->pdev,
+ rp->rx_skbuff_dma[i],
+ rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ dev_kfree_skb(rp->rx_skbuff[i]);
}
- np->rx_skbuff[i] = 0;
+ rp->rx_skbuff[i] = 0;
}
}
static void alloc_tbufs(struct net_device* dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
dma_addr_t next;
int i;
- np->dirty_tx = np->cur_tx = 0;
- next = np->tx_ring_dma;
+ rp->dirty_tx = rp->cur_tx = 0;
+ next = rp->tx_ring_dma;
for (i = 0; i < TX_RING_SIZE; i++) {
- np->tx_skbuff[i] = 0;
- np->tx_ring[i].tx_status = 0;
- np->tx_ring[i].desc_length = cpu_to_le32(TXDESC);
+ rp->tx_skbuff[i] = 0;
+ rp->tx_ring[i].tx_status = 0;
+ rp->tx_ring[i].desc_length = cpu_to_le32(TXDESC);
next += sizeof(struct tx_desc);
- np->tx_ring[i].next_desc = cpu_to_le32(next);
- np->tx_buf[i] = &np->tx_bufs[i * PKT_BUF_SZ];
+ rp->tx_ring[i].next_desc = cpu_to_le32(next);
+ rp->tx_buf[i] = &rp->tx_bufs[i * PKT_BUF_SZ];
}
- np->tx_ring[i-1].next_desc = cpu_to_le32(np->tx_ring_dma);
+ rp->tx_ring[i-1].next_desc = cpu_to_le32(rp->tx_ring_dma);
}
static void free_tbufs(struct net_device* dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
int i;
for (i = 0; i < TX_RING_SIZE; i++) {
- np->tx_ring[i].tx_status = 0;
- np->tx_ring[i].desc_length = cpu_to_le32(TXDESC);
- np->tx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
- if (np->tx_skbuff[i]) {
- if (np->tx_skbuff_dma[i]) {
- pci_unmap_single(np->pdev,
- np->tx_skbuff_dma[i],
- np->tx_skbuff[i]->len, PCI_DMA_TODEVICE);
+ rp->tx_ring[i].tx_status = 0;
+ rp->tx_ring[i].desc_length = cpu_to_le32(TXDESC);
+ rp->tx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
+ if (rp->tx_skbuff[i]) {
+ if (rp->tx_skbuff_dma[i]) {
+ pci_unmap_single(rp->pdev,
+ rp->tx_skbuff_dma[i],
+ rp->tx_skbuff[i]->len, PCI_DMA_TODEVICE);
}
- dev_kfree_skb(np->tx_skbuff[i]);
+ dev_kfree_skb(rp->tx_skbuff[i]);
}
- np->tx_skbuff[i] = 0;
- np->tx_buf[i] = 0;
+ rp->tx_skbuff[i] = 0;
+ rp->tx_buf[i] = 0;
}
}
static void init_registers(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
int i;
@@ -1054,17 +1054,17 @@ static void init_registers(struct net_de
writew(0x0006, ioaddr + PCIBusConfig); /* Tune configuration??? */
/* Configure initial FIFO thresholds. */
writeb(0x20, ioaddr + TxConfig);
- np->tx_thresh = 0x20;
- np->rx_thresh = 0x60; /* Written in via_rhine_set_rx_mode(). */
- np->mii_if.full_duplex = 0;
+ rp->tx_thresh = 0x20;
+ rp->rx_thresh = 0x60; /* Written in rhine_set_rx_mode(). */
+ rp->mii_if.full_duplex = 0;
if (dev->if_port == 0)
- dev->if_port = np->default_port;
+ dev->if_port = rp->default_port;
- writel(np->rx_ring_dma, ioaddr + RxRingPtr);
- writel(np->tx_ring_dma, ioaddr + TxRingPtr);
+ writel(rp->rx_ring_dma, ioaddr + RxRingPtr);
+ writel(rp->tx_ring_dma, ioaddr + TxRingPtr);
- via_rhine_set_rx_mode(dev);
+ rhine_set_rx_mode(dev);
/* Enable interrupts by setting the interrupt mask. */
writew(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |
@@ -1073,18 +1073,18 @@ static void init_registers(struct net_de
IntrPCIErr | IntrStatsMax | IntrLinkChange,
ioaddr + IntrEnable);
- np->chip_cmd = CmdStart|CmdTxOn|CmdRxOn|CmdNoTxPoll;
- if (np->mii_if.force_media)
- np->chip_cmd |= CmdFDuplex;
- writew(np->chip_cmd, ioaddr + ChipCmd);
+ rp->chip_cmd = CmdStart|CmdTxOn|CmdRxOn|CmdNoTxPoll;
+ if (rp->mii_if.force_media)
+ rp->chip_cmd |= CmdFDuplex;
+ writew(rp->chip_cmd, ioaddr + ChipCmd);
- via_rhine_check_duplex(dev);
+ rhine_check_duplex(dev);
/* The LED outputs of various MII xcvrs should be configured. */
/* For NS or Mison phys, turn on bit 1 in register 0x17 */
/* For ESI phys, turn on bit 7 in register 0x17. */
- mdio_write(dev, np->phys[0], 0x17, mdio_read(dev, np->phys[0], 0x17) |
- (np->drv_flags & HasESIPhy) ? 0x0080 : 0x0001);
+ mdio_write(dev, rp->phys[0], 0x17, mdio_read(dev, rp->phys[0], 0x17) |
+ (rp->drv_flags & HasESIPhy) ? 0x0080 : 0x0001);
}
/* Read and write over the MII Management Data I/O (MDIO) interface. */
@@ -1108,20 +1108,20 @@ static int mdio_read(struct net_device *
static void mdio_write(struct net_device *dev, int phy_id, int regnum, int value)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
int boguscnt = 1024;
- if (phy_id == np->phys[0]) {
+ if (phy_id == rp->phys[0]) {
switch (regnum) {
case MII_BMCR: /* Is user forcing speed/duplex? */
if (value & 0x9000) /* Autonegotiation. */
- np->mii_if.force_media = 0;
+ rp->mii_if.force_media = 0;
else
- np->mii_if.full_duplex = (value & 0x0100) ? 1 : 0;
+ rp->mii_if.full_duplex = (value & 0x0100) ? 1 : 0;
break;
case MII_ADVERTISE:
- np->mii_if.advertising = value;
+ rp->mii_if.advertising = value;
break;
}
}
@@ -1137,78 +1137,78 @@ static void mdio_write(struct net_device
}
-static int via_rhine_open(struct net_device *dev)
+static int rhine_open(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
int i;
/* Reset the chip. */
writew(CmdReset, ioaddr + ChipCmd);
- i = request_irq(np->pdev->irq, &via_rhine_interrupt, SA_SHIRQ, dev->name, dev);
+ i = request_irq(rp->pdev->irq, &rhine_interrupt, SA_SHIRQ, dev->name, dev);
if (i)
return i;
if (debug > 1)
- printk(KERN_DEBUG "%s: via_rhine_open() irq %d.\n",
- dev->name, np->pdev->irq);
+ printk(KERN_DEBUG "%s: rhine_open() irq %d.\n",
+ dev->name, rp->pdev->irq);
i = alloc_ring(dev);
if (i)
return i;
alloc_rbufs(dev);
alloc_tbufs(dev);
- wait_for_reset(dev, np->chip_id, dev->name);
+ wait_for_reset(dev, rp->chip_id, dev->name);
init_registers(dev);
if (debug > 2)
- printk(KERN_DEBUG "%s: Done via_rhine_open(), status %4.4x "
+ printk(KERN_DEBUG "%s: Done rhine_open(), status %4.4x "
"MII status: %4.4x.\n",
dev->name, readw(ioaddr + ChipCmd),
- mdio_read(dev, np->phys[0], MII_BMSR));
+ mdio_read(dev, rp->phys[0], MII_BMSR));
netif_start_queue(dev);
/* Set the timer to check for link beat. */
- init_timer(&np->timer);
- np->timer.expires = jiffies + 2 * HZ/100;
- np->timer.data = (unsigned long)dev;
- np->timer.function = &via_rhine_timer; /* timer handler */
- add_timer(&np->timer);
+ init_timer(&rp->timer);
+ rp->timer.expires = jiffies + 2 * HZ/100;
+ rp->timer.data = (unsigned long)dev;
+ rp->timer.function = &rhine_timer; /* timer handler */
+ add_timer(&rp->timer);
return 0;
}
-static void via_rhine_check_duplex(struct net_device *dev)
+static void rhine_check_duplex(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
- int mii_lpa = mdio_read(dev, np->phys[0], MII_LPA);
- int negotiated = mii_lpa & np->mii_if.advertising;
+ int mii_lpa = mdio_read(dev, rp->phys[0], MII_LPA);
+ int negotiated = mii_lpa & rp->mii_if.advertising;
int duplex;
- if (np->mii_if.force_media || mii_lpa == 0xffff)
+ if (rp->mii_if.force_media || mii_lpa == 0xffff)
return;
duplex = (negotiated & 0x0100) || (negotiated & 0x01C0) == 0x0040;
- if (np->mii_if.full_duplex != duplex) {
- np->mii_if.full_duplex = duplex;
+ if (rp->mii_if.full_duplex != duplex) {
+ rp->mii_if.full_duplex = duplex;
if (debug)
printk(KERN_INFO "%s: Setting %s-duplex based on MII #%d link"
" partner capability of %4.4x.\n", dev->name,
- duplex ? "full" : "half", np->phys[0], mii_lpa);
+ duplex ? "full" : "half", rp->phys[0], mii_lpa);
if (duplex)
- np->chip_cmd |= CmdFDuplex;
+ rp->chip_cmd |= CmdFDuplex;
else
- np->chip_cmd &= ~CmdFDuplex;
- writew(np->chip_cmd, ioaddr + ChipCmd);
+ rp->chip_cmd &= ~CmdFDuplex;
+ writew(rp->chip_cmd, ioaddr + ChipCmd);
}
}
-static void via_rhine_timer(unsigned long data)
+static void rhine_timer(unsigned long data)
{
struct net_device *dev = (struct net_device *)data;
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
int next_tick = 10*HZ;
int mii_status;
@@ -1218,43 +1218,43 @@ static void via_rhine_timer(unsigned lon
dev->name, readw(ioaddr + IntrStatus));
}
- spin_lock_irq (&np->lock);
+ spin_lock_irq (&rp->lock);
- via_rhine_check_duplex(dev);
+ rhine_check_duplex(dev);
/* make IFF_RUNNING follow the MII status bit "Link established" */
- mii_status = mdio_read(dev, np->phys[0], MII_BMSR);
- if ( (mii_status & BMSR_LSTATUS) != (np->mii_status & BMSR_LSTATUS) ) {
+ mii_status = mdio_read(dev, rp->phys[0], MII_BMSR);
+ if ( (mii_status & BMSR_LSTATUS) != (rp->mii_status & BMSR_LSTATUS) ) {
if (mii_status & BMSR_LSTATUS)
netif_carrier_on(dev);
else
netif_carrier_off(dev);
}
- np->mii_status = mii_status;
+ rp->mii_status = mii_status;
- spin_unlock_irq (&np->lock);
+ spin_unlock_irq (&rp->lock);
- np->timer.expires = jiffies + next_tick;
- add_timer(&np->timer);
+ rp->timer.expires = jiffies + next_tick;
+ add_timer(&rp->timer);
}
-static void via_rhine_tx_timeout (struct net_device *dev)
+static void rhine_tx_timeout (struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
printk (KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
"%4.4x, resetting...\n",
dev->name, readw (ioaddr + IntrStatus),
- mdio_read (dev, np->phys[0], MII_BMSR));
+ mdio_read (dev, rp->phys[0], MII_BMSR));
dev->if_port = 0;
/* protect against concurrent rx interrupts */
- disable_irq(np->pdev->irq);
+ disable_irq(rp->pdev->irq);
- spin_lock(&np->lock);
+ spin_lock(&rp->lock);
/* Reset the chip. */
writew(CmdReset, ioaddr + ChipCmd);
@@ -1266,20 +1266,20 @@ static void via_rhine_tx_timeout (struct
alloc_rbufs(dev);
/* Reinitialize the hardware. */
- wait_for_reset(dev, np->chip_id, dev->name);
+ wait_for_reset(dev, rp->chip_id, dev->name);
init_registers(dev);
- spin_unlock(&np->lock);
- enable_irq(np->pdev->irq);
+ spin_unlock(&rp->lock);
+ enable_irq(rp->pdev->irq);
dev->trans_start = jiffies;
- np->stats.tx_errors++;
+ rp->stats.tx_errors++;
netif_wake_queue(dev);
}
-static int via_rhine_start_tx(struct sk_buff *skb, struct net_device *dev)
+static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
unsigned entry;
u32 intr_status;
@@ -1287,7 +1287,7 @@ static int via_rhine_start_tx(struct sk_
with the "ownership" bits last. */
/* Calculate the next Tx descriptor entry. */
- entry = np->cur_tx % TX_RING_SIZE;
+ entry = rp->cur_tx % TX_RING_SIZE;
if (skb->len < ETH_ZLEN) {
skb = skb_padto(skb, ETH_ZLEN);
@@ -1295,39 +1295,39 @@ static int via_rhine_start_tx(struct sk_
return 0;
}
- np->tx_skbuff[entry] = skb;
+ rp->tx_skbuff[entry] = skb;
- if ((np->drv_flags & ReqTxAlign) &&
+ if ((rp->drv_flags & ReqTxAlign) &&
(((long)skb->data & 3) || skb_shinfo(skb)->nr_frags != 0 || skb->ip_summed == CHECKSUM_HW)
) {
/* Must use alignment buffer. */
if (skb->len > PKT_BUF_SZ) {
/* packet too long, drop it */
dev_kfree_skb(skb);
- np->tx_skbuff[entry] = NULL;
- np->stats.tx_dropped++;
+ rp->tx_skbuff[entry] = NULL;
+ rp->stats.tx_dropped++;
return 0;
}
- skb_copy_and_csum_dev(skb, np->tx_buf[entry]);
- np->tx_skbuff_dma[entry] = 0;
- np->tx_ring[entry].addr = cpu_to_le32(np->tx_bufs_dma +
- (np->tx_buf[entry] - np->tx_bufs));
+ skb_copy_and_csum_dev(skb, rp->tx_buf[entry]);
+ rp->tx_skbuff_dma[entry] = 0;
+ rp->tx_ring[entry].addr = cpu_to_le32(rp->tx_bufs_dma +
+ (rp->tx_buf[entry] - rp->tx_bufs));
} else {
- np->tx_skbuff_dma[entry] =
- pci_map_single(np->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
- np->tx_ring[entry].addr = cpu_to_le32(np->tx_skbuff_dma[entry]);
+ rp->tx_skbuff_dma[entry] =
+ pci_map_single(rp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
+ rp->tx_ring[entry].addr = cpu_to_le32(rp->tx_skbuff_dma[entry]);
}
- np->tx_ring[entry].desc_length =
+ rp->tx_ring[entry].desc_length =
cpu_to_le32(TXDESC | (skb->len >= ETH_ZLEN ? skb->len : ETH_ZLEN));
/* lock eth irq */
- spin_lock_irq (&np->lock);
+ spin_lock_irq (&rp->lock);
wmb();
- np->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
+ rp->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
wmb();
- np->cur_tx++;
+ rp->cur_tx++;
/* Non-x86 Todo: explicitly flush cache lines here. */
@@ -1337,27 +1337,27 @@ static int via_rhine_start_tx(struct sk_
*/
intr_status = get_intr_status(dev);
if ((intr_status & IntrTxErrSummary) == 0) {
- writew(CmdTxDemand | np->chip_cmd, dev->base_addr + ChipCmd);
+ writew(CmdTxDemand | rp->chip_cmd, dev->base_addr + ChipCmd);
}
IOSYNC;
- if (np->cur_tx == np->dirty_tx + TX_QUEUE_LEN)
+ if (rp->cur_tx == rp->dirty_tx + TX_QUEUE_LEN)
netif_stop_queue(dev);
dev->trans_start = jiffies;
- spin_unlock_irq (&np->lock);
+ spin_unlock_irq (&rp->lock);
if (debug > 4) {
printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n",
- dev->name, np->cur_tx-1, entry);
+ dev->name, rp->cur_tx-1, entry);
}
return 0;
}
/* The interrupt handler does all of the Rx thread work and cleans up
after the Tx thread. */
-static irqreturn_t via_rhine_interrupt(int irq, void *dev_instance, struct pt_regs *rgs)
+static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *rgs)
{
struct net_device *dev = dev_instance;
long ioaddr;
@@ -1382,7 +1382,7 @@ static irqreturn_t via_rhine_interrupt(i
if (intr_status & (IntrRxDone | IntrRxErr | IntrRxDropped |
IntrRxWakeUp | IntrRxEmpty | IntrRxNoBuf))
- via_rhine_rx(dev);
+ rhine_rx(dev);
if (intr_status & (IntrTxErrSummary | IntrTxDone)) {
if (intr_status & IntrTxErrSummary) {
@@ -1391,18 +1391,18 @@ static irqreturn_t via_rhine_interrupt(i
while ((readw(ioaddr+ChipCmd) & CmdTxOn) && --cnt)
udelay(5);
if (debug > 2 && !cnt)
- printk(KERN_WARNING "%s: via_rhine_interrupt() "
+ printk(KERN_WARNING "%s: rhine_interrupt() "
"Tx engine still on.\n",
dev->name);
}
- via_rhine_tx(dev);
+ rhine_tx(dev);
}
/* Abnormal error summary/uncommon events handlers. */
if (intr_status & (IntrPCIErr | IntrLinkChange |
IntrStatsMax | IntrTxError | IntrTxAborted |
IntrTxUnderrun | IntrTxDescRace))
- via_rhine_error(dev, intr_status);
+ rhine_error(dev, intr_status);
if (--boguscnt < 0) {
printk(KERN_WARNING "%s: Too much work at interrupt, "
@@ -1420,16 +1420,16 @@ static irqreturn_t via_rhine_interrupt(i
/* This routine is logically part of the interrupt handler, but isolated
for clarity. */
-static void via_rhine_tx(struct net_device *dev)
+static void rhine_tx(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
- int txstatus = 0, entry = np->dirty_tx % TX_RING_SIZE;
+ struct rhine_private *rp = dev->priv;
+ int txstatus = 0, entry = rp->dirty_tx % TX_RING_SIZE;
- spin_lock (&np->lock);
+ spin_lock (&rp->lock);
/* find and cleanup dirty tx descriptors */
- while (np->dirty_tx != np->cur_tx) {
- txstatus = le32_to_cpu(np->tx_ring[entry].tx_status);
+ while (rp->dirty_tx != rp->cur_tx) {
+ txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status);
if (debug > 6)
printk(KERN_DEBUG " Tx scavenge %d status %8.8x.\n",
entry, txstatus);
@@ -1439,67 +1439,67 @@ static void via_rhine_tx(struct net_devi
if (debug > 1)
printk(KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n",
dev->name, txstatus);
- np->stats.tx_errors++;
- if (txstatus & 0x0400) np->stats.tx_carrier_errors++;
- if (txstatus & 0x0200) np->stats.tx_window_errors++;
- if (txstatus & 0x0100) np->stats.tx_aborted_errors++;
- if (txstatus & 0x0080) np->stats.tx_heartbeat_errors++;
- if (((np->chip_id == VT86C100A) && txstatus & 0x0002) ||
+ rp->stats.tx_errors++;
+ if (txstatus & 0x0400) rp->stats.tx_carrier_errors++;
+ if (txstatus & 0x0200) rp->stats.tx_window_errors++;
+ if (txstatus & 0x0100) rp->stats.tx_aborted_errors++;
+ if (txstatus & 0x0080) rp->stats.tx_heartbeat_errors++;
+ if (((rp->chip_id == VT86C100A) && txstatus & 0x0002) ||
(txstatus & 0x0800) || (txstatus & 0x1000)) {
- np->stats.tx_fifo_errors++;
- np->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
+ rp->stats.tx_fifo_errors++;
+ rp->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
break; /* Keep the skb - we try again */
}
/* Transmitter restarted in 'abnormal' handler. */
} else {
- if (np->chip_id == VT86C100A)
- np->stats.collisions += (txstatus >> 3) & 0x0F;
+ if (rp->chip_id == VT86C100A)
+ rp->stats.collisions += (txstatus >> 3) & 0x0F;
else
- np->stats.collisions += txstatus & 0x0F;
+ rp->stats.collisions += txstatus & 0x0F;
if (debug > 6)
printk(KERN_DEBUG "collisions: %1.1x:%1.1x\n",
(txstatus >> 3) & 0xF,
txstatus & 0xF);
- np->stats.tx_bytes += np->tx_skbuff[entry]->len;
- np->stats.tx_packets++;
+ rp->stats.tx_bytes += rp->tx_skbuff[entry]->len;
+ rp->stats.tx_packets++;
}
/* Free the original skb. */
- if (np->tx_skbuff_dma[entry]) {
- pci_unmap_single(np->pdev,
- np->tx_skbuff_dma[entry],
- np->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
+ if (rp->tx_skbuff_dma[entry]) {
+ pci_unmap_single(rp->pdev,
+ rp->tx_skbuff_dma[entry],
+ rp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
}
- dev_kfree_skb_irq(np->tx_skbuff[entry]);
- np->tx_skbuff[entry] = NULL;
- entry = (++np->dirty_tx) % TX_RING_SIZE;
+ dev_kfree_skb_irq(rp->tx_skbuff[entry]);
+ rp->tx_skbuff[entry] = NULL;
+ entry = (++rp->dirty_tx) % TX_RING_SIZE;
}
- if ((np->cur_tx - np->dirty_tx) < TX_QUEUE_LEN - 4)
+ if ((rp->cur_tx - rp->dirty_tx) < TX_QUEUE_LEN - 4)
netif_wake_queue (dev);
- spin_unlock (&np->lock);
+ spin_unlock (&rp->lock);
}
/* This routine is logically part of the interrupt handler, but isolated
for clarity and better register allocation. */
-static void via_rhine_rx(struct net_device *dev)
+static void rhine_rx(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
- int entry = np->cur_rx % RX_RING_SIZE;
- int boguscnt = np->dirty_rx + RX_RING_SIZE - np->cur_rx;
+ struct rhine_private *rp = dev->priv;
+ int entry = rp->cur_rx % RX_RING_SIZE;
+ int boguscnt = rp->dirty_rx + RX_RING_SIZE - rp->cur_rx;
if (debug > 4) {
- printk(KERN_DEBUG "%s: via_rhine_rx(), entry %d status %8.8x.\n",
- dev->name, entry, le32_to_cpu(np->rx_head_desc->rx_status));
+ printk(KERN_DEBUG "%s: rhine_rx(), entry %d status %8.8x.\n",
+ dev->name, entry, le32_to_cpu(rp->rx_head_desc->rx_status));
}
/* If EOP is set on the next entry, it's a new packet. Send it up. */
- while ( ! (np->rx_head_desc->rx_status & cpu_to_le32(DescOwn))) {
- struct rx_desc *desc = np->rx_head_desc;
+ while ( ! (rp->rx_head_desc->rx_status & cpu_to_le32(DescOwn))) {
+ struct rx_desc *desc = rp->rx_head_desc;
u32 desc_status = le32_to_cpu(desc->rx_status);
int data_size = desc_status >> 16;
if (debug > 4)
- printk(KERN_DEBUG " via_rhine_rx() status is %8.8x.\n",
+ printk(KERN_DEBUG " rhine_rx() status is %8.8x.\n",
desc_status);
if (--boguscnt < 0)
break;
@@ -1509,22 +1509,22 @@ static void via_rhine_rx(struct net_devi
"multiple buffers, entry %#x length %d status %8.8x!\n",
dev->name, entry, data_size, desc_status);
printk(KERN_WARNING "%s: Oversized Ethernet frame %p vs %p.\n",
- dev->name, np->rx_head_desc, &np->rx_ring[entry]);
- np->stats.rx_length_errors++;
+ dev->name, rp->rx_head_desc, &rp->rx_ring[entry]);
+ rp->stats.rx_length_errors++;
} else if (desc_status & RxErr) {
/* There was a error. */
if (debug > 2)
- printk(KERN_DEBUG " via_rhine_rx() Rx error was %8.8x.\n",
+ printk(KERN_DEBUG " rhine_rx() Rx error was %8.8x.\n",
desc_status);
- np->stats.rx_errors++;
- if (desc_status & 0x0030) np->stats.rx_length_errors++;
- if (desc_status & 0x0048) np->stats.rx_fifo_errors++;
- if (desc_status & 0x0004) np->stats.rx_frame_errors++;
+ rp->stats.rx_errors++;
+ if (desc_status & 0x0030) rp->stats.rx_length_errors++;
+ if (desc_status & 0x0048) rp->stats.rx_fifo_errors++;
+ if (desc_status & 0x0004) rp->stats.rx_frame_errors++;
if (desc_status & 0x0002) {
/* this can also be updated outside the interrupt handler */
- spin_lock (&np->lock);
- np->stats.rx_crc_errors++;
- spin_unlock (&np->lock);
+ spin_lock (&rp->lock);
+ rp->stats.rx_crc_errors++;
+ spin_unlock (&rp->lock);
}
}
} else {
@@ -1538,59 +1538,59 @@ static void via_rhine_rx(struct net_devi
(skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
skb->dev = dev;
skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(np->pdev, np->rx_skbuff_dma[entry],
- np->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ pci_dma_sync_single_for_cpu(rp->pdev, rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
/* *_IP_COPYSUM isn't defined anywhere and eth_copy_and_sum
is memcpy for all archs so this is kind of pointless right
now ... or? */
#if HAS_IP_COPYSUM /* Call copy + cksum if available. */
- eth_copy_and_sum(skb, np->rx_skbuff[entry]->tail, pkt_len, 0);
+ eth_copy_and_sum(skb, rp->rx_skbuff[entry]->tail, pkt_len, 0);
skb_put(skb, pkt_len);
#else
- memcpy(skb_put(skb, pkt_len), np->rx_skbuff[entry]->tail,
+ memcpy(skb_put(skb, pkt_len), rp->rx_skbuff[entry]->tail,
pkt_len);
#endif
- pci_dma_sync_single_for_device(np->pdev, np->rx_skbuff_dma[entry],
- np->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ pci_dma_sync_single_for_device(rp->pdev, rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
} else {
- skb = np->rx_skbuff[entry];
+ skb = rp->rx_skbuff[entry];
if (skb == NULL) {
printk(KERN_ERR "%s: Inconsistent Rx descriptor chain.\n",
dev->name);
break;
}
- np->rx_skbuff[entry] = NULL;
+ rp->rx_skbuff[entry] = NULL;
skb_put(skb, pkt_len);
- pci_unmap_single(np->pdev, np->rx_skbuff_dma[entry],
- np->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ pci_unmap_single(rp->pdev, rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
}
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->last_rx = jiffies;
- np->stats.rx_bytes += pkt_len;
- np->stats.rx_packets++;
+ rp->stats.rx_bytes += pkt_len;
+ rp->stats.rx_packets++;
}
- entry = (++np->cur_rx) % RX_RING_SIZE;
- np->rx_head_desc = &np->rx_ring[entry];
+ entry = (++rp->cur_rx) % RX_RING_SIZE;
+ rp->rx_head_desc = &rp->rx_ring[entry];
}
/* Refill the Rx ring buffers. */
- for (; np->cur_rx - np->dirty_rx > 0; np->dirty_rx++) {
+ for (; rp->cur_rx - rp->dirty_rx > 0; rp->dirty_rx++) {
struct sk_buff *skb;
- entry = np->dirty_rx % RX_RING_SIZE;
- if (np->rx_skbuff[entry] == NULL) {
- skb = dev_alloc_skb(np->rx_buf_sz);
- np->rx_skbuff[entry] = skb;
+ entry = rp->dirty_rx % RX_RING_SIZE;
+ if (rp->rx_skbuff[entry] == NULL) {
+ skb = dev_alloc_skb(rp->rx_buf_sz);
+ rp->rx_skbuff[entry] = skb;
if (skb == NULL)
break; /* Better luck next round. */
skb->dev = dev; /* Mark as being used by this device. */
- np->rx_skbuff_dma[entry] =
- pci_map_single(np->pdev, skb->tail, np->rx_buf_sz,
+ rp->rx_skbuff_dma[entry] =
+ pci_map_single(rp->pdev, skb->tail, rp->rx_buf_sz,
PCI_DMA_FROMDEVICE);
- np->rx_ring[entry].addr = cpu_to_le32(np->rx_skbuff_dma[entry]);
+ rp->rx_ring[entry].addr = cpu_to_le32(rp->rx_skbuff_dma[entry]);
}
- np->rx_ring[entry].rx_status = cpu_to_le32(DescOwn);
+ rp->rx_ring[entry].rx_status = cpu_to_le32(DescOwn);
}
/* Pre-emptively restart Rx engine. */
@@ -1609,10 +1609,10 @@ static inline void clear_tally_counters(
readw(ioaddr + RxMissed);
}
-static void via_rhine_restart_tx(struct net_device *dev) {
- struct netdev_private *np = dev->priv;
+static void rhine_restart_tx(struct net_device *dev) {
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
- int entry = np->dirty_tx % TX_RING_SIZE;
+ int entry = rp->dirty_tx % TX_RING_SIZE;
u32 intr_status;
/*
@@ -1624,45 +1624,45 @@ static void via_rhine_restart_tx(struct
if ((intr_status & IntrTxErrSummary) == 0) {
/* We know better than the chip where it should continue. */
- writel(np->tx_ring_dma + entry * sizeof(struct tx_desc),
+ writel(rp->tx_ring_dma + entry * sizeof(struct tx_desc),
ioaddr + TxRingPtr);
- writew(CmdTxDemand | np->chip_cmd, ioaddr + ChipCmd);
+ writew(CmdTxDemand | rp->chip_cmd, ioaddr + ChipCmd);
IOSYNC;
}
else {
/* This should never happen */
if (debug > 1)
- printk(KERN_WARNING "%s: via_rhine_restart_tx() "
+ printk(KERN_WARNING "%s: rhine_restart_tx() "
"Another error occured %8.8x.\n",
dev->name, intr_status);
}
}
-static void via_rhine_error(struct net_device *dev, int intr_status)
+static void rhine_error(struct net_device *dev, int intr_status)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
- spin_lock (&np->lock);
+ spin_lock (&rp->lock);
if (intr_status & (IntrLinkChange)) {
if (readb(ioaddr + MIIStatus) & 0x02) {
/* Link failed, restart autonegotiation. */
- if (np->drv_flags & HasDavicomPhy)
- mdio_write(dev, np->phys[0], MII_BMCR, 0x3300);
+ if (rp->drv_flags & HasDavicomPhy)
+ mdio_write(dev, rp->phys[0], MII_BMCR, 0x3300);
} else
- via_rhine_check_duplex(dev);
+ rhine_check_duplex(dev);
if (debug)
printk(KERN_ERR "%s: MII status changed: Autonegotiation "
"advertising %4.4x partner %4.4x.\n", dev->name,
- mdio_read(dev, np->phys[0], MII_ADVERTISE),
- mdio_read(dev, np->phys[0], MII_LPA));
+ mdio_read(dev, rp->phys[0], MII_ADVERTISE),
+ mdio_read(dev, rp->phys[0], MII_LPA));
}
if (intr_status & IntrStatsMax) {
- np->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
- np->stats.rx_missed_errors += readw(ioaddr + RxMissed);
+ rp->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
+ rp->stats.rx_missed_errors += readw(ioaddr + RxMissed);
clear_tally_counters(ioaddr);
}
if (intr_status & IntrTxAborted) {
@@ -1671,12 +1671,12 @@ static void via_rhine_error(struct net_d
dev->name, intr_status);
}
if (intr_status & IntrTxUnderrun) {
- if (np->tx_thresh < 0xE0)
- writeb(np->tx_thresh += 0x20, ioaddr + TxConfig);
+ if (rp->tx_thresh < 0xE0)
+ writeb(rp->tx_thresh += 0x20, ioaddr + TxConfig);
if (debug > 1)
printk(KERN_INFO "%s: Transmitter underrun, Tx "
"threshold now %2.2x.\n",
- dev->name, np->tx_thresh);
+ dev->name, rp->tx_thresh);
}
if (intr_status & IntrTxDescRace) {
if (debug > 2)
@@ -1686,17 +1686,17 @@ static void via_rhine_error(struct net_d
if ((intr_status & IntrTxError) &&
(intr_status & ( IntrTxAborted |
IntrTxUnderrun | IntrTxDescRace )) == 0) {
- if (np->tx_thresh < 0xE0) {
- writeb(np->tx_thresh += 0x20, ioaddr + TxConfig);
+ if (rp->tx_thresh < 0xE0) {
+ writeb(rp->tx_thresh += 0x20, ioaddr + TxConfig);
}
if (debug > 1)
printk(KERN_INFO "%s: Unspecified error. Tx "
"threshold now %2.2x.\n",
- dev->name, np->tx_thresh);
+ dev->name, rp->tx_thresh);
}
if (intr_status & ( IntrTxAborted | IntrTxUnderrun | IntrTxDescRace |
IntrTxError ))
- via_rhine_restart_tx(dev);
+ rhine_restart_tx(dev);
if (intr_status & ~( IntrLinkChange | IntrStatsMax | IntrTxUnderrun |
IntrTxError | IntrTxAborted | IntrNormalSummary |
@@ -1706,27 +1706,27 @@ static void via_rhine_error(struct net_d
dev->name, intr_status);
}
- spin_unlock (&np->lock);
+ spin_unlock (&rp->lock);
}
-static struct net_device_stats *via_rhine_get_stats(struct net_device *dev)
+static struct net_device_stats *rhine_get_stats(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
unsigned long flags;
- spin_lock_irqsave(&np->lock, flags);
- np->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
- np->stats.rx_missed_errors += readw(ioaddr + RxMissed);
+ spin_lock_irqsave(&rp->lock, flags);
+ rp->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
+ rp->stats.rx_missed_errors += readw(ioaddr + RxMissed);
clear_tally_counters(ioaddr);
- spin_unlock_irqrestore(&np->lock, flags);
+ spin_unlock_irqrestore(&rp->lock, flags);
- return &np->stats;
+ return &rp->stats;
}
-static void via_rhine_set_rx_mode(struct net_device *dev)
+static void rhine_set_rx_mode(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
u32 mc_filter[2]; /* Multicast hash filter */
u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */
@@ -1757,66 +1757,66 @@ static void via_rhine_set_rx_mode(struct
writel(mc_filter[1], ioaddr + MulticastFilter1);
rx_mode = 0x0C;
}
- writeb(np->rx_thresh | rx_mode, ioaddr + RxConfig);
+ writeb(rp->rx_thresh | rx_mode, ioaddr + RxConfig);
}
static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
strcpy (info->driver, DRV_NAME);
strcpy (info->version, DRV_VERSION);
- strcpy (info->bus_info, pci_name(np->pdev));
+ strcpy (info->bus_info, pci_name(rp->pdev));
}
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
int rc;
- if (!(np->drv_flags & CanHaveMII))
+ if (!(rp->drv_flags & CanHaveMII))
return -EINVAL;
- spin_lock_irq(&np->lock);
- rc = mii_ethtool_gset(&np->mii_if, cmd);
- spin_unlock_irq(&np->lock);
+ spin_lock_irq(&rp->lock);
+ rc = mii_ethtool_gset(&rp->mii_if, cmd);
+ spin_unlock_irq(&rp->lock);
return rc;
}
static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
int rc;
- if (!(np->drv_flags & CanHaveMII))
+ if (!(rp->drv_flags & CanHaveMII))
return -EINVAL;
- spin_lock_irq(&np->lock);
- rc = mii_ethtool_sset(&np->mii_if, cmd);
- spin_unlock_irq(&np->lock);
+ spin_lock_irq(&rp->lock);
+ rc = mii_ethtool_sset(&rp->mii_if, cmd);
+ spin_unlock_irq(&rp->lock);
return rc;
}
static int netdev_nway_reset(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
- if (!(np->drv_flags & CanHaveMII))
+ if (!(rp->drv_flags & CanHaveMII))
return -EINVAL;
- return mii_nway_restart(&np->mii_if);
+ return mii_nway_restart(&rp->mii_if);
}
static u32 netdev_get_link(struct net_device *dev)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
- if (!(np->drv_flags & CanHaveMII))
+ if (!(rp->drv_flags & CanHaveMII))
return 0; /* -EINVAL */
- return mii_link_ok(&np->mii_if);
+ return mii_link_ok(&rp->mii_if);
}
static u32 netdev_get_msglevel(struct net_device *dev)
@@ -1843,28 +1843,28 @@ static struct ethtool_ops netdev_ethtool
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
struct mii_ioctl_data *data = (struct mii_ioctl_data *) & rq->ifr_data;
int rc;
if (!netif_running(dev))
return -EINVAL;
- spin_lock_irq(&np->lock);
- rc = generic_mii_ioctl(&np->mii_if, data, cmd, NULL);
- spin_unlock_irq(&np->lock);
+ spin_lock_irq(&rp->lock);
+ rc = generic_mii_ioctl(&rp->mii_if, data, cmd, NULL);
+ spin_unlock_irq(&rp->lock);
return rc;
}
-static int via_rhine_close(struct net_device *dev)
+static int rhine_close(struct net_device *dev)
{
long ioaddr = dev->base_addr;
- struct netdev_private *np = dev->priv;
+ struct rhine_private *rp = dev->priv;
- del_timer_sync(&np->timer);
+ del_timer_sync(&rp->timer);
- spin_lock_irq(&np->lock);
+ spin_lock_irq(&rp->lock);
netif_stop_queue(dev);
@@ -1873,7 +1873,7 @@ static int via_rhine_close(struct net_de
dev->name, readw(ioaddr + ChipCmd));
/* Switch to loopback mode to avoid hardware races. */
- writeb(np->tx_thresh | 0x02, ioaddr + TxConfig);
+ writeb(rp->tx_thresh | 0x02, ioaddr + TxConfig);
/* Disable interrupts by clearing the interrupt mask. */
writew(0x0000, ioaddr + IntrEnable);
@@ -1881,9 +1881,9 @@ static int via_rhine_close(struct net_de
/* Stop the chip's Tx and Rx processes. */
writew(CmdStop, ioaddr + ChipCmd);
- spin_unlock_irq(&np->lock);
+ spin_unlock_irq(&rp->lock);
- free_irq(np->pdev->irq, dev);
+ free_irq(rp->pdev->irq, dev);
free_rbufs(dev);
free_tbufs(dev);
free_ring(dev);
@@ -1892,7 +1892,7 @@ static int via_rhine_close(struct net_de
}
-static void __devexit via_rhine_remove_one (struct pci_dev *pdev)
+static void __devexit rhine_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -1910,32 +1910,32 @@ static void __devexit via_rhine_remove_o
}
-static struct pci_driver via_rhine_driver = {
+static struct pci_driver rhine_driver = {
.name = "via-rhine",
- .id_table = via_rhine_pci_tbl,
- .probe = via_rhine_init_one,
- .remove = __devexit_p(via_rhine_remove_one),
+ .id_table = rhine_pci_tbl,
+ .probe = rhine_init_one,
+ .remove = __devexit_p(rhine_remove_one),
};
-static int __init via_rhine_init (void)
+static int __init rhine_init (void)
{
/* when a module, this is printed whether or not devices are found in probe */
#ifdef MODULE
printk(version);
#endif
- return pci_module_init (&via_rhine_driver);
+ return pci_module_init (&rhine_driver);
}
-static void __exit via_rhine_cleanup (void)
+static void __exit rhine_cleanup (void)
{
- pci_unregister_driver (&via_rhine_driver);
+ pci_unregister_driver (&rhine_driver);
}
-module_init(via_rhine_init);
-module_exit(via_rhine_cleanup);
+module_init(rhine_init);
+module_exit(rhine_cleanup);
/*
^ permalink raw reply [flat|nested] 5+ messages in thread* [3/4][PATCH 2.6] via-rhine: Whitespace clean-up
2004-05-23 10:46 [0/4] via-rhine: clean-up for 2.6 Roger Luethi
2004-05-23 10:50 ` [2/4][PATCH 2.6] via-rhine: Rename some symbols Roger Luethi
@ 2004-05-23 10:50 ` Roger Luethi
2004-05-23 10:50 ` [4/4][PATCH 2.6] via-rhine: USE_MEM, USE_IO -> USE_MMIO Roger Luethi
2004-05-23 14:52 ` [5/4][PATCH 2.6] via-rhine: netdev_priv() Roger Luethi
3 siblings, 0 replies; 5+ messages in thread
From: Roger Luethi @ 2004-05-23 10:50 UTC (permalink / raw)
To: Jeff Garzik, Andrew Morton; +Cc: linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
- Switch to 8 char tabs.
- Remove kernel log pointer to the scyld web site -- it's
a) fairly irrelevant by now and
b) gone.
- Remove Emacs Voodoo.
- More white space clean up, mostly coding style.
[-- Attachment #2: via-rhine-2.6.6-3-tabs8.diff --]
[-- Type: text/plain, Size: 44775 bytes --]
--- linux-2.6.6/drivers/net/via-rhine.c 2004-05-23 10:27:31.000000000 +0200
+++ linux-2.6.6-patch/drivers/net/via-rhine.c 2004-05-23 11:34:48.387242724 +0200
@@ -74,8 +74,8 @@
LK1.1.11:
- David Woodhouse: Set dev->base_addr before the first time we call
- wait_for_reset(). It's a lot happier that way.
- Free np->tx_bufs only if we actually allocated it.
+ wait_for_reset(). It's a lot happier that way.
+ Free np->tx_bufs only if we actually allocated it.
LK1.1.12:
- Martin Eriksson: Allow Memory-Mapped IO to be enabled.
@@ -85,7 +85,7 @@
- Replace some MII-related magic numbers with constants
LK1.1.14 (Ivan G.):
- - fixes comments for Rhine-III
+ - fixes comments for Rhine-III
- removes W_MAX_TIMEOUT (unused)
- adds HasDavicomPhy for Rhine-I (basis: linuxfet driver; my card
is R-I and has Davicom chip, flag is referenced in kernel driver)
@@ -96,10 +96,10 @@
- transmit frame queue message is off by one - fixed
- adds IntrNormalSummary to "Something Wicked" exclusion list
so normal interrupts will not trigger the message (src: Donald Becker)
- (Roger Luethi)
- - show confused chip where to continue after Tx error
- - location of collision counter is chip specific
- - allow selecting backoff algorithm (module parameter)
+ (Roger Luethi)
+ - show confused chip where to continue after Tx error
+ - location of collision counter is chip specific
+ - allow selecting backoff algorithm (module parameter)
LK1.1.15 (jgarzik):
- Use new MII lib helper generic_mii_ioctl
@@ -135,7 +135,7 @@
/* A few user-configurable values.
These may be modified when a driver module is loaded. */
-static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */
+static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */
static int max_interrupt_work = 20;
/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
@@ -155,12 +155,12 @@ static int backoff;
Use option values 0x10 and 0x100 for forcing half duplex fixed speed.
Use option values 0x20 and 0x200 for forcing full duplex operation.
*/
-#define MAX_UNITS 8 /* More are supported, limit only on options */
+#define MAX_UNITS 8 /* More are supported, limit only on options */
static int options[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
/* Maximum number of multicast addresses to filter (vs. rx-all-multicast).
- The Rhine has a 64 element 8390-like hash table. */
+ The Rhine has a 64 element 8390-like hash table. */
static const int multicast_filter_limit = 32;
@@ -172,16 +172,16 @@ static const int multicast_filter_limit
bonding and packet priority.
There are no ill effects from too-large receive rings. */
#define TX_RING_SIZE 16
-#define TX_QUEUE_LEN 10 /* Limit ring entries actually used. */
+#define TX_QUEUE_LEN 10 /* Limit ring entries actually used. */
#define RX_RING_SIZE 16
/* Operational parameters that usually are not changed. */
/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT (2*HZ)
+#define TX_TIMEOUT (2*HZ)
-#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/
+#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/
#if !defined(__OPTIMIZE__) || !defined(__KERNEL__)
#warning You must compile this file with the correct options!
@@ -206,7 +206,7 @@ static const int multicast_filter_limit
#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/crc32.h>
-#include <asm/processor.h> /* Processor type for cache alignment. */
+#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/irq.h>
@@ -214,8 +214,7 @@ static const int multicast_filter_limit
/* These identify the driver base version and may not be removed. */
static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n"
-KERN_INFO " http://www.scyld.com/network/via-rhine.html\n";
+KERN_INFO DRV_NAME ".c:v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker\n";
static char shortname[] = DRV_NAME;
@@ -258,7 +257,7 @@ MODULE_PARM_DESC(options, "VIA Rhine: Bi
MODULE_PARM_DESC(full_duplex, "VIA Rhine full duplex setting(s) (1)");
/*
- Theory of Operation
+ Theory of Operation
I. Board Compatibility
@@ -281,7 +280,7 @@ IIIa. Ring buffers
This driver uses two statically allocated fixed-size descriptor lists
formed into rings by a branch from the final descriptor to the beginning of
-the list. The ring sizes are set at compile time by RX/TX_RING_SIZE.
+the list. The ring sizes are set at compile time by RX/TX_RING_SIZE.
IIIb/c. Transmit/Receive Structure
@@ -292,29 +291,29 @@ the driver must often copy transmit pack
The driver allocates full frame size skbuffs for the Rx ring buffers at
open() time and passes the skb->data field to the chip as receive data
-buffers. When an incoming frame is less than RX_COPYBREAK bytes long,
+buffers. When an incoming frame is less than RX_COPYBREAK bytes long,
a fresh skbuff is allocated and the frame is copied to the new skbuff.
When the incoming frame is larger, the skbuff is passed directly up the
-protocol stack. Buffers consumed this way are replaced by newly allocated
-skbuffs in the last phase of via_rhine_rx().
+protocol stack. Buffers consumed this way are replaced by newly allocated
+skbuffs in the last phase of rhine_rx().
The RX_COPYBREAK value is chosen to trade-off the memory wasted by
using a full-sized skbuff for small frames vs. the copying costs of larger
-frames. New boards are typically used in generously configured machines
+frames. New boards are typically used in generously configured machines
and the underfilled buffers have negligible impact compared to the benefit of
a single allocation size, so the default value of zero results in never
-copying packets. When copying is done, the cost is usually mitigated by using
-a combined copy/checksum routine. Copying also preloads the cache, which is
+copying packets. When copying is done, the cost is usually mitigated by using
+a combined copy/checksum routine. Copying also preloads the cache, which is
most useful with small frames.
Since the VIA chips are only able to transfer data to buffers on 32 bit
boundaries, the IP header at offset 14 in an ethernet frame isn't
-longword aligned for further processing. Copying these unaligned buffers
+longword aligned for further processing. Copying these unaligned buffers
has the beneficial effect of 16-byte aligning the IP header.
IIId. Synchronization
-The driver runs as two independent, single-threaded flows of control. One
+The driver runs as two independent, single-threaded flows of control. One
is the send-packet routine, which enforces single-threaded use by the
dev->priv->lock spinlock. The other thread is the interrupt handler, which
is single threaded by the hardware and interrupt handling software.
@@ -324,7 +323,7 @@ dev->priv->lock whenever it's queuing a
is not available it stops the transmit queue by calling netif_stop_queue.
The interrupt handler has exclusive control over the Rx ring and records stats
-from the Tx ring. After reaping the stats, it marks the Tx queue entry as
+from the Tx ring. After reaping the stats, it marks the Tx queue entry as
empty by incrementing the dirty_tx mark. If at least half of the entries in
the Rx ring are available the transmit queue is woken up if it was stopped.
@@ -350,7 +349,7 @@ The chip does not pad to minimum transmi
*/
-/* This table drives the PCI probe routines. It's mostly boilerplate in all
+/* This table drives the PCI probe routines. It's mostly boilerplate in all
of the drivers, and will likely be provided by some future kernel.
Note the matching code -- the first table entry matchs all 56** cards but
second only the 1234 card.
@@ -378,7 +377,8 @@ struct rhine_chip_info {
enum chip_capability_flags {
CanHaveMII=1, HasESIPhy=2, HasDavicomPhy=4,
- ReqTxAlign=0x10, HasWOL=0x20, };
+ ReqTxAlign=0x10, HasWOL=0x20,
+};
#ifdef USE_MEM
#define RHINE_IOTYPE (PCI_USES_MEM | PCI_USES_MASTER | PCI_ADDR1)
@@ -407,7 +407,7 @@ static struct pci_device_id rhine_pci_tb
{0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6102},
{0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6105}, /* 6105{,L,LOM} */
{0x1106, 0x3053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VT6105M},
- {0,} /* terminate list */
+ {0,} /* terminate list */
};
MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);
@@ -469,7 +469,7 @@ struct tx_desc {
};
/* Initial value for tx_desc.desc_length, Buffer size goes to bits 0-10 */
-#define TXDESC 0x00e08000
+#define TXDESC 0x00e08000
enum rx_status_bits {
RxOK=0x8000, RxWholePkt=0x0300, RxErr=0x008F
@@ -517,19 +517,19 @@ struct rhine_private {
/* Frequently used values: keep some adjacent for cache effect. */
int chip_id, drv_flags;
struct rx_desc *rx_head_desc;
- unsigned int cur_rx, dirty_rx; /* Producer/consumer ring indices */
+ unsigned int cur_rx, dirty_rx; /* Producer/consumer ring indices */
unsigned int cur_tx, dirty_tx;
- unsigned int rx_buf_sz; /* Based on MTU+slack. */
- u16 chip_cmd; /* Current setting for ChipCmd */
+ unsigned int rx_buf_sz; /* Based on MTU+slack. */
+ u16 chip_cmd; /* Current setting for ChipCmd */
/* These values are keep track of the transceiver/media in use. */
- unsigned int default_port:4; /* Last dev->if_port value. */
+ unsigned int default_port:4; /* Last dev->if_port value. */
u8 tx_thresh, rx_thresh;
/* MII transceiver section. */
- unsigned char phys[MAX_MII_CNT]; /* MII device addresses. */
- unsigned int mii_cnt; /* number of MIIs found, but only the first one is used */
- u16 mii_status; /* last read MII status */
+ unsigned char phys[MAX_MII_CNT]; /* MII device addresses. */
+ unsigned int mii_cnt; /* number of MIIs found, but only the first one is used */
+ u16 mii_status; /* last read MII status */
struct mii_if_info mii_if;
};
@@ -624,8 +624,8 @@ static void rhine_poll(struct net_device
}
#endif
-static int __devinit rhine_init_one (struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit rhine_init_one(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct net_device *dev;
struct rhine_private *rp;
@@ -652,31 +652,33 @@ static int __devinit rhine_init_one (str
io_size = rhine_chip_info[chip_id].io_size;
pci_flags = rhine_chip_info[chip_id].pci_flags;
- if (pci_enable_device (pdev))
+ if (pci_enable_device(pdev))
goto err_out;
/* this should always be supported */
if (pci_set_dma_mask(pdev, 0xffffffff)) {
- printk(KERN_ERR "32-bit PCI DMA addresses not supported by the card!?\n");
+ printk(KERN_ERR "32-bit PCI DMA addresses not supported by "
+ "the card!?\n");
goto err_out;
}
/* sanity check */
- if ((pci_resource_len (pdev, 0) < io_size) ||
- (pci_resource_len (pdev, 1) < io_size)) {
- printk (KERN_ERR "Insufficient PCI resources, aborting\n");
+ if ((pci_resource_len(pdev, 0) < io_size) ||
+ (pci_resource_len(pdev, 1) < io_size)) {
+ printk(KERN_ERR "Insufficient PCI resources, aborting\n");
goto err_out;
}
- ioaddr = pci_resource_start (pdev, 0);
- memaddr = pci_resource_start (pdev, 1);
+ ioaddr = pci_resource_start(pdev, 0);
+ memaddr = pci_resource_start(pdev, 1);
if (pci_flags & PCI_USES_MASTER)
- pci_set_master (pdev);
+ pci_set_master(pdev);
dev = alloc_etherdev(sizeof(*rp));
if (dev == NULL) {
- printk (KERN_ERR "init_ethernet failed for card #%d\n", card_idx);
+ printk(KERN_ERR "init_ethernet failed for card #%d\n",
+ card_idx);
goto err_out;
}
SET_MODULE_OWNER(dev);
@@ -689,10 +691,10 @@ static int __devinit rhine_init_one (str
ioaddr0 = ioaddr;
enable_mmio(ioaddr0, chip_id);
- ioaddr = (long) ioremap (memaddr, io_size);
+ ioaddr = (long) ioremap(memaddr, io_size);
if (!ioaddr) {
- printk (KERN_ERR "ioremap failed for device %s, region 0x%X @ 0x%lX\n",
- pci_name(pdev), io_size, memaddr);
+ printk(KERN_ERR "ioremap failed for device %s, region 0x%X "
+ "@ 0x%lX\n", pci_name(pdev), io_size, memaddr);
goto err_out_free_res;
}
@@ -703,8 +705,8 @@ static int __devinit rhine_init_one (str
unsigned char a = inb(ioaddr0+reg);
unsigned char b = readb(ioaddr+reg);
if (a != b) {
- printk (KERN_ERR "MMIO do not match PIO [%02x] (%02x != %02x)\n",
- reg, a, b);
+ printk(KERN_ERR "MMIO do not match PIO [%02x] "
+ "(%02x != %02x)\n", reg, a, b);
goto err_out_unmap;
}
}
@@ -756,7 +758,7 @@ static int __devinit rhine_init_one (str
if (chip_id == VT6102) {
/*
* for 3065D, EEPROM reloaded will cause bit 0 in MAC_REG_CFGA
- * turned on. it makes MAC receive magic packet
+ * turned on. it makes MAC receive magic packet
* automatically. So, we turn it off. (D-Link)
*/
writeb(readb(ioaddr + ConfigA) & 0xFE, ioaddr + ConfigA);
@@ -765,12 +767,12 @@ static int __devinit rhine_init_one (str
/* Select backoff algorithm */
if (backoff)
writeb(readb(ioaddr + ConfigD) & (0xF0 | backoff),
- ioaddr + ConfigD);
+ ioaddr + ConfigD);
dev->irq = pdev->irq;
rp = dev->priv;
- spin_lock_init (&rp->lock);
+ spin_lock_init(&rp->lock);
rp->chip_id = chip_id;
rp->drv_flags = rhine_chip_info[chip_id].drv_flags;
rp->pdev = pdev;
@@ -810,21 +812,21 @@ static int __devinit rhine_init_one (str
rp->mii_if.full_duplex = 1;
rp->default_port = option & 15;
}
- if (card_idx < MAX_UNITS && full_duplex[card_idx] > 0)
+ if (card_idx < MAX_UNITS && full_duplex[card_idx] > 0)
rp->mii_if.full_duplex = 1;
if (rp->mii_if.full_duplex) {
- printk(KERN_INFO "%s: Set to forced full duplex, autonegotiation"
- " disabled.\n", dev->name);
+ printk(KERN_INFO "%s: Set to forced full duplex, "
+ "autonegotiation disabled.\n", dev->name);
rp->mii_if.force_media = 1;
}
printk(KERN_INFO "%s: %s at 0x%lx, ",
- dev->name, rhine_chip_info[chip_id].name,
- (pci_flags & PCI_USES_IO) ? ioaddr : memaddr);
+ dev->name, rhine_chip_info[chip_id].name,
+ (pci_flags & PCI_USES_IO) ? ioaddr : memaddr);
for (i = 0; i < 5; i++)
- printk("%2.2x:", dev->dev_addr[i]);
+ printk("%2.2x:", dev->dev_addr[i]);
printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], pdev->irq);
pci_set_drvdata(pdev, dev);
@@ -834,13 +836,14 @@ static int __devinit rhine_init_one (str
rp->phys[0] = 1; /* Standard for this chip. */
for (phy = 1; phy < 32 && phy_idx < MAX_MII_CNT; phy++) {
int mii_status = mdio_read(dev, phy, 1);
- if (mii_status != 0xffff && mii_status != 0x0000) {
+ if (mii_status != 0xffff && mii_status != 0x0000) {
rp->phys[phy_idx++] = phy;
rp->mii_if.advertising = mdio_read(dev, phy, 4);
- printk(KERN_INFO "%s: MII PHY found at address %d, status "
- "0x%4.4x advertising %4.4x Link %4.4x.\n",
- dev->name, phy, mii_status, rp->mii_if.advertising,
- mdio_read(dev, phy, 5));
+ printk(KERN_INFO "%s: MII PHY found at address "
+ "%d, status 0x%4.4x advertising %4.4x "
+ "Link %4.4x.\n", dev->name, phy,
+ mii_status, rp->mii_if.advertising,
+ mdio_read(dev, phy, 5));
/* set IFF_RUNNING */
if (mii_status & BMSR_LSTATUS)
@@ -863,13 +866,14 @@ static int __devinit rhine_init_one (str
if (option & 0x330) {
/* FIXME: shouldn't someone check this variable? */
/* rp->medialock = 1; */
- printk(KERN_INFO " Forcing %dMbs %s-duplex operation.\n",
- (option & 0x300 ? 100 : 10),
- (option & 0x220 ? "full" : "half"));
+ printk(KERN_INFO " Forcing %dMbs %s-duplex "
+ "operation.\n",
+ (option & 0x300 ? 100 : 10),
+ (option & 0x220 ? "full" : "half"));
if (rp->mii_cnt)
mdio_write(dev, rp->phys[0], MII_BMCR,
- ((option & 0x300) ? 0x2000 : 0) | /* 100mbps? */
- ((option & 0x220) ? 0x0100 : 0)); /* Full duplex? */
+ ((option & 0x300) ? 0x2000 : 0) | /* 100mbps? */
+ ((option & 0x220) ? 0x0100 : 0)); /* Full duplex? */
}
}
@@ -882,7 +886,7 @@ err_out_free_res:
#endif
pci_release_regions(pdev);
err_out_free_netdev:
- free_netdev (dev);
+ free_netdev(dev);
err_out:
return -ENODEV;
}
@@ -902,8 +906,9 @@ static int alloc_ring(struct net_device*
return -ENOMEM;
}
if (rp->drv_flags & ReqTxAlign) {
- rp->tx_bufs = pci_alloc_consistent(rp->pdev, PKT_BUF_SZ * TX_RING_SIZE,
- &rp->tx_bufs_dma);
+ rp->tx_bufs = pci_alloc_consistent(rp->pdev,
+ PKT_BUF_SZ * TX_RING_SIZE,
+ &rp->tx_bufs_dma);
if (rp->tx_bufs == NULL) {
pci_free_consistent(rp->pdev,
RX_RING_SIZE * sizeof(struct rx_desc) +
@@ -933,7 +938,7 @@ void free_ring(struct net_device* dev)
if (rp->tx_bufs)
pci_free_consistent(rp->pdev, PKT_BUF_SZ * TX_RING_SIZE,
- rp->tx_bufs, rp->tx_bufs_dma);
+ rp->tx_bufs, rp->tx_bufs_dma);
rp->tx_bufs = NULL;
@@ -972,7 +977,7 @@ static void alloc_rbufs(struct net_devic
rp->rx_skbuff_dma[i] =
pci_map_single(rp->pdev, skb->tail, rp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
+ PCI_DMA_FROMDEVICE);
rp->rx_ring[i].addr = cpu_to_le32(rp->rx_skbuff_dma[i]);
rp->rx_ring[i].rx_status = cpu_to_le32(DescOwn);
@@ -991,8 +996,8 @@ static void free_rbufs(struct net_device
rp->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
if (rp->rx_skbuff[i]) {
pci_unmap_single(rp->pdev,
- rp->rx_skbuff_dma[i],
- rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ rp->rx_skbuff_dma[i],
+ rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
dev_kfree_skb(rp->rx_skbuff[i]);
}
rp->rx_skbuff[i] = 0;
@@ -1031,8 +1036,9 @@ static void free_tbufs(struct net_device
if (rp->tx_skbuff[i]) {
if (rp->tx_skbuff_dma[i]) {
pci_unmap_single(rp->pdev,
- rp->tx_skbuff_dma[i],
- rp->tx_skbuff[i]->len, PCI_DMA_TODEVICE);
+ rp->tx_skbuff_dma[i],
+ rp->tx_skbuff[i]->len,
+ PCI_DMA_TODEVICE);
}
dev_kfree_skb(rp->tx_skbuff[i]);
}
@@ -1055,7 +1061,7 @@ static void init_registers(struct net_de
/* Configure initial FIFO thresholds. */
writeb(0x20, ioaddr + TxConfig);
rp->tx_thresh = 0x20;
- rp->rx_thresh = 0x60; /* Written in rhine_set_rx_mode(). */
+ rp->rx_thresh = 0x60; /* Written in rhine_set_rx_mode(). */
rp->mii_if.full_duplex = 0;
if (dev->if_port == 0)
@@ -1068,10 +1074,10 @@ static void init_registers(struct net_de
/* Enable interrupts by setting the interrupt mask. */
writew(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow |
- IntrRxDropped | IntrRxNoBuf | IntrTxAborted |
- IntrTxDone | IntrTxError | IntrTxUnderrun |
- IntrPCIErr | IntrStatsMax | IntrLinkChange,
- ioaddr + IntrEnable);
+ IntrRxDropped | IntrRxNoBuf | IntrTxAborted |
+ IntrTxDone | IntrTxError | IntrTxUnderrun |
+ IntrPCIErr | IntrStatsMax | IntrLinkChange,
+ ioaddr + IntrEnable);
rp->chip_cmd = CmdStart|CmdTxOn|CmdRxOn|CmdNoTxPoll;
if (rp->mii_if.force_media)
@@ -1080,12 +1086,13 @@ static void init_registers(struct net_de
rhine_check_duplex(dev);
- /* The LED outputs of various MII xcvrs should be configured. */
+ /* The LED outputs of various MII xcvrs should be configured. */
/* For NS or Mison phys, turn on bit 1 in register 0x17 */
/* For ESI phys, turn on bit 7 in register 0x17. */
mdio_write(dev, rp->phys[0], 0x17, mdio_read(dev, rp->phys[0], 0x17) |
- (rp->drv_flags & HasESIPhy) ? 0x0080 : 0x0001);
+ (rp->drv_flags & HasESIPhy) ? 0x0080 : 0x0001);
}
+
/* Read and write over the MII Management Data I/O (MDIO) interface. */
static int mdio_read(struct net_device *dev, int phy_id, int regnum)
@@ -1099,7 +1106,7 @@ static int mdio_read(struct net_device *
writeb(0x00, ioaddr + MIICmd);
writeb(phy_id, ioaddr + MIIPhyAddr);
writeb(regnum, ioaddr + MIIRegAddr);
- writeb(0x40, ioaddr + MIICmd); /* Trigger read */
+ writeb(0x40, ioaddr + MIICmd); /* Trigger read */
boguscnt = 1024;
while ((readb(ioaddr + MIICmd) & 0x40) && --boguscnt > 0)
;
@@ -1114,8 +1121,8 @@ static void mdio_write(struct net_device
if (phy_id == rp->phys[0]) {
switch (regnum) {
- case MII_BMCR: /* Is user forcing speed/duplex? */
- if (value & 0x9000) /* Autonegotiation. */
+ case MII_BMCR: /* Is user forcing speed/duplex? */
+ if (value & 0x9000) /* Autonegotiation. */
rp->mii_if.force_media = 0;
else
rp->mii_if.full_duplex = (value & 0x0100) ? 1 : 0;
@@ -1133,7 +1140,7 @@ static void mdio_write(struct net_device
writeb(phy_id, ioaddr + MIIPhyAddr);
writeb(regnum, ioaddr + MIIRegAddr);
writew(value, ioaddr + MIIData);
- writeb(0x20, ioaddr + MIICmd); /* Trigger write. */
+ writeb(0x20, ioaddr + MIICmd); /* Trigger write. */
}
@@ -1146,13 +1153,14 @@ static int rhine_open(struct net_device
/* Reset the chip. */
writew(CmdReset, ioaddr + ChipCmd);
- i = request_irq(rp->pdev->irq, &rhine_interrupt, SA_SHIRQ, dev->name, dev);
+ i = request_irq(rp->pdev->irq, &rhine_interrupt, SA_SHIRQ, dev->name,
+ dev);
if (i)
return i;
if (debug > 1)
printk(KERN_DEBUG "%s: rhine_open() irq %d.\n",
- dev->name, rp->pdev->irq);
+ dev->name, rp->pdev->irq);
i = alloc_ring(dev);
if (i)
@@ -1163,9 +1171,9 @@ static int rhine_open(struct net_device
init_registers(dev);
if (debug > 2)
printk(KERN_DEBUG "%s: Done rhine_open(), status %4.4x "
- "MII status: %4.4x.\n",
- dev->name, readw(ioaddr + ChipCmd),
- mdio_read(dev, rp->phys[0], MII_BMSR));
+ "MII status: %4.4x.\n",
+ dev->name, readw(ioaddr + ChipCmd),
+ mdio_read(dev, rp->phys[0], MII_BMSR));
netif_start_queue(dev);
@@ -1173,7 +1181,7 @@ static int rhine_open(struct net_device
init_timer(&rp->timer);
rp->timer.expires = jiffies + 2 * HZ/100;
rp->timer.data = (unsigned long)dev;
- rp->timer.function = &rhine_timer; /* timer handler */
+ rp->timer.function = &rhine_timer; /* timer handler */
add_timer(&rp->timer);
return 0;
@@ -1187,15 +1195,16 @@ static void rhine_check_duplex(struct ne
int negotiated = mii_lpa & rp->mii_if.advertising;
int duplex;
- if (rp->mii_if.force_media || mii_lpa == 0xffff)
+ if (rp->mii_if.force_media || mii_lpa == 0xffff)
return;
duplex = (negotiated & 0x0100) || (negotiated & 0x01C0) == 0x0040;
if (rp->mii_if.full_duplex != duplex) {
rp->mii_if.full_duplex = duplex;
if (debug)
- printk(KERN_INFO "%s: Setting %s-duplex based on MII #%d link"
- " partner capability of %4.4x.\n", dev->name,
- duplex ? "full" : "half", rp->phys[0], mii_lpa);
+ printk(KERN_INFO "%s: Setting %s-duplex based on "
+ "MII #%d link partner capability of %4.4x.\n",
+ dev->name, duplex ? "full" : "half",
+ rp->phys[0], mii_lpa);
if (duplex)
rp->chip_cmd |= CmdFDuplex;
else
@@ -1215,7 +1224,7 @@ static void rhine_timer(unsigned long da
if (debug > 3) {
printk(KERN_DEBUG "%s: VIA Rhine monitor tick, status %4.4x.\n",
- dev->name, readw(ioaddr + IntrStatus));
+ dev->name, readw(ioaddr + IntrStatus));
}
spin_lock_irq (&rp->lock);
@@ -1224,7 +1233,7 @@ static void rhine_timer(unsigned long da
/* make IFF_RUNNING follow the MII status bit "Link established" */
mii_status = mdio_read(dev, rp->phys[0], MII_BMSR);
- if ( (mii_status & BMSR_LSTATUS) != (rp->mii_status & BMSR_LSTATUS) ) {
+ if ((mii_status & BMSR_LSTATUS) != (rp->mii_status & BMSR_LSTATUS)) {
if (mii_status & BMSR_LSTATUS)
netif_carrier_on(dev);
else
@@ -1232,22 +1241,22 @@ static void rhine_timer(unsigned long da
}
rp->mii_status = mii_status;
- spin_unlock_irq (&rp->lock);
+ spin_unlock_irq(&rp->lock);
rp->timer.expires = jiffies + next_tick;
add_timer(&rp->timer);
}
-static void rhine_tx_timeout (struct net_device *dev)
+static void rhine_tx_timeout(struct net_device *dev)
{
struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
- printk (KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
- "%4.4x, resetting...\n",
- dev->name, readw (ioaddr + IntrStatus),
- mdio_read (dev, rp->phys[0], MII_BMSR));
+ printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
+ "%4.4x, resetting...\n",
+ dev->name, readw(ioaddr + IntrStatus),
+ mdio_read(dev, rp->phys[0], MII_BMSR));
dev->if_port = 0;
@@ -1298,8 +1307,7 @@ static int rhine_start_tx(struct sk_buff
rp->tx_skbuff[entry] = skb;
if ((rp->drv_flags & ReqTxAlign) &&
- (((long)skb->data & 3) || skb_shinfo(skb)->nr_frags != 0 || skb->ip_summed == CHECKSUM_HW)
- ) {
+ (((long)skb->data & 3) || skb_shinfo(skb)->nr_frags != 0 || skb->ip_summed == CHECKSUM_HW)) {
/* Must use alignment buffer. */
if (skb->len > PKT_BUF_SZ) {
/* packet too long, drop it */
@@ -1311,10 +1319,12 @@ static int rhine_start_tx(struct sk_buff
skb_copy_and_csum_dev(skb, rp->tx_buf[entry]);
rp->tx_skbuff_dma[entry] = 0;
rp->tx_ring[entry].addr = cpu_to_le32(rp->tx_bufs_dma +
- (rp->tx_buf[entry] - rp->tx_bufs));
+ (rp->tx_buf[entry] -
+ rp->tx_bufs));
} else {
rp->tx_skbuff_dma[entry] =
- pci_map_single(rp->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
+ pci_map_single(rp->pdev, skb->data, skb->len,
+ PCI_DMA_TODEVICE);
rp->tx_ring[entry].addr = cpu_to_le32(rp->tx_skbuff_dma[entry]);
}
@@ -1322,7 +1332,7 @@ static int rhine_start_tx(struct sk_buff
cpu_to_le32(TXDESC | (skb->len >= ETH_ZLEN ? skb->len : ETH_ZLEN));
/* lock eth irq */
- spin_lock_irq (&rp->lock);
+ spin_lock_irq(&rp->lock);
wmb();
rp->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
wmb();
@@ -1346,11 +1356,11 @@ static int rhine_start_tx(struct sk_buff
dev->trans_start = jiffies;
- spin_unlock_irq (&rp->lock);
+ spin_unlock_irq(&rp->lock);
if (debug > 4) {
printk(KERN_DEBUG "%s: Transmit frame #%d queued in slot %d.\n",
- dev->name, rp->cur_tx-1, entry);
+ dev->name, rp->cur_tx-1, entry);
}
return 0;
}
@@ -1378,10 +1388,10 @@ static irqreturn_t rhine_interrupt(int i
if (debug > 4)
printk(KERN_DEBUG "%s: Interrupt, status %8.8x.\n",
- dev->name, intr_status);
+ dev->name, intr_status);
if (intr_status & (IntrRxDone | IntrRxErr | IntrRxDropped |
- IntrRxWakeUp | IntrRxEmpty | IntrRxNoBuf))
+ IntrRxWakeUp | IntrRxEmpty | IntrRxNoBuf))
rhine_rx(dev);
if (intr_status & (IntrTxErrSummary | IntrTxDone)) {
@@ -1391,9 +1401,9 @@ static irqreturn_t rhine_interrupt(int i
while ((readw(ioaddr+ChipCmd) & CmdTxOn) && --cnt)
udelay(5);
if (debug > 2 && !cnt)
- printk(KERN_WARNING "%s: rhine_interrupt() "
- "Tx engine still on.\n",
- dev->name);
+ printk(KERN_WARNING "%s: "
+ "rhine_interrupt() Tx engine"
+ "still on.\n", dev->name);
}
rhine_tx(dev);
}
@@ -1406,15 +1416,15 @@ static irqreturn_t rhine_interrupt(int i
if (--boguscnt < 0) {
printk(KERN_WARNING "%s: Too much work at interrupt, "
- "status=%#8.8x.\n",
- dev->name, intr_status);
+ "status=%#8.8x.\n",
+ dev->name, intr_status);
break;
}
}
if (debug > 3)
printk(KERN_DEBUG "%s: exiting interrupt, status=%8.8x.\n",
- dev->name, readw(ioaddr + IntrStatus));
+ dev->name, readw(ioaddr + IntrStatus));
return IRQ_RETVAL(handled);
}
@@ -1425,27 +1435,28 @@ static void rhine_tx(struct net_device *
struct rhine_private *rp = dev->priv;
int txstatus = 0, entry = rp->dirty_tx % TX_RING_SIZE;
- spin_lock (&rp->lock);
+ spin_lock(&rp->lock);
/* find and cleanup dirty tx descriptors */
while (rp->dirty_tx != rp->cur_tx) {
txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status);
if (debug > 6)
printk(KERN_DEBUG " Tx scavenge %d status %8.8x.\n",
- entry, txstatus);
+ entry, txstatus);
if (txstatus & DescOwn)
break;
if (txstatus & 0x8000) {
if (debug > 1)
- printk(KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n",
- dev->name, txstatus);
+ printk(KERN_DEBUG "%s: Transmit error, "
+ "Tx status %8.8x.\n",
+ dev->name, txstatus);
rp->stats.tx_errors++;
if (txstatus & 0x0400) rp->stats.tx_carrier_errors++;
if (txstatus & 0x0200) rp->stats.tx_window_errors++;
if (txstatus & 0x0100) rp->stats.tx_aborted_errors++;
if (txstatus & 0x0080) rp->stats.tx_heartbeat_errors++;
if (((rp->chip_id == VT86C100A) && txstatus & 0x0002) ||
- (txstatus & 0x0800) || (txstatus & 0x1000)) {
+ (txstatus & 0x0800) || (txstatus & 0x1000)) {
rp->stats.tx_fifo_errors++;
rp->tx_ring[entry].tx_status = cpu_to_le32(DescOwn);
break; /* Keep the skb - we try again */
@@ -1458,25 +1469,26 @@ static void rhine_tx(struct net_device *
rp->stats.collisions += txstatus & 0x0F;
if (debug > 6)
printk(KERN_DEBUG "collisions: %1.1x:%1.1x\n",
- (txstatus >> 3) & 0xF,
- txstatus & 0xF);
+ (txstatus >> 3) & 0xF,
+ txstatus & 0xF);
rp->stats.tx_bytes += rp->tx_skbuff[entry]->len;
rp->stats.tx_packets++;
}
/* Free the original skb. */
if (rp->tx_skbuff_dma[entry]) {
pci_unmap_single(rp->pdev,
- rp->tx_skbuff_dma[entry],
- rp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
+ rp->tx_skbuff_dma[entry],
+ rp->tx_skbuff[entry]->len,
+ PCI_DMA_TODEVICE);
}
dev_kfree_skb_irq(rp->tx_skbuff[entry]);
rp->tx_skbuff[entry] = NULL;
entry = (++rp->dirty_tx) % TX_RING_SIZE;
}
if ((rp->cur_tx - rp->dirty_tx) < TX_QUEUE_LEN - 4)
- netif_wake_queue (dev);
+ netif_wake_queue(dev);
- spin_unlock (&rp->lock);
+ spin_unlock(&rp->lock);
}
/* This routine is logically part of the interrupt handler, but isolated
@@ -1489,42 +1501,47 @@ static void rhine_rx(struct net_device *
if (debug > 4) {
printk(KERN_DEBUG "%s: rhine_rx(), entry %d status %8.8x.\n",
- dev->name, entry, le32_to_cpu(rp->rx_head_desc->rx_status));
+ dev->name, entry,
+ le32_to_cpu(rp->rx_head_desc->rx_status));
}
/* If EOP is set on the next entry, it's a new packet. Send it up. */
- while ( ! (rp->rx_head_desc->rx_status & cpu_to_le32(DescOwn))) {
+ while (!(rp->rx_head_desc->rx_status & cpu_to_le32(DescOwn))) {
struct rx_desc *desc = rp->rx_head_desc;
u32 desc_status = le32_to_cpu(desc->rx_status);
int data_size = desc_status >> 16;
if (debug > 4)
- printk(KERN_DEBUG " rhine_rx() status is %8.8x.\n",
- desc_status);
+ printk(KERN_DEBUG " rhine_rx() status is %8.8x.\n",
+ desc_status);
if (--boguscnt < 0)
break;
- if ( (desc_status & (RxWholePkt | RxErr)) != RxWholePkt) {
- if ((desc_status & RxWholePkt) != RxWholePkt) {
- printk(KERN_WARNING "%s: Oversized Ethernet frame spanned "
- "multiple buffers, entry %#x length %d status %8.8x!\n",
- dev->name, entry, data_size, desc_status);
- printk(KERN_WARNING "%s: Oversized Ethernet frame %p vs %p.\n",
- dev->name, rp->rx_head_desc, &rp->rx_ring[entry]);
+ if ((desc_status & (RxWholePkt | RxErr)) != RxWholePkt) {
+ if ((desc_status & RxWholePkt) != RxWholePkt) {
+ printk(KERN_WARNING "%s: Oversized Ethernet "
+ "frame spanned multiple buffers, entry "
+ "%#x length %d status %8.8x!\n",
+ dev->name, entry, data_size,
+ desc_status);
+ printk(KERN_WARNING "%s: Oversized Ethernet "
+ "frame %p vs %p.\n", dev->name,
+ rp->rx_head_desc, &rp->rx_ring[entry]);
rp->stats.rx_length_errors++;
} else if (desc_status & RxErr) {
/* There was a error. */
if (debug > 2)
- printk(KERN_DEBUG " rhine_rx() Rx error was %8.8x.\n",
- desc_status);
+ printk(KERN_DEBUG " rhine_rx() Rx "
+ "error was %8.8x.\n",
+ desc_status);
rp->stats.rx_errors++;
if (desc_status & 0x0030) rp->stats.rx_length_errors++;
if (desc_status & 0x0048) rp->stats.rx_fifo_errors++;
if (desc_status & 0x0004) rp->stats.rx_frame_errors++;
if (desc_status & 0x0002) {
/* this can also be updated outside the interrupt handler */
- spin_lock (&rp->lock);
+ spin_lock(&rp->lock);
rp->stats.rx_crc_errors++;
- spin_unlock (&rp->lock);
+ spin_unlock(&rp->lock);
}
}
} else {
@@ -1532,38 +1549,48 @@ static void rhine_rx(struct net_device *
/* Length should omit the CRC */
int pkt_len = data_size - 4;
- /* Check if the packet is long enough to accept without copying
- to a minimally-sized skbuff. */
+ /* Check if the packet is long enough to accept without
+ copying to a minimally-sized skbuff. */
if (pkt_len < rx_copybreak &&
(skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
skb->dev = dev;
skb_reserve(skb, 2); /* 16 byte align the IP header */
- pci_dma_sync_single_for_cpu(rp->pdev, rp->rx_skbuff_dma[entry],
- rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
-
- /* *_IP_COPYSUM isn't defined anywhere and eth_copy_and_sum
- is memcpy for all archs so this is kind of pointless right
- now ... or? */
-#if HAS_IP_COPYSUM /* Call copy + cksum if available. */
- eth_copy_and_sum(skb, rp->rx_skbuff[entry]->tail, pkt_len, 0);
+ pci_dma_sync_single_for_cpu(rp->pdev,
+ rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz,
+ PCI_DMA_FROMDEVICE);
+
+ /* *_IP_COPYSUM isn't defined anywhere and
+ eth_copy_and_sum is memcpy for all archs so
+ this is kind of pointless right now
+ ... or? */
+#if HAS_IP_COPYSUM /* Call copy + cksum if available. */
+ eth_copy_and_sum(skb,
+ rp->rx_skbuff[entry]->tail,
+ pkt_len, 0);
skb_put(skb, pkt_len);
#else
- memcpy(skb_put(skb, pkt_len), rp->rx_skbuff[entry]->tail,
- pkt_len);
+ memcpy(skb_put(skb, pkt_len),
+ rp->rx_skbuff[entry]->tail, pkt_len);
#endif
- pci_dma_sync_single_for_device(rp->pdev, rp->rx_skbuff_dma[entry],
- rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ pci_dma_sync_single_for_device(rp->pdev,
+ rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz,
+ PCI_DMA_FROMDEVICE);
} else {
skb = rp->rx_skbuff[entry];
if (skb == NULL) {
- printk(KERN_ERR "%s: Inconsistent Rx descriptor chain.\n",
- dev->name);
+ printk(KERN_ERR "%s: Inconsistent Rx "
+ "descriptor chain.\n",
+ dev->name);
break;
}
rp->rx_skbuff[entry] = NULL;
skb_put(skb, pkt_len);
- pci_unmap_single(rp->pdev, rp->rx_skbuff_dma[entry],
- rp->rx_buf_sz, PCI_DMA_FROMDEVICE);
+ pci_unmap_single(rp->pdev,
+ rp->rx_skbuff_dma[entry],
+ rp->rx_buf_sz,
+ PCI_DMA_FROMDEVICE);
}
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
@@ -1583,11 +1610,12 @@ static void rhine_rx(struct net_device *
skb = dev_alloc_skb(rp->rx_buf_sz);
rp->rx_skbuff[entry] = skb;
if (skb == NULL)
- break; /* Better luck next round. */
- skb->dev = dev; /* Mark as being used by this device. */
+ break; /* Better luck next round. */
+ skb->dev = dev; /* Mark as being used by this device. */
rp->rx_skbuff_dma[entry] =
- pci_map_single(rp->pdev, skb->tail, rp->rx_buf_sz,
- PCI_DMA_FROMDEVICE);
+ pci_map_single(rp->pdev, skb->tail,
+ rp->rx_buf_sz,
+ PCI_DMA_FROMDEVICE);
rp->rx_ring[entry].addr = cpu_to_le32(rp->rx_skbuff_dma[entry]);
}
rp->rx_ring[entry].rx_status = cpu_to_le32(DescOwn);
@@ -1595,13 +1623,15 @@ static void rhine_rx(struct net_device *
/* Pre-emptively restart Rx engine. */
writew(readw(dev->base_addr + ChipCmd) | CmdRxOn | CmdRxDemand,
- dev->base_addr + ChipCmd);
+ dev->base_addr + ChipCmd);
}
-/* Clears the "tally counters" for CRC errors and missed frames(?).
- It has been reported that some chips need a write of 0 to clear
- these, for others the counters are set to 1 when written to and
- instead cleared when read. So we clear them both ways ... */
+/*
+ * Clears the "tally counters" for CRC errors and missed frames(?).
+ * It has been reported that some chips need a write of 0 to clear
+ * these, for others the counters are set to 1 when written to and
+ * instead cleared when read. So we clear them both ways ...
+ */
static inline void clear_tally_counters(const long ioaddr)
{
writel(0, ioaddr + RxMissed);
@@ -1625,7 +1655,7 @@ static void rhine_restart_tx(struct net_
/* We know better than the chip where it should continue. */
writel(rp->tx_ring_dma + entry * sizeof(struct tx_desc),
- ioaddr + TxRingPtr);
+ ioaddr + TxRingPtr);
writew(CmdTxDemand | rp->chip_cmd, ioaddr + ChipCmd);
IOSYNC;
@@ -1634,8 +1664,8 @@ static void rhine_restart_tx(struct net_
/* This should never happen */
if (debug > 1)
printk(KERN_WARNING "%s: rhine_restart_tx() "
- "Another error occured %8.8x.\n",
- dev->name, intr_status);
+ "Another error occured %8.8x.\n",
+ dev->name, intr_status);
}
}
@@ -1645,7 +1675,7 @@ static void rhine_error(struct net_devic
struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
- spin_lock (&rp->lock);
+ spin_lock(&rp->lock);
if (intr_status & (IntrLinkChange)) {
if (readb(ioaddr + MIIStatus) & 0x02) {
@@ -1655,58 +1685,59 @@ static void rhine_error(struct net_devic
} else
rhine_check_duplex(dev);
if (debug)
- printk(KERN_ERR "%s: MII status changed: Autonegotiation "
- "advertising %4.4x partner %4.4x.\n", dev->name,
- mdio_read(dev, rp->phys[0], MII_ADVERTISE),
- mdio_read(dev, rp->phys[0], MII_LPA));
+ printk(KERN_ERR "%s: MII status changed: "
+ "Autonegotiation advertising %4.4x partner "
+ "%4.4x.\n", dev->name,
+ mdio_read(dev, rp->phys[0], MII_ADVERTISE),
+ mdio_read(dev, rp->phys[0], MII_LPA));
}
if (intr_status & IntrStatsMax) {
- rp->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
- rp->stats.rx_missed_errors += readw(ioaddr + RxMissed);
+ rp->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
+ rp->stats.rx_missed_errors += readw(ioaddr + RxMissed);
clear_tally_counters(ioaddr);
}
if (intr_status & IntrTxAborted) {
if (debug > 1)
printk(KERN_INFO "%s: Abort %8.8x, frame dropped.\n",
- dev->name, intr_status);
+ dev->name, intr_status);
}
if (intr_status & IntrTxUnderrun) {
if (rp->tx_thresh < 0xE0)
writeb(rp->tx_thresh += 0x20, ioaddr + TxConfig);
if (debug > 1)
printk(KERN_INFO "%s: Transmitter underrun, Tx "
- "threshold now %2.2x.\n",
- dev->name, rp->tx_thresh);
+ "threshold now %2.2x.\n",
+ dev->name, rp->tx_thresh);
}
if (intr_status & IntrTxDescRace) {
if (debug > 2)
printk(KERN_INFO "%s: Tx descriptor write-back race.\n",
- dev->name);
+ dev->name);
}
if ((intr_status & IntrTxError) &&
- (intr_status & ( IntrTxAborted |
- IntrTxUnderrun | IntrTxDescRace )) == 0) {
+ (intr_status & (IntrTxAborted |
+ IntrTxUnderrun | IntrTxDescRace)) == 0) {
if (rp->tx_thresh < 0xE0) {
writeb(rp->tx_thresh += 0x20, ioaddr + TxConfig);
}
if (debug > 1)
printk(KERN_INFO "%s: Unspecified error. Tx "
- "threshold now %2.2x.\n",
- dev->name, rp->tx_thresh);
+ "threshold now %2.2x.\n",
+ dev->name, rp->tx_thresh);
}
- if (intr_status & ( IntrTxAborted | IntrTxUnderrun | IntrTxDescRace |
- IntrTxError ))
+ if (intr_status & (IntrTxAborted | IntrTxUnderrun | IntrTxDescRace |
+ IntrTxError))
rhine_restart_tx(dev);
- if (intr_status & ~( IntrLinkChange | IntrStatsMax | IntrTxUnderrun |
- IntrTxError | IntrTxAborted | IntrNormalSummary |
- IntrTxDescRace )) {
+ if (intr_status & ~(IntrLinkChange | IntrStatsMax | IntrTxUnderrun |
+ IntrTxError | IntrTxAborted | IntrNormalSummary |
+ IntrTxDescRace)) {
if (debug > 1)
- printk(KERN_ERR "%s: Something Wicked happened! %8.8x.\n",
- dev->name, intr_status);
+ printk(KERN_ERR "%s: Something Wicked happened! "
+ "%8.8x.\n", dev->name, intr_status);
}
- spin_unlock (&rp->lock);
+ spin_unlock(&rp->lock);
}
static struct net_device_stats *rhine_get_stats(struct net_device *dev)
@@ -1716,8 +1747,8 @@ static struct net_device_stats *rhine_ge
unsigned long flags;
spin_lock_irqsave(&rp->lock, flags);
- rp->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
- rp->stats.rx_missed_errors += readw(ioaddr + RxMissed);
+ rp->stats.rx_crc_errors += readw(ioaddr + RxCRCErrs);
+ rp->stats.rx_missed_errors += readw(ioaddr + RxMissed);
clear_tally_counters(ioaddr);
spin_unlock_irqrestore(&rp->lock, flags);
@@ -1728,17 +1759,18 @@ static void rhine_set_rx_mode(struct net
{
struct rhine_private *rp = dev->priv;
long ioaddr = dev->base_addr;
- u32 mc_filter[2]; /* Multicast hash filter */
- u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */
+ u32 mc_filter[2]; /* Multicast hash filter */
+ u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */
- if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
+ if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
/* Unconditionally log net taps. */
- printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
+ printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
+ dev->name);
rx_mode = 0x1C;
writel(0xffffffff, ioaddr + MulticastFilter0);
writel(0xffffffff, ioaddr + MulticastFilter1);
} else if ((dev->mc_count > multicast_filter_limit)
- || (dev->flags & IFF_ALLMULTI)) {
+ || (dev->flags & IFF_ALLMULTI)) {
/* Too many to match, or accept all multicasts. */
writel(0xffffffff, ioaddr + MulticastFilter0);
writel(0xffffffff, ioaddr + MulticastFilter1);
@@ -1748,7 +1780,7 @@ static void rhine_set_rx_mode(struct net
int i;
memset(mc_filter, 0, sizeof(mc_filter));
for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
- i++, mclist = mclist->next) {
+ i++, mclist = mclist->next) {
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31));
@@ -1760,13 +1792,13 @@ static void rhine_set_rx_mode(struct net
writeb(rp->rx_thresh | rx_mode, ioaddr + RxConfig);
}
-static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info)
+static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{
struct rhine_private *rp = dev->priv;
- strcpy (info->driver, DRV_NAME);
- strcpy (info->version, DRV_VERSION);
- strcpy (info->bus_info, pci_name(rp->pdev));
+ strcpy(info->driver, DRV_NAME);
+ strcpy(info->version, DRV_VERSION);
+ strcpy(info->bus_info, pci_name(rp->pdev));
}
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -1869,8 +1901,9 @@ static int rhine_close(struct net_device
netif_stop_queue(dev);
if (debug > 1)
- printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.\n",
- dev->name, readw(ioaddr + ChipCmd));
+ printk(KERN_DEBUG "%s: Shutting down ethercard, "
+ "status was %4.4x.\n",
+ dev->name, readw(ioaddr + ChipCmd));
/* Switch to loopback mode to avoid hardware races. */
writeb(rp->tx_thresh | 0x02, ioaddr + TxConfig);
@@ -1892,7 +1925,7 @@ static int rhine_close(struct net_device
}
-static void __devexit rhine_remove_one (struct pci_dev *pdev)
+static void __devexit rhine_remove_one(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
@@ -1918,31 +1951,21 @@ static struct pci_driver rhine_driver =
};
-static int __init rhine_init (void)
+static int __init rhine_init(void)
{
/* when a module, this is printed whether or not devices are found in probe */
#ifdef MODULE
printk(version);
#endif
- return pci_module_init (&rhine_driver);
+ return pci_module_init(&rhine_driver);
}
-static void __exit rhine_cleanup (void)
+static void __exit rhine_cleanup(void)
{
- pci_unregister_driver (&rhine_driver);
+ pci_unregister_driver(&rhine_driver);
}
module_init(rhine_init);
module_exit(rhine_cleanup);
-
-
-/*
- * Local variables:
- * compile-command: "gcc -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -c via-rhine.c `[ -f /usr/include/linux/modversions.h ] && echo -DMODVERSIONS`"
- * c-indent-level: 4
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- */
^ permalink raw reply [flat|nested] 5+ messages in thread* [4/4][PATCH 2.6] via-rhine: USE_MEM, USE_IO -> USE_MMIO
2004-05-23 10:46 [0/4] via-rhine: clean-up for 2.6 Roger Luethi
2004-05-23 10:50 ` [2/4][PATCH 2.6] via-rhine: Rename some symbols Roger Luethi
2004-05-23 10:50 ` [3/4][PATCH 2.6] via-rhine: Whitespace clean-up Roger Luethi
@ 2004-05-23 10:50 ` Roger Luethi
2004-05-23 14:52 ` [5/4][PATCH 2.6] via-rhine: netdev_priv() Roger Luethi
3 siblings, 0 replies; 5+ messages in thread
From: Roger Luethi @ 2004-05-23 10:50 UTC (permalink / raw)
To: Jeff Garzik, Andrew Morton; +Cc: linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 49 bytes --]
Replace USE_MEM and USE_IO with USE_MMIO define.
[-- Attachment #2: via-rhine-2.6.6-4-defmem.diff --]
[-- Type: text/plain, Size: 2792 bytes --]
--- linux-2.6.6/drivers/net/via-rhine.c 2004-05-23 11:38:22.798939458 +0200
+++ linux-2.6.6-patch/drivers/net/via-rhine.c 2004-05-23 11:44:18.972292582 +0200
@@ -222,9 +222,8 @@ static char shortname[] = DRV_NAME;
/* This driver was written to use PCI memory space, however most versions
of the Rhine only work correctly with I/O space accesses. */
#ifdef CONFIG_VIA_RHINE_MMIO
-#define USE_MEM
+#define USE_MMIO
#else
-#define USE_IO
#undef readb
#undef readw
#undef readl
@@ -380,7 +379,7 @@ enum chip_capability_flags {
ReqTxAlign=0x10, HasWOL=0x20,
};
-#ifdef USE_MEM
+#ifdef USE_MMIO
#define RHINE_IOTYPE (PCI_USES_MEM | PCI_USES_MASTER | PCI_ADDR1)
#else
#define RHINE_IOTYPE (PCI_USES_IO | PCI_USES_MASTER | PCI_ADDR0)
@@ -432,7 +431,7 @@ enum backoff_bits {
BackCaptureEffect=0x04, BackRandom=0x08
};
-#ifdef USE_MEM
+#ifdef USE_MMIO
/* Registers we check that mmio and reg are the same. */
int mmio_verify_registers[] = {
RxConfig, TxConfig, IntrEnable, ConfigA, ConfigB, ConfigC, ConfigD,
@@ -590,7 +589,7 @@ static void wait_for_reset(struct net_de
boguscnt ? "succeeded" : "failed");
}
-#ifdef USE_MEM
+#ifdef USE_MMIO
static void __devinit enable_mmio(long ioaddr, int chip_id)
{
int n;
@@ -636,7 +635,7 @@ static int __devinit rhine_init_one(stru
long memaddr;
int io_size;
int pci_flags;
-#ifdef USE_MEM
+#ifdef USE_MMIO
long ioaddr0;
#endif
@@ -687,7 +686,7 @@ static int __devinit rhine_init_one(stru
if (pci_request_regions(pdev, shortname))
goto err_out_free_netdev;
-#ifdef USE_MEM
+#ifdef USE_MMIO
ioaddr0 = ioaddr;
enable_mmio(ioaddr0, chip_id);
@@ -710,7 +709,7 @@ static int __devinit rhine_init_one(stru
goto err_out_unmap;
}
}
-#endif
+#endif /* USE_MMIO */
/* D-Link provided reset code (with comment additions) */
if (rhine_chip_info[chip_id].drv_flags & HasWOL) {
@@ -737,14 +736,14 @@ static int __devinit rhine_init_one(stru
wait_for_reset(dev, chip_id, shortname);
/* Reload the station address from the EEPROM. */
-#ifdef USE_IO
- reload_eeprom(ioaddr);
-#else
+#ifdef USE_MMIO
reload_eeprom(ioaddr0);
/* Reloading from eeprom overwrites cfgA-D, so we must re-enable MMIO.
If reload_eeprom() was done first this could be avoided, but it is
not known if that still works with the "win98-reboot" problem. */
enable_mmio(ioaddr0, chip_id);
+#else
+ reload_eeprom(ioaddr);
#endif
for (i = 0; i < 6; i++)
@@ -880,7 +879,7 @@ static int __devinit rhine_init_one(stru
return 0;
err_out_unmap:
-#ifdef USE_MEM
+#ifdef USE_MMIO
iounmap((void *)ioaddr);
err_out_free_res:
#endif
@@ -1933,7 +1932,7 @@ static void __devexit rhine_remove_one(s
pci_release_regions(pdev);
-#ifdef USE_MEM
+#ifdef USE_MMIO
iounmap((char *)(dev->base_addr));
#endif
^ permalink raw reply [flat|nested] 5+ messages in thread* [5/4][PATCH 2.6] via-rhine: netdev_priv()
2004-05-23 10:46 [0/4] via-rhine: clean-up for 2.6 Roger Luethi
` (2 preceding siblings ...)
2004-05-23 10:50 ` [4/4][PATCH 2.6] via-rhine: USE_MEM, USE_IO -> USE_MMIO Roger Luethi
@ 2004-05-23 14:52 ` Roger Luethi
3 siblings, 0 replies; 5+ messages in thread
From: Roger Luethi @ 2004-05-23 14:52 UTC (permalink / raw)
To: Jeff Garzik, Andrew Morton; +Cc: linux-kernel, netdev
[-- Attachment #1: Type: text/plain, Size: 142 bytes --]
Found another patch that should go with this batch:
Switch to netdev_priv(). Fix outdated comment and bump version number
while we're at it.
[-- Attachment #2: via-rhine-2.6.6-5-netdev_priv.diff --]
[-- Type: text/plain, Size: 8770 bytes --]
--- linux-2.6.6/drivers/net/via-rhine.c 2004-05-23 11:56:08.043812192 +0200
+++ linux-2.6.6-patch/drivers/net/via-rhine.c 2004-05-23 16:42:26.550821369 +0200
@@ -128,8 +128,8 @@
*/
#define DRV_NAME "via-rhine"
-#define DRV_VERSION "1.1.19-2.5"
-#define DRV_RELDATE "July-12-2003"
+#define DRV_VERSION "1.1.20-2.6"
+#define DRV_RELDATE "May-23-2004"
/* A few user-configurable values.
@@ -219,8 +219,8 @@ KERN_INFO DRV_NAME ".c:v1.10-LK" DRV_VER
static char shortname[] = DRV_NAME;
-/* This driver was written to use PCI memory space, however most versions
- of the Rhine only work correctly with I/O space accesses. */
+/* This driver was written to use PCI memory space. Some early versions
+ of the Rhine may only work correctly with I/O space accesses. */
#ifdef CONFIG_VIA_RHINE_MMIO
#define USE_MMIO
#else
@@ -552,7 +552,7 @@ static int rhine_close(struct net_devic
static inline u32 get_intr_status(struct net_device *dev)
{
long ioaddr = dev->base_addr;
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
u32 intr_status;
intr_status = readw(ioaddr + IntrStatus);
@@ -770,7 +770,7 @@ static int __devinit rhine_init_one(stru
dev->irq = pdev->irq;
- rp = dev->priv;
+ rp = netdev_priv(dev);
spin_lock_init(&rp->lock);
rp->chip_id = chip_id;
rp->drv_flags = rhine_chip_info[chip_id].drv_flags;
@@ -892,7 +892,7 @@ err_out:
static int alloc_ring(struct net_device* dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
void *ring;
dma_addr_t ring_dma;
@@ -927,7 +927,7 @@ static int alloc_ring(struct net_device*
void free_ring(struct net_device* dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
pci_free_consistent(rp->pdev,
RX_RING_SIZE * sizeof(struct rx_desc) +
@@ -945,7 +945,7 @@ void free_ring(struct net_device* dev)
static void alloc_rbufs(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
dma_addr_t next;
int i;
@@ -986,7 +986,7 @@ static void alloc_rbufs(struct net_devic
static void free_rbufs(struct net_device* dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
int i;
/* Free all the skbuffs in the Rx queue. */
@@ -1005,7 +1005,7 @@ static void free_rbufs(struct net_device
static void alloc_tbufs(struct net_device* dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
dma_addr_t next;
int i;
@@ -1025,7 +1025,7 @@ static void alloc_tbufs(struct net_devic
static void free_tbufs(struct net_device* dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
int i;
for (i = 0; i < TX_RING_SIZE; i++) {
@@ -1048,7 +1048,7 @@ static void free_tbufs(struct net_device
static void init_registers(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
int i;
@@ -1114,7 +1114,7 @@ static int mdio_read(struct net_device *
static void mdio_write(struct net_device *dev, int phy_id, int regnum, int value)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
int boguscnt = 1024;
@@ -1145,7 +1145,7 @@ static void mdio_write(struct net_device
static int rhine_open(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
int i;
@@ -1188,7 +1188,7 @@ static int rhine_open(struct net_device
static void rhine_check_duplex(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
int mii_lpa = mdio_read(dev, rp->phys[0], MII_LPA);
int negotiated = mii_lpa & rp->mii_if.advertising;
@@ -1216,7 +1216,7 @@ static void rhine_check_duplex(struct ne
static void rhine_timer(unsigned long data)
{
struct net_device *dev = (struct net_device *)data;
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
int next_tick = 10*HZ;
int mii_status;
@@ -1249,7 +1249,7 @@ static void rhine_timer(unsigned long da
static void rhine_tx_timeout(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
@@ -1287,7 +1287,7 @@ static void rhine_tx_timeout(struct net_
static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
unsigned entry;
u32 intr_status;
@@ -1431,7 +1431,7 @@ static irqreturn_t rhine_interrupt(int i
for clarity. */
static void rhine_tx(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
int txstatus = 0, entry = rp->dirty_tx % TX_RING_SIZE;
spin_lock(&rp->lock);
@@ -1494,7 +1494,7 @@ static void rhine_tx(struct net_device *
for clarity and better register allocation. */
static void rhine_rx(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
int entry = rp->cur_rx % RX_RING_SIZE;
int boguscnt = rp->dirty_rx + RX_RING_SIZE - rp->cur_rx;
@@ -1639,7 +1639,7 @@ static inline void clear_tally_counters(
}
static void rhine_restart_tx(struct net_device *dev) {
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
int entry = rp->dirty_tx % TX_RING_SIZE;
u32 intr_status;
@@ -1671,7 +1671,7 @@ static void rhine_restart_tx(struct net_
static void rhine_error(struct net_device *dev, int intr_status)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
spin_lock(&rp->lock);
@@ -1741,7 +1741,7 @@ static void rhine_error(struct net_devic
static struct net_device_stats *rhine_get_stats(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
unsigned long flags;
@@ -1756,7 +1756,7 @@ static struct net_device_stats *rhine_ge
static void rhine_set_rx_mode(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
long ioaddr = dev->base_addr;
u32 mc_filter[2]; /* Multicast hash filter */
u8 rx_mode; /* Note: 0x02=accept runt, 0x01=accept errs */
@@ -1793,7 +1793,7 @@ static void rhine_set_rx_mode(struct net
static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
strcpy(info->driver, DRV_NAME);
strcpy(info->version, DRV_VERSION);
@@ -1802,7 +1802,7 @@ static void netdev_get_drvinfo(struct ne
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
int rc;
if (!(rp->drv_flags & CanHaveMII))
@@ -1817,7 +1817,7 @@ static int netdev_get_settings(struct ne
static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
int rc;
if (!(rp->drv_flags & CanHaveMII))
@@ -1832,7 +1832,7 @@ static int netdev_set_settings(struct ne
static int netdev_nway_reset(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
if (!(rp->drv_flags & CanHaveMII))
return -EINVAL;
@@ -1842,7 +1842,7 @@ static int netdev_nway_reset(struct net_
static u32 netdev_get_link(struct net_device *dev)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
if (!(rp->drv_flags & CanHaveMII))
return 0; /* -EINVAL */
@@ -1874,7 +1874,7 @@ static struct ethtool_ops netdev_ethtool
static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
struct mii_ioctl_data *data = (struct mii_ioctl_data *) & rq->ifr_data;
int rc;
@@ -1891,7 +1891,7 @@ static int netdev_ioctl(struct net_devic
static int rhine_close(struct net_device *dev)
{
long ioaddr = dev->base_addr;
- struct rhine_private *rp = dev->priv;
+ struct rhine_private *rp = netdev_priv(dev);
del_timer_sync(&rp->timer);
^ permalink raw reply [flat|nested] 5+ messages in thread