diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 4 | ||||
-rw-r--r-- | drivers/net/sh_eth.c | 202 | ||||
-rw-r--r-- | drivers/net/sh_eth.h | 426 |
3 files changed, 482 insertions, 150 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fa533c27052a..8a03875ec877 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -510,14 +510,14 @@ config STNIC | |||
510 | config SH_ETH | 510 | config SH_ETH |
511 | tristate "Renesas SuperH Ethernet support" | 511 | tristate "Renesas SuperH Ethernet support" |
512 | depends on SUPERH && \ | 512 | depends on SUPERH && \ |
513 | (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712) | 513 | (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763) |
514 | select CRC32 | 514 | select CRC32 |
515 | select MII | 515 | select MII |
516 | select MDIO_BITBANG | 516 | select MDIO_BITBANG |
517 | select PHYLIB | 517 | select PHYLIB |
518 | help | 518 | help |
519 | Renesas SuperH Ethernet device driver. | 519 | Renesas SuperH Ethernet device driver. |
520 | This driver support SH7710 and SH7712. | 520 | This driver support SH7710, SH7712 and SH7763. |
521 | 521 | ||
522 | config SUNLANCE | 522 | config SUNLANCE |
523 | tristate "Sun LANCE support" | 523 | tristate "Sun LANCE support" |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index c69ba1395fa9..6a06b9503e4f 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * SuperH Ethernet device driver | 2 | * SuperH Ethernet device driver |
3 | * | 3 | * |
4 | * Copyright (C) 2006,2007 Nobuhiro Iwamatsu | 4 | * Copyright (C) 2006-2008 Nobuhiro Iwamatsu |
5 | * Copyright (C) 2008 Renesas Solutions Corp. | 5 | * Copyright (C) 2008 Renesas Solutions Corp. |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify it | 7 | * This program is free software; you can redistribute it and/or modify it |
@@ -143,13 +143,39 @@ static struct mdiobb_ops bb_ops = { | |||
143 | .get_mdio_data = sh_get_mdio, | 143 | .get_mdio_data = sh_get_mdio, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | /* Chip Reset */ | ||
146 | static void sh_eth_reset(struct net_device *ndev) | 147 | static void sh_eth_reset(struct net_device *ndev) |
147 | { | 148 | { |
148 | u32 ioaddr = ndev->base_addr; | 149 | u32 ioaddr = ndev->base_addr; |
149 | 150 | ||
151 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
152 | int cnt = 100; | ||
153 | |||
154 | ctrl_outl(EDSR_ENALL, ioaddr + EDSR); | ||
155 | ctrl_outl(ctrl_inl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR); | ||
156 | while (cnt > 0) { | ||
157 | if (!(ctrl_inl(ioaddr + EDMR) & 0x3)) | ||
158 | break; | ||
159 | mdelay(1); | ||
160 | cnt--; | ||
161 | } | ||
162 | if (cnt < 0) | ||
163 | printk(KERN_ERR "Device reset fail\n"); | ||
164 | |||
165 | /* Table Init */ | ||
166 | ctrl_outl(0x0, ioaddr + TDLAR); | ||
167 | ctrl_outl(0x0, ioaddr + TDFAR); | ||
168 | ctrl_outl(0x0, ioaddr + TDFXR); | ||
169 | ctrl_outl(0x0, ioaddr + TDFFR); | ||
170 | ctrl_outl(0x0, ioaddr + RDLAR); | ||
171 | ctrl_outl(0x0, ioaddr + RDFAR); | ||
172 | ctrl_outl(0x0, ioaddr + RDFXR); | ||
173 | ctrl_outl(0x0, ioaddr + RDFFR); | ||
174 | #else | ||
150 | ctrl_outl(ctrl_inl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR); | 175 | ctrl_outl(ctrl_inl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR); |
151 | mdelay(3); | 176 | mdelay(3); |
152 | ctrl_outl(ctrl_inl(ioaddr + EDMR) & ~EDMR_SRST, ioaddr + EDMR); | 177 | ctrl_outl(ctrl_inl(ioaddr + EDMR) & ~EDMR_SRST, ioaddr + EDMR); |
178 | #endif | ||
153 | } | 179 | } |
154 | 180 | ||
155 | /* free skb and descriptor buffer */ | 181 | /* free skb and descriptor buffer */ |
@@ -180,6 +206,7 @@ static void sh_eth_ring_free(struct net_device *ndev) | |||
180 | /* format skb and descriptor buffer */ | 206 | /* format skb and descriptor buffer */ |
181 | static void sh_eth_ring_format(struct net_device *ndev) | 207 | static void sh_eth_ring_format(struct net_device *ndev) |
182 | { | 208 | { |
209 | u32 ioaddr = ndev->base_addr, reserve = 0; | ||
183 | struct sh_eth_private *mdp = netdev_priv(ndev); | 210 | struct sh_eth_private *mdp = netdev_priv(ndev); |
184 | int i; | 211 | int i; |
185 | struct sk_buff *skb; | 212 | struct sk_buff *skb; |
@@ -201,9 +228,15 @@ static void sh_eth_ring_format(struct net_device *ndev) | |||
201 | mdp->rx_skbuff[i] = skb; | 228 | mdp->rx_skbuff[i] = skb; |
202 | if (skb == NULL) | 229 | if (skb == NULL) |
203 | break; | 230 | break; |
204 | skb->dev = ndev; /* Mark as being used by this device. */ | 231 | skb->dev = ndev; /* Mark as being used by this device. */ |
232 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
233 | reserve = SH7763_SKB_ALIGN | ||
234 | - ((uint32_t)skb->data & (SH7763_SKB_ALIGN-1)); | ||
235 | if (reserve) | ||
236 | skb_reserve(skb, reserve); | ||
237 | #else | ||
205 | skb_reserve(skb, RX_OFFSET); | 238 | skb_reserve(skb, RX_OFFSET); |
206 | 239 | #endif | |
207 | /* RX descriptor */ | 240 | /* RX descriptor */ |
208 | rxdesc = &mdp->rx_ring[i]; | 241 | rxdesc = &mdp->rx_ring[i]; |
209 | rxdesc->addr = (u32)skb->data & ~0x3UL; | 242 | rxdesc->addr = (u32)skb->data & ~0x3UL; |
@@ -211,12 +244,25 @@ static void sh_eth_ring_format(struct net_device *ndev) | |||
211 | 244 | ||
212 | /* The size of the buffer is 16 byte boundary. */ | 245 | /* The size of the buffer is 16 byte boundary. */ |
213 | rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; | 246 | rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; |
247 | /* Rx descriptor address set */ | ||
248 | if (i == 0) { | ||
249 | ctrl_outl((u32)rxdesc, ioaddr + RDLAR); | ||
250 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
251 | ctrl_outl((u32)rxdesc, ioaddr + RDFAR); | ||
252 | #endif | ||
253 | } | ||
214 | } | 254 | } |
215 | 255 | ||
256 | /* Rx descriptor address set */ | ||
257 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
258 | ctrl_outl((u32)rxdesc, ioaddr + RDFXR); | ||
259 | ctrl_outl(0x1, ioaddr + RDFFR); | ||
260 | #endif | ||
261 | |||
216 | mdp->dirty_rx = (u32) (i - RX_RING_SIZE); | 262 | mdp->dirty_rx = (u32) (i - RX_RING_SIZE); |
217 | 263 | ||
218 | /* Mark the last entry as wrapping the ring. */ | 264 | /* Mark the last entry as wrapping the ring. */ |
219 | rxdesc->status |= cpu_to_le32(RC_RDEL); | 265 | rxdesc->status |= cpu_to_le32(RD_RDEL); |
220 | 266 | ||
221 | memset(mdp->tx_ring, 0, tx_ringsize); | 267 | memset(mdp->tx_ring, 0, tx_ringsize); |
222 | 268 | ||
@@ -226,8 +272,21 @@ static void sh_eth_ring_format(struct net_device *ndev) | |||
226 | txdesc = &mdp->tx_ring[i]; | 272 | txdesc = &mdp->tx_ring[i]; |
227 | txdesc->status = cpu_to_le32(TD_TFP); | 273 | txdesc->status = cpu_to_le32(TD_TFP); |
228 | txdesc->buffer_length = 0; | 274 | txdesc->buffer_length = 0; |
275 | if (i == 0) { | ||
276 | /* Rx descriptor address set */ | ||
277 | ctrl_outl((u32)txdesc, ioaddr + TDLAR); | ||
278 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
279 | ctrl_outl((u32)txdesc, ioaddr + TDFAR); | ||
280 | #endif | ||
281 | } | ||
229 | } | 282 | } |
230 | 283 | ||
284 | /* Rx descriptor address set */ | ||
285 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
286 | ctrl_outl((u32)txdesc, ioaddr + TDFXR); | ||
287 | ctrl_outl(0x1, ioaddr + TDFFR); | ||
288 | #endif | ||
289 | |||
231 | txdesc->status |= cpu_to_le32(TD_TDLE); | 290 | txdesc->status |= cpu_to_le32(TD_TDLE); |
232 | } | 291 | } |
233 | 292 | ||
@@ -311,31 +370,43 @@ static int sh_eth_dev_init(struct net_device *ndev) | |||
311 | /* Soft Reset */ | 370 | /* Soft Reset */ |
312 | sh_eth_reset(ndev); | 371 | sh_eth_reset(ndev); |
313 | 372 | ||
314 | ctrl_outl(RPADIR_PADS1, ioaddr + RPADIR); /* SH7712-DMA-RX-PAD2 */ | 373 | /* Descriptor format */ |
374 | sh_eth_ring_format(ndev); | ||
375 | ctrl_outl(RPADIR_INIT, ioaddr + RPADIR); | ||
315 | 376 | ||
316 | /* all sh_eth int mask */ | 377 | /* all sh_eth int mask */ |
317 | ctrl_outl(0, ioaddr + EESIPR); | 378 | ctrl_outl(0, ioaddr + EESIPR); |
318 | 379 | ||
319 | /* FIFO size set */ | 380 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) |
381 | ctrl_outl(EDMR_EL, ioaddr + EDMR); | ||
382 | #else | ||
320 | ctrl_outl(0, ioaddr + EDMR); /* Endian change */ | 383 | ctrl_outl(0, ioaddr + EDMR); /* Endian change */ |
384 | #endif | ||
321 | 385 | ||
386 | /* FIFO size set */ | ||
322 | ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR); | 387 | ctrl_outl((FIFO_SIZE_T | FIFO_SIZE_R), ioaddr + FDR); |
323 | ctrl_outl(0, ioaddr + TFTR); | 388 | ctrl_outl(0, ioaddr + TFTR); |
324 | 389 | ||
390 | /* Frame recv control */ | ||
325 | ctrl_outl(0, ioaddr + RMCR); | 391 | ctrl_outl(0, ioaddr + RMCR); |
326 | 392 | ||
327 | rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5; | 393 | rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5; |
328 | tx_int_var = mdp->tx_int_var = DESC_I_TINT2; | 394 | tx_int_var = mdp->tx_int_var = DESC_I_TINT2; |
329 | ctrl_outl(rx_int_var | tx_int_var, ioaddr + TRSCER); | 395 | ctrl_outl(rx_int_var | tx_int_var, ioaddr + TRSCER); |
330 | 396 | ||
397 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
398 | /* Burst sycle set */ | ||
399 | ctrl_outl(0x800, ioaddr + BCULR); | ||
400 | #endif | ||
401 | |||
331 | ctrl_outl((FIFO_F_D_RFF | FIFO_F_D_RFD), ioaddr + FCFTR); | 402 | ctrl_outl((FIFO_F_D_RFF | FIFO_F_D_RFD), ioaddr + FCFTR); |
332 | ctrl_outl(0, ioaddr + TRIMD); | ||
333 | 403 | ||
334 | /* Descriptor format */ | 404 | #if !defined(CONFIG_CPU_SUBTYPE_SH7763) |
335 | sh_eth_ring_format(ndev); | 405 | ctrl_outl(0, ioaddr + TRIMD); |
406 | #endif | ||
336 | 407 | ||
337 | ctrl_outl((u32)mdp->rx_ring, ioaddr + RDLAR); | 408 | /* Recv frame limit set register */ |
338 | ctrl_outl((u32)mdp->tx_ring, ioaddr + TDLAR); | 409 | ctrl_outl(RFLR_VALUE, ioaddr + RFLR); |
339 | 410 | ||
340 | ctrl_outl(ctrl_inl(ioaddr + EESR), ioaddr + EESR); | 411 | ctrl_outl(ctrl_inl(ioaddr + EESR), ioaddr + EESR); |
341 | ctrl_outl((DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff), ioaddr + EESIPR); | 412 | ctrl_outl((DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff), ioaddr + EESIPR); |
@@ -345,21 +416,26 @@ static int sh_eth_dev_init(struct net_device *ndev) | |||
345 | ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE; | 416 | ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE; |
346 | 417 | ||
347 | ctrl_outl(val, ioaddr + ECMR); | 418 | ctrl_outl(val, ioaddr + ECMR); |
348 | ctrl_outl(ECSR_BRCRX | ECSR_PSRTO | ECSR_LCHNG | ECSR_ICD | | 419 | |
349 | ECSIPR_MPDIP, ioaddr + ECSR); | 420 | /* E-MAC Status Register clear */ |
350 | ctrl_outl(ECSIPR_BRCRXIP | ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | | 421 | ctrl_outl(ECSR_INIT, ioaddr + ECSR); |
351 | ECSIPR_ICDIP | ECSIPR_MPDIP, ioaddr + ECSIPR); | 422 | |
423 | /* E-MAC Interrupt Enable register */ | ||
424 | ctrl_outl(ECSIPR_INIT, ioaddr + ECSIPR); | ||
352 | 425 | ||
353 | /* Set MAC address */ | 426 | /* Set MAC address */ |
354 | update_mac_address(ndev); | 427 | update_mac_address(ndev); |
355 | 428 | ||
356 | /* mask reset */ | 429 | /* mask reset */ |
357 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) | 430 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7763) |
358 | ctrl_outl(APR_AP, ioaddr + APR); | 431 | ctrl_outl(APR_AP, ioaddr + APR); |
359 | ctrl_outl(MPR_MP, ioaddr + MPR); | 432 | ctrl_outl(MPR_MP, ioaddr + MPR); |
360 | ctrl_outl(TPAUSER_UNLIMITED, ioaddr + TPAUSER); | 433 | ctrl_outl(TPAUSER_UNLIMITED, ioaddr + TPAUSER); |
434 | #endif | ||
435 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) | ||
361 | ctrl_outl(BCFR_UNLIMITED, ioaddr + BCFR); | 436 | ctrl_outl(BCFR_UNLIMITED, ioaddr + BCFR); |
362 | #endif | 437 | #endif |
438 | |||
363 | /* Setting the Rx mode will start the Rx process. */ | 439 | /* Setting the Rx mode will start the Rx process. */ |
364 | ctrl_outl(EDRRR_R, ioaddr + EDRRR); | 440 | ctrl_outl(EDRRR_R, ioaddr + EDRRR); |
365 | 441 | ||
@@ -407,7 +483,7 @@ static int sh_eth_rx(struct net_device *ndev) | |||
407 | int boguscnt = (mdp->dirty_rx + RX_RING_SIZE) - mdp->cur_rx; | 483 | int boguscnt = (mdp->dirty_rx + RX_RING_SIZE) - mdp->cur_rx; |
408 | struct sk_buff *skb; | 484 | struct sk_buff *skb; |
409 | u16 pkt_len = 0; | 485 | u16 pkt_len = 0; |
410 | u32 desc_status; | 486 | u32 desc_status, reserve = 0; |
411 | 487 | ||
412 | rxdesc = &mdp->rx_ring[entry]; | 488 | rxdesc = &mdp->rx_ring[entry]; |
413 | while (!(rxdesc->status & cpu_to_le32(RD_RACT))) { | 489 | while (!(rxdesc->status & cpu_to_le32(RD_RACT))) { |
@@ -454,28 +530,38 @@ static int sh_eth_rx(struct net_device *ndev) | |||
454 | for (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) { | 530 | for (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) { |
455 | entry = mdp->dirty_rx % RX_RING_SIZE; | 531 | entry = mdp->dirty_rx % RX_RING_SIZE; |
456 | rxdesc = &mdp->rx_ring[entry]; | 532 | rxdesc = &mdp->rx_ring[entry]; |
533 | /* The size of the buffer is 16 byte boundary. */ | ||
534 | rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; | ||
535 | |||
457 | if (mdp->rx_skbuff[entry] == NULL) { | 536 | if (mdp->rx_skbuff[entry] == NULL) { |
458 | skb = dev_alloc_skb(mdp->rx_buf_sz); | 537 | skb = dev_alloc_skb(mdp->rx_buf_sz); |
459 | mdp->rx_skbuff[entry] = skb; | 538 | mdp->rx_skbuff[entry] = skb; |
460 | if (skb == NULL) | 539 | if (skb == NULL) |
461 | break; /* Better luck next round. */ | 540 | break; /* Better luck next round. */ |
462 | skb->dev = ndev; | 541 | skb->dev = ndev; |
542 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
543 | reserve = SH7763_SKB_ALIGN | ||
544 | - ((uint32_t)skb->data & (SH7763_SKB_ALIGN-1)); | ||
545 | if (reserve) | ||
546 | skb_reserve(skb, reserve); | ||
547 | #else | ||
463 | skb_reserve(skb, RX_OFFSET); | 548 | skb_reserve(skb, RX_OFFSET); |
549 | #endif | ||
550 | skb->ip_summed = CHECKSUM_NONE; | ||
464 | rxdesc->addr = (u32)skb->data & ~0x3UL; | 551 | rxdesc->addr = (u32)skb->data & ~0x3UL; |
465 | } | 552 | } |
466 | /* The size of the buffer is 16 byte boundary. */ | ||
467 | rxdesc->buffer_length = (mdp->rx_buf_sz + 16) & ~0x0F; | ||
468 | if (entry >= RX_RING_SIZE - 1) | 553 | if (entry >= RX_RING_SIZE - 1) |
469 | rxdesc->status |= | 554 | rxdesc->status |= |
470 | cpu_to_le32(RD_RACT | RD_RFP | RC_RDEL); | 555 | cpu_to_le32(RD_RACT | RD_RFP | RD_RDEL); |
471 | else | 556 | else |
472 | rxdesc->status |= | 557 | rxdesc->status |= |
473 | cpu_to_le32(RD_RACT | RD_RFP); | 558 | cpu_to_le32(RD_RACT | RD_RFP); |
474 | } | 559 | } |
475 | 560 | ||
476 | /* Restart Rx engine if stopped. */ | 561 | /* Restart Rx engine if stopped. */ |
477 | /* If we don't need to check status, don't. -KDU */ | 562 | /* If we don't need to check status, don't. -KDU */ |
478 | ctrl_outl(EDRRR_R, ndev->base_addr + EDRRR); | 563 | if (!(ctrl_inl(ndev->base_addr + EDRRR) & EDRRR_R)) |
564 | ctrl_outl(EDRRR_R, ndev->base_addr + EDRRR); | ||
479 | 565 | ||
480 | return 0; | 566 | return 0; |
481 | } | 567 | } |
@@ -529,13 +615,14 @@ static void sh_eth_error(struct net_device *ndev, int intr_status) | |||
529 | printk(KERN_ERR "Receive Frame Overflow\n"); | 615 | printk(KERN_ERR "Receive Frame Overflow\n"); |
530 | } | 616 | } |
531 | } | 617 | } |
532 | 618 | #if !defined(CONFIG_CPU_SUBTYPE_SH7763) | |
533 | if (intr_status & EESR_ADE) { | 619 | if (intr_status & EESR_ADE) { |
534 | if (intr_status & EESR_TDE) { | 620 | if (intr_status & EESR_TDE) { |
535 | if (intr_status & EESR_TFE) | 621 | if (intr_status & EESR_TFE) |
536 | mdp->stats.tx_fifo_errors++; | 622 | mdp->stats.tx_fifo_errors++; |
537 | } | 623 | } |
538 | } | 624 | } |
625 | #endif | ||
539 | 626 | ||
540 | if (intr_status & EESR_RDE) { | 627 | if (intr_status & EESR_RDE) { |
541 | /* Receive Descriptor Empty int */ | 628 | /* Receive Descriptor Empty int */ |
@@ -550,8 +637,11 @@ static void sh_eth_error(struct net_device *ndev, int intr_status) | |||
550 | mdp->stats.rx_fifo_errors++; | 637 | mdp->stats.rx_fifo_errors++; |
551 | printk(KERN_ERR "Receive FIFO Overflow\n"); | 638 | printk(KERN_ERR "Receive FIFO Overflow\n"); |
552 | } | 639 | } |
553 | if (intr_status & | 640 | if (intr_status & (EESR_TWB | EESR_TABT | |
554 | (EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE)) { | 641 | #if !defined(CONFIG_CPU_SUBTYPE_SH7763) |
642 | EESR_ADE | | ||
643 | #endif | ||
644 | EESR_TDE | EESR_TFE)) { | ||
555 | /* Tx error */ | 645 | /* Tx error */ |
556 | u32 edtrr = ctrl_inl(ndev->base_addr + EDTRR); | 646 | u32 edtrr = ctrl_inl(ndev->base_addr + EDTRR); |
557 | /* dmesg */ | 647 | /* dmesg */ |
@@ -582,17 +672,23 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) | |||
582 | ioaddr = ndev->base_addr; | 672 | ioaddr = ndev->base_addr; |
583 | spin_lock(&mdp->lock); | 673 | spin_lock(&mdp->lock); |
584 | 674 | ||
675 | /* Get interrpt stat */ | ||
585 | intr_status = ctrl_inl(ioaddr + EESR); | 676 | intr_status = ctrl_inl(ioaddr + EESR); |
586 | /* Clear interrupt */ | 677 | /* Clear interrupt */ |
587 | ctrl_outl(intr_status, ioaddr + EESR); | 678 | ctrl_outl(intr_status, ioaddr + EESR); |
588 | 679 | ||
589 | if (intr_status & (EESR_FRC | EESR_RINT8 | | 680 | if (intr_status & (EESR_FRC | /* Frame recv*/ |
590 | EESR_RINT5 | EESR_RINT4 | EESR_RINT3 | EESR_RINT2 | | 681 | EESR_RMAF | /* Multi cast address recv*/ |
591 | EESR_RINT1)) | 682 | EESR_RRF | /* Bit frame recv */ |
683 | EESR_RTLF | /* Long frame recv*/ | ||
684 | EESR_RTSF | /* short frame recv */ | ||
685 | EESR_PRE | /* PHY-LSI recv error */ | ||
686 | EESR_CERF)){ /* recv frame CRC error */ | ||
592 | sh_eth_rx(ndev); | 687 | sh_eth_rx(ndev); |
593 | if (intr_status & (EESR_FTC | | 688 | } |
594 | EESR_TINT4 | EESR_TINT3 | EESR_TINT2 | EESR_TINT1)) { | ||
595 | 689 | ||
690 | /* Tx Check */ | ||
691 | if (intr_status & TX_CHECK) { | ||
596 | sh_eth_txfree(ndev); | 692 | sh_eth_txfree(ndev); |
597 | netif_wake_queue(ndev); | 693 | netif_wake_queue(ndev); |
598 | } | 694 | } |
@@ -631,11 +727,32 @@ static void sh_eth_adjust_link(struct net_device *ndev) | |||
631 | if (phydev->duplex != mdp->duplex) { | 727 | if (phydev->duplex != mdp->duplex) { |
632 | new_state = 1; | 728 | new_state = 1; |
633 | mdp->duplex = phydev->duplex; | 729 | mdp->duplex = phydev->duplex; |
730 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
731 | if (mdp->duplex) { /* FULL */ | ||
732 | ctrl_outl(ctrl_inl(ioaddr + ECMR) | ECMR_DM, | ||
733 | ioaddr + ECMR); | ||
734 | } else { /* Half */ | ||
735 | ctrl_outl(ctrl_inl(ioaddr + ECMR) & ~ECMR_DM, | ||
736 | ioaddr + ECMR); | ||
737 | } | ||
738 | #endif | ||
634 | } | 739 | } |
635 | 740 | ||
636 | if (phydev->speed != mdp->speed) { | 741 | if (phydev->speed != mdp->speed) { |
637 | new_state = 1; | 742 | new_state = 1; |
638 | mdp->speed = phydev->speed; | 743 | mdp->speed = phydev->speed; |
744 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
745 | switch (mdp->speed) { | ||
746 | case 10: /* 10BASE */ | ||
747 | ctrl_outl(GECMR_10, ioaddr + GECMR); break; | ||
748 | case 100:/* 100BASE */ | ||
749 | ctrl_outl(GECMR_100, ioaddr + GECMR); break; | ||
750 | case 1000: /* 1000BASE */ | ||
751 | ctrl_outl(GECMR_1000, ioaddr + GECMR); break; | ||
752 | default: | ||
753 | break; | ||
754 | } | ||
755 | #endif | ||
639 | } | 756 | } |
640 | if (mdp->link == PHY_DOWN) { | 757 | if (mdp->link == PHY_DOWN) { |
641 | ctrl_outl((ctrl_inl(ioaddr + ECMR) & ~ECMR_TXF) | 758 | ctrl_outl((ctrl_inl(ioaddr + ECMR) & ~ECMR_TXF) |
@@ -730,7 +847,7 @@ static int sh_eth_open(struct net_device *ndev) | |||
730 | /* Set the timer to check for link beat. */ | 847 | /* Set the timer to check for link beat. */ |
731 | init_timer(&mdp->timer); | 848 | init_timer(&mdp->timer); |
732 | mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */ | 849 | mdp->timer.expires = (jiffies + (24 * HZ)) / 10;/* 2.4 sec. */ |
733 | setup_timer(&mdp->timer, sh_eth_timer, ndev); | 850 | setup_timer(&mdp->timer, sh_eth_timer, (unsigned long)ndev); |
734 | 851 | ||
735 | return ret; | 852 | return ret; |
736 | 853 | ||
@@ -820,7 +937,9 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
820 | 937 | ||
821 | mdp->cur_tx++; | 938 | mdp->cur_tx++; |
822 | 939 | ||
823 | ctrl_outl(EDTRR_TRNS, ndev->base_addr + EDTRR); | 940 | if (!(ctrl_inl(ndev->base_addr + EDTRR) & EDTRR_TRNS)) |
941 | ctrl_outl(EDTRR_TRNS, ndev->base_addr + EDTRR); | ||
942 | |||
824 | ndev->trans_start = jiffies; | 943 | ndev->trans_start = jiffies; |
825 | 944 | ||
826 | return 0; | 945 | return 0; |
@@ -877,9 +996,15 @@ static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev) | |||
877 | ctrl_outl(0, ioaddr + CDCR); /* (write clear) */ | 996 | ctrl_outl(0, ioaddr + CDCR); /* (write clear) */ |
878 | mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + LCCR); | 997 | mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + LCCR); |
879 | ctrl_outl(0, ioaddr + LCCR); /* (write clear) */ | 998 | ctrl_outl(0, ioaddr + LCCR); /* (write clear) */ |
999 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
1000 | mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + CERCR);/* CERCR */ | ||
1001 | ctrl_outl(0, ioaddr + CERCR); /* (write clear) */ | ||
1002 | mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + CEECR);/* CEECR */ | ||
1003 | ctrl_outl(0, ioaddr + CEECR); /* (write clear) */ | ||
1004 | #else | ||
880 | mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + CNDCR); | 1005 | mdp->stats.tx_carrier_errors += ctrl_inl(ioaddr + CNDCR); |
881 | ctrl_outl(0, ioaddr + CNDCR); /* (write clear) */ | 1006 | ctrl_outl(0, ioaddr + CNDCR); /* (write clear) */ |
882 | 1007 | #endif | |
883 | return &mdp->stats; | 1008 | return &mdp->stats; |
884 | } | 1009 | } |
885 | 1010 | ||
@@ -929,8 +1054,13 @@ static void sh_eth_tsu_init(u32 ioaddr) | |||
929 | ctrl_outl(0, ioaddr + TSU_FWSL0); | 1054 | ctrl_outl(0, ioaddr + TSU_FWSL0); |
930 | ctrl_outl(0, ioaddr + TSU_FWSL1); | 1055 | ctrl_outl(0, ioaddr + TSU_FWSL1); |
931 | ctrl_outl(TSU_FWSLC_POSTENU | TSU_FWSLC_POSTENL, ioaddr + TSU_FWSLC); | 1056 | ctrl_outl(TSU_FWSLC_POSTENU | TSU_FWSLC_POSTENL, ioaddr + TSU_FWSLC); |
1057 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
1058 | ctrl_outl(0, ioaddr + TSU_QTAG0); /* Disable QTAG(0->1) */ | ||
1059 | ctrl_outl(0, ioaddr + TSU_QTAG1); /* Disable QTAG(1->0) */ | ||
1060 | #else | ||
932 | ctrl_outl(0, ioaddr + TSU_QTAGM0); /* Disable QTAG(0->1) */ | 1061 | ctrl_outl(0, ioaddr + TSU_QTAGM0); /* Disable QTAG(0->1) */ |
933 | ctrl_outl(0, ioaddr + TSU_QTAGM1); /* Disable QTAG(1->0) */ | 1062 | ctrl_outl(0, ioaddr + TSU_QTAGM1); /* Disable QTAG(1->0) */ |
1063 | #endif | ||
934 | ctrl_outl(0, ioaddr + TSU_FWSR); /* all interrupt status clear */ | 1064 | ctrl_outl(0, ioaddr + TSU_FWSR); /* all interrupt status clear */ |
935 | ctrl_outl(0, ioaddr + TSU_FWINMK); /* Disable all interrupt */ | 1065 | ctrl_outl(0, ioaddr + TSU_FWINMK); /* Disable all interrupt */ |
936 | ctrl_outl(0, ioaddr + TSU_TEN); /* Disable all CAM entry */ | 1066 | ctrl_outl(0, ioaddr + TSU_TEN); /* Disable all CAM entry */ |
@@ -1088,7 +1218,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) | |||
1088 | /* First device only init */ | 1218 | /* First device only init */ |
1089 | if (!devno) { | 1219 | if (!devno) { |
1090 | /* reset device */ | 1220 | /* reset device */ |
1091 | ctrl_outl(ARSTR_ARSTR, ndev->base_addr + ARSTR); | 1221 | ctrl_outl(ARSTR_ARSTR, ARSTR); |
1092 | mdelay(1); | 1222 | mdelay(1); |
1093 | 1223 | ||
1094 | /* TSU init (Init only)*/ | 1224 | /* TSU init (Init only)*/ |
@@ -1110,8 +1240,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev) | |||
1110 | ndev->name, CARDNAME, (u32) ndev->base_addr); | 1240 | ndev->name, CARDNAME, (u32) ndev->base_addr); |
1111 | 1241 | ||
1112 | for (i = 0; i < 5; i++) | 1242 | for (i = 0; i < 5; i++) |
1113 | printk(KERN_INFO "%2.2x:", ndev->dev_addr[i]); | 1243 | printk(KERN_INFO "%02X:", ndev->dev_addr[i]); |
1114 | printk(KERN_INFO "%2.2x, IRQ %d.\n", ndev->dev_addr[i], ndev->irq); | 1244 | printk(KERN_INFO "%02X, IRQ %d.\n", ndev->dev_addr[i], ndev->irq); |
1115 | 1245 | ||
1116 | platform_set_drvdata(pdev, ndev); | 1246 | platform_set_drvdata(pdev, ndev); |
1117 | 1247 | ||
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index e01e1c347715..45ad1b09ca5a 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h | |||
@@ -32,118 +32,249 @@ | |||
32 | 32 | ||
33 | #define CARDNAME "sh-eth" | 33 | #define CARDNAME "sh-eth" |
34 | #define TX_TIMEOUT (5*HZ) | 34 | #define TX_TIMEOUT (5*HZ) |
35 | 35 | #define TX_RING_SIZE 64 /* Tx ring size */ | |
36 | #define TX_RING_SIZE 128 /* Tx ring size */ | 36 | #define RX_RING_SIZE 64 /* Rx ring size */ |
37 | #define RX_RING_SIZE 128 /* Rx ring size */ | ||
38 | #define RX_OFFSET 2 /* skb offset */ | ||
39 | #define ETHERSMALL 60 | 37 | #define ETHERSMALL 60 |
40 | #define PKT_BUF_SZ 1538 | 38 | #define PKT_BUF_SZ 1538 |
41 | 39 | ||
40 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
41 | |||
42 | #define SH7763_SKB_ALIGN 32 | ||
42 | /* Chip Base Address */ | 43 | /* Chip Base Address */ |
43 | #define SH_TSU_ADDR 0xA7000804 | 44 | # define SH_TSU_ADDR 0xFFE01800 |
45 | # define ARSTR 0xFFE01800 | ||
46 | |||
47 | /* Chip Registers */ | ||
48 | /* E-DMAC */ | ||
49 | # define EDSR 0x000 | ||
50 | # define EDMR 0x400 | ||
51 | # define EDTRR 0x408 | ||
52 | # define EDRRR 0x410 | ||
53 | # define EESR 0x428 | ||
54 | # define EESIPR 0x430 | ||
55 | # define TDLAR 0x010 | ||
56 | # define TDFAR 0x014 | ||
57 | # define TDFXR 0x018 | ||
58 | # define TDFFR 0x01C | ||
59 | # define RDLAR 0x030 | ||
60 | # define RDFAR 0x034 | ||
61 | # define RDFXR 0x038 | ||
62 | # define RDFFR 0x03C | ||
63 | # define TRSCER 0x438 | ||
64 | # define RMFCR 0x440 | ||
65 | # define TFTR 0x448 | ||
66 | # define FDR 0x450 | ||
67 | # define RMCR 0x458 | ||
68 | # define RPADIR 0x460 | ||
69 | # define FCFTR 0x468 | ||
70 | |||
71 | /* Ether Register */ | ||
72 | # define ECMR 0x500 | ||
73 | # define ECSR 0x510 | ||
74 | # define ECSIPR 0x518 | ||
75 | # define PIR 0x520 | ||
76 | # define PSR 0x528 | ||
77 | # define PIPR 0x52C | ||
78 | # define RFLR 0x508 | ||
79 | # define APR 0x554 | ||
80 | # define MPR 0x558 | ||
81 | # define PFTCR 0x55C | ||
82 | # define PFRCR 0x560 | ||
83 | # define TPAUSER 0x564 | ||
84 | # define GECMR 0x5B0 | ||
85 | # define BCULR 0x5B4 | ||
86 | # define MAHR 0x5C0 | ||
87 | # define MALR 0x5C8 | ||
88 | # define TROCR 0x700 | ||
89 | # define CDCR 0x708 | ||
90 | # define LCCR 0x710 | ||
91 | # define CEFCR 0x740 | ||
92 | # define FRECR 0x748 | ||
93 | # define TSFRCR 0x750 | ||
94 | # define TLFRCR 0x758 | ||
95 | # define RFCR 0x760 | ||
96 | # define CERCR 0x768 | ||
97 | # define CEECR 0x770 | ||
98 | # define MAFCR 0x778 | ||
99 | |||
100 | /* TSU Absolute Address */ | ||
101 | # define TSU_CTRST 0x004 | ||
102 | # define TSU_FWEN0 0x010 | ||
103 | # define TSU_FWEN1 0x014 | ||
104 | # define TSU_FCM 0x18 | ||
105 | # define TSU_BSYSL0 0x20 | ||
106 | # define TSU_BSYSL1 0x24 | ||
107 | # define TSU_PRISL0 0x28 | ||
108 | # define TSU_PRISL1 0x2C | ||
109 | # define TSU_FWSL0 0x30 | ||
110 | # define TSU_FWSL1 0x34 | ||
111 | # define TSU_FWSLC 0x38 | ||
112 | # define TSU_QTAG0 0x40 | ||
113 | # define TSU_QTAG1 0x44 | ||
114 | # define TSU_FWSR 0x50 | ||
115 | # define TSU_FWINMK 0x54 | ||
116 | # define TSU_ADQT0 0x48 | ||
117 | # define TSU_ADQT1 0x4C | ||
118 | # define TSU_VTAG0 0x58 | ||
119 | # define TSU_VTAG1 0x5C | ||
120 | # define TSU_ADSBSY 0x60 | ||
121 | # define TSU_TEN 0x64 | ||
122 | # define TSU_POST1 0x70 | ||
123 | # define TSU_POST2 0x74 | ||
124 | # define TSU_POST3 0x78 | ||
125 | # define TSU_POST4 0x7C | ||
126 | # define TSU_ADRH0 0x100 | ||
127 | # define TSU_ADRL0 0x104 | ||
128 | # define TSU_ADRH31 0x1F8 | ||
129 | # define TSU_ADRL31 0x1FC | ||
130 | |||
131 | # define TXNLCR0 0x80 | ||
132 | # define TXALCR0 0x84 | ||
133 | # define RXNLCR0 0x88 | ||
134 | # define RXALCR0 0x8C | ||
135 | # define FWNLCR0 0x90 | ||
136 | # define FWALCR0 0x94 | ||
137 | # define TXNLCR1 0xA0 | ||
138 | # define TXALCR1 0xA4 | ||
139 | # define RXNLCR1 0xA8 | ||
140 | # define RXALCR1 0xAC | ||
141 | # define FWNLCR1 0xB0 | ||
142 | # define FWALCR1 0x40 | ||
143 | |||
144 | #else /* CONFIG_CPU_SUBTYPE_SH7763 */ | ||
145 | # define RX_OFFSET 2 /* skb offset */ | ||
146 | /* Chip base address */ | ||
147 | # define SH_TSU_ADDR 0xA7000804 | ||
148 | # define ARSTR 0xA7000800 | ||
44 | 149 | ||
45 | /* Chip Registers */ | 150 | /* Chip Registers */ |
46 | /* E-DMAC */ | 151 | /* E-DMAC */ |
47 | #define EDMR 0x0000 | 152 | # define EDMR 0x0000 |
48 | #define EDTRR 0x0004 | 153 | # define EDTRR 0x0004 |
49 | #define EDRRR 0x0008 | 154 | # define EDRRR 0x0008 |
50 | #define TDLAR 0x000C | 155 | # define TDLAR 0x000C |
51 | #define RDLAR 0x0010 | 156 | # define RDLAR 0x0010 |
52 | #define EESR 0x0014 | 157 | # define EESR 0x0014 |
53 | #define EESIPR 0x0018 | 158 | # define EESIPR 0x0018 |
54 | #define TRSCER 0x001C | 159 | # define TRSCER 0x001C |
55 | #define RMFCR 0x0020 | 160 | # define RMFCR 0x0020 |
56 | #define TFTR 0x0024 | 161 | # define TFTR 0x0024 |
57 | #define FDR 0x0028 | 162 | # define FDR 0x0028 |
58 | #define RMCR 0x002C | 163 | # define RMCR 0x002C |
59 | #define EDOCR 0x0030 | 164 | # define EDOCR 0x0030 |
60 | #define FCFTR 0x0034 | 165 | # define FCFTR 0x0034 |
61 | #define RPADIR 0x0038 | 166 | # define RPADIR 0x0038 |
62 | #define TRIMD 0x003C | 167 | # define TRIMD 0x003C |
63 | #define RBWAR 0x0040 | 168 | # define RBWAR 0x0040 |
64 | #define RDFAR 0x0044 | 169 | # define RDFAR 0x0044 |
65 | #define TBRAR 0x004C | 170 | # define TBRAR 0x004C |
66 | #define TDFAR 0x0050 | 171 | # define TDFAR 0x0050 |
172 | |||
67 | /* Ether Register */ | 173 | /* Ether Register */ |
68 | #define ECMR 0x0160 | 174 | # define ECMR 0x0160 |
69 | #define ECSR 0x0164 | 175 | # define ECSR 0x0164 |
70 | #define ECSIPR 0x0168 | 176 | # define ECSIPR 0x0168 |
71 | #define PIR 0x016C | 177 | # define PIR 0x016C |
72 | #define MAHR 0x0170 | 178 | # define MAHR 0x0170 |
73 | #define MALR 0x0174 | 179 | # define MALR 0x0174 |
74 | #define RFLR 0x0178 | 180 | # define RFLR 0x0178 |
75 | #define PSR 0x017C | 181 | # define PSR 0x017C |
76 | #define TROCR 0x0180 | 182 | # define TROCR 0x0180 |
77 | #define CDCR 0x0184 | 183 | # define CDCR 0x0184 |
78 | #define LCCR 0x0188 | 184 | # define LCCR 0x0188 |
79 | #define CNDCR 0x018C | 185 | # define CNDCR 0x018C |
80 | #define CEFCR 0x0194 | 186 | # define CEFCR 0x0194 |
81 | #define FRECR 0x0198 | 187 | # define FRECR 0x0198 |
82 | #define TSFRCR 0x019C | 188 | # define TSFRCR 0x019C |
83 | #define TLFRCR 0x01A0 | 189 | # define TLFRCR 0x01A0 |
84 | #define RFCR 0x01A4 | 190 | # define RFCR 0x01A4 |
85 | #define MAFCR 0x01A8 | 191 | # define MAFCR 0x01A8 |
86 | #define IPGR 0x01B4 | 192 | # define IPGR 0x01B4 |
87 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) | 193 | # if defined(CONFIG_CPU_SUBTYPE_SH7710) |
88 | #define APR 0x01B8 | 194 | # define APR 0x01B8 |
89 | #define MPR 0x01BC | 195 | # define MPR 0x01BC |
90 | #define TPAUSER 0x1C4 | 196 | # define TPAUSER 0x1C4 |
91 | #define BCFR 0x1CC | 197 | # define BCFR 0x1CC |
92 | #endif /* CONFIG_CPU_SH7710 */ | 198 | # endif /* CONFIG_CPU_SH7710 */ |
93 | |||
94 | #define ARSTR 0x0800 | ||
95 | 199 | ||
96 | /* TSU */ | 200 | /* TSU */ |
97 | #define TSU_CTRST 0x004 | 201 | # define TSU_CTRST 0x004 |
98 | #define TSU_FWEN0 0x010 | 202 | # define TSU_FWEN0 0x010 |
99 | #define TSU_FWEN1 0x014 | 203 | # define TSU_FWEN1 0x014 |
100 | #define TSU_FCM 0x018 | 204 | # define TSU_FCM 0x018 |
101 | #define TSU_BSYSL0 0x020 | 205 | # define TSU_BSYSL0 0x020 |
102 | #define TSU_BSYSL1 0x024 | 206 | # define TSU_BSYSL1 0x024 |
103 | #define TSU_PRISL0 0x028 | 207 | # define TSU_PRISL0 0x028 |
104 | #define TSU_PRISL1 0x02C | 208 | # define TSU_PRISL1 0x02C |
105 | #define TSU_FWSL0 0x030 | 209 | # define TSU_FWSL0 0x030 |
106 | #define TSU_FWSL1 0x034 | 210 | # define TSU_FWSL1 0x034 |
107 | #define TSU_FWSLC 0x038 | 211 | # define TSU_FWSLC 0x038 |
108 | #define TSU_QTAGM0 0x040 | 212 | # define TSU_QTAGM0 0x040 |
109 | #define TSU_QTAGM1 0x044 | 213 | # define TSU_QTAGM1 0x044 |
110 | #define TSU_ADQT0 0x048 | 214 | # define TSU_ADQT0 0x048 |
111 | #define TSU_ADQT1 0x04C | 215 | # define TSU_ADQT1 0x04C |
112 | #define TSU_FWSR 0x050 | 216 | # define TSU_FWSR 0x050 |
113 | #define TSU_FWINMK 0x054 | 217 | # define TSU_FWINMK 0x054 |
114 | #define TSU_ADSBSY 0x060 | 218 | # define TSU_ADSBSY 0x060 |
115 | #define TSU_TEN 0x064 | 219 | # define TSU_TEN 0x064 |
116 | #define TSU_POST1 0x070 | 220 | # define TSU_POST1 0x070 |
117 | #define TSU_POST2 0x074 | 221 | # define TSU_POST2 0x074 |
118 | #define TSU_POST3 0x078 | 222 | # define TSU_POST3 0x078 |
119 | #define TSU_POST4 0x07C | 223 | # define TSU_POST4 0x07C |
120 | #define TXNLCR0 0x080 | 224 | # define TXNLCR0 0x080 |
121 | #define TXALCR0 0x084 | 225 | # define TXALCR0 0x084 |
122 | #define RXNLCR0 0x088 | 226 | # define RXNLCR0 0x088 |
123 | #define RXALCR0 0x08C | 227 | # define RXALCR0 0x08C |
124 | #define FWNLCR0 0x090 | 228 | # define FWNLCR0 0x090 |
125 | #define FWALCR0 0x094 | 229 | # define FWALCR0 0x094 |
126 | #define TXNLCR1 0x0A0 | 230 | # define TXNLCR1 0x0A0 |
127 | #define TXALCR1 0x0A4 | 231 | # define TXALCR1 0x0A4 |
128 | #define RXNLCR1 0x0A8 | 232 | # define RXNLCR1 0x0A8 |
129 | #define RXALCR1 0x0AC | 233 | # define RXALCR1 0x0AC |
130 | #define FWNLCR1 0x0B0 | 234 | # define FWNLCR1 0x0B0 |
131 | #define FWALCR1 0x0B4 | 235 | # define FWALCR1 0x0B4 |
132 | 236 | ||
133 | #define TSU_ADRH0 0x0100 | 237 | #define TSU_ADRH0 0x0100 |
134 | #define TSU_ADRL0 0x0104 | 238 | #define TSU_ADRL0 0x0104 |
135 | #define TSU_ADRL31 0x01FC | 239 | #define TSU_ADRL31 0x01FC |
136 | 240 | ||
137 | /* Register's bits */ | 241 | #endif /* CONFIG_CPU_SUBTYPE_SH7763 */ |
242 | |||
243 | /* | ||
244 | * Register's bits | ||
245 | */ | ||
246 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
247 | /* EDSR */ | ||
248 | enum EDSR_BIT { | ||
249 | EDSR_ENT = 0x01, EDSR_ENR = 0x02, | ||
250 | }; | ||
251 | #define EDSR_ENALL (EDSR_ENT|EDSR_ENR) | ||
252 | |||
253 | /* GECMR */ | ||
254 | enum GECMR_BIT { | ||
255 | GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01, | ||
256 | }; | ||
257 | #endif | ||
138 | 258 | ||
139 | /* EDMR */ | 259 | /* EDMR */ |
140 | enum DMAC_M_BIT { | 260 | enum DMAC_M_BIT { |
141 | EDMR_DL1 = 0x20, EDMR_DL0 = 0x10, EDMR_SRST = 0x01, | 261 | EDMR_DL1 = 0x20, EDMR_DL0 = 0x10, |
262 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
263 | EDMR_SRST = 0x03, | ||
264 | EMDR_DESC_R = 0x30, /* Descriptor reserve size */ | ||
265 | EDMR_EL = 0x40, /* Litte endian */ | ||
266 | #else /* CONFIG_CPU_SUBTYPE_SH7763 */ | ||
267 | EDMR_SRST = 0x01, | ||
268 | #endif | ||
142 | }; | 269 | }; |
143 | 270 | ||
144 | /* EDTRR */ | 271 | /* EDTRR */ |
145 | enum DMAC_T_BIT { | 272 | enum DMAC_T_BIT { |
273 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
274 | EDTRR_TRNS = 0x03, | ||
275 | #else | ||
146 | EDTRR_TRNS = 0x01, | 276 | EDTRR_TRNS = 0x01, |
277 | #endif | ||
147 | }; | 278 | }; |
148 | 279 | ||
149 | /* EDRRR*/ | 280 | /* EDRRR*/ |
@@ -173,21 +304,47 @@ enum PHY_STATUS_BIT { PHY_ST_LINK = 0x01, }; | |||
173 | 304 | ||
174 | /* EESR */ | 305 | /* EESR */ |
175 | enum EESR_BIT { | 306 | enum EESR_BIT { |
176 | EESR_TWB = 0x40000000, EESR_TABT = 0x04000000, | 307 | #ifndef CONFIG_CPU_SUBTYPE_SH7763 |
308 | EESR_TWB = 0x40000000, | ||
309 | #else | ||
310 | EESR_TWB = 0xC0000000, | ||
311 | EESR_TC1 = 0x20000000, | ||
312 | EESR_TUC = 0x10000000, | ||
313 | EESR_ROC = 0x80000000, | ||
314 | #endif | ||
315 | EESR_TABT = 0x04000000, | ||
177 | EESR_RABT = 0x02000000, EESR_RFRMER = 0x01000000, | 316 | EESR_RABT = 0x02000000, EESR_RFRMER = 0x01000000, |
178 | EESR_ADE = 0x00800000, EESR_ECI = 0x00400000, | 317 | #ifndef CONFIG_CPU_SUBTYPE_SH7763 |
179 | EESR_FTC = 0x00200000, EESR_TDE = 0x00100000, | 318 | EESR_ADE = 0x00800000, |
180 | EESR_TFE = 0x00080000, EESR_FRC = 0x00040000, | 319 | #endif |
181 | EESR_RDE = 0x00020000, EESR_RFE = 0x00010000, | 320 | EESR_ECI = 0x00400000, |
182 | EESR_TINT4 = 0x00000800, EESR_TINT3 = 0x00000400, | 321 | EESR_FTC = 0x00200000, EESR_TDE = 0x00100000, |
183 | EESR_TINT2 = 0x00000200, EESR_TINT1 = 0x00000100, | 322 | EESR_TFE = 0x00080000, EESR_FRC = 0x00040000, |
184 | EESR_RINT8 = 0x00000080, EESR_RINT5 = 0x00000010, | 323 | EESR_RDE = 0x00020000, EESR_RFE = 0x00010000, |
185 | EESR_RINT4 = 0x00000008, EESR_RINT3 = 0x00000004, | 324 | #ifndef CONFIG_CPU_SUBTYPE_SH7763 |
186 | EESR_RINT2 = 0x00000002, EESR_RINT1 = 0x00000001, | 325 | EESR_CND = 0x00000800, |
187 | }; | 326 | #endif |
188 | 327 | EESR_DLC = 0x00000400, | |
189 | #define EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \ | 328 | EESR_CD = 0x00000200, EESR_RTO = 0x00000100, |
329 | EESR_RMAF = 0x00000080, EESR_CEEF = 0x00000040, | ||
330 | EESR_CELF = 0x00000020, EESR_RRF = 0x00000010, | ||
331 | EESR_RTLF = 0x00000008, EESR_RTSF = 0x00000004, | ||
332 | EESR_PRE = 0x00000002, EESR_CERF = 0x00000001, | ||
333 | }; | ||
334 | |||
335 | |||
336 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
337 | # define TX_CHECK (EESR_TC1 | EESR_FTC) | ||
338 | # define EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \ | ||
339 | | EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI) | ||
340 | # define TX_ERROR_CEHCK (EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE) | ||
341 | |||
342 | #else | ||
343 | # define TX_CHECK (EESR_FTC | EESR_CND | EESR_DLC | EESR_CD | EESR_RTO) | ||
344 | # define EESR_ERR_CHECK (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \ | ||
190 | | EESR_RFRMER | EESR_ADE | EESR_TFE | EESR_TDE | EESR_ECI) | 345 | | EESR_RFRMER | EESR_ADE | EESR_TFE | EESR_TDE | EESR_ECI) |
346 | # define TX_ERROR_CEHCK (EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE) | ||
347 | #endif | ||
191 | 348 | ||
192 | /* EESIPR */ | 349 | /* EESIPR */ |
193 | enum DMAC_IM_BIT { | 350 | enum DMAC_IM_BIT { |
@@ -207,8 +364,8 @@ enum DMAC_IM_BIT { | |||
207 | 364 | ||
208 | /* Receive descriptor bit */ | 365 | /* Receive descriptor bit */ |
209 | enum RD_STS_BIT { | 366 | enum RD_STS_BIT { |
210 | RD_RACT = 0x80000000, RC_RDEL = 0x40000000, | 367 | RD_RACT = 0x80000000, RD_RDEL = 0x40000000, |
211 | RC_RFP1 = 0x20000000, RC_RFP0 = 0x10000000, | 368 | RD_RFP1 = 0x20000000, RD_RFP0 = 0x10000000, |
212 | RD_RFE = 0x08000000, RD_RFS10 = 0x00000200, | 369 | RD_RFE = 0x08000000, RD_RFS10 = 0x00000200, |
213 | RD_RFS9 = 0x00000100, RD_RFS8 = 0x00000080, | 370 | RD_RFS9 = 0x00000100, RD_RFS8 = 0x00000080, |
214 | RD_RFS7 = 0x00000040, RD_RFS6 = 0x00000020, | 371 | RD_RFS7 = 0x00000040, RD_RFS6 = 0x00000020, |
@@ -216,9 +373,9 @@ enum RD_STS_BIT { | |||
216 | RD_RFS3 = 0x00000004, RD_RFS2 = 0x00000002, | 373 | RD_RFS3 = 0x00000004, RD_RFS2 = 0x00000002, |
217 | RD_RFS1 = 0x00000001, | 374 | RD_RFS1 = 0x00000001, |
218 | }; | 375 | }; |
219 | #define RDF1ST RC_RFP1 | 376 | #define RDF1ST RD_RFP1 |
220 | #define RDFEND RC_RFP0 | 377 | #define RDFEND RD_RFP0 |
221 | #define RD_RFP (RC_RFP1|RC_RFP0) | 378 | #define RD_RFP (RD_RFP1|RD_RFP0) |
222 | 379 | ||
223 | /* FCFTR */ | 380 | /* FCFTR */ |
224 | enum FCFTR_BIT { | 381 | enum FCFTR_BIT { |
@@ -231,7 +388,8 @@ enum FCFTR_BIT { | |||
231 | 388 | ||
232 | /* Transfer descriptor bit */ | 389 | /* Transfer descriptor bit */ |
233 | enum TD_STS_BIT { | 390 | enum TD_STS_BIT { |
234 | TD_TACT = 0x80000000, TD_TDLE = 0x40000000, TD_TFP1 = 0x20000000, | 391 | TD_TACT = 0x80000000, |
392 | TD_TDLE = 0x40000000, TD_TFP1 = 0x20000000, | ||
235 | TD_TFP0 = 0x10000000, | 393 | TD_TFP0 = 0x10000000, |
236 | }; | 394 | }; |
237 | #define TDF1ST TD_TFP1 | 395 | #define TDF1ST TD_TFP1 |
@@ -242,6 +400,10 @@ enum TD_STS_BIT { | |||
242 | enum RECV_RST_BIT { RMCR_RST = 0x01, }; | 400 | enum RECV_RST_BIT { RMCR_RST = 0x01, }; |
243 | /* ECMR */ | 401 | /* ECMR */ |
244 | enum FELIC_MODE_BIT { | 402 | enum FELIC_MODE_BIT { |
403 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
404 | ECMR_TRCCM = 0x04000000, ECMR_RCSC = 0x00800000, | ||
405 | ECMR_DPAD = 0x00200000, ECMR_RZPF = 0x00100000, | ||
406 | #endif | ||
245 | ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000, | 407 | ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000, |
246 | ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000, | 408 | ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000, |
247 | ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, | 409 | ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020, |
@@ -249,18 +411,45 @@ enum FELIC_MODE_BIT { | |||
249 | ECMR_PRM = 0x00000001, | 411 | ECMR_PRM = 0x00000001, |
250 | }; | 412 | }; |
251 | 413 | ||
414 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
415 | #define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF |\ | ||
416 | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT) | ||
417 | #else | ||
418 | #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR ECMR_RXF | ECMR_TXF | ECMR_MCT) | ||
419 | #endif | ||
420 | |||
252 | /* ECSR */ | 421 | /* ECSR */ |
253 | enum ECSR_STATUS_BIT { | 422 | enum ECSR_STATUS_BIT { |
254 | ECSR_BRCRX = 0x20, ECSR_PSRTO = 0x10, ECSR_LCHNG = 0x04, | 423 | #ifndef CONFIG_CPU_SUBTYPE_SH7763 |
424 | ECSR_BRCRX = 0x20, ECSR_PSRTO = 0x10, | ||
425 | #endif | ||
426 | ECSR_LCHNG = 0x04, | ||
255 | ECSR_MPD = 0x02, ECSR_ICD = 0x01, | 427 | ECSR_MPD = 0x02, ECSR_ICD = 0x01, |
256 | }; | 428 | }; |
257 | 429 | ||
430 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
431 | # define ECSR_INIT (ECSR_ICD | ECSIPR_MPDIP) | ||
432 | #else | ||
433 | # define ECSR_INIT (ECSR_BRCRX | ECSR_PSRTO | \ | ||
434 | ECSR_LCHNG | ECSR_ICD | ECSIPR_MPDIP) | ||
435 | #endif | ||
436 | |||
258 | /* ECSIPR */ | 437 | /* ECSIPR */ |
259 | enum ECSIPR_STATUS_MASK_BIT { | 438 | enum ECSIPR_STATUS_MASK_BIT { |
260 | ECSIPR_BRCRXIP = 0x20, ECSIPR_PSRTOIP = 0x10, ECSIPR_LCHNGIP = 0x04, | 439 | #ifndef CONFIG_CPU_SUBTYPE_SH7763 |
440 | ECSIPR_BRCRXIP = 0x20, ECSIPR_PSRTOIP = 0x10, | ||
441 | #endif | ||
442 | ECSIPR_LCHNGIP = 0x04, | ||
261 | ECSIPR_MPDIP = 0x02, ECSIPR_ICDIP = 0x01, | 443 | ECSIPR_MPDIP = 0x02, ECSIPR_ICDIP = 0x01, |
262 | }; | 444 | }; |
263 | 445 | ||
446 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
447 | # define ECSIPR_INIT (ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP) | ||
448 | #else | ||
449 | # define ECSIPR_INIT (ECSIPR_BRCRXIP | ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | \ | ||
450 | ECSIPR_ICDIP | ECSIPR_MPDIP) | ||
451 | #endif | ||
452 | |||
264 | /* APR */ | 453 | /* APR */ |
265 | enum APR_BIT { | 454 | enum APR_BIT { |
266 | APR_AP = 0x00000001, | 455 | APR_AP = 0x00000001, |
@@ -285,6 +474,15 @@ enum RPADIR_BIT { | |||
285 | RPADIR_PADR = 0x0003f, | 474 | RPADIR_PADR = 0x0003f, |
286 | }; | 475 | }; |
287 | 476 | ||
477 | #if defined(CONFIG_CPU_SUBTYPE_SH7763) | ||
478 | # define RPADIR_INIT (0x00) | ||
479 | #else | ||
480 | # define RPADIR_INIT (RPADIR_PADS1) | ||
481 | #endif | ||
482 | |||
483 | /* RFLR */ | ||
484 | #define RFLR_VALUE 0x1000 | ||
485 | |||
288 | /* FDR */ | 486 | /* FDR */ |
289 | enum FIFO_SIZE_BIT { | 487 | enum FIFO_SIZE_BIT { |
290 | FIFO_SIZE_T = 0x00000700, FIFO_SIZE_R = 0x00000007, | 488 | FIFO_SIZE_T = 0x00000700, FIFO_SIZE_R = 0x00000007, |
@@ -316,7 +514,7 @@ enum PHY_ANA_BIT { | |||
316 | PHY_A_NP = 0x8000, PHY_A_ACK = 0x4000, PHY_A_RF = 0x2000, | 514 | PHY_A_NP = 0x8000, PHY_A_ACK = 0x4000, PHY_A_RF = 0x2000, |
317 | PHY_A_FCS = 0x0400, PHY_A_T4 = 0x0200, PHY_A_FDX = 0x0100, | 515 | PHY_A_FCS = 0x0400, PHY_A_T4 = 0x0200, PHY_A_FDX = 0x0100, |
318 | PHY_A_HDX = 0x0080, PHY_A_10FDX = 0x0040, PHY_A_10HDX = 0x0020, | 516 | PHY_A_HDX = 0x0080, PHY_A_10FDX = 0x0040, PHY_A_10HDX = 0x0020, |
319 | PHY_A_SEL = 0x001f, | 517 | PHY_A_SEL = 0x001e, |
320 | }; | 518 | }; |
321 | /* PHY_ANL */ | 519 | /* PHY_ANL */ |
322 | enum PHY_ANL_BIT { | 520 | enum PHY_ANL_BIT { |
@@ -449,6 +647,10 @@ struct sh_eth_private { | |||
449 | struct net_device_stats tsu_stats; /* TSU forward status */ | 647 | struct net_device_stats tsu_stats; /* TSU forward status */ |
450 | }; | 648 | }; |
451 | 649 | ||
650 | #ifdef CONFIG_CPU_SUBTYPE_SH7763 | ||
651 | /* SH7763 has endian control register */ | ||
652 | #define swaps(x, y) | ||
653 | #else | ||
452 | static void swaps(char *src, int len) | 654 | static void swaps(char *src, int len) |
453 | { | 655 | { |
454 | #ifdef __LITTLE_ENDIAN__ | 656 | #ifdef __LITTLE_ENDIAN__ |
@@ -460,5 +662,5 @@ static void swaps(char *src, int len) | |||
460 | *p = swab32(*p); | 662 | *p = swab32(*p); |
461 | #endif | 663 | #endif |
462 | } | 664 | } |
463 | 665 | #endif /* CONFIG_CPU_SUBTYPE_SH7763 */ | |
464 | #endif | 666 | #endif |