lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/7990: Fix whitespace errors

Browse Source 
Most of them reported by checkpatch.pl

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geert Uytterhoeven
2013-12-28 21:11:14 +01:00
committed by David S. Miller
parent ea074b3495
commit a8ab77a83a
4 changed files with 578 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
drivers/net/ethernet/amd/7990.c
View File

@@ -42,8 +42,8 @@
#include "7990.h" #include "7990.h"
#define WRITERAP(lp,x) out_be16(lp->base + LANCE_RAP, (x)) #define WRITERAP(lp, x) out_be16(lp->base + LANCE_RAP, (x))
#define WRITERDP(lp,x) out_be16(lp->base + LANCE_RDP, (x)) #define WRITERDP(lp, x) out_be16(lp->base + LANCE_RDP, (x))
#define READRDP(lp) in_be16(lp->base + LANCE_RDP) #define READRDP(lp) in_be16(lp->base + LANCE_RDP)
#if defined(CONFIG_HPLANCE) || defined(CONFIG_HPLANCE_MODULE) #if defined(CONFIG_HPLANCE) || defined(CONFIG_HPLANCE_MODULE)
@@ -56,8 +56,8 @@
#if defined(CONFIG_MVME147_NET) || defined(CONFIG_MVME147_NET_MODULE) #if defined(CONFIG_MVME147_NET) || defined(CONFIG_MVME147_NET_MODULE)
/* Lossage Factor Nine, Mr Sulu. */ /* Lossage Factor Nine, Mr Sulu. */
#define WRITERAP(lp,x) (lp->writerap(lp,x)) #define WRITERAP(lp, x) (lp->writerap(lp, x))
#define WRITERDP(lp,x) (lp->writerdp(lp,x)) #define WRITERDP(lp, x) (lp->writerdp(lp, x))
#define READRDP(lp) (lp->readrdp(lp)) #define READRDP(lp) (lp->readrdp(lp))
#else #else
@@ -95,30 +95,30 @@ static inline __u16 READRDP(struct lance_private *lp)
#define PRINT_RINGS() \ #define PRINT_RINGS() \
do { \ do { \
int t; \ int t; \
for (t=0; t < RX_RING_SIZE; t++) { \ for (t = 0; t < RX_RING_SIZE; t++) { \
printk("R%d: @(%02X %04X) len %04X, mblen %04X, bits %02X\n",\ printk("R%d: @(%02X %04X) len %04X, mblen %04X, bits %02X\n", \
t, ib->brx_ring[t].rmd1_hadr, ib->brx_ring[t].rmd0,\ t, ib->brx_ring[t].rmd1_hadr, ib->brx_ring[t].rmd0, \
ib->brx_ring[t].length,\ ib->brx_ring[t].length, \
ib->brx_ring[t].mblength, ib->brx_ring[t].rmd1_bits);\ ib->brx_ring[t].mblength, ib->brx_ring[t].rmd1_bits); \
}\ } \
for (t=0; t < TX_RING_SIZE; t++) { \ for (t = 0; t < TX_RING_SIZE; t++) { \
printk("T%d: @(%02X %04X) len %04X, misc %04X, bits %02X\n",\ printk("T%d: @(%02X %04X) len %04X, misc %04X, bits %02X\n", \
t, ib->btx_ring[t].tmd1_hadr, ib->btx_ring[t].tmd0,\ t, ib->btx_ring[t].tmd1_hadr, ib->btx_ring[t].tmd0, \
ib->btx_ring[t].length,\ ib->btx_ring[t].length, \
ib->btx_ring[t].misc, ib->btx_ring[t].tmd1_bits);\ ib->btx_ring[t].misc, ib->btx_ring[t].tmd1_bits); \
}\ } \
} while (0) } while (0)
#else #else
#define PRINT_RINGS() #define PRINT_RINGS()
#endif #endif
/* Load the CSR registers. The LANCE has to be STOPped when we do this! */ /* Load the CSR registers. The LANCE has to be STOPped when we do this! */
static void load_csrs (struct lance_private *lp) static void load_csrs(struct lance_private *lp)
{ {
volatile struct lance_init_block *aib = lp->lance_init_block; volatile struct lance_init_block *aib = lp->lance_init_block;
int leptr; int leptr;
leptr = LANCE_ADDR (aib); leptr = LANCE_ADDR(aib);
WRITERAP(lp, LE_CSR1); /* load address of init block */ WRITERAP(lp, LE_CSR1); /* load address of init block */
WRITERDP(lp, leptr & 0xFFFF); WRITERDP(lp, leptr & 0xFFFF);
@@ -134,7 +134,7 @@ static void load_csrs (struct lance_private *lp)
/* #define to 0 or 1 appropriately */ /* #define to 0 or 1 appropriately */
#define DEBUG_IRING 0 #define DEBUG_IRING 0
/* Set up the Lance Rx and Tx rings and the init block */ /* Set up the Lance Rx and Tx rings and the init block */
static void lance_init_ring (struct net_device *dev) static void lance_init_ring(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *ib = lp->init_block;
@@ -160,47 +160,47 @@ static void lance_init_ring (struct net_device *dev)
* use (addr[1] << 8) | addr[0] & co, but this is more efficient. * use (addr[1] << 8) | addr[0] & co, but this is more efficient.
*/ */
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
ib->phys_addr [0] = dev->dev_addr [1]; ib->phys_addr[0] = dev->dev_addr[1];
ib->phys_addr [1] = dev->dev_addr [0]; ib->phys_addr[1] = dev->dev_addr[0];
ib->phys_addr [2] = dev->dev_addr [3]; ib->phys_addr[2] = dev->dev_addr[3];
ib->phys_addr [3] = dev->dev_addr [2]; ib->phys_addr[3] = dev->dev_addr[2];
ib->phys_addr [4] = dev->dev_addr [5]; ib->phys_addr[4] = dev->dev_addr[5];
ib->phys_addr [5] = dev->dev_addr [4]; ib->phys_addr[5] = dev->dev_addr[4];
#else #else
for (i=0; i<6; i++) for (i = 0; i < 6; i++)
ib->phys_addr[i] = dev->dev_addr[i]; ib->phys_addr[i] = dev->dev_addr[i];
#endif #endif
if (DEBUG_IRING) if (DEBUG_IRING)
printk ("TX rings:\n"); printk("TX rings:\n");
lp->tx_full = 0; lp->tx_full = 0;
/* Setup the Tx ring entries */ /* Setup the Tx ring entries */
for (i = 0; i < (1<<lp->lance_log_tx_bufs); i++) { for (i = 0; i < (1 << lp->lance_log_tx_bufs); i++) {
leptr = LANCE_ADDR(&aib->tx_buf[i][0]); leptr = LANCE_ADDR(&aib->tx_buf[i][0]);
ib->btx_ring [i].tmd0 = leptr; ib->btx_ring[i].tmd0 = leptr;
ib->btx_ring [i].tmd1_hadr = leptr >> 16; ib->btx_ring[i].tmd1_hadr = leptr >> 16;
ib->btx_ring [i].tmd1_bits = 0; ib->btx_ring[i].tmd1_bits = 0;
ib->btx_ring [i].length = 0xf000; /* The ones required by tmd2 */ ib->btx_ring[i].length = 0xf000; /* The ones required by tmd2 */
ib->btx_ring [i].misc = 0; ib->btx_ring[i].misc = 0;
if (DEBUG_IRING) if (DEBUG_IRING)
printk ("%d: 0x%8.8x\n", i, leptr); printk("%d: 0x%8.8x\n", i, leptr);
} }
/* Setup the Rx ring entries */ /* Setup the Rx ring entries */
if (DEBUG_IRING) if (DEBUG_IRING)
printk ("RX rings:\n"); printk("RX rings:\n");
for (i = 0; i < (1<<lp->lance_log_rx_bufs); i++) { for (i = 0; i < (1 << lp->lance_log_rx_bufs); i++) {
leptr = LANCE_ADDR(&aib->rx_buf[i][0]); leptr = LANCE_ADDR(&aib->rx_buf[i][0]);
ib->brx_ring [i].rmd0 = leptr; ib->brx_ring[i].rmd0 = leptr;
ib->brx_ring [i].rmd1_hadr = leptr >> 16; ib->brx_ring[i].rmd1_hadr = leptr >> 16;
ib->brx_ring [i].rmd1_bits = LE_R1_OWN; ib->brx_ring[i].rmd1_bits = LE_R1_OWN;
/* 0xf000 == bits that must be one (reserved, presumably) */ /* 0xf000 == bits that must be one (reserved, presumably) */
ib->brx_ring [i].length = -RX_BUFF_SIZE | 0xf000; ib->brx_ring[i].length = -RX_BUFF_SIZE | 0xf000;
ib->brx_ring [i].mblength = 0; ib->brx_ring[i].mblength = 0;
if (DEBUG_IRING) if (DEBUG_IRING)
printk ("%d: 0x%8.8x\n", i, leptr); printk("%d: 0x%8.8x\n", i, leptr);
} }
/* Setup the initialization block */ /* Setup the initialization block */
@@ -210,23 +210,23 @@ static void lance_init_ring (struct net_device *dev)
ib->rx_len = (lp->lance_log_rx_bufs << 13) | (leptr >> 16); ib->rx_len = (lp->lance_log_rx_bufs << 13) | (leptr >> 16);
ib->rx_ptr = leptr; ib->rx_ptr = leptr;
if (DEBUG_IRING) if (DEBUG_IRING)
printk ("RX ptr: %8.8x\n", leptr); printk("RX ptr: %8.8x\n", leptr);
/* Setup tx descriptor pointer */ /* Setup tx descriptor pointer */
leptr = LANCE_ADDR(&aib->btx_ring); leptr = LANCE_ADDR(&aib->btx_ring);
ib->tx_len = (lp->lance_log_tx_bufs << 13) | (leptr >> 16); ib->tx_len = (lp->lance_log_tx_bufs << 13) | (leptr >> 16);
ib->tx_ptr = leptr; ib->tx_ptr = leptr;
if (DEBUG_IRING) if (DEBUG_IRING)
printk ("TX ptr: %8.8x\n", leptr); printk("TX ptr: %8.8x\n", leptr);
/* Clear the multicast filter */ /* Clear the multicast filter */
ib->filter [0] = 0; ib->filter[0] = 0;
ib->filter [1] = 0; ib->filter[1] = 0;
PRINT_RINGS(); PRINT_RINGS();
} }
/* LANCE must be STOPped before we do this, too... */ /* LANCE must be STOPped before we do this, too... */
static int init_restart_lance (struct lance_private *lp) static int init_restart_lance(struct lance_private *lp)
{ {
int i; int i;
@@ -239,7 +239,7 @@ static int init_restart_lance (struct lance_private *lp)
for (i = 0; (i < 100) && !(READRDP(lp) & (LE_C0_ERR | LE_C0_IDON)); i++) for (i = 0; (i < 100) && !(READRDP(lp) & (LE_C0_ERR | LE_C0_IDON)); i++)
barrier(); barrier();
if ((i == 100) || (READRDP(lp) & LE_C0_ERR)) { if ((i == 100) || (READRDP(lp) & LE_C0_ERR)) {
printk ("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, READRDP(lp)); printk("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, READRDP(lp));
return -1; return -1;
} }
@@ -250,7 +250,7 @@ static int init_restart_lance (struct lance_private *lp)
return 0; return 0;
} }
static int lance_reset (struct net_device *dev) static int lance_reset(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
int status; int status;
@@ -259,17 +259,17 @@ static int lance_reset (struct net_device *dev)
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
WRITERDP(lp, LE_C0_STOP); WRITERDP(lp, LE_C0_STOP);
load_csrs (lp); load_csrs(lp);
lance_init_ring (dev); lance_init_ring(dev);
dev->trans_start = jiffies; /* prevent tx timeout */ dev->trans_start = jiffies; /* prevent tx timeout */
status = init_restart_lance (lp); status = init_restart_lance(lp);
#ifdef DEBUG_DRIVER #ifdef DEBUG_DRIVER
printk ("Lance restart=%d\n", status); printk("Lance restart=%d\n", status);
#endif #endif
return status; return status;
} }
static int lance_rx (struct net_device *dev) static int lance_rx(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *ib = lp->init_block;
@@ -280,24 +280,24 @@ static int lance_rx (struct net_device *dev)
#endif #endif
#ifdef TEST_HITS #ifdef TEST_HITS
printk ("["); printk("[");
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {
if (i == lp->rx_new) if (i == lp->rx_new)
printk ("%s", printk("%s",
ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "_" : "X"); ib->brx_ring[i].rmd1_bits & LE_R1_OWN ? "_" : "X");
else else
printk ("%s", printk("%s",
ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "." : "1"); ib->brx_ring[i].rmd1_bits & LE_R1_OWN ? "." : "1");
} }
printk ("]"); printk("]");
#endif #endif
#ifdef CONFIG_HP300 #ifdef CONFIG_HP300
blinken_leds(0x40, 0); blinken_leds(0x40, 0);
#endif #endif
WRITERDP(lp, LE_C0_RINT | LE_C0_INEA); /* ack Rx int, reenable ints */ WRITERDP(lp, LE_C0_RINT | LE_C0_INEA); /* ack Rx int, reenable ints */
for (rd = &ib->brx_ring [lp->rx_new]; /* For each Rx ring we own... */ for (rd = &ib->brx_ring[lp->rx_new]; /* For each Rx ring we own... */
!((bits = rd->rmd1_bits) & LE_R1_OWN); !((bits = rd->rmd1_bits) & LE_R1_OWN);
rd = &ib->brx_ring [lp->rx_new]) { rd = &ib->brx_ring[lp->rx_new]) {
/* We got an incomplete frame? */ /* We got an incomplete frame? */
if ((bits & LE_R1_POK) != LE_R1_POK) { if ((bits & LE_R1_POK) != LE_R1_POK) {
@@ -308,11 +308,16 @@ static int lance_rx (struct net_device *dev)
/* Count only the end frame as a rx error, /* Count only the end frame as a rx error,
* not the beginning * not the beginning
*/ */
if (bits & LE_R1_BUF) dev->stats.rx_fifo_errors++; if (bits & LE_R1_BUF)
if (bits & LE_R1_CRC) dev->stats.rx_crc_errors++; dev->stats.rx_fifo_errors++;
if (bits & LE_R1_OFL) dev->stats.rx_over_errors++; if (bits & LE_R1_CRC)
if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++; dev->stats.rx_crc_errors++;
if (bits & LE_R1_EOP) dev->stats.rx_errors++; if (bits & LE_R1_OFL)
dev->stats.rx_over_errors++;
if (bits & LE_R1_FRA)
dev->stats.rx_frame_errors++;
if (bits & LE_R1_EOP)
dev->stats.rx_errors++;
} else { } else {
int len = (rd->mblength & 0xfff) - 4; int len = (rd->mblength & 0xfff) - 4;
struct sk_buff *skb = netdev_alloc_skb(dev, len + 2); struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
@@ -325,13 +330,13 @@ static int lance_rx (struct net_device *dev)
return 0; return 0;
} }
skb_reserve (skb, 2); /* 16 byte align */ skb_reserve(skb, 2); /* 16 byte align */
skb_put (skb, len); /* make room */ skb_put(skb, len); /* make room */
skb_copy_to_linear_data(skb, skb_copy_to_linear_data(skb,
(unsigned char *)&(ib->rx_buf [lp->rx_new][0]), (unsigned char *)&(ib->rx_buf[lp->rx_new][0]),
len); len);
skb->protocol = eth_type_trans (skb, dev); skb->protocol = eth_type_trans(skb, dev);
netif_rx (skb); netif_rx(skb);
dev->stats.rx_packets++; dev->stats.rx_packets++;
dev->stats.rx_bytes += len; dev->stats.rx_bytes += len;
} }
@@ -344,7 +349,7 @@ static int lance_rx (struct net_device *dev)
return 0; return 0;
} }
static int lance_tx (struct net_device *dev) static int lance_tx(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *ib = lp->init_block;
@@ -361,7 +366,7 @@ static int lance_tx (struct net_device *dev)
j = lp->tx_old; j = lp->tx_old;
for (i = j; i != lp->tx_new; i = j) { for (i = j; i != lp->tx_new; i = j) {
td = &ib->btx_ring [i]; td = &ib->btx_ring[i];
/* If we hit a packet not owned by us, stop */ /* If we hit a packet not owned by us, stop */
if (td->tmd1_bits & LE_T1_OWN) if (td->tmd1_bits & LE_T1_OWN)
@@ -371,21 +376,24 @@ static int lance_tx (struct net_device *dev)
status = td->misc; status = td->misc;
dev->stats.tx_errors++; dev->stats.tx_errors++;
if (status & LE_T3_RTY) dev->stats.tx_aborted_errors++; if (status & LE_T3_RTY)
if (status & LE_T3_LCOL) dev->stats.tx_window_errors++; dev->stats.tx_aborted_errors++;
if (status & LE_T3_LCOL)
dev->stats.tx_window_errors++;
if (status & LE_T3_CLOS) { if (status & LE_T3_CLOS) {
dev->stats.tx_carrier_errors++; dev->stats.tx_carrier_errors++;
if (lp->auto_select) { if (lp->auto_select) {
lp->tpe = 1 - lp->tpe; lp->tpe = 1 - lp->tpe;
printk("%s: Carrier Lost, trying %s\n", printk("%s: Carrier Lost, trying %s\n",
dev->name, lp->tpe?"TPE":"AUI"); dev->name,
lp->tpe ? "TPE" : "AUI");
/* Stop the lance */ /* Stop the lance */
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
WRITERDP(lp, LE_C0_STOP); WRITERDP(lp, LE_C0_STOP);
lance_init_ring (dev); lance_init_ring(dev);
load_csrs (lp); load_csrs(lp);
init_restart_lance (lp); init_restart_lance(lp);
return 0; return 0;
} }
} }
@@ -395,14 +403,14 @@ static int lance_tx (struct net_device *dev)
if (status & (LE_T3_BUF|LE_T3_UFL)) { if (status & (LE_T3_BUF|LE_T3_UFL)) {
dev->stats.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
printk ("%s: Tx: ERR_BUF|ERR_UFL, restarting\n", printk("%s: Tx: ERR_BUF|ERR_UFL, restarting\n",
dev->name); dev->name);
/* Stop the lance */ /* Stop the lance */
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
WRITERDP(lp, LE_C0_STOP); WRITERDP(lp, LE_C0_STOP);
lance_init_ring (dev); lance_init_ring(dev);
load_csrs (lp); load_csrs(lp);
init_restart_lance (lp); init_restart_lance(lp);
return 0; return 0;
} }
} else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) { } else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) {
@@ -430,13 +438,13 @@ static int lance_tx (struct net_device *dev)
} }
static irqreturn_t static irqreturn_t
lance_interrupt (int irq, void *dev_id) lance_interrupt(int irq, void *dev_id)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
int csr0; int csr0;
spin_lock (&lp->devlock); spin_lock(&lp->devlock);
WRITERAP(lp, LE_CSR0); /* LANCE Controller Status */ WRITERAP(lp, LE_CSR0); /* LANCE Controller Status */
csr0 = READRDP(lp); csr0 = READRDP(lp);
@@ -444,7 +452,7 @@ lance_interrupt (int irq, void *dev_id)
PRINT_RINGS(); PRINT_RINGS();
if (!(csr0 & LE_C0_INTR)) { /* Check if any interrupt has */ if (!(csr0 & LE_C0_INTR)) { /* Check if any interrupt has */
spin_unlock (&lp->devlock); spin_unlock(&lp->devlock);
return IRQ_NONE; /* been generated by the Lance. */ return IRQ_NONE; /* been generated by the Lance. */
} }
@@ -457,10 +465,10 @@ lance_interrupt (int irq, void *dev_id)
} }
if (csr0 & LE_C0_RINT) if (csr0 & LE_C0_RINT)
lance_rx (dev); lance_rx(dev);
if (csr0 & LE_C0_TINT) if (csr0 & LE_C0_TINT)
lance_tx (dev); lance_tx(dev);
/* Log misc errors. */ /* Log misc errors. */
if (csr0 & LE_C0_BABL) if (csr0 & LE_C0_BABL)
@@ -476,17 +484,17 @@ lance_interrupt (int irq, void *dev_id)
if (lp->tx_full && netif_queue_stopped(dev) && (TX_BUFFS_AVAIL >= 0)) { if (lp->tx_full && netif_queue_stopped(dev) && (TX_BUFFS_AVAIL >= 0)) {
lp->tx_full = 0; lp->tx_full = 0;
netif_wake_queue (dev); netif_wake_queue(dev);
} }
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
WRITERDP(lp, LE_C0_BABL|LE_C0_CERR|LE_C0_MISS|LE_C0_MERR|LE_C0_IDON|LE_C0_INEA); WRITERDP(lp, LE_C0_BABL|LE_C0_CERR|LE_C0_MISS|LE_C0_MERR|LE_C0_IDON|LE_C0_INEA);
spin_unlock (&lp->devlock); spin_unlock(&lp->devlock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
int lance_open (struct net_device *dev) int lance_open(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
int res; int res;
@@ -497,17 +505,17 @@ int lance_open (struct net_device *dev)
res = lance_reset(dev); res = lance_reset(dev);
spin_lock_init(&lp->devlock); spin_lock_init(&lp->devlock);
netif_start_queue (dev); netif_start_queue(dev);
return res; return res;
} }
EXPORT_SYMBOL_GPL(lance_open); EXPORT_SYMBOL_GPL(lance_open);
int lance_close (struct net_device *dev) int lance_close(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
netif_stop_queue (dev); netif_stop_queue(dev);
/* Stop the LANCE */ /* Stop the LANCE */
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
@@ -524,11 +532,11 @@ void lance_tx_timeout(struct net_device *dev)
printk("lance_tx_timeout\n"); printk("lance_tx_timeout\n");
lance_reset(dev); lance_reset(dev);
dev->trans_start = jiffies; /* prevent tx timeout */ dev->trans_start = jiffies; /* prevent tx timeout */
netif_wake_queue (dev); netif_wake_queue(dev);
} }
EXPORT_SYMBOL_GPL(lance_tx_timeout); EXPORT_SYMBOL_GPL(lance_tx_timeout);
int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *ib = lp->init_block;
@@ -539,7 +547,7 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
if (!TX_BUFFS_AVAIL) if (!TX_BUFFS_AVAIL)
return NETDEV_TX_LOCKED; return NETDEV_TX_LOCKED;
netif_stop_queue (dev); netif_stop_queue(dev);
skblen = skb->len; skblen = skb->len;
@@ -550,42 +558,42 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if ((i % 16) == 0) if ((i % 16) == 0)
printk ("\n"); printk("\n");
printk ("%2.2x ", skb->data [i]); printk("%2.2x ", skb->data[i]);
} }
} }
#endif #endif
len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen; len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen;
entry = lp->tx_new & lp->tx_ring_mod_mask; entry = lp->tx_new & lp->tx_ring_mod_mask;
ib->btx_ring [entry].length = (-len) | 0xf000; ib->btx_ring[entry].length = (-len) | 0xf000;
ib->btx_ring [entry].misc = 0; ib->btx_ring[entry].misc = 0;
if (skb->len < ETH_ZLEN) if (skb->len < ETH_ZLEN)
memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN);
skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen); skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen);
/* Now, give the packet to the lance */ /* Now, give the packet to the lance */
ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); ib->btx_ring[entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN);
lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask; lp->tx_new = (lp->tx_new + 1) & lp->tx_ring_mod_mask;
outs++; outs++;
/* Kick the lance: transmit now */ /* Kick the lance: transmit now */
WRITERDP(lp, LE_C0_INEA | LE_C0_TDMD); WRITERDP(lp, LE_C0_INEA | LE_C0_TDMD);
dev_kfree_skb (skb); dev_kfree_skb(skb);
spin_lock_irqsave (&lp->devlock, flags); spin_lock_irqsave(&lp->devlock, flags);
if (TX_BUFFS_AVAIL) if (TX_BUFFS_AVAIL)
netif_start_queue (dev); netif_start_queue(dev);
else else
lp->tx_full = 1; lp->tx_full = 1;
spin_unlock_irqrestore (&lp->devlock, flags); spin_unlock_irqrestore(&lp->devlock, flags);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
EXPORT_SYMBOL_GPL(lance_start_xmit); EXPORT_SYMBOL_GPL(lance_start_xmit);
/* taken from the depca driver via a2065.c */ /* taken from the depca driver via a2065.c */
static void lance_load_multicast (struct net_device *dev) static void lance_load_multicast(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *ib = lp->init_block;
@@ -594,25 +602,25 @@ static void lance_load_multicast (struct net_device *dev)
u32 crc; u32 crc;
/* set all multicast bits */ /* set all multicast bits */
if (dev->flags & IFF_ALLMULTI){ if (dev->flags & IFF_ALLMULTI) {
ib->filter [0] = 0xffffffff; ib->filter[0] = 0xffffffff;
ib->filter [1] = 0xffffffff; ib->filter[1] = 0xffffffff;
return; return;
} }
/* clear the multicast filter */ /* clear the multicast filter */
ib->filter [0] = 0; ib->filter[0] = 0;
ib->filter [1] = 0; ib->filter[1] = 0;
/* Add addresses */ /* Add addresses */
netdev_for_each_mc_addr(ha, dev) { netdev_for_each_mc_addr(ha, dev) {
crc = ether_crc_le(6, ha->addr); crc = ether_crc_le(6, ha->addr);
crc = crc >> 26; crc = crc >> 26;
mcast_table [crc >> 4] |= 1 << (crc & 0xf); mcast_table[crc >> 4] |= 1 << (crc & 0xf);
} }
} }
void lance_set_multicast (struct net_device *dev) void lance_set_multicast(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
volatile struct lance_init_block *ib = lp->init_block; volatile struct lance_init_block *ib = lp->init_block;
@@ -620,26 +628,26 @@ void lance_set_multicast (struct net_device *dev)
stopped = netif_queue_stopped(dev); stopped = netif_queue_stopped(dev);
if (!stopped) if (!stopped)
netif_stop_queue (dev); netif_stop_queue(dev);
while (lp->tx_old != lp->tx_new) while (lp->tx_old != lp->tx_new)
schedule(); schedule();
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
WRITERDP(lp, LE_C0_STOP); WRITERDP(lp, LE_C0_STOP);
lance_init_ring (dev); lance_init_ring(dev);
if (dev->flags & IFF_PROMISC) { if (dev->flags & IFF_PROMISC) {
ib->mode |= LE_MO_PROM; ib->mode |= LE_MO_PROM;
} else { } else {
ib->mode &= ~LE_MO_PROM; ib->mode &= ~LE_MO_PROM;
lance_load_multicast (dev); lance_load_multicast(dev);
} }
load_csrs (lp); load_csrs(lp);
init_restart_lance (lp); init_restart_lance(lp);
if (!stopped) if (!stopped)
netif_start_queue (dev); netif_start_queue(dev);
} }
EXPORT_SYMBOL_GPL(lance_set_multicast); EXPORT_SYMBOL_GPL(lance_set_multicast);
@@ -648,10 +656,10 @@ void lance_poll(struct net_device *dev)
{ {
struct lance_private *lp = netdev_priv(dev); struct lance_private *lp = netdev_priv(dev);
spin_lock (&lp->devlock); spin_lock(&lp->devlock);
WRITERAP(lp, LE_CSR0); WRITERAP(lp, LE_CSR0);
WRITERDP(lp, LE_C0_STRT); WRITERDP(lp, LE_C0_STRT);
spin_unlock (&lp->devlock); spin_unlock(&lp->devlock);
lance_interrupt(dev->irq, dev); lance_interrupt(dev->irq, dev);
} }
#endif #endif

32
drivers/net/ethernet/amd/7990.h
View File

@@ -35,8 +35,8 @@
#define LANCE_LOG_RX_BUFFERS 3 #define LANCE_LOG_RX_BUFFERS 3
#endif #endif
#define TX_RING_SIZE (1<<LANCE_LOG_TX_BUFFERS) #define TX_RING_SIZE (1 << LANCE_LOG_TX_BUFFERS)
#define RX_RING_SIZE (1<<LANCE_LOG_RX_BUFFERS) #define RX_RING_SIZE (1 << LANCE_LOG_RX_BUFFERS)
#define TX_RING_MOD_MASK (TX_RING_SIZE - 1) #define TX_RING_MOD_MASK (TX_RING_SIZE - 1)
#define RX_RING_MOD_MASK (RX_RING_SIZE - 1) #define RX_RING_MOD_MASK (RX_RING_SIZE - 1)
#define TX_RING_LEN_BITS ((LANCE_LOG_TX_BUFFERS) << 29) #define TX_RING_LEN_BITS ((LANCE_LOG_TX_BUFFERS) << 29)
@@ -51,8 +51,7 @@ struct lance_rx_desc {
volatile unsigned char rmd1_bits; /* descriptor bits */ volatile unsigned char rmd1_bits; /* descriptor bits */
volatile unsigned char rmd1_hadr; /* high address of packet */ volatile unsigned char rmd1_hadr; /* high address of packet */
volatile short length; /* This length is 2s complement (negative)! volatile short length; /* This length is 2s complement (negative)!
* Buffer length * Buffer length */
*/
volatile unsigned short mblength; /* Actual number of bytes received */ volatile unsigned short mblength; /* Actual number of bytes received */
}; };
@@ -87,8 +86,8 @@ struct lance_init_block {
volatile struct lance_tx_desc btx_ring[TX_RING_SIZE]; volatile struct lance_tx_desc btx_ring[TX_RING_SIZE];
volatile struct lance_rx_desc brx_ring[RX_RING_SIZE]; volatile struct lance_rx_desc brx_ring[RX_RING_SIZE];
volatile char tx_buf [TX_RING_SIZE][TX_BUFF_SIZE]; volatile char tx_buf[TX_RING_SIZE][TX_BUFF_SIZE];
volatile char rx_buf [RX_RING_SIZE][RX_BUFF_SIZE]; volatile char rx_buf[RX_RING_SIZE][RX_BUFF_SIZE];
/* we use this just to make the struct big enough that we can move its startaddr /* we use this just to make the struct big enough that we can move its startaddr
* in order to force alignment to an eight byte boundary. * in order to force alignment to an eight byte boundary.
*/ */
@@ -98,8 +97,7 @@ struct lance_init_block {
* I'm definitely unhappy about the mechanism for allowing specific * I'm definitely unhappy about the mechanism for allowing specific
* drivers to add things... * drivers to add things...
*/ */
struct lance_private struct lance_private {
{
char *name; char *name;
unsigned long base; unsigned long base;
volatile struct lance_init_block *init_block; /* CPU address of RAM */ volatile struct lance_init_block *init_block; /* CPU address of RAM */
@@ -161,10 +159,8 @@ struct lance_private
/* /*
* Bit definitions for CSR3 * Bit definitions for CSR3
*/ */
#define LE_C3_BSWP 0x0004 /* Byte Swap #define LE_C3_BSWP 0x0004 /* Byte Swap (on for big endian byte order) */
(on for big endian byte order) */ #define LE_C3_ACON 0x0002 /* ALE Control (on for active low ALE) */
#define LE_C3_ACON 0x0002 /* ALE Control
(on for active low ALE) */
#define LE_C3_BCON 0x0001 /* Byte Control */ #define LE_C3_BCON 0x0001 /* Byte Control */
@@ -234,18 +230,18 @@ struct lance_private
/* Miscellaneous useful macros */ /* Miscellaneous useful macros */
#define TX_BUFFS_AVAIL ((lp->tx_old<=lp->tx_new)?\ #define TX_BUFFS_AVAIL ((lp->tx_old <= lp->tx_new) ? \
lp->tx_old+lp->tx_ring_mod_mask-lp->tx_new:\ lp->tx_old + lp->tx_ring_mod_mask - lp->tx_new : \
lp->tx_old - lp->tx_new-1) lp->tx_old - lp->tx_new - 1)
/* The LANCE only uses 24 bit addresses. This does the obvious thing. */ /* The LANCE only uses 24 bit addresses. This does the obvious thing. */
#define LANCE_ADDR(x) ((int)(x) & ~0xff000000) #define LANCE_ADDR(x) ((int)(x) & ~0xff000000)
/* Now the prototypes we export */ /* Now the prototypes we export */
int lance_open(struct net_device *dev); int lance_open(struct net_device *dev);
int lance_close (struct net_device *dev); int lance_close(struct net_device *dev);
int lance_start_xmit (struct sk_buff *skb, struct net_device *dev); int lance_start_xmit(struct sk_buff *skb, struct net_device *dev);
void lance_set_multicast (struct net_device *dev); void lance_set_multicast(struct net_device *dev);
void lance_tx_timeout(struct net_device *dev); void lance_tx_timeout(struct net_device *dev);
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
void lance_poll(struct net_device *dev); void lance_poll(struct net_device *dev);

6
drivers/net/ethernet/amd/hplance.c
View File

@@ -132,7 +132,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)
int i; int i;
/* reset the board */ /* reset the board */
out_8(va+DIO_IDOFF, 0xff); out_8(va + DIO_IDOFF, 0xff);
udelay(100); /* ariba! ariba! udelay! udelay! */ udelay(100); /* ariba! ariba! udelay! udelay! */
/* Fill the dev fields */ /* Fill the dev fields */
@@ -140,7 +140,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)
dev->netdev_ops = &hplance_netdev_ops; dev->netdev_ops = &hplance_netdev_ops;
dev->dma = 0; dev->dma = 0;
for (i=0; i<6; i++) { for (i = 0; i < 6; i++) {
/* The NVRAM holds our ethernet address, one nibble per byte, /* The NVRAM holds our ethernet address, one nibble per byte,
* at bytes NVRAMOFF+1,3,5,7,9... * at bytes NVRAMOFF+1,3,5,7,9...
*/ */
@@ -149,7 +149,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)
} }
lp = netdev_priv(dev); lp = netdev_priv(dev);
lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ lp->lance.name = (char *)d->name; /* discards const, shut up gcc */
lp->lance.base = va; lp->lance.base = va;
lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */
lp->lance.lance_init_block = NULL; /* LANCE addr of same RAM */ lp->lance.lance_init_block = NULL; /* LANCE addr of same RAM */

34
drivers/net/ethernet/amd/mvme147.c
View File

@@ -94,33 +94,31 @@ struct net_device * __init mvme147lance_probe(int unit)
dev->netdev_ops = &lance_netdev_ops; dev->netdev_ops = &lance_netdev_ops;
dev->dma = 0; dev->dma = 0;
addr=(u_long *)ETHERNET_ADDRESS; addr = (u_long *)ETHERNET_ADDRESS;
address = *addr; address = *addr;
dev->dev_addr[0]=0x08; dev->dev_addr[0] = 0x08;
dev->dev_addr[1]=0x00; dev->dev_addr[1] = 0x00;
dev->dev_addr[2]=0x3e; dev->dev_addr[2] = 0x3e;
address=address>>8; address = address >> 8;
dev->dev_addr[5]=address&0xff; dev->dev_addr[5] = address&0xff;
address=address>>8; address = address >> 8;
dev->dev_addr[4]=address&0xff; dev->dev_addr[4] = address&0xff;
address=address>>8; address = address >> 8;
dev->dev_addr[3]=address&0xff; dev->dev_addr[3] = address&0xff;
printk("%s: MVME147 at 0x%08lx, irq %d, " printk("%s: MVME147 at 0x%08lx, irq %d, Hardware Address %pM\n",
"Hardware Address %pM\n",
dev->name, dev->base_addr, MVME147_LANCE_IRQ, dev->name, dev->base_addr, MVME147_LANCE_IRQ,
dev->dev_addr); dev->dev_addr);
lp = netdev_priv(dev); lp = netdev_priv(dev);
lp->ram = __get_dma_pages(GFP_ATOMIC, 3); /* 16K */ lp->ram = __get_dma_pages(GFP_ATOMIC, 3); /* 16K */
if (!lp->ram) if (!lp->ram) {
{
printk("%s: No memory for LANCE buffers\n", dev->name); printk("%s: No memory for LANCE buffers\n", dev->name);
free_netdev(dev); free_netdev(dev);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
lp->lance.name = (char*)name; /* discards const, shut up gcc */ lp->lance.name = (char *)name; /* discards const, shut up gcc */
lp->lance.base = dev->base_addr; lp->lance.base = dev->base_addr;
lp->lance.init_block = (struct lance_init_block *)(lp->ram); /* CPU addr */ lp->lance.init_block = (struct lance_init_block *)(lp->ram); /* CPU addr */
lp->lance.lance_init_block = (struct lance_init_block *)(lp->ram); /* LANCE addr of same RAM */ lp->lance.lance_init_block = (struct lance_init_block *)(lp->ram); /* LANCE addr of same RAM */
@@ -167,8 +165,8 @@ static int m147lance_open(struct net_device *dev)
if (status) if (status)
return status; return status;
/* enable interrupts at board level. */ /* enable interrupts at board level. */
m147_pcc->lan_cntrl=0; /* clear the interrupts (if any) */ m147_pcc->lan_cntrl = 0; /* clear the interrupts (if any) */
m147_pcc->lan_cntrl=0x08 | 0x04; /* Enable irq 4 */ m147_pcc->lan_cntrl = 0x08 | 0x04; /* Enable irq 4 */
return 0; return 0;
} }
@@ -176,7 +174,7 @@ static int m147lance_open(struct net_device *dev)
static int m147lance_close(struct net_device *dev) static int m147lance_close(struct net_device *dev)
{ {
/* disable interrupts at boardlevel */ /* disable interrupts at boardlevel */
m147_pcc->lan_cntrl=0x0; /* disable interrupts */ m147_pcc->lan_cntrl = 0x0; /* disable interrupts */
lance_close(dev); lance_close(dev);
return 0; return 0;
} }