diff options
Diffstat (limited to 'drivers/net/ethernet/amd/7990.c')
-rw-r--r-- | drivers/net/ethernet/amd/7990.c | 836 |
1 files changed, 422 insertions, 414 deletions
diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c index 65926a956575..72cfff7d23a5 100644 --- a/drivers/net/ethernet/amd/7990.c +++ b/drivers/net/ethernet/amd/7990.c | |||
@@ -42,9 +42,9 @@ | |||
42 | 42 | ||
43 | #include "7990.h" | 43 | #include "7990.h" |
44 | 44 | ||
45 | #define WRITERAP(lp,x) out_be16(lp->base + LANCE_RAP, (x)) | 45 | #define WRITERAP(lp, x) out_be16(lp->base + LANCE_RAP, (x)) |
46 | #define WRITERDP(lp,x) out_be16(lp->base + LANCE_RDP, (x)) | 46 | #define WRITERDP(lp, x) out_be16(lp->base + LANCE_RDP, (x)) |
47 | #define READRDP(lp) in_be16(lp->base + LANCE_RDP) | 47 | #define READRDP(lp) in_be16(lp->base + LANCE_RDP) |
48 | 48 | ||
49 | #if defined(CONFIG_HPLANCE) || defined(CONFIG_HPLANCE_MODULE) | 49 | #if defined(CONFIG_HPLANCE) || defined(CONFIG_HPLANCE_MODULE) |
50 | #include "hplance.h" | 50 | #include "hplance.h" |
@@ -56,9 +56,9 @@ | |||
56 | #if defined(CONFIG_MVME147_NET) || defined(CONFIG_MVME147_NET_MODULE) | 56 | #if defined(CONFIG_MVME147_NET) || defined(CONFIG_MVME147_NET_MODULE) |
57 | 57 | ||
58 | /* Lossage Factor Nine, Mr Sulu. */ | 58 | /* Lossage Factor Nine, Mr Sulu. */ |
59 | #define WRITERAP(lp,x) (lp->writerap(lp,x)) | 59 | #define WRITERAP(lp, x) (lp->writerap(lp, x)) |
60 | #define WRITERDP(lp,x) (lp->writerdp(lp,x)) | 60 | #define WRITERDP(lp, x) (lp->writerdp(lp, x)) |
61 | #define READRDP(lp) (lp->readrdp(lp)) | 61 | #define READRDP(lp) (lp->readrdp(lp)) |
62 | 62 | ||
63 | #else | 63 | #else |
64 | 64 | ||
@@ -94,428 +94,436 @@ static inline __u16 READRDP(struct lance_private *lp) | |||
94 | #ifdef UNDEF | 94 | #ifdef UNDEF |
95 | #define PRINT_RINGS() \ | 95 | #define PRINT_RINGS() \ |
96 | do { \ | 96 | do { \ |
97 | int t; \ | 97 | int t; \ |
98 | for (t=0; t < RX_RING_SIZE; t++) { \ | 98 | for (t = 0; t < RX_RING_SIZE; t++) { \ |
99 | printk("R%d: @(%02X %04X) len %04X, mblen %04X, bits %02X\n",\ | 99 | printk("R%d: @(%02X %04X) len %04X, mblen %04X, bits %02X\n", \ |
100 | t, ib->brx_ring[t].rmd1_hadr, ib->brx_ring[t].rmd0,\ | 100 | t, ib->brx_ring[t].rmd1_hadr, ib->brx_ring[t].rmd0, \ |
101 | ib->brx_ring[t].length,\ | 101 | ib->brx_ring[t].length, \ |
102 | ib->brx_ring[t].mblength, ib->brx_ring[t].rmd1_bits);\ | 102 | ib->brx_ring[t].mblength, ib->brx_ring[t].rmd1_bits); \ |
103 | }\ | 103 | } \ |
104 | for (t=0; t < TX_RING_SIZE; t++) { \ | 104 | for (t = 0; t < TX_RING_SIZE; t++) { \ |
105 | printk("T%d: @(%02X %04X) len %04X, misc %04X, bits %02X\n",\ | 105 | printk("T%d: @(%02X %04X) len %04X, misc %04X, bits %02X\n", \ |
106 | t, ib->btx_ring[t].tmd1_hadr, ib->btx_ring[t].tmd0,\ | 106 | t, ib->btx_ring[t].tmd1_hadr, ib->btx_ring[t].tmd0, \ |
107 | ib->btx_ring[t].length,\ | 107 | ib->btx_ring[t].length, \ |
108 | ib->btx_ring[t].misc, ib->btx_ring[t].tmd1_bits);\ | 108 | ib->btx_ring[t].misc, ib->btx_ring[t].tmd1_bits); \ |
109 | }\ | 109 | } \ |
110 | } while (0) | 110 | } while (0) |
111 | #else | 111 | #else |
112 | #define PRINT_RINGS() | 112 | #define PRINT_RINGS() |
113 | #endif | 113 | #endif |
114 | 114 | ||
115 | /* Load the CSR registers. The LANCE has to be STOPped when we do this! */ | 115 | /* Load the CSR registers. The LANCE has to be STOPped when we do this! */ |
116 | static void load_csrs (struct lance_private *lp) | 116 | static void load_csrs(struct lance_private *lp) |
117 | { | 117 | { |
118 | volatile struct lance_init_block *aib = lp->lance_init_block; | 118 | volatile struct lance_init_block *aib = lp->lance_init_block; |
119 | int leptr; | 119 | int leptr; |
120 | 120 | ||
121 | leptr = LANCE_ADDR (aib); | 121 | leptr = LANCE_ADDR(aib); |
122 | 122 | ||
123 | WRITERAP(lp, LE_CSR1); /* load address of init block */ | 123 | WRITERAP(lp, LE_CSR1); /* load address of init block */ |
124 | WRITERDP(lp, leptr & 0xFFFF); | 124 | WRITERDP(lp, leptr & 0xFFFF); |
125 | WRITERAP(lp, LE_CSR2); | 125 | WRITERAP(lp, LE_CSR2); |
126 | WRITERDP(lp, leptr >> 16); | 126 | WRITERDP(lp, leptr >> 16); |
127 | WRITERAP(lp, LE_CSR3); | 127 | WRITERAP(lp, LE_CSR3); |
128 | WRITERDP(lp, lp->busmaster_regval); /* set byteswap/ALEctrl/byte ctrl */ | 128 | WRITERDP(lp, lp->busmaster_regval); /* set byteswap/ALEctrl/byte ctrl */ |
129 | 129 | ||
130 | /* Point back to csr0 */ | 130 | /* Point back to csr0 */ |
131 | WRITERAP(lp, LE_CSR0); | 131 | WRITERAP(lp, LE_CSR0); |
132 | } | 132 | } |
133 | 133 | ||
134 | /* #define to 0 or 1 appropriately */ | 134 | /* #define to 0 or 1 appropriately */ |
135 | #define DEBUG_IRING 0 | 135 | #define DEBUG_IRING 0 |
136 | /* Set up the Lance Rx and Tx rings and the init block */ | 136 | /* Set up the Lance Rx and Tx rings and the init block */ |
137 | static void lance_init_ring (struct net_device *dev) | 137 | static void lance_init_ring(struct net_device *dev) |
138 | { | 138 | { |
139 | struct lance_private *lp = netdev_priv(dev); | 139 | struct lance_private *lp = netdev_priv(dev); |
140 | volatile struct lance_init_block *ib = lp->init_block; | 140 | volatile struct lance_init_block *ib = lp->init_block; |
141 | volatile struct lance_init_block *aib; /* for LANCE_ADDR computations */ | 141 | volatile struct lance_init_block *aib; /* for LANCE_ADDR computations */ |
142 | int leptr; | 142 | int leptr; |
143 | int i; | 143 | int i; |
144 | 144 | ||
145 | aib = lp->lance_init_block; | 145 | aib = lp->lance_init_block; |
146 | 146 | ||
147 | lp->rx_new = lp->tx_new = 0; | 147 | lp->rx_new = lp->tx_new = 0; |
148 | lp->rx_old = lp->tx_old = 0; | 148 | lp->rx_old = lp->tx_old = 0; |
149 | 149 | ||
150 | ib->mode = LE_MO_PROM; /* normal, enable Tx & Rx */ | 150 | ib->mode = LE_MO_PROM; /* normal, enable Tx & Rx */ |
151 | 151 | ||
152 | /* Copy the ethernet address to the lance init block | 152 | /* Copy the ethernet address to the lance init block |
153 | * Notice that we do a byteswap if we're big endian. | 153 | * Notice that we do a byteswap if we're big endian. |
154 | * [I think this is the right criterion; at least, sunlance, | 154 | * [I think this is the right criterion; at least, sunlance, |
155 | * a2065 and atarilance do the byteswap and lance.c (PC) doesn't. | 155 | * a2065 and atarilance do the byteswap and lance.c (PC) doesn't. |
156 | * However, the datasheet says that the BSWAP bit doesn't affect | 156 | * However, the datasheet says that the BSWAP bit doesn't affect |
157 | * the init block, so surely it should be low byte first for | 157 | * the init block, so surely it should be low byte first for |
158 | * everybody? Um.] | 158 | * everybody? Um.] |
159 | * We could define the ib->physaddr as three 16bit values and | 159 | * We could define the ib->physaddr as three 16bit values and |
160 | * use (addr[1] << 8) | addr[0] & co, but this is more efficient. | 160 | * use (addr[1] << 8) | addr[0] & co, but this is more efficient. |
161 | */ | 161 | */ |
162 | #ifdef __BIG_ENDIAN | 162 | #ifdef __BIG_ENDIAN |
163 | ib->phys_addr [0] = dev->dev_addr [1]; | 163 | ib->phys_addr[0] = dev->dev_addr[1]; |
164 | ib->phys_addr [1] = dev->dev_addr [0]; | 164 | ib->phys_addr[1] = dev->dev_addr[0]; |
165 | ib->phys_addr [2] = dev->dev_addr [3]; | 165 | ib->phys_addr[2] = dev->dev_addr[3]; |
166 | ib->phys_addr [3] = dev->dev_addr [2]; | 166 | ib->phys_addr[3] = dev->dev_addr[2]; |
167 | ib->phys_addr [4] = dev->dev_addr [5]; | 167 | ib->phys_addr[4] = dev->dev_addr[5]; |
168 | ib->phys_addr [5] = dev->dev_addr [4]; | 168 | ib->phys_addr[5] = dev->dev_addr[4]; |
169 | #else | 169 | #else |
170 | for (i=0; i<6; i++) | 170 | for (i = 0; i < 6; i++) |
171 | ib->phys_addr[i] = dev->dev_addr[i]; | 171 | ib->phys_addr[i] = dev->dev_addr[i]; |
172 | #endif | 172 | #endif |
173 | 173 | ||
174 | if (DEBUG_IRING) | 174 | if (DEBUG_IRING) |
175 | printk ("TX rings:\n"); | 175 | printk("TX rings:\n"); |
176 | 176 | ||
177 | lp->tx_full = 0; | 177 | lp->tx_full = 0; |
178 | /* Setup the Tx ring entries */ | 178 | /* Setup the Tx ring entries */ |
179 | for (i = 0; i < (1<<lp->lance_log_tx_bufs); i++) { | 179 | for (i = 0; i < (1 << lp->lance_log_tx_bufs); i++) { |
180 | leptr = LANCE_ADDR(&aib->tx_buf[i][0]); | 180 | leptr = LANCE_ADDR(&aib->tx_buf[i][0]); |
181 | ib->btx_ring [i].tmd0 = leptr; | 181 | ib->btx_ring[i].tmd0 = leptr; |
182 | ib->btx_ring [i].tmd1_hadr = leptr >> 16; | 182 | ib->btx_ring[i].tmd1_hadr = leptr >> 16; |
183 | ib->btx_ring [i].tmd1_bits = 0; | 183 | ib->btx_ring[i].tmd1_bits = 0; |
184 | ib->btx_ring [i].length = 0xf000; /* The ones required by tmd2 */ | 184 | ib->btx_ring[i].length = 0xf000; /* The ones required by tmd2 */ |
185 | ib->btx_ring [i].misc = 0; | 185 | ib->btx_ring[i].misc = 0; |
186 | if (DEBUG_IRING) | 186 | if (DEBUG_IRING) |
187 | printk ("%d: 0x%8.8x\n", i, leptr); | 187 | printk("%d: 0x%8.8x\n", i, leptr); |
188 | } | 188 | } |
189 | 189 | ||
190 | /* Setup the Rx ring entries */ | 190 | /* Setup the Rx ring entries */ |
191 | if (DEBUG_IRING) | 191 | if (DEBUG_IRING) |
192 | printk ("RX rings:\n"); | 192 | printk("RX rings:\n"); |
193 | for (i = 0; i < (1<<lp->lance_log_rx_bufs); i++) { | 193 | for (i = 0; i < (1 << lp->lance_log_rx_bufs); i++) { |
194 | leptr = LANCE_ADDR(&aib->rx_buf[i][0]); | 194 | leptr = LANCE_ADDR(&aib->rx_buf[i][0]); |
195 | 195 | ||
196 | ib->brx_ring [i].rmd0 = leptr; | 196 | ib->brx_ring[i].rmd0 = leptr; |
197 | ib->brx_ring [i].rmd1_hadr = leptr >> 16; | 197 | ib->brx_ring[i].rmd1_hadr = leptr >> 16; |
198 | ib->brx_ring [i].rmd1_bits = LE_R1_OWN; | 198 | ib->brx_ring[i].rmd1_bits = LE_R1_OWN; |
199 | /* 0xf000 == bits that must be one (reserved, presumably) */ | 199 | /* 0xf000 == bits that must be one (reserved, presumably) */ |
200 | ib->brx_ring [i].length = -RX_BUFF_SIZE | 0xf000; | 200 | ib->brx_ring[i].length = -RX_BUFF_SIZE | 0xf000; |
201 | ib->brx_ring [i].mblength = 0; | 201 | ib->brx_ring[i].mblength = 0; |
202 | if (DEBUG_IRING) | 202 | if (DEBUG_IRING) |
203 | printk ("%d: 0x%8.8x\n", i, leptr); | 203 | printk("%d: 0x%8.8x\n", i, leptr); |
204 | } | 204 | } |
205 | 205 | ||
206 | /* Setup the initialization block */ | 206 | /* Setup the initialization block */ |
207 | 207 | ||
208 | /* Setup rx descriptor pointer */ | 208 | /* Setup rx descriptor pointer */ |
209 | leptr = LANCE_ADDR(&aib->brx_ring); | 209 | leptr = LANCE_ADDR(&aib->brx_ring); |
210 | ib->rx_len = (lp->lance_log_rx_bufs << 13) | (leptr >> 16); | 210 | ib->rx_len = (lp->lance_log_rx_bufs << 13) | (leptr >> 16); |
211 | ib->rx_ptr = leptr; | 211 | ib->rx_ptr = leptr; |
212 | if (DEBUG_IRING) | 212 | if (DEBUG_IRING) |
213 | printk ("RX ptr: %8.8x\n", leptr); | 213 | printk("RX ptr: %8.8x\n", leptr); |
214 | 214 | ||
215 | /* Setup tx descriptor pointer */ | 215 | /* Setup tx descriptor pointer */ |
216 | leptr = LANCE_ADDR(&aib->btx_ring); | 216 | leptr = LANCE_ADDR(&aib->btx_ring); |
217 | ib->tx_len = (lp->lance_log_tx_bufs << 13) | (leptr >> 16); | 217 | ib->tx_len = (lp->lance_log_tx_bufs << 13) | (leptr >> 16); |
218 | ib->tx_ptr = leptr; | 218 | ib->tx_ptr = leptr; |
219 | if (DEBUG_IRING) | 219 | if (DEBUG_IRING) |
220 | printk ("TX ptr: %8.8x\n", leptr); | 220 | printk("TX ptr: %8.8x\n", leptr); |
221 | 221 | ||
222 | /* Clear the multicast filter */ | 222 | /* Clear the multicast filter */ |
223 | ib->filter [0] = 0; | 223 | ib->filter[0] = 0; |
224 | ib->filter [1] = 0; | 224 | ib->filter[1] = 0; |
225 | PRINT_RINGS(); | 225 | PRINT_RINGS(); |
226 | } | 226 | } |
227 | 227 | ||
228 | /* LANCE must be STOPped before we do this, too... */ | 228 | /* LANCE must be STOPped before we do this, too... */ |
229 | static int init_restart_lance (struct lance_private *lp) | 229 | static int init_restart_lance(struct lance_private *lp) |
230 | { | 230 | { |
231 | int i; | 231 | int i; |
232 | 232 | ||
233 | WRITERAP(lp, LE_CSR0); | 233 | WRITERAP(lp, LE_CSR0); |
234 | WRITERDP(lp, LE_C0_INIT); | 234 | WRITERDP(lp, LE_C0_INIT); |
235 | 235 | ||
236 | /* Need a hook here for sunlance ledma stuff */ | 236 | /* Need a hook here for sunlance ledma stuff */ |
237 | 237 | ||
238 | /* Wait for the lance to complete initialization */ | 238 | /* Wait for the lance to complete initialization */ |
239 | for (i = 0; (i < 100) && !(READRDP(lp) & (LE_C0_ERR | LE_C0_IDON)); i++) | 239 | for (i = 0; (i < 100) && !(READRDP(lp) & (LE_C0_ERR | LE_C0_IDON)); i++) |
240 | barrier(); | 240 | barrier(); |
241 | if ((i == 100) || (READRDP(lp) & LE_C0_ERR)) { | 241 | if ((i == 100) || (READRDP(lp) & LE_C0_ERR)) { |
242 | printk ("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, READRDP(lp)); | 242 | printk("LANCE unopened after %d ticks, csr0=%4.4x.\n", i, READRDP(lp)); |
243 | return -1; | 243 | return -1; |
244 | } | 244 | } |
245 | 245 | ||
246 | /* Clear IDON by writing a "1", enable interrupts and start lance */ | 246 | /* Clear IDON by writing a "1", enable interrupts and start lance */ |
247 | WRITERDP(lp, LE_C0_IDON); | 247 | WRITERDP(lp, LE_C0_IDON); |
248 | WRITERDP(lp, LE_C0_INEA | LE_C0_STRT); | 248 | WRITERDP(lp, LE_C0_INEA | LE_C0_STRT); |
249 | 249 | ||
250 | return 0; | 250 | return 0; |
251 | } | 251 | } |
252 | 252 | ||
253 | static int lance_reset (struct net_device *dev) | 253 | static int lance_reset(struct net_device *dev) |
254 | { | 254 | { |
255 | struct lance_private *lp = netdev_priv(dev); | 255 | struct lance_private *lp = netdev_priv(dev); |
256 | int status; | 256 | int status; |
257 | 257 | ||
258 | /* Stop the lance */ | 258 | /* Stop the lance */ |
259 | WRITERAP(lp, LE_CSR0); | 259 | WRITERAP(lp, LE_CSR0); |
260 | WRITERDP(lp, LE_C0_STOP); | 260 | WRITERDP(lp, LE_C0_STOP); |
261 | 261 | ||
262 | load_csrs (lp); | 262 | load_csrs(lp); |
263 | lance_init_ring (dev); | 263 | lance_init_ring(dev); |
264 | dev->trans_start = jiffies; /* prevent tx timeout */ | 264 | dev->trans_start = jiffies; /* prevent tx timeout */ |
265 | status = init_restart_lance (lp); | 265 | status = init_restart_lance(lp); |
266 | #ifdef DEBUG_DRIVER | 266 | #ifdef DEBUG_DRIVER |
267 | printk ("Lance restart=%d\n", status); | 267 | printk("Lance restart=%d\n", status); |
268 | #endif | 268 | #endif |
269 | return status; | 269 | return status; |
270 | } | 270 | } |
271 | 271 | ||
272 | static int lance_rx (struct net_device *dev) | 272 | static int lance_rx(struct net_device *dev) |
273 | { | 273 | { |
274 | struct lance_private *lp = netdev_priv(dev); | 274 | struct lance_private *lp = netdev_priv(dev); |
275 | volatile struct lance_init_block *ib = lp->init_block; | 275 | volatile struct lance_init_block *ib = lp->init_block; |
276 | volatile struct lance_rx_desc *rd; | 276 | volatile struct lance_rx_desc *rd; |
277 | unsigned char bits; | 277 | unsigned char bits; |
278 | #ifdef TEST_HITS | 278 | #ifdef TEST_HITS |
279 | int i; | 279 | int i; |
280 | #endif | 280 | #endif |
281 | 281 | ||
282 | #ifdef TEST_HITS | 282 | #ifdef TEST_HITS |
283 | printk ("["); | 283 | printk("["); |
284 | for (i = 0; i < RX_RING_SIZE; i++) { | 284 | for (i = 0; i < RX_RING_SIZE; i++) { |
285 | if (i == lp->rx_new) | 285 | if (i == lp->rx_new) |
286 | printk ("%s", | 286 | printk("%s", |
287 | ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "_" : "X"); | 287 | ib->brx_ring[i].rmd1_bits & LE_R1_OWN ? "_" : "X"); |
288 | else | 288 | else |
289 | printk ("%s", | 289 | printk("%s", |
290 | ib->brx_ring [i].rmd1_bits & LE_R1_OWN ? "." : "1"); | 290 | ib->brx_ring[i].rmd1_bits & LE_R1_OWN ? "." : "1"); |
291 | } | 291 | } |
292 | printk ("]"); | 292 | printk("]"); |
293 | #endif | 293 | #endif |
294 | #ifdef CONFIG_HP300 | 294 | #ifdef CONFIG_HP300 |
295 | blinken_leds(0x40, 0); | 295 | blinken_leds(0x40, 0); |
296 | #endif | 296 | #endif |
297 | WRITERDP(lp, LE_C0_RINT | LE_C0_INEA); /* ack Rx int, reenable ints */ | 297 | WRITERDP(lp, LE_C0_RINT | LE_C0_INEA); /* ack Rx int, reenable ints */ |
298 | for (rd = &ib->brx_ring [lp->rx_new]; /* For each Rx ring we own... */ | 298 | for (rd = &ib->brx_ring[lp->rx_new]; /* For each Rx ring we own... */ |
299 | !((bits = rd->rmd1_bits) & LE_R1_OWN); | 299 | !((bits = rd->rmd1_bits) & LE_R1_OWN); |
300 | rd = &ib->brx_ring [lp->rx_new]) { | 300 | rd = &ib->brx_ring[lp->rx_new]) { |
301 | 301 | ||
302 | /* We got an incomplete frame? */ | 302 | /* We got an incomplete frame? */ |
303 | if ((bits & LE_R1_POK) != LE_R1_POK) { | 303 | if ((bits & LE_R1_POK) != LE_R1_POK) { |
304 | dev->stats.rx_over_errors++; | 304 | dev->stats.rx_over_errors++; |
305 | dev->stats.rx_errors++; | 305 | dev->stats.rx_errors++; |
306 | continue; | 306 | continue; |
307 | } else if (bits & LE_R1_ERR) { | 307 | } else if (bits & LE_R1_ERR) { |
308 | /* Count only the end frame as a rx error, | 308 | /* Count only the end frame as a rx error, |
309 | * not the beginning | 309 | * not the beginning |
310 | */ | 310 | */ |
311 | if (bits & LE_R1_BUF) dev->stats.rx_fifo_errors++; | 311 | if (bits & LE_R1_BUF) |
312 | if (bits & LE_R1_CRC) dev->stats.rx_crc_errors++; | 312 | dev->stats.rx_fifo_errors++; |
313 | if (bits & LE_R1_OFL) dev->stats.rx_over_errors++; | 313 | if (bits & LE_R1_CRC) |
314 | if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++; | 314 | dev->stats.rx_crc_errors++; |
315 | if (bits & LE_R1_EOP) dev->stats.rx_errors++; | 315 | if (bits & LE_R1_OFL) |
316 | } else { | 316 | dev->stats.rx_over_errors++; |
317 | if (bits & LE_R1_FRA) | ||
318 | dev->stats.rx_frame_errors++; | ||
319 | if (bits & LE_R1_EOP) | ||
320 | dev->stats.rx_errors++; | ||
321 | } else { | ||
317 | int len = (rd->mblength & 0xfff) - 4; | 322 | int len = (rd->mblength & 0xfff) - 4; |
318 | struct sk_buff *skb = netdev_alloc_skb(dev, len + 2); | 323 | struct sk_buff *skb = netdev_alloc_skb(dev, len + 2); |
319 | 324 | ||
320 | if (!skb) { | 325 | if (!skb) { |
321 | dev->stats.rx_dropped++; | 326 | dev->stats.rx_dropped++; |
322 | rd->mblength = 0; | 327 | rd->mblength = 0; |
323 | rd->rmd1_bits = LE_R1_OWN; | 328 | rd->rmd1_bits = LE_R1_OWN; |
324 | lp->rx_new = (lp->rx_new + 1) & lp->rx_ring_mod_mask; | 329 | lp->rx_new = (lp->rx_new + 1) & lp->rx_ring_mod_mask; |
325 | return 0; | 330 | return 0; |
326 | } | 331 | } |
327 | 332 | ||
328 | skb_reserve (skb, 2); /* 16 byte align */ | 333 | skb_reserve(skb, 2); /* 16 byte align */ |
329 | skb_put (skb, len); /* make room */ | 334 | skb_put(skb, len); /* make room */ |
330 | skb_copy_to_linear_data(skb, | 335 | skb_copy_to_linear_data(skb, |
331 | (unsigned char *)&(ib->rx_buf [lp->rx_new][0]), | 336 | (unsigned char *)&(ib->rx_buf[lp->rx_new][0]), |
332 | len); | 337 | len); |
333 | skb->protocol = eth_type_trans (skb, dev); | 338 | skb->protocol = eth_type_trans(skb, dev); |
334 | netif_rx (skb); | 339 | netif_rx(skb); |
335 | dev->stats.rx_packets++; | 340 | dev->stats.rx_packets++; |
336 | dev->stats.rx_bytes += len; | 341 | dev->stats.rx_bytes += len; |
337 | } | 342 | } |
338 | 343 | ||
339 | /* Return the packet to the pool */ | 344 | /* Return the packet to the pool */ |
340 | rd->mblength = 0; | 345 | rd->mblength = 0; |
341 | rd->rmd1_bits = LE_R1_OWN; | 346 | rd->rmd1_bits = LE_R1_OWN; |
342 | lp->rx_new = (lp->rx_new + 1) & lp->rx_ring_mod_mask; | 347 | lp->rx_new = (lp->rx_new + 1) & lp->rx_ring_mod_mask; |
343 | } | 348 | } |
344 | return 0; | 349 | return 0; |
345 | } | 350 | } |
346 | 351 | ||
347 | static int lance_tx (struct net_device *dev) | 352 | static int lance_tx(struct net_device *dev) |
348 | { | 353 | { |
349 | struct lance_private *lp = netdev_priv(dev); | 354 | struct lance_private *lp = netdev_priv(dev); |
350 | volatile struct lance_init_block *ib = lp->init_block; | 355 | volatile struct lance_init_block *ib = lp->init_block; |
351 | volatile struct lance_tx_desc *td; | 356 | volatile struct lance_tx_desc *td; |
352 | int i, j; | 357 | int i, j; |
353 | int status; | 358 | int status; |
354 | 359 | ||
355 | #ifdef CONFIG_HP300 | 360 | #ifdef CONFIG_HP300 |
356 | blinken_leds(0x80, 0); | 361 | blinken_leds(0x80, 0); |
357 | #endif | 362 | #endif |
358 | /* csr0 is 2f3 */ | 363 | /* csr0 is 2f3 */ |
359 | WRITERDP(lp, LE_C0_TINT | LE_C0_INEA); | 364 | WRITERDP(lp, LE_C0_TINT | LE_C0_INEA); |
360 | /* csr0 is 73 */ | 365 | /* csr0 is 73 */ |
361 | 366 | ||
362 | j = lp->tx_old; | 367 | j = lp->tx_old; |
363 | for (i = j; i != lp->tx_new; i = j) { | 368 | for (i = j; i != lp->tx_new; i = j) { |
364 | td = &ib->btx_ring [i]; | 369 | td = &ib->btx_ring[i]; |
365 | 370 | ||
366 | /* If we hit a packet not owned by us, stop */ | 371 | /* If we hit a packet not owned by us, stop */ |
367 | if (td->tmd1_bits & LE_T1_OWN) | 372 | if (td->tmd1_bits & LE_T1_OWN) |
368 | break; | 373 | break; |
369 | 374 | ||
370 | if (td->tmd1_bits & LE_T1_ERR) { | 375 | if (td->tmd1_bits & LE_T1_ERR) { |
371 | status = td->misc; | 376 | status = td->misc; |
372 | 377 | ||
373 | dev->stats.tx_errors++; | 378 | dev->stats.tx_errors++; |
374 | if (status & LE_T3_RTY) dev->stats.tx_aborted_errors++; | 379 | if (status & LE_T3_RTY) |
375 | if (status & LE_T3_LCOL) dev->stats.tx_window_errors++; | 380 | dev->stats.tx_aborted_errors++; |
376 | 381 | if (status & LE_T3_LCOL) | |
377 | if (status & LE_T3_CLOS) { | 382 | dev->stats.tx_window_errors++; |
378 | dev->stats.tx_carrier_errors++; | 383 | |
379 | if (lp->auto_select) { | 384 | if (status & LE_T3_CLOS) { |
380 | lp->tpe = 1 - lp->tpe; | 385 | dev->stats.tx_carrier_errors++; |
381 | printk("%s: Carrier Lost, trying %s\n", | 386 | if (lp->auto_select) { |
382 | dev->name, lp->tpe?"TPE":"AUI"); | 387 | lp->tpe = 1 - lp->tpe; |
383 | /* Stop the lance */ | 388 | printk("%s: Carrier Lost, trying %s\n", |
384 | WRITERAP(lp, LE_CSR0); | 389 | dev->name, |
385 | WRITERDP(lp, LE_C0_STOP); | 390 | lp->tpe ? "TPE" : "AUI"); |
386 | lance_init_ring (dev); | 391 | /* Stop the lance */ |
387 | load_csrs (lp); | 392 | WRITERAP(lp, LE_CSR0); |
388 | init_restart_lance (lp); | 393 | WRITERDP(lp, LE_C0_STOP); |
389 | return 0; | 394 | lance_init_ring(dev); |
390 | } | 395 | load_csrs(lp); |
391 | } | 396 | init_restart_lance(lp); |
392 | 397 | return 0; | |
393 | /* buffer errors and underflows turn off the transmitter */ | 398 | } |
394 | /* Restart the adapter */ | 399 | } |
395 | if (status & (LE_T3_BUF|LE_T3_UFL)) { | 400 | |
396 | dev->stats.tx_fifo_errors++; | 401 | /* buffer errors and underflows turn off the transmitter */ |
397 | 402 | /* Restart the adapter */ | |
398 | printk ("%s: Tx: ERR_BUF|ERR_UFL, restarting\n", | 403 | if (status & (LE_T3_BUF|LE_T3_UFL)) { |
399 | dev->name); | 404 | dev->stats.tx_fifo_errors++; |
400 | /* Stop the lance */ | 405 | |
401 | WRITERAP(lp, LE_CSR0); | 406 | printk("%s: Tx: ERR_BUF|ERR_UFL, restarting\n", |
402 | WRITERDP(lp, LE_C0_STOP); | 407 | dev->name); |
403 | lance_init_ring (dev); | 408 | /* Stop the lance */ |
404 | load_csrs (lp); | 409 | WRITERAP(lp, LE_CSR0); |
405 | init_restart_lance (lp); | 410 | WRITERDP(lp, LE_C0_STOP); |
406 | return 0; | 411 | lance_init_ring(dev); |
407 | } | 412 | load_csrs(lp); |
408 | } else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) { | 413 | init_restart_lance(lp); |
409 | /* | 414 | return 0; |
410 | * So we don't count the packet more than once. | 415 | } |
411 | */ | 416 | } else if ((td->tmd1_bits & LE_T1_POK) == LE_T1_POK) { |
412 | td->tmd1_bits &= ~(LE_T1_POK); | 417 | /* |
413 | 418 | * So we don't count the packet more than once. | |
414 | /* One collision before packet was sent. */ | 419 | */ |
415 | if (td->tmd1_bits & LE_T1_EONE) | 420 | td->tmd1_bits &= ~(LE_T1_POK); |
416 | dev->stats.collisions++; | 421 | |
417 | 422 | /* One collision before packet was sent. */ | |
418 | /* More than one collision, be optimistic. */ | 423 | if (td->tmd1_bits & LE_T1_EONE) |
419 | if (td->tmd1_bits & LE_T1_EMORE) | 424 | dev->stats.collisions++; |
420 | dev->stats.collisions += 2; | 425 | |
421 | 426 | /* More than one collision, be optimistic. */ | |
422 | dev->stats.tx_packets++; | 427 | if (td->tmd1_bits & LE_T1_EMORE) |
423 | } | 428 | dev->stats.collisions += 2; |
424 | 429 | ||
425 | j = (j + 1) & lp->tx_ring_mod_mask; | 430 | dev->stats.tx_packets++; |
426 | } | 431 | } |
427 | lp->tx_old = j; | 432 | |
428 | WRITERDP(lp, LE_C0_TINT | LE_C0_INEA); | 433 | j = (j + 1) & lp->tx_ring_mod_mask; |
429 | return 0; | 434 | } |
435 | lp->tx_old = j; | ||
436 | WRITERDP(lp, LE_C0_TINT | LE_C0_INEA); | ||
437 | return 0; | ||
430 | } | 438 | } |
431 | 439 | ||
432 | static irqreturn_t | 440 | static irqreturn_t |
433 | lance_interrupt (int irq, void *dev_id) | 441 | lance_interrupt(int irq, void *dev_id) |
434 | { | 442 | { |
435 | struct net_device *dev = (struct net_device *)dev_id; | 443 | struct net_device *dev = (struct net_device *)dev_id; |
436 | struct lance_private *lp = netdev_priv(dev); | 444 | struct lance_private *lp = netdev_priv(dev); |
437 | int csr0; | 445 | int csr0; |
438 | 446 | ||
439 | spin_lock (&lp->devlock); | 447 | spin_lock(&lp->devlock); |
440 | 448 | ||
441 | WRITERAP(lp, LE_CSR0); /* LANCE Controller Status */ | 449 | WRITERAP(lp, LE_CSR0); /* LANCE Controller Status */ |
442 | csr0 = READRDP(lp); | 450 | csr0 = READRDP(lp); |
443 | 451 | ||
444 | PRINT_RINGS(); | 452 | PRINT_RINGS(); |
445 | 453 | ||
446 | if (!(csr0 & LE_C0_INTR)) { /* Check if any interrupt has */ | 454 | if (!(csr0 & LE_C0_INTR)) { /* Check if any interrupt has */ |
447 | spin_unlock (&lp->devlock); | 455 | spin_unlock(&lp->devlock); |
448 | return IRQ_NONE; /* been generated by the Lance. */ | 456 | return IRQ_NONE; /* been generated by the Lance. */ |
449 | } | 457 | } |
450 | 458 | ||
451 | /* Acknowledge all the interrupt sources ASAP */ | 459 | /* Acknowledge all the interrupt sources ASAP */ |
452 | WRITERDP(lp, csr0 & ~(LE_C0_INEA|LE_C0_TDMD|LE_C0_STOP|LE_C0_STRT|LE_C0_INIT)); | 460 | WRITERDP(lp, csr0 & ~(LE_C0_INEA|LE_C0_TDMD|LE_C0_STOP|LE_C0_STRT|LE_C0_INIT)); |
453 | 461 | ||
454 | if ((csr0 & LE_C0_ERR)) { | 462 | if ((csr0 & LE_C0_ERR)) { |
455 | /* Clear the error condition */ | 463 | /* Clear the error condition */ |
456 | WRITERDP(lp, LE_C0_BABL|LE_C0_ERR|LE_C0_MISS|LE_C0_INEA); | 464 | WRITERDP(lp, LE_C0_BABL|LE_C0_ERR|LE_C0_MISS|LE_C0_INEA); |
457 | } | 465 | } |
458 | 466 | ||
459 | if (csr0 & LE_C0_RINT) | 467 | if (csr0 & LE_C0_RINT) |
460 | lance_rx (dev); | 468 | lance_rx(dev); |
461 | 469 | ||
462 | if (csr0 & LE_C0_TINT) | 470 | if (csr0 & LE_C0_TINT) |
463 | lance_tx (dev); | 471 | lance_tx(dev); |
464 | 472 | ||
465 | /* Log misc errors. */ | 473 | /* Log misc errors. */ |
466 | if (csr0 & LE_C0_BABL) | 474 | if (csr0 & LE_C0_BABL) |
467 | dev->stats.tx_errors++; /* Tx babble. */ | 475 | dev->stats.tx_errors++; /* Tx babble. */ |
468 | if (csr0 & LE_C0_MISS) | 476 | if (csr0 & LE_C0_MISS) |
469 | dev->stats.rx_errors++; /* Missed a Rx frame. */ | 477 | dev->stats.rx_errors++; /* Missed a Rx frame. */ |
470 | if (csr0 & LE_C0_MERR) { | 478 | if (csr0 & LE_C0_MERR) { |
471 | printk("%s: Bus master arbitration failure, status %4.4x.\n", | 479 | printk("%s: Bus master arbitration failure, status %4.4x.\n", |
472 | dev->name, csr0); | 480 | dev->name, csr0); |
473 | /* Restart the chip. */ | 481 | /* Restart the chip. */ |
474 | WRITERDP(lp, LE_C0_STRT); | 482 | WRITERDP(lp, LE_C0_STRT); |
475 | } | 483 | } |
476 | 484 | ||
477 | if (lp->tx_full && netif_queue_stopped(dev) && (TX_BUFFS_AVAIL >= 0)) { | 485 | if (lp->tx_full && netif_queue_stopped(dev) && (TX_BUFFS_AVAIL >= 0)) { |
478 | lp->tx_full = 0; | 486 | lp->tx_full = 0; |
479 | netif_wake_queue (dev); | 487 | netif_wake_queue(dev); |
480 | } | 488 | } |
481 | 489 | ||
482 | WRITERAP(lp, LE_CSR0); | 490 | WRITERAP(lp, LE_CSR0); |
483 | WRITERDP(lp, LE_C0_BABL|LE_C0_CERR|LE_C0_MISS|LE_C0_MERR|LE_C0_IDON|LE_C0_INEA); | 491 | WRITERDP(lp, LE_C0_BABL|LE_C0_CERR|LE_C0_MISS|LE_C0_MERR|LE_C0_IDON|LE_C0_INEA); |
484 | 492 | ||
485 | spin_unlock (&lp->devlock); | 493 | spin_unlock(&lp->devlock); |
486 | return IRQ_HANDLED; | 494 | return IRQ_HANDLED; |
487 | } | 495 | } |
488 | 496 | ||
489 | int lance_open (struct net_device *dev) | 497 | int lance_open(struct net_device *dev) |
490 | { | 498 | { |
491 | struct lance_private *lp = netdev_priv(dev); | 499 | struct lance_private *lp = netdev_priv(dev); |
492 | int res; | 500 | int res; |
493 | 501 | ||
494 | /* Install the Interrupt handler. Or we could shunt this out to specific drivers? */ | 502 | /* Install the Interrupt handler. Or we could shunt this out to specific drivers? */ |
495 | if (request_irq(lp->irq, lance_interrupt, IRQF_SHARED, lp->name, dev)) | 503 | if (request_irq(lp->irq, lance_interrupt, IRQF_SHARED, lp->name, dev)) |
496 | return -EAGAIN; | 504 | return -EAGAIN; |
497 | 505 | ||
498 | res = lance_reset(dev); | 506 | res = lance_reset(dev); |
499 | spin_lock_init(&lp->devlock); | 507 | spin_lock_init(&lp->devlock); |
500 | netif_start_queue (dev); | 508 | netif_start_queue(dev); |
501 | 509 | ||
502 | return res; | 510 | return res; |
503 | } | 511 | } |
504 | EXPORT_SYMBOL_GPL(lance_open); | 512 | EXPORT_SYMBOL_GPL(lance_open); |
505 | 513 | ||
506 | int lance_close (struct net_device *dev) | 514 | int lance_close(struct net_device *dev) |
507 | { | 515 | { |
508 | struct lance_private *lp = netdev_priv(dev); | 516 | struct lance_private *lp = netdev_priv(dev); |
509 | 517 | ||
510 | netif_stop_queue (dev); | 518 | netif_stop_queue(dev); |
511 | 519 | ||
512 | /* Stop the LANCE */ | 520 | /* Stop the LANCE */ |
513 | WRITERAP(lp, LE_CSR0); | 521 | WRITERAP(lp, LE_CSR0); |
514 | WRITERDP(lp, LE_C0_STOP); | 522 | WRITERDP(lp, LE_C0_STOP); |
515 | 523 | ||
516 | free_irq(lp->irq, dev); | 524 | free_irq(lp->irq, dev); |
517 | 525 | ||
518 | return 0; | 526 | return 0; |
519 | } | 527 | } |
520 | EXPORT_SYMBOL_GPL(lance_close); | 528 | EXPORT_SYMBOL_GPL(lance_close); |
521 | 529 | ||
@@ -524,122 +532,122 @@ void lance_tx_timeout(struct net_device *dev) | |||
524 | printk("lance_tx_timeout\n"); | 532 | printk("lance_tx_timeout\n"); |
525 | lance_reset(dev); | 533 | lance_reset(dev); |
526 | dev->trans_start = jiffies; /* prevent tx timeout */ | 534 | dev->trans_start = jiffies; /* prevent tx timeout */ |
527 | netif_wake_queue (dev); | 535 | netif_wake_queue(dev); |
528 | } | 536 | } |
529 | EXPORT_SYMBOL_GPL(lance_tx_timeout); | 537 | EXPORT_SYMBOL_GPL(lance_tx_timeout); |
530 | 538 | ||
531 | int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) | 539 | int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) |
532 | { | 540 | { |
533 | struct lance_private *lp = netdev_priv(dev); | 541 | struct lance_private *lp = netdev_priv(dev); |
534 | volatile struct lance_init_block *ib = lp->init_block; | 542 | volatile struct lance_init_block *ib = lp->init_block; |
535 | int entry, skblen, len; | 543 | int entry, skblen, len; |
536 | static int outs; | 544 | static int outs; |
537 | unsigned long flags; | 545 | unsigned long flags; |
538 | 546 | ||
539 | if (!TX_BUFFS_AVAIL) | 547 | if (!TX_BUFFS_AVAIL) |
540 | return NETDEV_TX_LOCKED; | 548 | return NETDEV_TX_LOCKED; |
541 | 549 | ||
542 | netif_stop_queue (dev); | 550 | netif_stop_queue(dev); |
543 | 551 | ||
544 | skblen = skb->len; | 552 | skblen = skb->len; |
545 | 553 | ||
546 | #ifdef DEBUG_DRIVER | 554 | #ifdef DEBUG_DRIVER |
547 | /* dump the packet */ | 555 | /* dump the packet */ |
548 | { | 556 | { |
549 | int i; | 557 | int i; |
550 | 558 | ||
551 | for (i = 0; i < 64; i++) { | 559 | for (i = 0; i < 64; i++) { |
552 | if ((i % 16) == 0) | 560 | if ((i % 16) == 0) |
553 | printk ("\n"); | 561 | printk("\n"); |
554 | printk ("%2.2x ", skb->data [i]); | 562 | printk("%2.2x ", skb->data[i]); |
555 | } | 563 | } |
556 | } | 564 | } |
557 | #endif | 565 | #endif |
558 | len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen; | 566 | len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen; |
559 | entry = lp->tx_new & lp->tx_ring_mod_mask; | 567 | entry = lp->tx_new & lp->tx_ring_mod_mask; |
560 | ib->btx_ring [entry].length = (-len) | 0xf000; | 568 | ib->btx_ring[entry].length = (-len) | 0xf000; |
561 | ib->btx_ring [entry].misc = 0; | 569 | ib->btx_ring[entry].misc = 0; |
562 | 570 | ||
563 | if (skb->len < ETH_ZLEN) | 571 | if (skb->len < ETH_ZLEN) |
564 | memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); | 572 | memset((void *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); |
565 | skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen); | 573 | skb_copy_from_linear_data(skb, (void *)&ib->tx_buf[entry][0], skblen); |
566 | 574 | ||
567 | /* Now, give the packet to the lance */ | 575 | /* Now, give the packet to the lance */ |
568 | ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); | 576 | ib->btx_ring[entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); |
569 | lp->tx_new = (lp->tx_new+1) & lp->tx_ring_mod_mask; | 577 | lp->tx_new = (lp->tx_new + 1) & lp->tx_ring_mod_mask; |
570 | 578 | ||
571 | outs++; | 579 | outs++; |
572 | /* Kick the lance: transmit now */ | 580 | /* Kick the lance: transmit now */ |
573 | WRITERDP(lp, LE_C0_INEA | LE_C0_TDMD); | 581 | WRITERDP(lp, LE_C0_INEA | LE_C0_TDMD); |
574 | dev_kfree_skb (skb); | 582 | dev_kfree_skb(skb); |
575 | 583 | ||
576 | spin_lock_irqsave (&lp->devlock, flags); | 584 | spin_lock_irqsave(&lp->devlock, flags); |
577 | if (TX_BUFFS_AVAIL) | 585 | if (TX_BUFFS_AVAIL) |
578 | netif_start_queue (dev); | 586 | netif_start_queue(dev); |
579 | else | 587 | else |
580 | lp->tx_full = 1; | 588 | lp->tx_full = 1; |
581 | spin_unlock_irqrestore (&lp->devlock, flags); | 589 | spin_unlock_irqrestore(&lp->devlock, flags); |
582 | 590 | ||
583 | return NETDEV_TX_OK; | 591 | return NETDEV_TX_OK; |
584 | } | 592 | } |
585 | EXPORT_SYMBOL_GPL(lance_start_xmit); | 593 | EXPORT_SYMBOL_GPL(lance_start_xmit); |
586 | 594 | ||
587 | /* taken from the depca driver via a2065.c */ | 595 | /* taken from the depca driver via a2065.c */ |
588 | static void lance_load_multicast (struct net_device *dev) | 596 | static void lance_load_multicast(struct net_device *dev) |
589 | { | 597 | { |
590 | struct lance_private *lp = netdev_priv(dev); | 598 | struct lance_private *lp = netdev_priv(dev); |
591 | volatile struct lance_init_block *ib = lp->init_block; | 599 | volatile struct lance_init_block *ib = lp->init_block; |
592 | volatile u16 *mcast_table = (u16 *)&ib->filter; | 600 | volatile u16 *mcast_table = (u16 *)&ib->filter; |
593 | struct netdev_hw_addr *ha; | 601 | struct netdev_hw_addr *ha; |
594 | u32 crc; | 602 | u32 crc; |
595 | 603 | ||
596 | /* set all multicast bits */ | 604 | /* set all multicast bits */ |
597 | if (dev->flags & IFF_ALLMULTI){ | 605 | if (dev->flags & IFF_ALLMULTI) { |
598 | ib->filter [0] = 0xffffffff; | 606 | ib->filter[0] = 0xffffffff; |
599 | ib->filter [1] = 0xffffffff; | 607 | ib->filter[1] = 0xffffffff; |
600 | return; | 608 | return; |
601 | } | 609 | } |
602 | /* clear the multicast filter */ | 610 | /* clear the multicast filter */ |
603 | ib->filter [0] = 0; | 611 | ib->filter[0] = 0; |
604 | ib->filter [1] = 0; | 612 | ib->filter[1] = 0; |
605 | 613 | ||
606 | /* Add addresses */ | 614 | /* Add addresses */ |
607 | netdev_for_each_mc_addr(ha, dev) { | 615 | netdev_for_each_mc_addr(ha, dev) { |
608 | crc = ether_crc_le(6, ha->addr); | 616 | crc = ether_crc_le(6, ha->addr); |
609 | crc = crc >> 26; | 617 | crc = crc >> 26; |
610 | mcast_table [crc >> 4] |= 1 << (crc & 0xf); | 618 | mcast_table[crc >> 4] |= 1 << (crc & 0xf); |
611 | } | 619 | } |
612 | } | 620 | } |
613 | 621 | ||
614 | 622 | ||
615 | void lance_set_multicast (struct net_device *dev) | 623 | void lance_set_multicast(struct net_device *dev) |
616 | { | 624 | { |
617 | struct lance_private *lp = netdev_priv(dev); | 625 | struct lance_private *lp = netdev_priv(dev); |
618 | volatile struct lance_init_block *ib = lp->init_block; | 626 | volatile struct lance_init_block *ib = lp->init_block; |
619 | int stopped; | 627 | int stopped; |
620 | 628 | ||
621 | stopped = netif_queue_stopped(dev); | 629 | stopped = netif_queue_stopped(dev); |
622 | if (!stopped) | 630 | if (!stopped) |
623 | netif_stop_queue (dev); | 631 | netif_stop_queue(dev); |
624 | |||
625 | while (lp->tx_old != lp->tx_new) | ||
626 | schedule(); | ||
627 | 632 | ||
628 | WRITERAP(lp, LE_CSR0); | 633 | while (lp->tx_old != lp->tx_new) |
629 | WRITERDP(lp, LE_C0_STOP); | 634 | schedule(); |
630 | lance_init_ring (dev); | ||
631 | 635 | ||
632 | if (dev->flags & IFF_PROMISC) { | 636 | WRITERAP(lp, LE_CSR0); |
633 | ib->mode |= LE_MO_PROM; | 637 | WRITERDP(lp, LE_C0_STOP); |
634 | } else { | 638 | lance_init_ring(dev); |
635 | ib->mode &= ~LE_MO_PROM; | 639 | |
636 | lance_load_multicast (dev); | 640 | if (dev->flags & IFF_PROMISC) { |
637 | } | 641 | ib->mode |= LE_MO_PROM; |
638 | load_csrs (lp); | 642 | } else { |
639 | init_restart_lance (lp); | 643 | ib->mode &= ~LE_MO_PROM; |
644 | lance_load_multicast(dev); | ||
645 | } | ||
646 | load_csrs(lp); | ||
647 | init_restart_lance(lp); | ||
640 | 648 | ||
641 | if (!stopped) | 649 | if (!stopped) |
642 | netif_start_queue (dev); | 650 | netif_start_queue(dev); |
643 | } | 651 | } |
644 | EXPORT_SYMBOL_GPL(lance_set_multicast); | 652 | EXPORT_SYMBOL_GPL(lance_set_multicast); |
645 | 653 | ||
@@ -648,10 +656,10 @@ void lance_poll(struct net_device *dev) | |||
648 | { | 656 | { |
649 | struct lance_private *lp = netdev_priv(dev); | 657 | struct lance_private *lp = netdev_priv(dev); |
650 | 658 | ||
651 | spin_lock (&lp->devlock); | 659 | spin_lock(&lp->devlock); |
652 | WRITERAP(lp, LE_CSR0); | 660 | WRITERAP(lp, LE_CSR0); |
653 | WRITERDP(lp, LE_C0_STRT); | 661 | WRITERDP(lp, LE_C0_STRT); |
654 | spin_unlock (&lp->devlock); | 662 | spin_unlock(&lp->devlock); |
655 | lance_interrupt(dev->irq, dev); | 663 | lance_interrupt(dev->irq, dev); |
656 | } | 664 | } |
657 | #endif | 665 | #endif |