Merge with testing-4xx_enet (Create generic 4xx Ethernet code)
This commit is contained in:
Wolfgang Denk
commit
ec2e5a2cce
15
MAKEALL
15
MAKEALL
@ -65,13 +65,14 @@ LIST_4xx=" \
|
||||
CANBT CPCI405 CPCI4052 CPCI405AB \
|
||||
CPCI440 CPCIISER4 CRAYL1 csb272 \
|
||||
csb472 DASA_SIM DP405 DU405 \
|
||||
ebony ERIC EXBITGEN HUB405 \
|
||||
JSE KAREF METROBOX MIP405 \
|
||||
MIP405T ML2 ml300 ocotea \
|
||||
OCRTC ORSG PCI405 PIP405 \
|
||||
PLU405 PMC405 PPChameleonEVB VOH405 \
|
||||
W7OLMC W7OLMG walnut WUH405 \
|
||||
XPEDITE1K yellowstone yosemite \
|
||||
ebony ERIC EXBITGEN G2000 \
|
||||
HUB405 JSE KAREF METROBOX \
|
||||
MIP405 MIP405T ML2 ml300 \
|
||||
ocotea OCRTC ORSG PCI405 \
|
||||
PIP405 PLU405 PMC405 PPChameleonEVB \
|
||||
sbc405 VOH405 W7OLMC W7OLMG \
|
||||
walnut WUH405 XPEDITE1K yellowstone \
|
||||
yosemite \
|
||||
"
|
||||
|
||||
#########################################################################
|
||||
|
||||
@ -74,7 +74,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/440gx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -68,7 +68,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -74,7 +74,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#include "ocotea.h"
|
||||
#include <asm/processor.h>
|
||||
#include <spd_sdram.h>
|
||||
#include <440gx_enet.h>
|
||||
#include <ppc4xx_enet.h>
|
||||
|
||||
#define BOOT_SMALL_FLASH 32 /* 00100000 */
|
||||
#define FLASH_ONBD_N 2 /* 00000010 */
|
||||
|
||||
@ -74,7 +74,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/440gx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -68,7 +68,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -74,7 +74,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -74,7 +74,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -69,7 +69,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <i2c.h>
|
||||
#include <miiphy.h>
|
||||
#include <405gp_enet.h>
|
||||
#include <ppc4xx_enet.h>
|
||||
|
||||
/*
|
||||
* Configuration data for AMIS FS6377-01 Programmable 3-PLL Clock Generator
|
||||
|
||||
@ -69,7 +69,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#include <asm/processor.h>
|
||||
#include <i2c.h>
|
||||
#include <miiphy.h>
|
||||
#include <405gp_enet.h>
|
||||
#include <ppc4xx_enet.h>
|
||||
|
||||
/*
|
||||
* board_early_init_f: do early board initialization
|
||||
|
||||
@ -69,7 +69,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -69,7 +69,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
lib_ppc/board.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -76,7 +76,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -64,7 +64,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -73,7 +73,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -69,7 +69,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -75,7 +75,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/440gx_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -65,7 +65,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/440gx_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -75,7 +75,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/440gx_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -65,7 +65,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/440gx_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -67,7 +67,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -65,7 +65,7 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
cpu/ppc4xx/4xx_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -74,7 +74,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
@ -64,7 +64,6 @@ SECTIONS
|
||||
cpu/ppc4xx/serial.o (.text)
|
||||
cpu/ppc4xx/cpu_init.o (.text)
|
||||
cpu/ppc4xx/speed.o (.text)
|
||||
cpu/ppc4xx/405gp_enet.o (.text)
|
||||
common/dlmalloc.o (.text)
|
||||
lib_generic/crc32.o (.text)
|
||||
lib_ppc/extable.o (.text)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -72,27 +72,37 @@
|
||||
* - ported from 405gp_enet.c to utilized upto 4 EMAC ports
|
||||
* in the 440GX. This port should work with the 440GP
|
||||
* (2 EMACs) also
|
||||
* 15-Aug-05 sr@denx.de
|
||||
* - merged 405gp_enet.c and 440gx_enet.c to generic 4xx_enet.c
|
||||
now handling all 4xx cpu's.
|
||||
*-----------------------------------------------------------------------------*/
|
||||
|
||||
#include <config.h>
|
||||
#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI)
|
||||
|
||||
#include <common.h>
|
||||
#include <net.h>
|
||||
#include <asm/processor.h>
|
||||
#include <ppc440.h>
|
||||
#include <commproc.h>
|
||||
#include <440gx_enet.h>
|
||||
#include <ppc4xx.h>
|
||||
#include <ppc4xx_enet.h>
|
||||
#include <405_mal.h>
|
||||
#include <miiphy.h>
|
||||
#include <malloc.h>
|
||||
#include "vecnum.h"
|
||||
|
||||
/*
|
||||
* Only compile for platform with IBM/AMCC EMAC ethernet controller and
|
||||
* network support enabled.
|
||||
* Remark: CONFIG_405 describes Xilinx PPC405 FPGA without EMAC controller!
|
||||
*/
|
||||
#if (CONFIG_COMMANDS & CFG_CMD_NET) && !defined(CONFIG_405) && !defined(CONFIG_IOP480)
|
||||
|
||||
#if !(defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII))
|
||||
#error "CONFIG_MII has to be defined!"
|
||||
#endif
|
||||
|
||||
#define EMAC_RESET_TIMEOUT 1000 /* 1000 ms reset timeout */
|
||||
#define PHY_AUTONEGOTIATE_TIMEOUT 4000 /* 4000 ms autonegotiate timeout */
|
||||
|
||||
|
||||
/* Ethernet Transmit and Receive Buffers */
|
||||
/* AS.HARNOIS
|
||||
* In the same way ENET_MAX_MTU and ENET_MAX_MTU_ALIGNED are set from
|
||||
@ -101,7 +111,6 @@
|
||||
#define ENET_MAX_MTU PKTSIZE
|
||||
#define ENET_MAX_MTU_ALIGNED PKTSIZE_ALIGN
|
||||
|
||||
|
||||
/* define the number of channels implemented */
|
||||
#define EMAC_RXCHL EMAC_NUM_DEV
|
||||
#define EMAC_TXCHL EMAC_NUM_DEV
|
||||
@ -113,19 +122,27 @@
|
||||
#define MAL_UIC_ERR ( UIC_MAL_SERR | UIC_MAL_TXDE | UIC_MAL_RXDE)
|
||||
#define MAL_UIC_DEF (UIC_MAL_RXEOB | MAL_UIC_ERR)
|
||||
#define EMAC_UIC_DEF UIC_ENET
|
||||
#define EMAC_UIC_DEF1 UIC_ENET1
|
||||
#define SEL_UIC_DEF(p) (p ? UIC_ENET1 : UIC_ENET )
|
||||
|
||||
#undef INFO_440_ENET
|
||||
#undef INFO_4XX_ENET
|
||||
|
||||
#define BI_PHYMODE_NONE 0
|
||||
#define BI_PHYMODE_ZMII 1
|
||||
#define BI_PHYMODE_RGMII 2
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------------------+
|
||||
* Global variables. TX and RX descriptors and buffers.
|
||||
*-----------------------------------------------------------------------------*/
|
||||
/* IER globals */
|
||||
static uint32_t mal_ier;
|
||||
|
||||
#if !defined(CONFIG_NET_MULTI)
|
||||
struct eth_device *emac0_dev;
|
||||
#endif
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------------------+
|
||||
* Prototypes and externals.
|
||||
*-----------------------------------------------------------------------------*/
|
||||
@ -137,31 +154,33 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
|
||||
unsigned long mal_errr);
|
||||
static void emac_err (struct eth_device *dev, unsigned long isr);
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------------------+
|
||||
| ppc_440x_eth_halt
|
||||
| ppc_4xx_eth_halt
|
||||
| Disable MAL channel, and EMACn
|
||||
|
|
||||
|
|
||||
+-----------------------------------------------------------------------------*/
|
||||
static void ppc_440x_eth_halt (struct eth_device *dev)
|
||||
static void ppc_4xx_eth_halt (struct eth_device *dev)
|
||||
{
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
uint32_t failsafe = 10000;
|
||||
|
||||
out32 (EMAC_IER + hw_p->hw_addr, 0x00000000); /* disable emac interrupts */
|
||||
|
||||
/* 1st reset MAL channel */
|
||||
/* Note: writing a 0 to a channel has no effect */
|
||||
#if defined(CONFIG_405EP) || defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
mtdcr (maltxcarr, (MAL_CR_MMSR >> (hw_p->devnum * 2)));
|
||||
#else
|
||||
mtdcr (maltxcarr, (MAL_CR_MMSR >> hw_p->devnum));
|
||||
#endif
|
||||
mtdcr (malrxcarr, (MAL_CR_MMSR >> hw_p->devnum));
|
||||
|
||||
/* wait for reset */
|
||||
while (mfdcr (maltxcasr) & (MAL_CR_MMSR >> hw_p->devnum)) {
|
||||
while (mfdcr (malrxcasr) & (MAL_CR_MMSR >> hw_p->devnum)) {
|
||||
udelay (1000); /* Delay 1 MS so as not to hammer the register */
|
||||
failsafe--;
|
||||
if (failsafe == 0)
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
/* EMAC RESET */
|
||||
@ -176,7 +195,7 @@ extern int phy_setup_aneg (unsigned char addr);
|
||||
extern int miiphy_reset (unsigned char addr);
|
||||
|
||||
#if defined (CONFIG_440GX)
|
||||
int ppc_440x_eth_setup_bridge(int devnum, bd_t * bis)
|
||||
int ppc_4xx_eth_setup_bridge(int devnum, bd_t * bis)
|
||||
{
|
||||
unsigned long pfc1;
|
||||
unsigned long zmiifer;
|
||||
@ -267,10 +286,10 @@ int ppc_440x_eth_setup_bridge(int devnum, bd_t * bis)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
{
|
||||
int i, j;
|
||||
unsigned long reg;
|
||||
unsigned long reg = 0;
|
||||
unsigned long msr;
|
||||
unsigned long speed;
|
||||
unsigned long duplex;
|
||||
@ -278,27 +297,29 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
unsigned mode_reg;
|
||||
unsigned short devnum;
|
||||
unsigned short reg_short;
|
||||
sys_info_t sysinfo;
|
||||
#if defined(CONFIG_440GX)
|
||||
sys_info_t sysinfo;
|
||||
int ethgroup;
|
||||
#endif
|
||||
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
|
||||
/* before doing anything, figure out if we have a MAC address */
|
||||
/* if not, bail */
|
||||
if (memcmp (dev->enetaddr, "\0\0\0\0\0\0", 6) == 0)
|
||||
return -1;
|
||||
|
||||
#if defined(CONFIG_440GX)
|
||||
/* Need to get the OPB frequency so we can access the PHY */
|
||||
get_sys_info (&sysinfo);
|
||||
#endif
|
||||
|
||||
msr = mfmsr ();
|
||||
mtmsr (msr & ~(MSR_EE)); /* disable interrupts */
|
||||
|
||||
devnum = hw_p->devnum;
|
||||
|
||||
#ifdef INFO_440_ENET
|
||||
#ifdef INFO_4XX_ENET
|
||||
/* AS.HARNOIS
|
||||
* We should have :
|
||||
* hw_p->stats.pkts_handled <= hw_p->stats.pkts_rx <= hw_p->stats.pkts_handled+PKTBUFSRX
|
||||
@ -320,29 +341,6 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
hw_p->stats.pkts_handled = 0;
|
||||
#endif
|
||||
|
||||
/* MAL Channel RESET */
|
||||
/* 1st reset MAL channel */
|
||||
/* Note: writing a 0 to a channel has no effect */
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
mtdcr (maltxcarr, (MAL_TXRX_CASR >> (hw_p->devnum*2)));
|
||||
#else
|
||||
mtdcr (maltxcarr, (MAL_TXRX_CASR >> hw_p->devnum));
|
||||
#endif
|
||||
|
||||
mtdcr (malrxcarr, (MAL_TXRX_CASR >> hw_p->devnum));
|
||||
|
||||
/* wait for reset */
|
||||
/* TBS: should have udelay and failsafe here */
|
||||
failsafe = 10000;
|
||||
/* wait for reset */
|
||||
while (mfdcr (maltxcasr) & (MAL_CR_MMSR >> hw_p->devnum)) {
|
||||
udelay (1000); /* Delay 1 MS so as not to hammer the register */
|
||||
failsafe--;
|
||||
if (failsafe == 0)
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
hw_p->tx_err_index = 0; /* Transmit Error Index for tx_err_log */
|
||||
hw_p->rx_err_index = 0; /* Receive Error Index for rx_err_log */
|
||||
|
||||
@ -354,6 +352,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
hw_p->tx_i_index = 0; /* Transmit Interrupt Queue Index */
|
||||
hw_p->tx_u_index = 0; /* Transmit User Queue Index */
|
||||
|
||||
#if defined(CONFIG_440)
|
||||
/* set RMII mode */
|
||||
/* NOTE: 440GX spec states that mode is mutually exclusive */
|
||||
/* NOTE: Therefore, disable all other EMACS, since we handle */
|
||||
@ -365,7 +364,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
out32 (ZMII_FER, (ZMII_FER_RMII | ZMII_FER_MDI) << ZMII_FER_V (devnum));
|
||||
#elif defined(CONFIG_440GX)
|
||||
ethgroup = ppc_440x_eth_setup_bridge(devnum, bis);
|
||||
ethgroup = ppc_4xx_eth_setup_bridge(devnum, bis);
|
||||
#else
|
||||
if ((devnum == 0) || (devnum == 1)) {
|
||||
out32 (ZMII_FER, (ZMII_FER_SMII | ZMII_FER_MDI) << ZMII_FER_V (devnum));
|
||||
@ -378,6 +377,8 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
#endif
|
||||
|
||||
out32 (ZMII_SSR, ZMII_SSR_SP << ZMII_SSR_V(devnum));
|
||||
#endif /* defined(CONFIG_440) */
|
||||
|
||||
__asm__ volatile ("eieio");
|
||||
|
||||
/* reset emac so we have access to the phy */
|
||||
@ -415,9 +416,11 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
case 0:
|
||||
reg = CONFIG_PHY_ADDR;
|
||||
break;
|
||||
#if defined (CONFIG_PHY1_ADDR)
|
||||
case 1:
|
||||
reg = CONFIG_PHY1_ADDR;
|
||||
break;
|
||||
#endif
|
||||
#if defined (CONFIG_440GX)
|
||||
case 2:
|
||||
reg = CONFIG_PHY2_ADDR;
|
||||
@ -433,7 +436,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
|
||||
bis->bi_phynum[devnum] = reg;
|
||||
|
||||
#ifndef CONFIG_NO_PHY_RESET
|
||||
#if defined(CONFIG_PHY_RESET)
|
||||
/*
|
||||
* Reset the phy, only if its the first time through
|
||||
* otherwise, just check the speeds & feeds
|
||||
@ -476,7 +479,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
phy_setup_aneg (reg);
|
||||
udelay (1000);
|
||||
}
|
||||
#endif /* CONFIG_NO_PHY_RESET */
|
||||
#endif /* defined(CONFIG_PHY_RESET) */
|
||||
|
||||
miiphy_read (reg, PHY_BMSR, ®_short);
|
||||
|
||||
@ -506,7 +509,8 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
puts (" done\n");
|
||||
udelay (500000); /* another 500 ms (results in faster booting) */
|
||||
}
|
||||
#endif
|
||||
#endif /* #ifndef CONFIG_CS8952_PHY */
|
||||
|
||||
speed = miiphy_speed (reg);
|
||||
duplex = miiphy_duplex (reg);
|
||||
|
||||
@ -516,6 +520,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
(int) speed, (duplex == HALF) ? "HALF" : "FULL");
|
||||
}
|
||||
|
||||
#if defined(CONFIG_440)
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
mfsdr(sdr_mfr, reg);
|
||||
if (speed == 100) {
|
||||
@ -543,6 +548,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
|
||||
out32 (RGMII_SSR, reg);
|
||||
}
|
||||
#endif /* defined(CONFIG_440) */
|
||||
|
||||
/* set the Mal configuration reg */
|
||||
#if defined(CONFIG_440GX)
|
||||
@ -665,13 +671,15 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
switch (devnum) {
|
||||
case 1:
|
||||
/* setup MAL tx & rx channel pointers */
|
||||
#if defined (CONFIG_440EP) || defined (CONFIG_440GR)
|
||||
#if defined (CONFIG_405EP) || defined (CONFIG_440EP) || defined (CONFIG_440GR)
|
||||
mtdcr (maltxctp2r, hw_p->tx);
|
||||
#else
|
||||
mtdcr (maltxctp1r, hw_p->tx);
|
||||
#endif
|
||||
#if defined(CONFIG_440)
|
||||
mtdcr (maltxbattr, 0x0);
|
||||
mtdcr (malrxbattr, 0x0);
|
||||
#endif
|
||||
mtdcr (malrxctp1r, hw_p->rx);
|
||||
/* set RX buffer size */
|
||||
mtdcr (malrcbs1, ENET_MAX_MTU_ALIGNED / 16);
|
||||
@ -680,8 +688,8 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
case 2:
|
||||
/* setup MAL tx & rx channel pointers */
|
||||
mtdcr (maltxbattr, 0x0);
|
||||
mtdcr (maltxctp2r, hw_p->tx);
|
||||
mtdcr (malrxbattr, 0x0);
|
||||
mtdcr (maltxctp2r, hw_p->tx);
|
||||
mtdcr (malrxctp2r, hw_p->rx);
|
||||
/* set RX buffer size */
|
||||
mtdcr (malrcbs2, ENET_MAX_MTU_ALIGNED / 16);
|
||||
@ -699,9 +707,11 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
case 0:
|
||||
default:
|
||||
/* setup MAL tx & rx channel pointers */
|
||||
#if defined(CONFIG_440)
|
||||
mtdcr (maltxbattr, 0x0);
|
||||
mtdcr (maltxctp0r, hw_p->tx);
|
||||
mtdcr (malrxbattr, 0x0);
|
||||
#endif
|
||||
mtdcr (maltxctp0r, hw_p->tx);
|
||||
mtdcr (malrxctp0r, hw_p->rx);
|
||||
/* set RX buffer size */
|
||||
mtdcr (malrcbs0, ENET_MAX_MTU_ALIGNED / 16);
|
||||
@ -709,7 +719,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
}
|
||||
|
||||
/* Enable MAL transmit and receive channels */
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
#if defined(CONFIG_405EP) || defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
mtdcr (maltxcasr, (MAL_TXRX_CASR >> (hw_p->devnum*2)));
|
||||
#else
|
||||
mtdcr (maltxcasr, (MAL_TXRX_CASR >> hw_p->devnum));
|
||||
@ -745,8 +755,13 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
out32 (EMAC_TRTR + hw_p->hw_addr, 0x18000000); /* 256 byte threshold */
|
||||
|
||||
/* set receive low/high water mark register */
|
||||
#if defined(CONFIG_440)
|
||||
/* 440GP has a 64 byte burst length */
|
||||
out32 (EMAC_RX_HI_LO_WMARK + hw_p->hw_addr, 0x80009000);
|
||||
#else
|
||||
/* 405s have a 16 byte burst length */
|
||||
out32 (EMAC_RX_HI_LO_WMARK + hw_p->hw_addr, 0x0f002000);
|
||||
#endif /* defined(CONFIG_440) */
|
||||
out32 (EMAC_TXM1 + hw_p->hw_addr, 0xf8640000);
|
||||
|
||||
/* Set fifo limit entry in tx mode 0 */
|
||||
@ -755,8 +770,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
out32 (EMAC_I_FRAME_GAP_REG + hw_p->hw_addr, 0x00000008);
|
||||
|
||||
/* Set EMAC IER */
|
||||
hw_p->emac_ier = EMAC_ISR_PTLE | EMAC_ISR_BFCS |
|
||||
EMAC_ISR_PTLE | EMAC_ISR_ORE | EMAC_ISR_IRE;
|
||||
hw_p->emac_ier = EMAC_ISR_PTLE | EMAC_ISR_BFCS | EMAC_ISR_ORE | EMAC_ISR_IRE;
|
||||
if (speed == _100BASET)
|
||||
hw_p->emac_ier = hw_p->emac_ier | EMAC_ISR_SYE;
|
||||
|
||||
@ -767,8 +781,6 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
/*
|
||||
* Connect interrupt service routines
|
||||
*/
|
||||
irq_install_handler (VECNUM_EWU0 + (hw_p->devnum * 2),
|
||||
(interrupt_handler_t *) enetInt, dev);
|
||||
irq_install_handler (VECNUM_ETH0 + (hw_p->devnum * 2),
|
||||
(interrupt_handler_t *) enetInt, dev);
|
||||
}
|
||||
@ -782,13 +794,13 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
|
||||
}
|
||||
|
||||
|
||||
static int ppc_440x_eth_send (struct eth_device *dev, volatile void *ptr,
|
||||
static int ppc_4xx_eth_send (struct eth_device *dev, volatile void *ptr,
|
||||
int len)
|
||||
{
|
||||
struct enet_frame *ef_ptr;
|
||||
ulong time_start, time_now;
|
||||
unsigned long temp_txm0;
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
|
||||
ef_ptr = (struct enet_frame *) ptr;
|
||||
|
||||
@ -823,7 +835,7 @@ static int ppc_440x_eth_send (struct eth_device *dev, volatile void *ptr,
|
||||
|
||||
out32 (EMAC_TXM0 + hw_p->hw_addr,
|
||||
in32 (EMAC_TXM0 + hw_p->hw_addr) | EMAC_TXM0_GNP0);
|
||||
#ifdef INFO_440_ENET
|
||||
#ifdef INFO_4XX_ENET
|
||||
hw_p->stats.pkts_tx++;
|
||||
#endif
|
||||
|
||||
@ -849,6 +861,7 @@ static int ppc_440x_eth_send (struct eth_device *dev, volatile void *ptr,
|
||||
}
|
||||
}
|
||||
|
||||
#if defined (CONFIG_440)
|
||||
|
||||
int enetInt (struct eth_device *dev)
|
||||
{
|
||||
@ -862,13 +875,17 @@ int enetInt (struct eth_device *dev)
|
||||
#if defined(CONFIG_440GX)
|
||||
unsigned long my_uic2msr;
|
||||
#endif
|
||||
EMAC_440GX_HW_PST hw_p;
|
||||
EMAC_4XX_HW_PST hw_p;
|
||||
|
||||
/*
|
||||
* Because the mal is generic, we need to get the current
|
||||
* eth device
|
||||
*/
|
||||
dev = eth_get_dev ();
|
||||
#if defined(CONFIG_NET_MULTI)
|
||||
dev = eth_get_dev();
|
||||
#else
|
||||
dev = emac0_dev;
|
||||
#endif
|
||||
|
||||
hw_p = dev->priv;
|
||||
|
||||
@ -1026,6 +1043,96 @@ int enetInt (struct eth_device *dev)
|
||||
return (rc);
|
||||
}
|
||||
|
||||
#else /* CONFIG_440 */
|
||||
|
||||
int enetInt (struct eth_device *dev)
|
||||
{
|
||||
int serviced;
|
||||
int rc = -1; /* default to not us */
|
||||
unsigned long mal_isr;
|
||||
unsigned long emac_isr = 0;
|
||||
unsigned long mal_rx_eob;
|
||||
unsigned long my_uicmsr;
|
||||
|
||||
EMAC_4XX_HW_PST hw_p;
|
||||
|
||||
/*
|
||||
* Because the mal is generic, we need to get the current
|
||||
* eth device
|
||||
*/
|
||||
#if defined(CONFIG_NET_MULTI)
|
||||
dev = eth_get_dev();
|
||||
#else
|
||||
dev = emac0_dev;
|
||||
#endif
|
||||
|
||||
hw_p = dev->priv;
|
||||
|
||||
/* enter loop that stays in interrupt code until nothing to service */
|
||||
do {
|
||||
serviced = 0;
|
||||
|
||||
my_uicmsr = mfdcr (uicmsr);
|
||||
|
||||
if ((my_uicmsr & (MAL_UIC_DEF | EMAC_UIC_DEF)) == 0) { /* not for us */
|
||||
return (rc);
|
||||
}
|
||||
/* get and clear controller status interrupts */
|
||||
/* look at Mal and EMAC interrupts */
|
||||
if ((MAL_UIC_DEF & my_uicmsr) != 0) { /* we have a MAL interrupt */
|
||||
mal_isr = mfdcr (malesr);
|
||||
/* look for mal error */
|
||||
if ((my_uicmsr & MAL_UIC_ERR) != 0) {
|
||||
mal_err (dev, mal_isr, my_uicmsr, MAL_UIC_DEF, MAL_UIC_ERR);
|
||||
serviced = 1;
|
||||
rc = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* port by port dispatch of emac interrupts */
|
||||
|
||||
if ((SEL_UIC_DEF(hw_p->devnum) & my_uicmsr) != 0) { /* look for EMAC errors */
|
||||
emac_isr = in32 (EMAC_ISR + hw_p->hw_addr);
|
||||
if ((hw_p->emac_ier & emac_isr) != 0) {
|
||||
emac_err (dev, emac_isr);
|
||||
serviced = 1;
|
||||
rc = 0;
|
||||
}
|
||||
}
|
||||
if (((hw_p->emac_ier & emac_isr) != 0) || ((MAL_UIC_ERR & my_uicmsr) != 0)) {
|
||||
mtdcr (uicsr, MAL_UIC_DEF | SEL_UIC_DEF(hw_p->devnum)); /* Clear */
|
||||
return (rc); /* we had errors so get out */
|
||||
}
|
||||
|
||||
/* handle MAX TX EOB interrupt from a tx */
|
||||
if (my_uicmsr & UIC_MAL_TXEOB) {
|
||||
mal_rx_eob = mfdcr (maltxeobisr);
|
||||
mtdcr (maltxeobisr, mal_rx_eob);
|
||||
mtdcr (uicsr, UIC_MAL_TXEOB);
|
||||
}
|
||||
/* handle MAL RX EOB interupt from a receive */
|
||||
/* check for EOB on valid channels */
|
||||
if (my_uicmsr & UIC_MAL_RXEOB)
|
||||
{
|
||||
mal_rx_eob = mfdcr (malrxeobisr);
|
||||
if ((mal_rx_eob & (0x80000000 >> hw_p->devnum)) != 0) { /* call emac routine for channel x */
|
||||
/* clear EOB
|
||||
mtdcr(malrxeobisr, mal_rx_eob); */
|
||||
enet_rcv (dev, emac_isr);
|
||||
/* indicate that we serviced an interrupt */
|
||||
serviced = 1;
|
||||
rc = 0;
|
||||
}
|
||||
}
|
||||
mtdcr (uicsr, MAL_UIC_DEF|EMAC_UIC_DEF|EMAC_UIC_DEF1); /* Clear */
|
||||
}
|
||||
while (serviced);
|
||||
|
||||
return (rc);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_440 */
|
||||
|
||||
/*-----------------------------------------------------------------------------+
|
||||
* MAL Error Routine
|
||||
*-----------------------------------------------------------------------------*/
|
||||
@ -1033,7 +1140,7 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
|
||||
unsigned long uic, unsigned long maldef,
|
||||
unsigned long mal_errr)
|
||||
{
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
|
||||
mtdcr (malesr, isr); /* clear interrupt */
|
||||
|
||||
@ -1041,7 +1148,7 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
|
||||
mtdcr (maltxdeir, 0xC0000000);
|
||||
mtdcr (malrxdeir, 0x80000000);
|
||||
|
||||
#ifdef INFO_440_ENET
|
||||
#ifdef INFO_4XX_ENET
|
||||
printf ("\nMAL error occured.... ISR = %lx UIC = = %lx MAL_DEF = %lx MAL_ERR= %lx \n", isr, uic, maldef, mal_errr);
|
||||
#endif
|
||||
|
||||
@ -1053,7 +1160,7 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
|
||||
*-----------------------------------------------------------------------------*/
|
||||
static void emac_err (struct eth_device *dev, unsigned long isr)
|
||||
{
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
|
||||
printf ("EMAC%d error occured.... ISR = %lx\n", hw_p->devnum, isr);
|
||||
out32 (EMAC_ISR + hw_p->hw_addr, isr);
|
||||
@ -1067,7 +1174,7 @@ static void enet_rcv (struct eth_device *dev, unsigned long malisr)
|
||||
struct enet_frame *ef_ptr;
|
||||
unsigned long data_len;
|
||||
unsigned long rx_eob_isr;
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
|
||||
int handled = 0;
|
||||
int i;
|
||||
@ -1127,7 +1234,7 @@ static void enet_rcv (struct eth_device *dev, unsigned long malisr)
|
||||
hw_p->stats.rx += data_len;
|
||||
ef_ptr = (struct enet_frame *) hw_p->rx[i].
|
||||
data_ptr;
|
||||
#ifdef INFO_440_ENET
|
||||
#ifdef INFO_4XX_ENET
|
||||
hw_p->stats.pkts_rx++;
|
||||
#endif
|
||||
/* AS.HARNOIS
|
||||
@ -1138,8 +1245,6 @@ static void enet_rcv (struct eth_device *dev, unsigned long malisr)
|
||||
if (NUM_RX_BUFF == hw_p->rx_i_index)
|
||||
hw_p->rx_i_index = 0;
|
||||
|
||||
/* printf("X"); /|* test-only *|/ */
|
||||
|
||||
/* AS.HARNOIS
|
||||
* free receive buffer only when
|
||||
* buffer has been handled (eth_rx)
|
||||
@ -1151,12 +1256,12 @@ static void enet_rcv (struct eth_device *dev, unsigned long malisr)
|
||||
}
|
||||
|
||||
|
||||
static int ppc_440x_eth_rx (struct eth_device *dev)
|
||||
static int ppc_4xx_eth_rx (struct eth_device *dev)
|
||||
{
|
||||
int length;
|
||||
int user_index;
|
||||
unsigned long msr;
|
||||
EMAC_440GX_HW_PST hw_p = dev->priv;
|
||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||
|
||||
hw_p->is_receiving = 1; /* tell driver */
|
||||
|
||||
@ -1188,7 +1293,7 @@ static int ppc_440x_eth_rx (struct eth_device *dev)
|
||||
if (NUM_RX_BUFF == hw_p->rx_u_index)
|
||||
hw_p->rx_u_index = 0;
|
||||
|
||||
#ifdef INFO_440_ENET
|
||||
#ifdef INFO_4XX_ENET
|
||||
hw_p->stats.pkts_handled++;
|
||||
#endif
|
||||
|
||||
@ -1200,12 +1305,12 @@ static int ppc_440x_eth_rx (struct eth_device *dev)
|
||||
return length;
|
||||
}
|
||||
|
||||
int ppc_440x_eth_initialize (bd_t * bis)
|
||||
int ppc_4xx_eth_initialize (bd_t * bis)
|
||||
{
|
||||
static int virgin = 0;
|
||||
struct eth_device *dev;
|
||||
int eth_num = 0;
|
||||
EMAC_440GX_HW_PST hw = NULL;
|
||||
EMAC_4XX_HW_PST hw = NULL;
|
||||
|
||||
#if defined(CONFIG_440GX)
|
||||
unsigned long pfc1;
|
||||
@ -1229,7 +1334,7 @@ int ppc_440x_eth_initialize (bd_t * bis)
|
||||
bis->bi_phymode[3] = 2;
|
||||
|
||||
#if defined (CONFIG_440GX)
|
||||
ppc_440x_eth_setup_bridge(0, bis);
|
||||
ppc_4xx_eth_setup_bridge(0, bis);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -1273,16 +1378,16 @@ int ppc_440x_eth_initialize (bd_t * bis)
|
||||
/* Allocate device structure */
|
||||
dev = (struct eth_device *) malloc (sizeof (*dev));
|
||||
if (dev == NULL) {
|
||||
printf ("ppc_440x_eth_initialize: "
|
||||
printf ("ppc_4xx_eth_initialize: "
|
||||
"Cannot allocate eth_device %d\n", eth_num);
|
||||
return (-1);
|
||||
}
|
||||
memset(dev, 0, sizeof(*dev));
|
||||
|
||||
/* Allocate our private use data */
|
||||
hw = (EMAC_440GX_HW_PST) malloc (sizeof (*hw));
|
||||
hw = (EMAC_4XX_HW_PST) malloc (sizeof (*hw));
|
||||
if (hw == NULL) {
|
||||
printf ("ppc_440x_eth_initialize: "
|
||||
printf ("ppc_4xx_eth_initialize: "
|
||||
"Cannot allocate private hw data for eth_device %d",
|
||||
eth_num);
|
||||
free (dev);
|
||||
@ -1319,12 +1424,12 @@ int ppc_440x_eth_initialize (bd_t * bis)
|
||||
hw->devnum = eth_num;
|
||||
hw->print_speed = 1;
|
||||
|
||||
sprintf (dev->name, "ppc_440x_eth%d", eth_num);
|
||||
sprintf (dev->name, "ppc_4xx_eth%d", eth_num);
|
||||
dev->priv = (void *) hw;
|
||||
dev->init = ppc_440x_eth_init;
|
||||
dev->halt = ppc_440x_eth_halt;
|
||||
dev->send = ppc_440x_eth_send;
|
||||
dev->recv = ppc_440x_eth_rx;
|
||||
dev->init = ppc_4xx_eth_init;
|
||||
dev->halt = ppc_4xx_eth_halt;
|
||||
dev->send = ppc_4xx_eth_send;
|
||||
dev->recv = ppc_4xx_eth_rx;
|
||||
|
||||
if (0 == virgin) {
|
||||
/* set the MAL IER ??? names may change with new spec ??? */
|
||||
@ -1355,9 +1460,42 @@ int ppc_440x_eth_initialize (bd_t * bis)
|
||||
virgin = 1;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_NET_MULTI)
|
||||
eth_register (dev);
|
||||
#else
|
||||
emac0_dev = dev;
|
||||
#endif
|
||||
|
||||
} /* end for each supported device */
|
||||
return (1);
|
||||
}
|
||||
#endif /* CONFIG_440 && CONFIG_NET_MULTI */
|
||||
|
||||
|
||||
#if !defined(CONFIG_NET_MULTI)
|
||||
void eth_halt (void) {
|
||||
if (emac0_dev) {
|
||||
ppc_4xx_eth_halt(emac0_dev);
|
||||
free(emac0_dev);
|
||||
emac0_dev = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
int eth_init (bd_t *bis)
|
||||
{
|
||||
ppc_4xx_eth_initialize(bis);
|
||||
return(ppc_4xx_eth_init(emac0_dev, bis));
|
||||
}
|
||||
|
||||
int eth_send(volatile void *packet, int length)
|
||||
{
|
||||
|
||||
return (ppc_4xx_eth_send(emac0_dev, packet, length));
|
||||
}
|
||||
|
||||
int eth_rx(void)
|
||||
{
|
||||
return (ppc_4xx_eth_rx(emac0_dev));
|
||||
}
|
||||
#endif /* !defined(CONFIG_NET_MULTI) */
|
||||
|
||||
#endif /* #if (CONFIG_COMMANDS & CFG_CMD_NET) */
|
||||
@ -27,10 +27,10 @@ LIB = lib$(CPU).a
|
||||
|
||||
START = start.o resetvec.o kgdb.o
|
||||
AOBJS = dcr.o
|
||||
COBJS = 405gp_enet.o 405gp_pci.o 440gx_enet.o \
|
||||
COBJS = 405gp_pci.o 4xx_enet.o \
|
||||
bedbug_405.o commproc.o \
|
||||
cpu.o cpu_init.o i2c.o interrupts.o \
|
||||
miiphy.o miiphy_440.o sdram.o serial.o \
|
||||
miiphy.o sdram.o serial.o \
|
||||
spd_sdram.o speed.o traps.o usb_ohci.o usbdev.o
|
||||
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <watchdog.h>
|
||||
#include <405gp_enet.h>
|
||||
#include <ppc4xx_enet.h>
|
||||
#include <asm/processor.h>
|
||||
#include <ppc4xx.h>
|
||||
|
||||
|
||||
@ -1,42 +1,44 @@
|
||||
/*-----------------------------------------------------------------------------+
|
||||
|
|
||||
| This source code has been made available to you by IBM on an AS-IS
|
||||
| basis. Anyone receiving this source is licensed under IBM
|
||||
| copyrights to use it in any way he or she deems fit, including
|
||||
| copying it, modifying it, compiling it, and redistributing it either
|
||||
| with or without modifications. No license under IBM patents or
|
||||
| patent applications is to be implied by the copyright license.
|
||||
| This source code has been made available to you by IBM on an AS-IS
|
||||
| basis. Anyone receiving this source is licensed under IBM
|
||||
| copyrights to use it in any way he or she deems fit, including
|
||||
| copying it, modifying it, compiling it, and redistributing it either
|
||||
| with or without modifications. No license under IBM patents or
|
||||
| patent applications is to be implied by the copyright license.
|
||||
|
|
||||
| Any user of this software should understand that IBM cannot provide
|
||||
| technical support for this software and will not be responsible for
|
||||
| any consequences resulting from the use of this software.
|
||||
| Any user of this software should understand that IBM cannot provide
|
||||
| technical support for this software and will not be responsible for
|
||||
| any consequences resulting from the use of this software.
|
||||
|
|
||||
| Any person who transfers this source code or any derivative work
|
||||
| must include the IBM copyright notice, this paragraph, and the
|
||||
| preceding two paragraphs in the transferred software.
|
||||
| Any person who transfers this source code or any derivative work
|
||||
| must include the IBM copyright notice, this paragraph, and the
|
||||
| preceding two paragraphs in the transferred software.
|
||||
|
|
||||
| COPYRIGHT I B M CORPORATION 1995
|
||||
| LICENSED MATERIAL - PROGRAM PROPERTY OF I B M
|
||||
| COPYRIGHT I B M CORPORATION 1995
|
||||
| LICENSED MATERIAL - PROGRAM PROPERTY OF I B M
|
||||
+-----------------------------------------------------------------------------*/
|
||||
/*-----------------------------------------------------------------------------+
|
||||
|
|
||||
| File Name: miiphy.c
|
||||
| File Name: miiphy.c
|
||||
|
|
||||
| Function: This module has utilities for accessing the MII PHY through
|
||||
| Function: This module has utilities for accessing the MII PHY through
|
||||
| the EMAC3 macro.
|
||||
|
|
||||
| Author: Mark Wisner
|
||||
| Author: Mark Wisner
|
||||
|
|
||||
| Change Activity-
|
||||
|
|
||||
| Date Description of Change BY
|
||||
| --------- --------------------- ---
|
||||
| 05-May-99 Created MKW
|
||||
| 01-Jul-99 Changed clock setting of sta_reg from 66Mhz to 50Mhz to
|
||||
| better match OPB speed. Also modified delay times. JWB
|
||||
| 29-Jul-99 Added Full duplex support MKW
|
||||
| 24-Aug-99 Removed printf from dp83843_duplex() JWB
|
||||
| 19-Jul-00 Ported to esd cpci405 sr
|
||||
| Date Description of Change BY
|
||||
| --------- --------------------- ---
|
||||
| 05-May-99 Created MKW
|
||||
| 01-Jul-99 Changed clock setting of sta_reg from 66Mhz to 50Mhz to
|
||||
| better match OPB speed. Also modified delay times. JWB
|
||||
| 29-Jul-99 Added Full duplex support MKW
|
||||
| 24-Aug-99 Removed printf from dp83843_duplex() JWB
|
||||
| 19-Jul-00 Ported to esd cpci405 sr
|
||||
| 23-Dec-03 Ported from miiphy.c to 440GX Travis Sawyer TBS
|
||||
| <travis.sawyer@sandburst.com>
|
||||
|
|
||||
+-----------------------------------------------------------------------------*/
|
||||
|
||||
@ -44,15 +46,13 @@
|
||||
#include <asm/processor.h>
|
||||
#include <ppc_asm.tmpl>
|
||||
#include <commproc.h>
|
||||
#include <405gp_enet.h>
|
||||
#include <ppc4xx_enet.h>
|
||||
#include <405_mal.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
|
||||
(defined(CONFIG_440) && !defined(CONFIG_NET_MULTI))
|
||||
|
||||
/***********************************************************/
|
||||
/* Dump out to the screen PHY regs */
|
||||
/* Dump out to the screen PHY regs */
|
||||
/***********************************************************/
|
||||
|
||||
void miiphy_dump (unsigned char addr)
|
||||
@ -72,75 +72,127 @@ void miiphy_dump (unsigned char addr)
|
||||
if (i == 0x07)
|
||||
i = 0x0f;
|
||||
|
||||
} /* end for loop */
|
||||
} /* end dump */
|
||||
} /* end for loop */
|
||||
} /* end dump */
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* read a phy reg and return the value with a rc */
|
||||
/* Note: We are referencing to EMAC_STACR register */
|
||||
/* @(EMAC_BASE + 92) because of: */
|
||||
/* - 405EP has only STACR for EMAC0 pinned out */
|
||||
/* - 405GP has onle one EMAC0 */
|
||||
/* - For 440 this module gets compiled only for */
|
||||
/* !CONFIG_NET_MULTI, i.e. only EMAC0 is supported. */
|
||||
/* (Re)start autonegotiation */
|
||||
/***********************************************************/
|
||||
|
||||
int miiphy_read (unsigned char addr, unsigned char reg,
|
||||
unsigned short *value)
|
||||
int phy_setup_aneg (unsigned char addr)
|
||||
{
|
||||
unsigned long sta_reg; /* STA scratch area */
|
||||
unsigned long i;
|
||||
unsigned short ctl, adv;
|
||||
|
||||
/* Setup standard advertise */
|
||||
miiphy_read (addr, PHY_ANAR, &adv);
|
||||
adv |= (PHY_ANLPAR_ACK | PHY_ANLPAR_RF | PHY_ANLPAR_T4 |
|
||||
PHY_ANLPAR_TXFD | PHY_ANLPAR_TX | PHY_ANLPAR_10FD |
|
||||
PHY_ANLPAR_10);
|
||||
miiphy_write (addr, PHY_ANAR, adv);
|
||||
|
||||
/* Start/Restart aneg */
|
||||
miiphy_read (addr, PHY_BMCR, &ctl);
|
||||
ctl |= (PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
|
||||
miiphy_write (addr, PHY_BMCR, ctl);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* read a phy reg and return the value with a rc */
|
||||
/***********************************************************/
|
||||
unsigned int miiphy_getemac_offset (void)
|
||||
{
|
||||
#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI)
|
||||
unsigned long zmii;
|
||||
unsigned long eoffset;
|
||||
|
||||
/* Need to find out which mdi port we're using */
|
||||
zmii = in32 (ZMII_FER);
|
||||
|
||||
if (zmii & (ZMII_FER_MDI << ZMII_FER_V (0))) {
|
||||
/* using port 0 */
|
||||
eoffset = 0;
|
||||
} else if (zmii & (ZMII_FER_MDI << ZMII_FER_V (1))) {
|
||||
/* using port 1 */
|
||||
eoffset = 0x100;
|
||||
} else if (zmii & (ZMII_FER_MDI << ZMII_FER_V (2))) {
|
||||
/* using port 2 */
|
||||
eoffset = 0x400;
|
||||
} else if (zmii & (ZMII_FER_MDI << ZMII_FER_V (3))) {
|
||||
/* using port 3 */
|
||||
eoffset = 0x600;
|
||||
} else {
|
||||
/* None of the mdi ports are enabled! */
|
||||
/* enable port 0 */
|
||||
zmii |= ZMII_FER_MDI << ZMII_FER_V (0);
|
||||
out32 (ZMII_FER, zmii);
|
||||
eoffset = 0;
|
||||
/* need to soft reset port 0 */
|
||||
zmii = in32 (EMAC_M0);
|
||||
zmii |= EMAC_M0_SRST;
|
||||
out32 (EMAC_M0, zmii);
|
||||
}
|
||||
|
||||
return (eoffset);
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
int miiphy_read (unsigned char addr, unsigned char reg, unsigned short *value)
|
||||
{
|
||||
unsigned long sta_reg; /* STA scratch area */
|
||||
unsigned long i;
|
||||
unsigned long emac_reg;
|
||||
|
||||
|
||||
emac_reg = miiphy_getemac_offset ();
|
||||
/* see if it is ready for 1000 nsec */
|
||||
i = 0;
|
||||
|
||||
/* see if it is ready for sec */
|
||||
while ((in32 (EMAC_STACR) & EMAC_STACR_OC) == 0) {
|
||||
while ((in32 (EMAC_STACR + emac_reg) & EMAC_STACR_OC) == 0) {
|
||||
udelay (7);
|
||||
if (i > 5) {
|
||||
#if 0 /* test-only */
|
||||
#if 0
|
||||
printf ("read err 1\n");
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
sta_reg = reg; /* reg address */
|
||||
sta_reg = reg; /* reg address */
|
||||
/* set clock (50Mhz) and read flags */
|
||||
#if defined(CONFIG_440GX)
|
||||
sta_reg |= EMAC_STACR_READ;
|
||||
#else
|
||||
sta_reg = (sta_reg | EMAC_STACR_READ) & ~EMAC_STACR_CLK_100MHZ;
|
||||
#ifdef CONFIG_PHY_CLK_FREQ
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PHY_CLK_FREQ) && !defined(CONFIG_440GX)
|
||||
sta_reg = sta_reg | CONFIG_PHY_CLK_FREQ;
|
||||
#endif
|
||||
sta_reg = sta_reg | (addr << 5); /* Phy address */
|
||||
|
||||
out32 (EMAC_STACR, sta_reg);
|
||||
#if 0 /* test-only */
|
||||
out32 (EMAC_STACR + emac_reg, sta_reg);
|
||||
#if 0 /* test-only */
|
||||
printf ("a2: write: EMAC_STACR=0x%0x\n", sta_reg); /* test-only */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PHY_CMD_DELAY
|
||||
udelay (CONFIG_PHY_CMD_DELAY); /* Intel LXT971A needs this */
|
||||
#endif
|
||||
sta_reg = in32 (EMAC_STACR);
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
i = 0;
|
||||
while ((sta_reg & EMAC_STACR_OC) == 0) {
|
||||
udelay (7);
|
||||
if (i > 5) {
|
||||
#if 0 /* test-only */
|
||||
printf ("read err 2\n");
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
i++;
|
||||
sta_reg = in32 (EMAC_STACR);
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
}
|
||||
if ((sta_reg & EMAC_STACR_PHYE) != 0) {
|
||||
#if 0 /* test-only */
|
||||
printf ("read err 3\n");
|
||||
printf ("a2: read: EMAC_STACR=0x%0lx, i=%d\n",
|
||||
sta_reg, (int) i); /* test-only */
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -148,58 +200,59 @@ int miiphy_read (unsigned char addr, unsigned char reg,
|
||||
return 0;
|
||||
|
||||
|
||||
} /* phy_read */
|
||||
} /* phy_read */
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* write a phy reg and return the value with a rc */
|
||||
/* write a phy reg and return the value with a rc */
|
||||
/***********************************************************/
|
||||
|
||||
int miiphy_write (unsigned char addr, unsigned char reg,
|
||||
unsigned short value)
|
||||
int miiphy_write (unsigned char addr, unsigned char reg, unsigned short value)
|
||||
{
|
||||
unsigned long sta_reg; /* STA scratch area */
|
||||
unsigned long sta_reg; /* STA scratch area */
|
||||
unsigned long i;
|
||||
unsigned long emac_reg;
|
||||
|
||||
emac_reg = miiphy_getemac_offset ();
|
||||
/* see if it is ready for 1000 nsec */
|
||||
i = 0;
|
||||
|
||||
while ((in32 (EMAC_STACR) & EMAC_STACR_OC) == 0) {
|
||||
while ((in32 (EMAC_STACR + emac_reg) & EMAC_STACR_OC) == 0) {
|
||||
if (i > 5)
|
||||
return -1;
|
||||
udelay (7);
|
||||
i++;
|
||||
}
|
||||
sta_reg = 0;
|
||||
sta_reg = reg; /* reg address */
|
||||
sta_reg = reg; /* reg address */
|
||||
/* set clock (50Mhz) and read flags */
|
||||
#if defined(CONFIG_440GX)
|
||||
sta_reg |= EMAC_STACR_WRITE;
|
||||
#else
|
||||
sta_reg = (sta_reg | EMAC_STACR_WRITE) & ~EMAC_STACR_CLK_100MHZ;
|
||||
#ifdef CONFIG_PHY_CLK_FREQ
|
||||
sta_reg = sta_reg | CONFIG_PHY_CLK_FREQ; /* Set clock frequency (PLB freq. dependend) */
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PHY_CLK_FREQ) && !defined(CONFIG_440GX)
|
||||
sta_reg = sta_reg | CONFIG_PHY_CLK_FREQ; /* Set clock frequency (PLB freq. dependend) */
|
||||
#endif
|
||||
sta_reg = sta_reg | ((unsigned long) addr << 5); /* Phy address */
|
||||
memcpy (&sta_reg, &value, 2); /* put in data */
|
||||
|
||||
out32 (EMAC_STACR, sta_reg);
|
||||
out32 (EMAC_STACR + emac_reg, sta_reg);
|
||||
|
||||
#ifdef CONFIG_PHY_CMD_DELAY
|
||||
udelay (CONFIG_PHY_CMD_DELAY); /* Intel LXT971A needs this */
|
||||
#endif
|
||||
/* wait for completion */
|
||||
i = 0;
|
||||
sta_reg = in32 (EMAC_STACR);
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
while ((sta_reg & EMAC_STACR_OC) == 0) {
|
||||
udelay (7);
|
||||
if (i > 5)
|
||||
return -1;
|
||||
i++;
|
||||
sta_reg = in32 (EMAC_STACR);
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
}
|
||||
|
||||
if ((sta_reg & EMAC_STACR_PHYE) != 0)
|
||||
return -1;
|
||||
return 0;
|
||||
|
||||
} /* phy_read */
|
||||
|
||||
#endif /* CONFIG_405GP */
|
||||
} /* phy_write */
|
||||
|
||||
@ -1,259 +0,0 @@
|
||||
/*-----------------------------------------------------------------------------+
|
||||
|
|
||||
| This source code has been made available to you by IBM on an AS-IS
|
||||
| basis. Anyone receiving this source is licensed under IBM
|
||||
| copyrights to use it in any way he or she deems fit, including
|
||||
| copying it, modifying it, compiling it, and redistributing it either
|
||||
| with or without modifications. No license under IBM patents or
|
||||
| patent applications is to be implied by the copyright license.
|
||||
|
|
||||
| Any user of this software should understand that IBM cannot provide
|
||||
| technical support for this software and will not be responsible for
|
||||
| any consequences resulting from the use of this software.
|
||||
|
|
||||
| Any person who transfers this source code or any derivative work
|
||||
| must include the IBM copyright notice, this paragraph, and the
|
||||
| preceding two paragraphs in the transferred software.
|
||||
|
|
||||
| COPYRIGHT I B M CORPORATION 1995
|
||||
| LICENSED MATERIAL - PROGRAM PROPERTY OF I B M
|
||||
+-----------------------------------------------------------------------------*/
|
||||
/*-----------------------------------------------------------------------------+
|
||||
|
|
||||
| File Name: miiphy.c
|
||||
|
|
||||
| Function: This module has utilities for accessing the MII PHY through
|
||||
| the EMAC3 macro.
|
||||
|
|
||||
| Author: Mark Wisner
|
||||
|
|
||||
| Change Activity-
|
||||
|
|
||||
| Date Description of Change BY
|
||||
| --------- --------------------- ---
|
||||
| 05-May-99 Created MKW
|
||||
| 01-Jul-99 Changed clock setting of sta_reg from 66Mhz to 50Mhz to
|
||||
| better match OPB speed. Also modified delay times. JWB
|
||||
| 29-Jul-99 Added Full duplex support MKW
|
||||
| 24-Aug-99 Removed printf from dp83843_duplex() JWB
|
||||
| 19-Jul-00 Ported to esd cpci405 sr
|
||||
| 23-Dec-03 Ported from miiphy.c to 440GX Travis Sawyer TBS
|
||||
| <travis.sawyer@sandburst.com>
|
||||
|
|
||||
+-----------------------------------------------------------------------------*/
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/processor.h>
|
||||
#include <ppc_asm.tmpl>
|
||||
#include <commproc.h>
|
||||
#include <440gx_enet.h>
|
||||
#include <405_mal.h>
|
||||
#include <miiphy.h>
|
||||
|
||||
#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI)
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* Dump out to the screen PHY regs */
|
||||
/***********************************************************/
|
||||
|
||||
void miiphy_dump (unsigned char addr)
|
||||
{
|
||||
unsigned long i;
|
||||
unsigned short data;
|
||||
|
||||
|
||||
for (i = 0; i < 0x1A; i++) {
|
||||
if (miiphy_read (addr, i, &data)) {
|
||||
printf ("read error for reg %lx\n", i);
|
||||
return;
|
||||
}
|
||||
printf ("Phy reg %lx ==> %4x\n", i, data);
|
||||
|
||||
/* jump to the next set of regs */
|
||||
if (i == 0x07)
|
||||
i = 0x0f;
|
||||
|
||||
} /* end for loop */
|
||||
} /* end dump */
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* (Re)start autonegotiation */
|
||||
/***********************************************************/
|
||||
int phy_setup_aneg (unsigned char addr)
|
||||
{
|
||||
unsigned short ctl, adv;
|
||||
|
||||
/* Setup standard advertise */
|
||||
miiphy_read (addr, PHY_ANAR, &adv);
|
||||
adv |= (PHY_ANLPAR_ACK | PHY_ANLPAR_RF | PHY_ANLPAR_T4 |
|
||||
PHY_ANLPAR_TXFD | PHY_ANLPAR_TX | PHY_ANLPAR_10FD |
|
||||
PHY_ANLPAR_10);
|
||||
miiphy_write (addr, PHY_ANAR, adv);
|
||||
|
||||
/* Start/Restart aneg */
|
||||
miiphy_read (addr, PHY_BMCR, &ctl);
|
||||
ctl |= (PHY_BMCR_AUTON | PHY_BMCR_RST_NEG);
|
||||
miiphy_write (addr, PHY_BMCR, ctl);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* read a phy reg and return the value with a rc */
|
||||
/***********************************************************/
|
||||
unsigned int miiphy_getemac_offset (void)
|
||||
{
|
||||
unsigned long zmii;
|
||||
unsigned long eoffset;
|
||||
|
||||
/* Need to find out which mdi port we're using */
|
||||
zmii = in32 (ZMII_FER);
|
||||
|
||||
if (zmii & (ZMII_FER_MDI << ZMII_FER_V (0))) {
|
||||
/* using port 0 */
|
||||
eoffset = 0;
|
||||
} else if (zmii & (ZMII_FER_MDI << ZMII_FER_V (1))) {
|
||||
/* using port 1 */
|
||||
eoffset = 0x100;
|
||||
} else if (zmii & (ZMII_FER_MDI << ZMII_FER_V (2))) {
|
||||
/* using port 2 */
|
||||
eoffset = 0x400;
|
||||
} else if (zmii & (ZMII_FER_MDI << ZMII_FER_V (3))) {
|
||||
/* using port 3 */
|
||||
eoffset = 0x600;
|
||||
} else {
|
||||
/* None of the mdi ports are enabled! */
|
||||
/* enable port 0 */
|
||||
zmii |= ZMII_FER_MDI << ZMII_FER_V (0);
|
||||
out32 (ZMII_FER, zmii);
|
||||
eoffset = 0;
|
||||
/* need to soft reset port 0 */
|
||||
zmii = in32 (EMAC_M0);
|
||||
zmii |= EMAC_M0_SRST;
|
||||
out32 (EMAC_M0, zmii);
|
||||
}
|
||||
|
||||
return (eoffset);
|
||||
|
||||
}
|
||||
|
||||
|
||||
int miiphy_read (unsigned char addr, unsigned char reg, unsigned short *value)
|
||||
{
|
||||
unsigned long sta_reg; /* STA scratch area */
|
||||
unsigned long i;
|
||||
unsigned long emac_reg;
|
||||
|
||||
|
||||
emac_reg = miiphy_getemac_offset ();
|
||||
/* see if it is ready for 1000 nsec */
|
||||
i = 0;
|
||||
|
||||
/* see if it is ready for sec */
|
||||
while ((in32 (EMAC_STACR + emac_reg) & EMAC_STACR_OC) == 0) {
|
||||
udelay (7);
|
||||
if (i > 5) {
|
||||
#if 0
|
||||
printf ("read err 1\n");
|
||||
#endif
|
||||
return -1;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
sta_reg = reg; /* reg address */
|
||||
/* set clock (50Mhz) and read flags */
|
||||
#if defined(CONFIG_440GX)
|
||||
sta_reg |= EMAC_STACR_READ;
|
||||
#else
|
||||
sta_reg = (sta_reg | EMAC_STACR_READ) & ~EMAC_STACR_CLK_100MHZ;
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PHY_CLK_FREQ) && !defined(CONFIG_440GX)
|
||||
sta_reg = sta_reg | CONFIG_PHY_CLK_FREQ;
|
||||
#endif
|
||||
sta_reg = sta_reg | (addr << 5); /* Phy address */
|
||||
|
||||
out32 (EMAC_STACR + emac_reg, sta_reg);
|
||||
#if 0 /* test-only */
|
||||
printf ("a2: write: EMAC_STACR=0x%0x\n", sta_reg); /* test-only */
|
||||
#endif
|
||||
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
i = 0;
|
||||
while ((sta_reg & EMAC_STACR_OC) == 0) {
|
||||
udelay (7);
|
||||
if (i > 5) {
|
||||
return -1;
|
||||
}
|
||||
i++;
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
}
|
||||
if ((sta_reg & EMAC_STACR_PHYE) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
*value = *(short *) (&sta_reg);
|
||||
return 0;
|
||||
|
||||
|
||||
} /* phy_read */
|
||||
|
||||
|
||||
/***********************************************************/
|
||||
/* write a phy reg and return the value with a rc */
|
||||
/***********************************************************/
|
||||
|
||||
int miiphy_write (unsigned char addr, unsigned char reg, unsigned short value)
|
||||
{
|
||||
unsigned long sta_reg; /* STA scratch area */
|
||||
unsigned long i;
|
||||
unsigned long emac_reg;
|
||||
|
||||
emac_reg = miiphy_getemac_offset ();
|
||||
/* see if it is ready for 1000 nsec */
|
||||
i = 0;
|
||||
|
||||
while ((in32 (EMAC_STACR + emac_reg) & EMAC_STACR_OC) == 0) {
|
||||
if (i > 5)
|
||||
return -1;
|
||||
udelay (7);
|
||||
i++;
|
||||
}
|
||||
sta_reg = 0;
|
||||
sta_reg = reg; /* reg address */
|
||||
/* set clock (50Mhz) and read flags */
|
||||
#if defined(CONFIG_440GX)
|
||||
sta_reg |= EMAC_STACR_WRITE;
|
||||
#else
|
||||
sta_reg = (sta_reg | EMAC_STACR_WRITE) & ~EMAC_STACR_CLK_100MHZ;
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PHY_CLK_FREQ) && !defined(CONFIG_440GX)
|
||||
sta_reg = sta_reg | CONFIG_PHY_CLK_FREQ; /* Set clock frequency (PLB freq. dependend) */
|
||||
#endif
|
||||
sta_reg = sta_reg | ((unsigned long) addr << 5); /* Phy address */
|
||||
memcpy (&sta_reg, &value, 2); /* put in data */
|
||||
|
||||
out32 (EMAC_STACR + emac_reg, sta_reg);
|
||||
|
||||
/* wait for completion */
|
||||
i = 0;
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
while ((sta_reg & EMAC_STACR_OC) == 0) {
|
||||
udelay (7);
|
||||
if (i > 5)
|
||||
return -1;
|
||||
i++;
|
||||
sta_reg = in32 (EMAC_STACR + emac_reg);
|
||||
}
|
||||
|
||||
if ((sta_reg & EMAC_STACR_PHYE) != 0)
|
||||
return -1;
|
||||
return 0;
|
||||
|
||||
} /* phy_write */
|
||||
|
||||
#endif /* CONFIG_405GP */
|
||||
@ -1,305 +0,0 @@
|
||||
/*----------------------------------------------------------------------------+
|
||||
|
|
||||
| This source code has been made available to you by IBM on an AS-IS
|
||||
| basis. Anyone receiving this source is licensed under IBM
|
||||
| copyrights to use it in any way he or she deems fit, including
|
||||
| copying it, modifying it, compiling it, and redistributing it either
|
||||
| with or without modifications. No license under IBM patents or
|
||||
| patent applications is to be implied by the copyright license.
|
||||
|
|
||||
| Any user of this software should understand that IBM cannot provide
|
||||
| technical support for this software and will not be responsible for
|
||||
| any consequences resulting from the use of this software.
|
||||
|
|
||||
| Any person who transfers this source code or any derivative work
|
||||
| must include the IBM copyright notice, this paragraph, and the
|
||||
| preceding two paragraphs in the transferred software.
|
||||
|
|
||||
| COPYRIGHT I B M CORPORATION 1999
|
||||
| LICENSED MATERIAL - PROGRAM PROPERTY OF I B M
|
||||
+----------------------------------------------------------------------------*/
|
||||
/*----------------------------------------------------------------------------+
|
||||
|
|
||||
| File Name: enetemac.h
|
||||
|
|
||||
| Function: Header file for the EMAC3 macro on the 405GP.
|
||||
|
|
||||
| Author: Mark Wisner
|
||||
|
|
||||
| Change Activity-
|
||||
|
|
||||
| Date Description of Change BY
|
||||
| --------- --------------------- ---
|
||||
| 29-Apr-99 Created MKW
|
||||
|
|
||||
+----------------------------------------------------------------------------*/
|
||||
#ifndef _enetemac_h_
|
||||
#define _enetemac_h_
|
||||
#include <net.h>
|
||||
#include <405_mal.h>
|
||||
|
||||
/*-----------------------------------------------------------------------------+
|
||||
| General enternet defines. 802 frames are not supported.
|
||||
+-----------------------------------------------------------------------------*/
|
||||
#define ENET_ADDR_LENGTH 6
|
||||
#define ENET_ARPTYPE 0x806
|
||||
#define ARP_REQUEST 1
|
||||
#define ARP_REPLY 2
|
||||
#define ENET_IPTYPE 0x800
|
||||
#define ARP_CACHE_SIZE 5
|
||||
|
||||
|
||||
struct enet_frame {
|
||||
unsigned char dest_addr[ENET_ADDR_LENGTH];
|
||||
unsigned char source_addr[ENET_ADDR_LENGTH];
|
||||
unsigned short type;
|
||||
unsigned char enet_data[1];
|
||||
};
|
||||
|
||||
struct arp_entry {
|
||||
unsigned long inet_address;
|
||||
unsigned char mac_address[ENET_ADDR_LENGTH];
|
||||
unsigned long valid;
|
||||
unsigned long sec;
|
||||
unsigned long nsec;
|
||||
};
|
||||
|
||||
|
||||
/*Register addresses */
|
||||
#if defined(CONFIG_440)
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
#define ZMII_BASE (CFG_PERIPHERAL_BASE + 0x0D00)
|
||||
#else
|
||||
#define ZMII_BASE (CFG_PERIPHERAL_BASE + 0x0780)
|
||||
#endif
|
||||
#define ZMII_FER (ZMII_BASE)
|
||||
#define ZMII_SSR (ZMII_BASE + 4)
|
||||
#define ZMII_SMIISR (ZMII_BASE + 8)
|
||||
|
||||
#define ZMII_RMII 0x22000000
|
||||
#define ZMII_MDI0 0x80000000
|
||||
#endif /* CONFIG_440 */
|
||||
|
||||
#if defined(CONFIG_440)
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
#define EMAC_BASE (CFG_PERIPHERAL_BASE + 0x0E00)
|
||||
#else
|
||||
#define EMAC_BASE (CFG_PERIPHERAL_BASE + 0x0800)
|
||||
#endif
|
||||
#else
|
||||
#define EMAC_BASE 0xEF600800
|
||||
#endif
|
||||
|
||||
#define EMAC_M0 (EMAC_BASE)
|
||||
#define EMAC_M1 (EMAC_BASE + 4)
|
||||
#define EMAC_TXM0 (EMAC_BASE + 8)
|
||||
#define EMAC_TXM1 (EMAC_BASE + 12)
|
||||
#define EMAC_RXM (EMAC_BASE + 16)
|
||||
#define EMAC_ISR (EMAC_BASE + 20)
|
||||
#define EMAC_IER (EMAC_BASE + 24)
|
||||
#define EMAC_IAH (EMAC_BASE + 28)
|
||||
#define EMAC_IAL (EMAC_BASE + 32)
|
||||
#define EMAC_VLAN_TPID_REG (EMAC_BASE + 36)
|
||||
#define EMAC_VLAN_TCI_REG (EMAC_BASE + 40)
|
||||
#define EMAC_PAUSE_TIME_REG (EMAC_BASE + 44)
|
||||
#define EMAC_IND_HASH_1 (EMAC_BASE + 48)
|
||||
#define EMAC_IND_HASH_2 (EMAC_BASE + 52)
|
||||
#define EMAC_IND_HASH_3 (EMAC_BASE + 56)
|
||||
#define EMAC_IND_HASH_4 (EMAC_BASE + 60)
|
||||
#define EMAC_GRP_HASH_1 (EMAC_BASE + 64)
|
||||
#define EMAC_GRP_HASH_2 (EMAC_BASE + 68)
|
||||
#define EMAC_GRP_HASH_3 (EMAC_BASE + 72)
|
||||
#define EMAC_GRP_HASH_4 (EMAC_BASE + 76)
|
||||
#define EMAC_LST_SRC_LOW (EMAC_BASE + 80)
|
||||
#define EMAC_LST_SRC_HI (EMAC_BASE + 84)
|
||||
#define EMAC_I_FRAME_GAP_REG (EMAC_BASE + 88)
|
||||
#define EMAC_STACR (EMAC_BASE + 92)
|
||||
#define EMAC_TRTR (EMAC_BASE + 96)
|
||||
#define EMAC_RX_HI_LO_WMARK (EMAC_BASE + 100)
|
||||
|
||||
/* bit definitions */
|
||||
/* MODE REG 0 */
|
||||
#define EMAC_M0_RXI 0x80000000
|
||||
#define EMAC_M0_TXI 0x40000000
|
||||
#define EMAC_M0_SRST 0x20000000
|
||||
#define EMAC_M0_TXE 0x10000000
|
||||
#define EMAC_M0_RXE 0x08000000
|
||||
#define EMAC_M0_WKE 0x04000000
|
||||
|
||||
/* MODE Reg 1 */
|
||||
#define EMAC_M1_FDE 0x80000000
|
||||
#define EMAC_M1_ILE 0x40000000
|
||||
#define EMAC_M1_VLE 0x20000000
|
||||
#define EMAC_M1_EIFC 0x10000000
|
||||
#define EMAC_M1_APP 0x08000000
|
||||
#define EMAC_M1_AEMI 0x02000000
|
||||
#define EMAC_M1_IST 0x01000000
|
||||
#define EMAC_M1_MF_1000MBPS 0x00800000 /* 0's for 10MBPS */
|
||||
#define EMAC_M1_MF_100MBPS 0x00400000
|
||||
#define EMAC_M1_RFS_4K 0x00300000 /* ~4k for 512 byte */
|
||||
#define EMAC_M1_RFS_2K 0x00200000
|
||||
#define EMAC_M1_RFS_1K 0x00100000
|
||||
#define EMAC_M1_TX_FIFO_2K 0x00080000 /* 0's for 512 byte */
|
||||
#define EMAC_M1_TX_FIFO_1K 0x00040000
|
||||
#define EMAC_M1_TR0_DEPEND 0x00010000 /* 0'x for single packet */
|
||||
#define EMAC_M1_TR0_MULTI 0x00008000
|
||||
#define EMAC_M1_TR1_DEPEND 0x00004000
|
||||
#define EMAC_M1_TR1_MULTI 0x00002000
|
||||
#define EMAC_M1_JUMBO_ENABLE 0x00001000
|
||||
|
||||
/* Transmit Mode Register 0 */
|
||||
#define EMAC_TXM0_GNP0 0x80000000
|
||||
#define EMAC_TXM0_GNP1 0x40000000
|
||||
#define EMAC_TXM0_GNPD 0x20000000
|
||||
#define EMAC_TXM0_FC 0x10000000
|
||||
|
||||
/* Receive Mode Register */
|
||||
#define EMAC_RMR_SP 0x80000000
|
||||
#define EMAC_RMR_SFCS 0x40000000
|
||||
#define EMAC_RMR_ARRP 0x20000000
|
||||
#define EMAC_RMR_ARP 0x10000000
|
||||
#define EMAC_RMR_AROP 0x08000000
|
||||
#define EMAC_RMR_ARPI 0x04000000
|
||||
#define EMAC_RMR_PPP 0x02000000
|
||||
#define EMAC_RMR_PME 0x01000000
|
||||
#define EMAC_RMR_PMME 0x00800000
|
||||
#define EMAC_RMR_IAE 0x00400000
|
||||
#define EMAC_RMR_MIAE 0x00200000
|
||||
#define EMAC_RMR_BAE 0x00100000
|
||||
#define EMAC_RMR_MAE 0x00080000
|
||||
|
||||
/* Interrupt Status & enable Regs */
|
||||
#define EMAC_ISR_OVR 0x02000000
|
||||
#define EMAC_ISR_PP 0x01000000
|
||||
#define EMAC_ISR_BP 0x00800000
|
||||
#define EMAC_ISR_RP 0x00400000
|
||||
#define EMAC_ISR_SE 0x00200000
|
||||
#define EMAC_ISR_SYE 0x00100000
|
||||
#define EMAC_ISR_BFCS 0x00080000
|
||||
#define EMAC_ISR_PTLE 0x00040000
|
||||
#define EMAC_ISR_ORE 0x00020000
|
||||
#define EMAC_ISR_IRE 0x00010000
|
||||
#define EMAC_ISR_DBDM 0x00000200
|
||||
#define EMAC_ISR_DB0 0x00000100
|
||||
#define EMAC_ISR_SE0 0x00000080
|
||||
#define EMAC_ISR_TE0 0x00000040
|
||||
#define EMAC_ISR_DB1 0x00000020
|
||||
#define EMAC_ISR_SE1 0x00000010
|
||||
#define EMAC_ISR_TE1 0x00000008
|
||||
#define EMAC_ISR_MOS 0x00000002
|
||||
#define EMAC_ISR_MOF 0x00000001
|
||||
|
||||
|
||||
/* STA CONTROL REG */
|
||||
#define EMAC_STACR_OC 0x00008000
|
||||
#define EMAC_STACR_PHYE 0x00004000
|
||||
#define EMAC_STACR_WRITE 0x00002000
|
||||
#define EMAC_STACR_READ 0x00001000
|
||||
#define EMAC_STACR_CLK_83MHZ 0x00000800 /* 0's for 50Mhz */
|
||||
#define EMAC_STACR_CLK_66MHZ 0x00000400
|
||||
#define EMAC_STACR_CLK_100MHZ 0x00000C00
|
||||
|
||||
/* Transmit Request Threshold Register */
|
||||
#define EMAC_TRTR_256 0x18000000 /* 0's for 64 Bytes */
|
||||
#define EMAC_TRTR_192 0x10000000
|
||||
#define EMAC_TRTR_128 0x01000000
|
||||
|
||||
/* the follwing defines are for the MadMAL status and control registers. */
|
||||
/* For bits 0..5 look at the mal.h file */
|
||||
#define EMAC_TX_CTRL_GFCS 0x0200
|
||||
#define EMAC_TX_CTRL_GP 0x0100
|
||||
#define EMAC_TX_CTRL_ISA 0x0080
|
||||
#define EMAC_TX_CTRL_RSA 0x0040
|
||||
#define EMAC_TX_CTRL_IVT 0x0020
|
||||
#define EMAC_TX_CTRL_RVT 0x0010
|
||||
|
||||
#define EMAC_TX_CTRL_DEFAULT (EMAC_TX_CTRL_GFCS |EMAC_TX_CTRL_GP)
|
||||
|
||||
#define EMAC_TX_ST_BFCS 0x0200
|
||||
#define EMAC_TX_ST_BPP 0x0100
|
||||
#define EMAC_TX_ST_LCS 0x0080
|
||||
#define EMAC_TX_ST_ED 0x0040
|
||||
#define EMAC_TX_ST_EC 0x0020
|
||||
#define EMAC_TX_ST_LC 0x0010
|
||||
#define EMAC_TX_ST_MC 0x0008
|
||||
#define EMAC_TX_ST_SC 0x0004
|
||||
#define EMAC_TX_ST_UR 0x0002
|
||||
#define EMAC_TX_ST_SQE 0x0001
|
||||
|
||||
#define EMAC_TX_ST_DEFAULT 0x03F3
|
||||
|
||||
|
||||
/* madmal receive status / Control bits */
|
||||
|
||||
#define EMAC_RX_ST_OE 0x0200
|
||||
#define EMAC_RX_ST_PP 0x0100
|
||||
#define EMAC_RX_ST_BP 0x0080
|
||||
#define EMAC_RX_ST_RP 0x0040
|
||||
#define EMAC_RX_ST_SE 0x0020
|
||||
#define EMAC_RX_ST_AE 0x0010
|
||||
#define EMAC_RX_ST_BFCS 0x0008
|
||||
#define EMAC_RX_ST_PTL 0x0004
|
||||
#define EMAC_RX_ST_ORE 0x0002
|
||||
#define EMAC_RX_ST_IRE 0x0001
|
||||
/* all the errors we care about */
|
||||
#define EMAC_RX_ERRORS 0x03FF
|
||||
|
||||
#define NUM_RX_BUFF PKTBUFSRX
|
||||
#define NUM_TX_BUFF 1
|
||||
|
||||
#define MAX_ERR_LOG 10
|
||||
typedef struct emac_stats_st{ /* Statistic Block */
|
||||
int data_len_err;
|
||||
int rx_frames;
|
||||
int rx;
|
||||
int rx_prot_err;
|
||||
int int_err;
|
||||
int pkts_tx;
|
||||
int pkts_rx;
|
||||
int pkts_handled;
|
||||
short tx_err_log[MAX_ERR_LOG];
|
||||
short rx_err_log[MAX_ERR_LOG];
|
||||
} EMAC_STATS_ST, *EMAC_STATS_PST;
|
||||
|
||||
/* Structure containing variables used by the shared code (440gx_enet.c) */
|
||||
typedef struct emac_440gx_hw_st {
|
||||
uint32_t hw_addr; /* EMAC offset */
|
||||
uint32_t tah_addr; /* TAH offset */
|
||||
uint32_t phy_id;
|
||||
uint32_t phy_addr;
|
||||
uint32_t original_fc;
|
||||
uint32_t txcw;
|
||||
uint32_t autoneg_failed;
|
||||
uint32_t emac_ier;
|
||||
volatile mal_desc_t *tx;
|
||||
volatile mal_desc_t *rx;
|
||||
bd_t *bis; /* for eth_init upon mal error */
|
||||
mal_desc_t *alloc_tx_buf;
|
||||
mal_desc_t *alloc_rx_buf;
|
||||
char *txbuf_ptr;
|
||||
uint16_t devnum;
|
||||
int get_link_status;
|
||||
int tbi_compatibility_en;
|
||||
int tbi_compatibility_on;
|
||||
int fc_send_xon;
|
||||
int report_tx_early;
|
||||
int first_init;
|
||||
int tx_err_index;
|
||||
int rx_err_index;
|
||||
int rx_slot; /* MAL Receive Slot */
|
||||
int rx_i_index; /* Receive Interrupt Queue Index */
|
||||
int rx_u_index; /* Receive User Queue Index */
|
||||
int tx_slot; /* MAL Transmit Slot */
|
||||
int tx_i_index; /* Transmit Interrupt Queue Index */
|
||||
int tx_u_index; /* Transmit User Queue Index */
|
||||
int rx_ready[NUM_RX_BUFF]; /* Receive Ready Queue */
|
||||
int tx_run[NUM_TX_BUFF]; /* Transmit Running Queue */
|
||||
int is_receiving; /* sync with eth interrupt */
|
||||
int print_speed; /* print speed message upon start */
|
||||
EMAC_STATS_ST stats;
|
||||
} EMAC_405_HW_ST, *EMAC_405_HW_PST;
|
||||
|
||||
/*-----------------------------------------------------------------------------+
|
||||
| Function prototypes for device table.
|
||||
+-----------------------------------------------------------------------------*/
|
||||
#endif /* _enetLib_h_ */
|
||||
@ -109,14 +109,18 @@ typedef struct bd_info {
|
||||
#if defined(CONFIG_NX823)
|
||||
unsigned char bi_sernum[8];
|
||||
#endif
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
int bi_phynum[2]; /* Determines phy mapping */
|
||||
int bi_phymode[2]; /* Determines phy mode */
|
||||
#endif
|
||||
#if defined(CONFIG_4xx)
|
||||
#if defined(CONFIG_440GX)
|
||||
int bi_phynum[4]; /* Determines phy mapping */
|
||||
int bi_phymode[4]; /* Determines phy mode */
|
||||
#elif defined(CONFIG_405EP) || defined(CONFIG_440)
|
||||
int bi_phynum[2]; /* Determines phy mapping */
|
||||
int bi_phymode[2]; /* Determines phy mode */
|
||||
#else
|
||||
int bi_phynum[1]; /* Determines phy mapping */
|
||||
int bi_phymode[1]; /* Determines phy mode */
|
||||
#endif
|
||||
#endif /* defined(CONFIG_4xx) */
|
||||
} bd_t;
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
@ -166,6 +166,7 @@
|
||||
#define CONFIG_HAS_ETH1
|
||||
#define CONFIG_HAS_ETH2
|
||||
#define CONFIG_HAS_ETH3
|
||||
#define CONFIG_PHY_RESET 1 /* reset phy upon startup */
|
||||
#define CONFIG_CIS8201_PHY 1 /* RGMII mode for Cicada */
|
||||
#define CONFIG_CIS8201_SHORT_ETCH 1 /* Use short etch mode */
|
||||
#define CONFIG_PHY_GIGE 1 /* GbE speed/duplex detect */
|
||||
|
||||
@ -230,6 +230,7 @@
|
||||
#define CONFIG_HAS_ETH1
|
||||
#define CONFIG_HAS_ETH2
|
||||
#define CONFIG_HAS_ETH3
|
||||
#define CONFIG_PHY_RESET 1 /* reset phy upon startup */
|
||||
#define CONFIG_CIS8201_PHY 1 /* RGMII mode for Cicada */
|
||||
#define CONFIG_CIS8201_SHORT_ETCH 1 /* Use short etch mode */
|
||||
#define CONFIG_PHY_GIGE 1 /* GbE speed/duplex detect */
|
||||
|
||||
@ -175,6 +175,7 @@ extern void out32(unsigned int, unsigned long);
|
||||
#define CONFIG_PHY3_ADDR 8 /* PHY address phy3 */
|
||||
#define CONFIG_NET_MULTI 1
|
||||
#define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */
|
||||
#define CONFIG_PHY_RESET 1 /* reset phy upon startup */
|
||||
#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */
|
||||
|
||||
#define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */
|
||||
|
||||
@ -275,15 +275,13 @@
|
||||
|
||||
#define CONFIG_MII 1 /* MII PHY management */
|
||||
#define CONFIG_PHY_ADDR 0 /* PHY address, See schematics */
|
||||
#define CONFIG_PHY1_ADDR 1
|
||||
|
||||
#ifndef CONFIG_BAMBOO_NAND
|
||||
#define CONFIG_NET_MULTI 1 /* required for netconsole */
|
||||
#define CONFIG_PHY1_ADDR 1
|
||||
#define CONFIG_HAS_ETH1 1 /* add support for "eth1addr" */
|
||||
#endif /* CONFIG_BAMBOO_NAND */
|
||||
|
||||
#define CONFIG_NO_PHY_RESET 1 /* no PHY reset on bamboo!!! */
|
||||
|
||||
#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */
|
||||
|
||||
/* Partitions */
|
||||
|
||||
@ -211,8 +211,14 @@
|
||||
#define CONFIG_PHY1_ADDR 2
|
||||
#define CONFIG_PHY2_ADDR 0x10
|
||||
#define CONFIG_PHY3_ADDR 0x18
|
||||
#define CONFIG_HAS_ETH0
|
||||
#define CONFIG_HAS_ETH1
|
||||
#define CONFIG_HAS_ETH2
|
||||
#define CONFIG_HAS_ETH3
|
||||
#define CONFIG_CIS8201_PHY 1 /* Enable 'special' RGMII mode for Cicada phy */
|
||||
#define CONFIG_PHY_GIGE 1 /* Include GbE speed/duplex detection */
|
||||
#define CONFIG_PHY_RESET 1 /* reset phy upon startup */
|
||||
#define CONFIG_PHY_RESET_DELAY 1000
|
||||
|
||||
#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
|
||||
CFG_CMD_ASKENV | \
|
||||
@ -256,7 +262,7 @@
|
||||
#define CFG_LOAD_ADDR 0x100000 /* default load address */
|
||||
#define CFG_EXTBDINFO 1 /* To use extended board_into (bd_t) */
|
||||
|
||||
#define CFG_HZ 100 /* decrementer freq: 1 ms ticks */
|
||||
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
|
||||
|
||||
#define CONFIG_AUTO_COMPLETE 1 /* add autocompletion support */
|
||||
#define CONFIG_LOOPW 1 /* enable loopw command */
|
||||
|
||||
@ -38,10 +38,9 @@
|
||||
| ported to handle 440GP and 440GX multiple EMACs
|
||||
+----------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef _emacgx_enet_h_
|
||||
#define _emacgx_enet_h_
|
||||
#ifndef _PPC4XX_ENET_H_
|
||||
#define _PPC4XX_ENET_H_
|
||||
|
||||
#if defined(CONFIG_440)
|
||||
#include <net.h>
|
||||
#include "405_mal.h"
|
||||
|
||||
@ -84,15 +83,15 @@ typedef struct emac_stats_st{ /* Statistic Block */
|
||||
int rx;
|
||||
int rx_prot_err;
|
||||
int int_err;
|
||||
int pkts_tx;
|
||||
int pkts_rx;
|
||||
int pkts_handled;
|
||||
int pkts_tx;
|
||||
int pkts_rx;
|
||||
int pkts_handled;
|
||||
short tx_err_log[MAX_ERR_LOG];
|
||||
short rx_err_log[MAX_ERR_LOG];
|
||||
} EMAC_STATS_ST, *EMAC_STATS_PST;
|
||||
|
||||
/* Structure containing variables used by the shared code (440gx_enet.c) */
|
||||
typedef struct emac_440gx_hw_st {
|
||||
/* Structure containing variables used by the shared code (4xx_enet.c) */
|
||||
typedef struct emac_4xx_hw_st {
|
||||
uint32_t hw_addr; /* EMAC offset */
|
||||
uint32_t tah_addr; /* TAH offset */
|
||||
uint32_t phy_id;
|
||||
@ -127,15 +126,15 @@ typedef struct emac_440gx_hw_st {
|
||||
int is_receiving; /* sync with eth interrupt */
|
||||
int print_speed; /* print speed message upon start */
|
||||
EMAC_STATS_ST stats;
|
||||
} EMAC_440GX_HW_ST, *EMAC_440GX_HW_PST;
|
||||
} EMAC_4XX_HW_ST, *EMAC_4XX_HW_PST;
|
||||
|
||||
|
||||
#if defined(CONFIG_440GX)
|
||||
#define EMAC_NUM_DEV 4
|
||||
#elif defined(CONFIG_440) && !defined(CONFIG_440GX)
|
||||
#elif (defined(CONFIG_440) || defined(CONFIG_405EP)) && defined(CONFIG_NET_MULTI)
|
||||
#define EMAC_NUM_DEV 2
|
||||
#else
|
||||
#warning Bad configuration
|
||||
#define EMAC_NUM_DEV 1
|
||||
#endif
|
||||
|
||||
|
||||
@ -224,7 +223,6 @@ typedef struct emac_440gx_hw_st {
|
||||
#define TAH_SSR5 (TAH_BASE + 0x28) /* Segment Size Reg 5 (R/W) */
|
||||
#define TAH_TSR (TAH_BASE + 0x2C) /* Transmit Status Register (RO) */
|
||||
|
||||
|
||||
/* TAH Revision */
|
||||
#define TAH_REV_RN_M (0x000FFF00) /* Revision Number */
|
||||
#define TAH_REV_BN_M (0x000000FF) /* Branch Revision Number */
|
||||
@ -276,11 +274,15 @@ typedef struct emac_440gx_hw_st {
|
||||
|
||||
|
||||
/* Ethernet MAC Regsiter Addresses */
|
||||
#if defined(CONFIG_440)
|
||||
#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
|
||||
#define EMAC_BASE (CFG_PERIPHERAL_BASE + 0x0E00)
|
||||
#else
|
||||
#define EMAC_BASE (CFG_PERIPHERAL_BASE + 0x0800)
|
||||
#endif
|
||||
#else
|
||||
#define EMAC_BASE 0xEF600800
|
||||
#endif
|
||||
|
||||
#define EMAC_M0 (EMAC_BASE)
|
||||
#define EMAC_M1 (EMAC_BASE + 4)
|
||||
@ -471,5 +473,4 @@ typedef struct emac_440gx_hw_st {
|
||||
/* all the errors we care about */
|
||||
#define EMAC_RX_ERRORS (0x03FF)
|
||||
|
||||
#endif /* CONFIG_440 */
|
||||
#endif /* _enetLib_h_ */
|
||||
#endif /* _PPC4XX_ENET_H_ */
|
||||
@ -47,7 +47,6 @@ extern int ns8382x_initialize(bd_t*);
|
||||
extern int pcnet_initialize(bd_t*);
|
||||
extern int plb2800_eth_initialize(bd_t*);
|
||||
extern int ppc_4xx_eth_initialize(bd_t *);
|
||||
extern int ppc_440x_eth_initialize(bd_t *);
|
||||
extern int rtl8139_initialize(bd_t*);
|
||||
extern int rtl8169_initialize(bd_t*);
|
||||
extern int scc_initialize(bd_t*);
|
||||
@ -126,13 +125,9 @@ int eth_initialize(bd_t *bis)
|
||||
#ifdef CONFIG_DB64460
|
||||
mv6446x_eth_initialize(bis);
|
||||
#endif
|
||||
#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
|
||||
( defined(CONFIG_440) && !defined(CONFIG_NET_MULTI) )
|
||||
#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480)
|
||||
ppc_4xx_eth_initialize(bis);
|
||||
#endif
|
||||
#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI)
|
||||
ppc_440x_eth_initialize(bis);
|
||||
#endif
|
||||
#ifdef CONFIG_INCA_IP_SWITCH
|
||||
inca_switch_initialize(bis);
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user