]> git.sur5r.net Git - u-boot/commitdiff
Merged 405gp_enet.c and 440gx_enet.c to generic 4xx_enet.c
authorStefan Roese <sr@denx.de>
Tue, 16 Aug 2005 16:18:00 +0000 (18:18 +0200)
committerStefan Roese <sr@denx.de>
Tue, 16 Aug 2005 16:18:00 +0000 (18:18 +0200)
now handling all 4xx cpu's.
Patch by Stefan Roese, 16 Aug 2005

64 files changed:
CHANGELOG
MAKEALL
board/amcc/bamboo/u-boot.lds
board/amcc/bubinga/u-boot.lds
board/amcc/ebony/u-boot.lds
board/amcc/ocotea/ocotea.c
board/amcc/ocotea/u-boot.lds
board/amcc/walnut/u-boot.lds
board/amcc/yellowstone/u-boot.lds
board/amcc/yosemite/u-boot.lds
board/cray/L1/u-boot.lds
board/csb272/csb272.c
board/csb272/u-boot.lds
board/csb472/csb472.c
board/csb472/u-boot.lds
board/dave/PPChameleonEVB/u-boot.lds
board/eric/u-boot.lds
board/esd/apc405/u-boot.lds
board/esd/ar405/u-boot.lds
board/esd/ash405/u-boot.lds
board/esd/canbt/u-boot.lds
board/esd/cpci405/u-boot.lds
board/esd/cpci440/u-boot.lds
board/esd/cpciiser4/u-boot.lds
board/esd/dp405/u-boot.lds
board/esd/du405/u-boot.lds
board/esd/hh405/u-boot.lds
board/esd/hub405/u-boot.lds
board/esd/ocrtc/u-boot.lds
board/esd/pci405/u-boot.lds
board/esd/plu405/u-boot.lds
board/esd/pmc405/u-boot.lds
board/esd/voh405/u-boot.lds
board/esd/vom405/u-boot.lds
board/esd/wuh405/u-boot.lds
board/g2000/u-boot.lds
board/ml2/u-boot.lds
board/mpl/mip405/u-boot.lds
board/mpl/pip405/u-boot.lds
board/sandburst/karef/u-boot.lds
board/sandburst/karef/u-boot.lds.debug
board/sandburst/metrobox/u-boot.lds
board/sandburst/metrobox/u-boot.lds.debug
board/sbc405/u-boot.lds
board/xilinx/ml300/u-boot.lds
board/xpedite1k/u-boot.lds
board/xpedite1k/u-boot.lds.debug
cpu/ppc4xx/405gp_enet.c [deleted file]
cpu/ppc4xx/440gx_enet.c [deleted file]
cpu/ppc4xx/4xx_enet.c [new file with mode: 0644]
cpu/ppc4xx/Makefile
cpu/ppc4xx/cpu_init.c
cpu/ppc4xx/miiphy.c
cpu/ppc4xx/miiphy_440.c [deleted file]
include/405gp_enet.h [deleted file]
include/440gx_enet.h [deleted file]
include/asm-ppc/u-boot.h
include/configs/KAREF.h
include/configs/METROBOX.h
include/configs/XPEDITE1K.h
include/configs/bamboo.h
include/configs/ocotea.h
include/ppc4xx_enet.h [new file with mode: 0644]
net/eth.c

index 2d249623ccb6a32ef625d6b95a4684cec4822efa..e6a55da9ca171949c19c6684113888c451ecd700 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Merged 405gp_enet.c and 440gx_enet.c to generic 4xx_enet.c
+  now handling all 4xx cpu's
+  Patch by Stefan Roese, 16 Aug 2005
+
 * Enable PCI on hmi1001 board
 
 * Fix return values of the jffs2 commands ls/fsload/fsinfo,
diff --git a/MAKEALL b/MAKEALL
index 32fbe45e919955835159b46623d9499987c4d186..74f06a22ab864e59965c9658294926cad0fa5ad6 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -64,13 +64,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        \
 "
 
 #########################################################################
index c978dbafe0ebd6e7e6c8cd7b1b1eb44ccc7406ea..2b5fafa8d868d8884a6b45d301e3a16feb5045ff 100644 (file)
@@ -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)
index b8f08eaf7edcb99ce9549ec7bf760fe972b92ff9..1d7fdd0fda1cf15e10f2f594cf26da4315fe8878 100644 (file)
@@ -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)
index 0ec3fad8c30a9414254cf42ca6afa7bce37cb3bf..476829dea1ebb293bc7ef3461d28106e62e41cd7 100644 (file)
@@ -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)
index 5f436eaeee98992c92e2eab974f2773f7649ddc7..50981c2367465cd0507d397b973a1f6680629a00 100644 (file)
@@ -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 */
index a9852461e10754c380a83fa483041779e2d1e6ae..446812bb16cdd38960241f968e13f858b57e3201 100644 (file)
@@ -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)
index 7107880887435cb25aa95143576d4e2c32b327be..5b325f63be1bae99ec1b463eae433526e8754a50 100644 (file)
@@ -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)
index 769eed3ef7d688c38b6d8a19f89618dc27990a8a..5441e78064dfebba1f865a9188cabc7021cae10a 100644 (file)
@@ -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)
index 62dc988d934a98794601079cace39da1af888afa..00b3198ac1aea44b884876f93d91f21f04496a76 100644 (file)
@@ -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)
index 88c880e2000a1464db3c15e382af2251dc6b30be..fc0879b63fbfa5c56a96c60461c5cc3d1ecaf4fa 100644 (file)
@@ -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)
index fecd7e8ef387620dd09db9c5b570d44e74bf11a4..e847879b167228db9f29ff7e6ca8a5844ee34d18 100644 (file)
@@ -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
index 8dbc5927a034afc7620a44d9f3cafa3d8f69f3d6..8571fa414cb2f7a291cbf663fd58deb103710a40 100644 (file)
@@ -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)
 
index 97de0fd9af924fef47da9fb5070eff94cceaeb77..83418dac8c18489a1148f09fdf03d942f0ec9ba8 100644 (file)
@@ -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
index f3e28ae8d89b5df3c4fb606e948bc525b26dd111..b3d40c00a46d3a40d0e89fb22a049200ceb9f047 100644 (file)
@@ -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)
 
index d6117674b189d1324a20a03ff5b8c567b414263b..941f8df48816c73ae0752a1e82310502e60d1c44 100644 (file)
@@ -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)
index 10f57d8499fc754e7a1081c0b49832d163a2e579..fd0fdcf242f945b172d3634690ad0ed8cd18a946 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..eabcdd87e103363e960287ac997c45cadcf64d40 100644 (file)
@@ -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)
index fcba23b6846dff081cddbfb51aa7fc83ea79d278..65ab788f203de8d711dcabe6ba155924ddba9a92 100644 (file)
@@ -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)
index ba555501ed4c02ad465130cd0a47e7e6aea0228d..4de10ca6bb9609b7b8ebeb629e89ae3cfaaa6cfc 100644 (file)
@@ -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)
index d739cea7765ef6c591f70f8dec8c1abbff87614e..049b731c9ef093bfc6d713c32a4ba76ffa03ed45 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..eabcdd87e103363e960287ac997c45cadcf64d40 100644 (file)
@@ -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)
index 3925ad9eb67f9719270ed0cd3659cbfe006c17be..24c35268dfb70d51f5af4e89e4b9f4e269216820 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..eabcdd87e103363e960287ac997c45cadcf64d40 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..b66d8cadb3e89de2d0e2d94aab21123756d45939 100644 (file)
@@ -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)
index b1793a2782f7ab7822a184d909703012211e6ba9..2e270a0e94a4c4b206d942592e5bba2999427dee 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..eabcdd87e103363e960287ac997c45cadcf64d40 100644 (file)
@@ -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)
index ba555501ed4c02ad465130cd0a47e7e6aea0228d..e3efc7e5f90edf714ebc69e069681da124a2beae 100644 (file)
@@ -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)
index 251a4cce9a5c1d3b2bb31493c462c0755a05bc53..022cbacbad686cfdd2c6488eccde0e60efd87d32 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..eabcdd87e103363e960287ac997c45cadcf64d40 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..b66d8cadb3e89de2d0e2d94aab21123756d45939 100644 (file)
@@ -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)
index bfd71dbfcbe43f8098f67cdb787c4ab3a915504a..0884f251b651e222364261d395ca73dcb96f87fa 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..b66d8cadb3e89de2d0e2d94aab21123756d45939 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..eabcdd87e103363e960287ac997c45cadcf64d40 100644 (file)
@@ -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)
index ba555501ed4c02ad465130cd0a47e7e6aea0228d..4de10ca6bb9609b7b8ebeb629e89ae3cfaaa6cfc 100644 (file)
@@ -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)
index 311a5fe7f2f0aaf346c04f5b62e47120c1ccadaa..b66d8cadb3e89de2d0e2d94aab21123756d45939 100644 (file)
@@ -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)
index 07275d3bd7a2513df4407d1edf926998bacf0908..cfddd5a87ae1bb210efd776fed02304bc5df5e39 100644 (file)
@@ -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)
index bb0f122b57c864ab0426ce31a8d0de4c87eb7c9e..7fa312ed0b426af84ca4bf48675258b3753286b5 100644 (file)
@@ -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)
index 9b83ded4d7539a371f13f54678fb3246f2a0f615..f766135c49a6afdc0bd46baa35b967a9eb76aeda 100644 (file)
@@ -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)
index ff8658f2fcdb8bc794de7da7d319f1cd9b413d4c..b16d1ca5c5d2b334877b4081611881b1c6a74355 100644 (file)
@@ -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)
index c6522b939b3d9cbf636bfffb3c1588553ad2b359..83004aa85ee43e186640788ed1d9fce324fffc8d 100644 (file)
@@ -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)
index 0fdb166ed5828af3522a2fcc65ef6adb919fce91..3b230962a95f2117fe3194ab9c50ec48b24c9489 100644 (file)
@@ -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)
index 459a1d83af6a71bc6684d71e1223d9b3067cedaa..2b42ce495ecc697cc2058d9a94495a510ead2e34 100644 (file)
@@ -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)
index bfd71dbfcbe43f8098f67cdb787c4ab3a915504a..45f4e1a8058a03bff9e279b4dc585761739ab019 100644 (file)
@@ -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)
index e7b7e107b0614c9ec5445a2aef4411d041f5c58d..8f1f28ec9003c9fbe8a7b476c2ab9f837a0a1f34 100644 (file)
@@ -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)
index 3f964c8852e1117e63b0693bb62ff187943f818e..92466c4cb7383f0d4788ab90805561ac1ac49810 100644 (file)
@@ -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)
index 3530c9889a72a9b9a258b46bad58632ba5dfa34b..e60a94de3f390afe280b655064c1010e77dab892 100644 (file)
@@ -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)
diff --git a/cpu/ppc4xx/405gp_enet.c b/cpu/ppc4xx/405gp_enet.c
deleted file mode 100644 (file)
index 968f0ce..0000000
+++ /dev/null
@@ -1,1062 +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:  enetemac.c
- *
- *  Function:   Device driver for the ethernet EMAC3 macro on the 405GP.
- *
- *  Author:     Mark Wisner
- *
- *  Change Activity-
- *
- *  Date        Description of Change                                       BY
- *  ---------   ---------------------                                       ---
- *  05-May-99   Created                                                     MKW
- *  27-Jun-99   Clean up                                                    JWB
- *  16-Jul-99   Added MAL error recovery and better IP packet handling      MKW
- *  29-Jul-99   Added Full duplex support                                   MKW
- *  06-Aug-99   Changed names for Mal CR reg                                MKW
- *  23-Aug-99   Turned off SYE when running at 10Mbs                        MKW
- *  24-Aug-99   Marked descriptor empty after call_xlc                      MKW
- *  07-Sep-99   Set MAL RX buffer size reg to ENET_MAX_MTU_ALIGNED / 16     MCG
- *              to avoid chaining maximum sized packets. Push starting
- *              RX descriptor address up to the next cache line boundary.
- *  16-Jan-00   Added support for booting with IP of 0x0                    MKW
- *  15-Mar-00   Updated enetInit() to enable broadcast addresses in the
- *             EMAC_RXM register.                                          JWB
- *  12-Mar-01   anne-sophie.harnois@nextream.fr
- *               - Variables are compatible with those already defined in
- *                include/net.h
- *              - Receive buffer descriptor ring is used to send buffers
- *                to the user
- *              - Info print about send/received/handled packet number if
- *                INFO_405_ENET is set
- *  17-Apr-01   stefan.roese@esd-electronics.com
- *              - MAL reset in "eth_halt" included
- *              - Enet speed and duplex output now in one line
- *  08-May-01   stefan.roese@esd-electronics.com
- *              - MAL error handling added (eth_init called again)
- *  13-Nov-01   stefan.roese@esd-electronics.com
- *              - Set IST bit in EMAC_M1 reg upon 100MBit or full duplex
- *  04-Jan-02   stefan.roese@esd-electronics.com
- *              - Wait for PHY auto negotiation to complete added
- *  06-Feb-02   stefan.roese@esd-electronics.com
- *              - Bug fixed in waiting for auto negotiation to complete
- *  26-Feb-02   stefan.roese@esd-electronics.com
- *              - rx and tx buffer descriptors now allocated (no fixed address
- *                used anymore)
- *  17-Jun-02   stefan.roese@esd-electronics.com
- *              - MAL error debug printf 'M' removed (rx de interrupt may
- *                occur upon many incoming packets with only 4 rx buffers).
- *  21-Nov-03   pavel.bartusek@sysgo.com
- *              - set ZMII bridge speed on 440
- *
- *-----------------------------------------------------------------------------*/
-
-#include <common.h>
-#include <asm/processor.h>
-#include <ppc4xx.h>
-#include <commproc.h>
-#include <405gp_enet.h>
-#include <405_mal.h>
-#include <miiphy.h>
-#include <net.h>
-#include <malloc.h>
-#include "vecnum.h"
-
-#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
-  ( defined(CONFIG_440)   && !defined(CONFIG_NET_MULTI))
-
-#if !defined(CONFIG_NET_MULTI) || !defined(CONFIG_405EP)
-/* 405GP, 440 with !CONFIG_NET_MULTI. For 440 only EMAC0 is supported */
-#define EMAC_NUM_DEV        1
-#else
-/* 440EP && CONFIG_NET_MULTI */
-#define EMAC_NUM_DEV        2
-#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
- * PKTSIZE and PKTSIZE_ALIGN (include/net.h)
- */
-#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
-
-/*-----------------------------------------------------------------------------+
- * Defines for MAL/EMAC interrupt conditions as reported in the UIC (Universal
- * Interrupt Controller).
- *-----------------------------------------------------------------------------*/
-#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 )
-
-
-/*-----------------------------------------------------------------------------+
- * 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.
- *-----------------------------------------------------------------------------*/
-static void enet_rcv (struct eth_device *dev, unsigned long malisr);
-
-int enetInt (struct eth_device *dev);
-static void mal_err (struct eth_device *dev, unsigned long isr,
-                    unsigned long uic, unsigned long maldef,
-                    unsigned long mal_errr);
-static void emac_err (struct eth_device *dev, unsigned long isr);
-
-/*-----------------------------------------------------------------------------+
-| ppc_405x_eth_halt
-| Disable MAL channel, and EMACn
-|
-|
-+-----------------------------------------------------------------------------*/
-static void ppc_4xx_eth_halt (struct eth_device *dev)
-{
-       EMAC_405_HW_PST hw_p = dev->priv;
-       uint32_t failsafe = 10000;
-
-       mtdcr (malier, 0x00000000); /* disable mal interrupts */
-       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 */
-       mtdcr (maltxcarr, (MAL_CR_MMSR >> (hw_p->devnum * 2)));
-       mtdcr (malrxcarr, (MAL_CR_MMSR >> hw_p->devnum));
-
-       /* wait for reset */
-       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 */
-       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_SRST);
-
-       hw_p->print_speed = 1;  /* print speed message again next time */
-
-       return;
-}
-
-static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
-{
-       int i;
-       unsigned long reg;
-       unsigned long msr;
-       unsigned long speed;
-       unsigned long duplex;
-       unsigned long failsafe;
-       unsigned mode_reg;
-       unsigned short devnum;
-       unsigned short reg_short;
-
-       EMAC_405_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;
-
-       msr = mfmsr ();
-       mtmsr (msr & ~(MSR_EE));        /* disable interrupts */
-
-       devnum = hw_p->devnum;
-
-#ifdef INFO_405_ENET
-       /* AS.HARNOIS
-        * We should have :
-        * hw_p->stats.pkts_handled <=  hw_p->stats.pkts_rx <= hw_p->stats.pkts_handled+PKTBUFSRX
-        * In the most cases hw_p->stats.pkts_handled = hw_p->stats.pkts_rx, but it
-        * is possible that new packets (without relationship with
-        * current transfer) have got the time to arrived before
-        * netloop calls eth_halt
-        */
-       printf ("About preceeding transfer (eth%d):\n"
-               "- Sent packet number %d\n"
-               "- Received packet number %d\n"
-               "- Handled packet number %d\n",
-               hw_p->devnum,
-               hw_p->stats.pkts_tx,
-               hw_p->stats.pkts_rx, hw_p->stats.pkts_handled);
-
-       hw_p->stats.pkts_tx = 0;
-       hw_p->stats.pkts_rx = 0;
-       hw_p->stats.pkts_handled = 0;
-#endif
-
-       /* MAL RESET */
-       mtdcr (malmcr, MAL_CR_MMSR);
-       /* wait for reset */
-       while (mfdcr (malmcr) & MAL_CR_MMSR) {
-       };
-
-#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
-       out32 (ZMII_FER, 0);
-       udelay(100);
-       /* set RII mode */
-       out32 (ZMII_FER, ZMII_RMII | ZMII_MDI0);
-#elif defined(CONFIG_440)
-       /* set RMII mode */
-       out32 (ZMII_FER, ZMII_RMII | ZMII_MDI0);
-#endif /* CONFIG_440 */
-
-       /* MAL Channel RESET */
-       /* 1st reset MAL channel */
-       /* Note: writing a 0 to a channel has no effect */
-       mtdcr (maltxcarr, (MAL_TXRX_CASR >> (hw_p->devnum * 2)));
-       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 (malrxcasr) & (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 */
-
-       hw_p->rx_slot = 0;      /* MAL Receive Slot */
-       hw_p->rx_i_index = 0;   /* Receive Interrupt Queue Index */
-       hw_p->rx_u_index = 0;   /* Receive User Queue Index */
-
-       hw_p->tx_slot = 0;      /* MAL Transmit Slot */
-       hw_p->tx_i_index = 0;   /* Transmit Interrupt Queue Index */
-       hw_p->tx_u_index = 0;   /* Transmit User Queue Index */
-
-       __asm__ volatile ("eieio");
-
-       /* reset emac so we have access to the phy */
-
-       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_SRST);
-       __asm__ volatile ("eieio");
-
-       failsafe = 1000;
-       while ((in32 (EMAC_M0 + hw_p->hw_addr) & (EMAC_M0_SRST)) && failsafe) {
-               udelay (1000);
-               failsafe--;
-       }
-
-#if defined(CONFIG_NET_MULTI)
-       reg = hw_p->devnum ? CONFIG_PHY1_ADDR : CONFIG_PHY_ADDR;
-#else
-       reg = CONFIG_PHY_ADDR;
-#endif
-       /* wait for PHY to complete auto negotiation */
-       reg_short = 0;
-#ifndef CONFIG_CS8952_PHY
-       miiphy_read (reg, PHY_BMSR, &reg_short);
-
-       /*
-        * Wait if PHY is capable of autonegotiation and autonegotiation is not complete
-        */
-       if ((reg_short & PHY_BMSR_AUTN_ABLE)
-           && !(reg_short & PHY_BMSR_AUTN_COMP)) {
-               puts ("Waiting for PHY auto negotiation to complete");
-               i = 0;
-               while (!(reg_short & PHY_BMSR_AUTN_COMP)) {
-                       /*
-                        * Timeout reached ?
-                        */
-                       if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
-                               puts (" TIMEOUT !\n");
-                               break;
-                       }
-
-                       if ((i++ % 1000) == 0) {
-                               putc ('.');
-                       }
-                       udelay (1000);  /* 1 ms */
-                       miiphy_read (reg, PHY_BMSR, &reg_short);
-               }
-               puts (" done\n");
-               udelay (500000);        /* another 500 ms (results in faster booting) */
-       }
-#endif
-       speed = miiphy_speed (reg);
-       duplex = miiphy_duplex (reg);
-
-       if (hw_p->print_speed) {
-               hw_p->print_speed = 0;
-               printf ("ENET Speed is %d Mbps - %s duplex connection\n",
-                       (int) speed, (duplex == HALF) ? "HALF" : "FULL");
-       }
-
-       mtdcr (malmcr, MAL_CR_PLBB | MAL_CR_OPBBL | MAL_CR_LEA | MAL_CR_PLBLT_DEFAULT);
-       /* Errata 1.12: MAL_1 -- Disable MAL bursting */
-       if (get_pvr() == PVR_440GP_RB) {
-               mtdcr (malmcr, mfdcr(malmcr) & ~MAL_CR_PLBB);
-       }
-
-       /* Free "old" buffers */
-       if (hw_p->alloc_tx_buf)
-               free (hw_p->alloc_tx_buf);
-       if (hw_p->alloc_rx_buf)
-               free (hw_p->alloc_rx_buf);
-
-       /*
-        * Malloc MAL buffer desciptors, make sure they are
-        * aligned on cache line boundary size
-        * (401/403/IOP480 = 16, 405 = 32)
-        * and doesn't cross cache block boundaries.
-        */
-       hw_p->alloc_tx_buf =
-               (mal_desc_t *) malloc ((sizeof (mal_desc_t) * NUM_TX_BUFF) +
-                                      ((2 * CFG_CACHELINE_SIZE) - 2));
-       if (((int) hw_p->alloc_tx_buf & CACHELINE_MASK) != 0) {
-               hw_p->tx =
-                       (mal_desc_t *) ((int) hw_p->alloc_tx_buf +
-                                       CFG_CACHELINE_SIZE -
-                                       ((int) hw_p->
-                                        alloc_tx_buf & CACHELINE_MASK));
-       } else {
-               hw_p->tx = hw_p->alloc_tx_buf;
-       }
-
-       hw_p->alloc_rx_buf =
-               (mal_desc_t *) malloc ((sizeof (mal_desc_t) * NUM_RX_BUFF) +
-                                      ((2 * CFG_CACHELINE_SIZE) - 2));
-       if (((int) hw_p->alloc_rx_buf & CACHELINE_MASK) != 0) {
-               hw_p->rx =
-                       (mal_desc_t *) ((int) hw_p->alloc_rx_buf +
-                                       CFG_CACHELINE_SIZE -
-                                       ((int) hw_p->
-                                        alloc_rx_buf & CACHELINE_MASK));
-       } else {
-               hw_p->rx = hw_p->alloc_rx_buf;
-       }
-
-       for (i = 0; i < NUM_TX_BUFF; i++) {
-               hw_p->tx[i].ctrl = 0;
-               hw_p->tx[i].data_len = 0;
-               if (hw_p->first_init == 0)
-                       hw_p->txbuf_ptr =
-                               (char *) malloc (ENET_MAX_MTU_ALIGNED);
-               hw_p->tx[i].data_ptr = hw_p->txbuf_ptr;
-               if ((NUM_TX_BUFF - 1) == i)
-                       hw_p->tx[i].ctrl |= MAL_TX_CTRL_WRAP;
-               hw_p->tx_run[i] = -1;
-#if 0
-               printf ("TX_BUFF %d @ 0x%08lx\n", i,
-                       (ulong) hw_p->tx[i].data_ptr);
-#endif
-       }
-
-       for (i = 0; i < NUM_RX_BUFF; i++) {
-               hw_p->rx[i].ctrl = 0;
-               hw_p->rx[i].data_len = 0;
-               /*       rx[i].data_ptr = (char *) &rx_buff[i]; */
-               hw_p->rx[i].data_ptr = (char *) NetRxPackets[i];
-               if ((NUM_RX_BUFF - 1) == i)
-                       hw_p->rx[i].ctrl |= MAL_RX_CTRL_WRAP;
-               hw_p->rx[i].ctrl |= MAL_RX_CTRL_EMPTY | MAL_RX_CTRL_INTR;
-               hw_p->rx_ready[i] = -1;
-#if 0
-               printf ("RX_BUFF %d @ 0x%08lx\n", i, (ulong) rx[i].data_ptr);
-#endif
-       }
-
-       reg = 0x00000000;
-       reg |= dev->enetaddr[0];        /* set high address */
-       reg = reg << 8;
-       reg |= dev->enetaddr[1];
-
-       out32 (EMAC_IAH + hw_p->hw_addr, reg);
-
-       reg = 0x00000000;
-       reg |= dev->enetaddr[2];        /* set low address  */
-       reg = reg << 8;
-       reg |= dev->enetaddr[3];
-       reg = reg << 8;
-       reg |= dev->enetaddr[4];
-       reg = reg << 8;
-       reg |= dev->enetaddr[5];
-
-       out32 (EMAC_IAL + hw_p->hw_addr, reg);
-
-       switch (devnum) {
-#if defined(CONFIG_NET_MULTI)
-       case 1:
-               /* setup MAL tx & rx channel pointers */
-               /* For 405EP, the EMAC1 tx channel 0 is MAL tx channel 2 */
-               mtdcr (maltxctp2r, hw_p->tx);
-               mtdcr (malrxctp1r, hw_p->rx);
-               /* set RX buffer size */
-               mtdcr (malrcbs1, ENET_MAX_MTU_ALIGNED / 16);
-               break;
-#endif
-       case 0:
-       default:
-               /* setup MAL tx & rx channel pointers */
-               mtdcr (maltxctp0r, hw_p->tx);
-               mtdcr (malrxctp0r, hw_p->rx);
-               /* set RX buffer size */
-               mtdcr (malrcbs0, ENET_MAX_MTU_ALIGNED / 16);
-               break;
-       }
-
-       /* Enable MAL transmit and receive channels */
-       mtdcr (maltxcasr, (MAL_TXRX_CASR >> (hw_p->devnum * 2)));
-       mtdcr (malrxcasr, (MAL_TXRX_CASR >> hw_p->devnum));
-
-       /* set transmit enable & receive enable */
-       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_TXE | EMAC_M0_RXE);
-
-       /* set receive fifo to 4k and tx fifo to 2k */
-       mode_reg = in32 (EMAC_M1 + hw_p->hw_addr);
-       mode_reg |= EMAC_M1_RFS_4K | EMAC_M1_TX_FIFO_2K;
-
-       /* set speed */
-       if (speed == _100BASET)
-               mode_reg = mode_reg | EMAC_M1_MF_100MBPS | EMAC_M1_IST;
-       else
-               mode_reg = mode_reg & ~0x00C00000;      /* 10 MBPS */
-       if (duplex == FULL)
-               mode_reg = mode_reg | 0x80000000 | EMAC_M1_IST;
-
-       out32 (EMAC_M1 + hw_p->hw_addr, mode_reg);
-
-#if defined(CONFIG_440)
-       /* set speed in the ZMII bridge */
-       if (speed == _100BASET)
-               out32(ZMII_SSR, in32(ZMII_SSR) | 0x10000000);
-       else
-               out32(ZMII_SSR, in32(ZMII_SSR) & ~0x10000000);
-#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
-       mfsdr(sdr_mfr, reg);
-       /* set speed */
-       if (speed == _100BASET) {
-               out32(ZMII_SSR, in32(ZMII_SSR) | 0x10000000);
-               reg = (reg & ~SDR0_MFR_ZMII_MODE_MASK) | SDR0_MFR_ZMII_MODE_RMII_100M;
-       } else {
-               reg = (reg & ~SDR0_MFR_ZMII_MODE_MASK) | SDR0_MFR_ZMII_MODE_RMII_10M;
-               out32(ZMII_SSR, in32(ZMII_SSR) & ~0x10000000);
-       }
-       mtsdr(sdr_mfr, reg);
-#endif
-#endif
-
-       /* Enable broadcast and indvidual address */
-       /* TBS: enabling runts as some misbehaved nics will send runts */
-       out32 (EMAC_RXM + hw_p->hw_addr, EMAC_RMR_BAE | EMAC_RMR_IAE);
-
-       /* we probably need to set the tx mode1 reg? maybe at tx time */
-
-       /* set transmit request threshold register */
-       out32 (EMAC_TRTR + hw_p->hw_addr, 0x18000000);  /* 256 byte threshold */
-
-#if defined(CONFIG_440)
-       /* 440GP has a 64 byte burst length */
-       out32 (EMAC_RX_HI_LO_WMARK + hw_p->hw_addr, 0x0f002000);
-       out32 (EMAC_TXM1 + hw_p->hw_addr, 0xf8640000);
-#else
-       /* 405s have a 16 byte burst length */
-       out32 (EMAC_RX_HI_LO_WMARK + hw_p->hw_addr, 0x0f002000);
-#endif
-
-       /* Frame gap set */
-       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_ORE | EMAC_ISR_IRE;
-       if (speed == _100BASET)
-               hw_p->emac_ier = hw_p->emac_ier | EMAC_ISR_SYE;
-
-       out32 (EMAC_ISR + hw_p->hw_addr, 0xffffffff);   /* clear pending interrupts */
-       out32 (EMAC_IER + hw_p->hw_addr, hw_p->emac_ier);
-
-       if (hw_p->first_init == 0) {
-               /*
-                * Connect interrupt service routines
-                */
-               irq_install_handler (VECNUM_ETH0 + (hw_p->devnum * 2),
-                                    (interrupt_handler_t *) enetInt, dev);
-       }
-
-       mtmsr (msr);            /* enable interrupts again */
-
-       hw_p->bis = bis;
-       hw_p->first_init = 1;
-
-       return (1);
-}
-
-
-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_405_HW_PST hw_p = dev->priv;
-
-       ef_ptr = (struct enet_frame *) ptr;
-
-       /*-----------------------------------------------------------------------+
-        *  Copy in our address into the frame.
-        *-----------------------------------------------------------------------*/
-       (void) memcpy (ef_ptr->source_addr, dev->enetaddr, ENET_ADDR_LENGTH);
-
-       /*-----------------------------------------------------------------------+
-        * If frame is too long or too short, modify length.
-        *-----------------------------------------------------------------------*/
-       /* TBS: where does the fragment go???? */
-       if (len > ENET_MAX_MTU)
-               len = ENET_MAX_MTU;
-
-       /*   memcpy ((void *) &tx_buff[tx_slot], (const void *) ptr, len); */
-       memcpy ((void *) hw_p->txbuf_ptr, (const void *) ptr, len);
-
-       /*-----------------------------------------------------------------------+
-        * set TX Buffer busy, and send it
-        *-----------------------------------------------------------------------*/
-       hw_p->tx[hw_p->tx_slot].ctrl = (MAL_TX_CTRL_LAST |
-                                       EMAC_TX_CTRL_GFCS | EMAC_TX_CTRL_GP) &
-               ~(EMAC_TX_CTRL_ISA | EMAC_TX_CTRL_RSA);
-       if ((NUM_TX_BUFF - 1) == hw_p->tx_slot)
-               hw_p->tx[hw_p->tx_slot].ctrl |= MAL_TX_CTRL_WRAP;
-
-       hw_p->tx[hw_p->tx_slot].data_len = (short) len;
-       hw_p->tx[hw_p->tx_slot].ctrl |= MAL_TX_CTRL_READY;
-
-       __asm__ volatile ("eieio");
-
-       out32 (EMAC_TXM0 + hw_p->hw_addr,
-              in32 (EMAC_TXM0 + hw_p->hw_addr) | EMAC_TXM0_GNP0);
-#ifdef INFO_405_ENET
-       hw_p->stats.pkts_tx++;
-#endif
-
-       /*-----------------------------------------------------------------------+
-        * poll unitl the packet is sent and then make sure it is OK
-        *-----------------------------------------------------------------------*/
-       time_start = get_timer (0);
-       while (1) {
-               temp_txm0 = in32 (EMAC_TXM0 + hw_p->hw_addr);
-               /* loop until either TINT turns on or 3 seconds elapse */
-               if ((temp_txm0 & EMAC_TXM0_GNP0) != 0) {
-                       /* transmit is done, so now check for errors
-                        * If there is an error, an interrupt should
-                        * happen when we return
-                        */
-                       time_now = get_timer (0);
-                       if ((time_now - time_start) > 3000) {
-                               return (-1);
-                       }
-               } else {
-                       return (len);
-               }
-       }
-}
-
-#if defined(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_uic0msr, my_uic1msr;
-       EMAC_405_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_uic0msr = mfdcr (uic0msr);
-               my_uic1msr = mfdcr (uic1msr);
-
-               if (!(my_uic0msr & UIC_MRE)
-                   && !(my_uic1msr & (UIC_ETH0 | UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                       /* not for us */
-                       return (rc);
-               }
-
-               /* get and clear controller status interrupts */
-               /* look at Mal and EMAC interrupts */
-               if ((my_uic0msr & UIC_MRE)
-                   || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                       /* we have a MAL interrupt */
-                       mal_isr = mfdcr (malesr);
-                       /* look for mal error */
-                       if (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE)) {
-                               mal_err (dev, mal_isr, my_uic0msr, MAL_UIC_DEF, MAL_UIC_ERR);
-                               serviced = 1;
-                               rc = 0;
-                       }
-               }
-               if (UIC_ETH0 & my_uic1msr) {    /* 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)
-                   || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                       mtdcr (uic0sr, UIC_MRE); /* Clear */
-                       mtdcr (uic1sr, UIC_ETH0 | UIC_MS | UIC_MTDE | UIC_MRDE); /* Clear */
-                       return (rc);            /* we had errors so get out */
-               }
-
-               /* handle MAL RX EOB  interupt from a receive */
-               /* check for EOB on valid channels            */
-               if (my_uic0msr & UIC_MRE) {
-                       mal_rx_eob = mfdcr (malrxeobisr);
-                       if ((mal_rx_eob & (0x80000000 >> hw_p->devnum)) != 0) { /* call emac routine for channel 0 */
-                               /* clear EOB
-                                  mtdcr(malrxeobisr, mal_rx_eob); */
-                               enet_rcv (dev, emac_isr);
-                               /* indicate that we serviced an interrupt */
-                               serviced = 1;
-                               rc = 0;
-                       }
-               }
-               mtdcr (uic0sr, UIC_MRE); /* Clear */
-               mtdcr (uic1sr, UIC_ETH0 | UIC_MS | UIC_MTDE | UIC_MRDE); /* Clear */
-       } while (serviced);
-
-       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_405_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
-/*-----------------------------------------------------------------------------+
- *  MAL Error Routine
- *-----------------------------------------------------------------------------*/
-static void mal_err (struct eth_device *dev, unsigned long isr,
-                    unsigned long uic, unsigned long maldef,
-                    unsigned long mal_errr)
-{
-       EMAC_405_HW_PST hw_p = dev->priv;
-
-       mtdcr (malesr, isr);    /* clear interrupt */
-
-       /* clear DE interrupt */
-       mtdcr (maltxdeir, 0xC0000000);
-       mtdcr (malrxdeir, 0x80000000);
-
-#ifdef INFO_405_ENET
-       printf ("\nMAL error occured.... ISR = %lx UIC = = %lx  MAL_DEF = %lx  MAL_ERR= %lx \n", isr, uic, maldef, mal_errr);
-#endif
-
-       eth_init (hw_p->bis);   /* start again... */
-}
-
-/*-----------------------------------------------------------------------------+
- *  EMAC Error Routine
- *-----------------------------------------------------------------------------*/
-static void emac_err (struct eth_device *dev, unsigned long isr)
-{
-       EMAC_405_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);
-}
-
-/*-----------------------------------------------------------------------------+
- *  enet_rcv() handles the ethernet receive data
- *-----------------------------------------------------------------------------*/
-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_405_HW_PST hw_p = dev->priv;
-
-       int handled = 0;
-       int i;
-       int loop_count = 0;
-
-       rx_eob_isr = mfdcr (malrxeobisr);
-       if ((0x80000000 >> hw_p->devnum) & rx_eob_isr) {
-               /* clear EOB */
-               mtdcr (malrxeobisr, rx_eob_isr);
-
-               /* EMAC RX done */
-               while (1) {     /* do all */
-                       i = hw_p->rx_slot;
-
-                       if ((MAL_RX_CTRL_EMPTY & hw_p->rx[i].ctrl)
-                           || (loop_count >= NUM_RX_BUFF))
-                               break;
-                       loop_count++;
-                       hw_p->rx_slot++;
-                       if (NUM_RX_BUFF == hw_p->rx_slot)
-                               hw_p->rx_slot = 0;
-                       handled++;
-                       data_len = (unsigned long) hw_p->rx[i].data_len;        /* Get len */
-                       if (data_len) {
-                               if (data_len > ENET_MAX_MTU)    /* Check len */
-                                       data_len = 0;
-                               else {
-                                       if (EMAC_RX_ERRORS & hw_p->rx[i].ctrl) {        /* Check Errors */
-                                               data_len = 0;
-                                               hw_p->stats.rx_err_log[hw_p->
-                                                                      rx_err_index]
-                                                       = hw_p->rx[i].ctrl;
-                                               hw_p->rx_err_index++;
-                                               if (hw_p->rx_err_index ==
-                                                   MAX_ERR_LOG)
-                                                       hw_p->rx_err_index =
-                                                               0;
-                                       }       /* emac_erros */
-                               }       /* data_len < max mtu */
-                       }       /* if data_len */
-                       if (!data_len) {        /* no data */
-                               hw_p->rx[i].ctrl |= MAL_RX_CTRL_EMPTY;  /* Free Recv Buffer */
-
-                               hw_p->stats.data_len_err++;     /* Error at Rx */
-                       }
-
-                       /* !data_len */
-                       /* AS.HARNOIS */
-                       /* Check if user has already eaten buffer */
-                       /* if not => ERROR */
-                       else if (hw_p->rx_ready[hw_p->rx_i_index] != -1) {
-                               if (hw_p->is_receiving)
-                                       printf ("ERROR : Receive buffers are full!\n");
-                               break;
-                       } else {
-                               hw_p->stats.rx_frames++;
-                               hw_p->stats.rx += data_len;
-                               ef_ptr = (struct enet_frame *) hw_p->rx[i].
-                                       data_ptr;
-#ifdef INFO_405_ENET
-                               hw_p->stats.pkts_rx++;
-#endif
-                               /* AS.HARNOIS
-                                * use ring buffer
-                                */
-                               hw_p->rx_ready[hw_p->rx_i_index] = i;
-                               hw_p->rx_i_index++;
-                               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)
-                                rx[i].ctrl |= MAL_RX_CTRL_EMPTY;
-                                */
-                       }       /* if data_len */
-               }               /* while */
-       }                       /* if EMACK_RXCHL */
-}
-
-
-static int ppc_4xx_eth_rx (struct eth_device *dev)
-{
-       int length;
-       int user_index;
-       unsigned long msr;
-       EMAC_405_HW_PST hw_p = dev->priv;
-
-       hw_p->is_receiving = 1; /* tell driver */
-
-       for (;;) {
-               /* AS.HARNOIS
-                * use ring buffer and
-                * get index from rx buffer desciptor queue
-                */
-               user_index = hw_p->rx_ready[hw_p->rx_u_index];
-               if (user_index == -1) {
-                       length = -1;
-                       break;  /* nothing received - leave for() loop */
-               }
-
-               msr = mfmsr ();
-               mtmsr (msr & ~(MSR_EE));
-
-               length = hw_p->rx[user_index].data_len;
-
-               /* Pass the packet up to the protocol layers. */
-               /*       NetReceive(NetRxPackets[rxIdx], length - 4); */
-               /*       NetReceive(NetRxPackets[i], length); */
-               NetReceive (NetRxPackets[user_index], length - 4);
-               /* Free Recv Buffer */
-               hw_p->rx[user_index].ctrl |= MAL_RX_CTRL_EMPTY;
-               /* Free rx buffer descriptor queue */
-               hw_p->rx_ready[hw_p->rx_u_index] = -1;
-               hw_p->rx_u_index++;
-               if (NUM_RX_BUFF == hw_p->rx_u_index)
-                       hw_p->rx_u_index = 0;
-
-#ifdef INFO_405_ENET
-               hw_p->stats.pkts_handled++;
-#endif
-
-               mtmsr (msr);    /* Enable IRQ's */
-       }
-
-       hw_p->is_receiving = 0; /* tell driver */
-
-       return length;
-}
-
-static int virgin = 0;
-int ppc_4xx_eth_initialize (bd_t * bis)
-{
-       struct eth_device *dev;
-       int eth_num = 0;
-
-       EMAC_405_HW_PST hw = NULL;
-
-       for (eth_num = 0; eth_num < EMAC_NUM_DEV; eth_num++) {
-
-               /* Allocate device structure */
-               dev = (struct eth_device *) malloc (sizeof (*dev));
-               if (dev == NULL) {
-                       printf ("ppc_405x_eth_initialize: "
-                               "Cannot allocate eth_device %d\n", eth_num);
-                       return (-1);
-               }
-               memset(dev, 0, sizeof(*dev));
-               /* Allocate our private use data */
-               hw = (EMAC_405_HW_PST) malloc (sizeof (*hw));
-               if (hw == NULL) {
-                       printf ("ppc_405x_eth_initialize: "
-                               "Cannot allocate private hw data for eth_device %d",
-                               eth_num);
-                       free (dev);
-                       return (-1);
-               }
-               memset(hw, 0, sizeof(*hw));
-
-               switch (eth_num) {
-               case 0:
-                       hw->hw_addr = 0;
-                       memcpy (dev->enetaddr, bis->bi_enetaddr, 6);
-                       break;
-#if defined(CONFIG_NET_MULTI)
-               case 1:
-                       hw->hw_addr = 0x100;
-                       memcpy (dev->enetaddr, bis->bi_enet1addr, 6);
-                       break;
-#endif
-               default:
-                       hw->hw_addr = 0;
-                       memcpy (dev->enetaddr, bis->bi_enetaddr, 6);
-                       break;
-               }
-
-               hw->devnum = eth_num;
-               hw->print_speed = 1;
-
-               sprintf (dev->name, "ppc_405x_eth%d", eth_num);
-               dev->priv = (void *) hw;
-               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 ??? */
-                       mal_ier =
-                               MAL_IER_DE | MAL_IER_NE | MAL_IER_TE |
-                               MAL_IER_OPBE | MAL_IER_PLBE;
-                       mtdcr (malesr, 0xffffffff);     /* clear pending interrupts */
-                       mtdcr (maltxdeir, 0xffffffff);  /* clear pending interrupts */
-                       mtdcr (malrxdeir, 0xffffffff);  /* clear pending interrupts */
-                       mtdcr (malier, mal_ier);
-
-                       /* install MAL interrupt handler */
-                       irq_install_handler (VECNUM_MS,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_MTE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_MRE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_TXDE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_RXDE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       virgin = 1;
-               }
-
-#if defined(CONFIG_NET_MULTI)
-               eth_register (dev);
-#else
-               emac0_dev = dev;
-#endif
-
-       }                       /* end for each supported device */
-
-       return (1);
-}
-
-#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
-
-#endif /* CONFIG_405 */
diff --git a/cpu/ppc4xx/440gx_enet.c b/cpu/ppc4xx/440gx_enet.c
deleted file mode 100644 (file)
index d0b6c15..0000000
+++ /dev/null
@@ -1,1363 +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:  enetemac.c
- *
- *  Function:   Device driver for the ethernet EMAC3 macro on the 405GP.
- *
- *  Author:     Mark Wisner
- *
- *  Change Activity-
- *
- *  Date        Description of Change                                       BY
- *  ---------   ---------------------                                       ---
- *  05-May-99   Created                                                     MKW
- *  27-Jun-99   Clean up                                                    JWB
- *  16-Jul-99   Added MAL error recovery and better IP packet handling      MKW
- *  29-Jul-99   Added Full duplex support                                   MKW
- *  06-Aug-99   Changed names for Mal CR reg                                MKW
- *  23-Aug-99   Turned off SYE when running at 10Mbs                        MKW
- *  24-Aug-99   Marked descriptor empty after call_xlc                      MKW
- *  07-Sep-99   Set MAL RX buffer size reg to ENET_MAX_MTU_ALIGNED / 16     MCG
- *              to avoid chaining maximum sized packets. Push starting
- *              RX descriptor address up to the next cache line boundary.
- *  16-Jan-00   Added support for booting with IP of 0x0                    MKW
- *  15-Mar-00   Updated enetInit() to enable broadcast addresses in the
- *             EMAC_RXM register.                                          JWB
- *  12-Mar-01   anne-sophie.harnois@nextream.fr
- *               - Variables are compatible with those already defined in
- *                include/net.h
- *              - Receive buffer descriptor ring is used to send buffers
- *                to the user
- *              - Info print about send/received/handled packet number if
- *                INFO_405_ENET is set
- *  17-Apr-01   stefan.roese@esd-electronics.com
- *              - MAL reset in "eth_halt" included
- *              - Enet speed and duplex output now in one line
- *  08-May-01   stefan.roese@esd-electronics.com
- *              - MAL error handling added (eth_init called again)
- *  13-Nov-01   stefan.roese@esd-electronics.com
- *              - Set IST bit in EMAC_M1 reg upon 100MBit or full duplex
- *  04-Jan-02   stefan.roese@esd-electronics.com
- *              - Wait for PHY auto negotiation to complete added
- *  06-Feb-02   stefan.roese@esd-electronics.com
- *              - Bug fixed in waiting for auto negotiation to complete
- *  26-Feb-02   stefan.roese@esd-electronics.com
- *              - rx and tx buffer descriptors now allocated (no fixed address
- *                used anymore)
- *  17-Jun-02   stefan.roese@esd-electronics.com
- *              - MAL error debug printf 'M' removed (rx de interrupt may
- *                occur upon many incoming packets with only 4 rx buffers).
- *-----------------------------------------------------------------------------*
- *  17-Nov-03   travis.sawyer@sandburst.com
- *              - ported from 405gp_enet.c to utilized upto 4 EMAC ports
- *                in the 440GX.  This port should work with the 440GP
- *                (2 EMACs) also
- *-----------------------------------------------------------------------------*/
-
-#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 <405_mal.h>
-#include <miiphy.h>
-#include <malloc.h>
-#include "vecnum.h"
-
-
-#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
- * PKTSIZE and PKTSIZE_ALIGN (include/net.h)
- */
-#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
-
-/*-----------------------------------------------------------------------------+
- * Defines for MAL/EMAC interrupt conditions as reported in the UIC (Universal
- * Interrupt Controller).
- *-----------------------------------------------------------------------------*/
-#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
-
-#undef INFO_440_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;
-
-/*-----------------------------------------------------------------------------+
- * Prototypes and externals.
- *-----------------------------------------------------------------------------*/
-static void enet_rcv (struct eth_device *dev, unsigned long malisr);
-
-int enetInt (struct eth_device *dev);
-static void mal_err (struct eth_device *dev, unsigned long isr,
-                    unsigned long uic, unsigned long maldef,
-                    unsigned long mal_errr);
-static void emac_err (struct eth_device *dev, unsigned long isr);
-
-/*-----------------------------------------------------------------------------+
-| ppc_440x_eth_halt
-| Disable MAL channel, and EMACn
-|
-|
-+-----------------------------------------------------------------------------*/
-static void ppc_440x_eth_halt (struct eth_device *dev)
-{
-       EMAC_440GX_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 */
-       mtdcr (maltxcarr, (MAL_CR_MMSR >> hw_p->devnum));
-       mtdcr (malrxcarr, (MAL_CR_MMSR >> hw_p->devnum));
-
-       /* 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;
-
-       }
-
-       /* EMAC RESET */
-       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_SRST);
-
-       hw_p->print_speed = 1;  /* print speed message again next time */
-
-       return;
-}
-
-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)
-{
-       unsigned long pfc1;
-       unsigned long zmiifer;
-       unsigned long rmiifer;
-
-       mfsdr(sdr_pfc1, pfc1);
-       pfc1 = SDR0_PFC1_EPS_DECODE(pfc1);
-
-       zmiifer = 0;
-       rmiifer = 0;
-
-       switch (pfc1) {
-       case 1:
-               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(0);
-               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(1);
-               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(2);
-               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(3);
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[3] = BI_PHYMODE_ZMII;
-               break;
-       case 2:
-               zmiifer = ZMII_FER_SMII << ZMII_FER_V(0);
-               zmiifer = ZMII_FER_SMII << ZMII_FER_V(1);
-               zmiifer = ZMII_FER_SMII << ZMII_FER_V(2);
-               zmiifer = ZMII_FER_SMII << ZMII_FER_V(3);
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[3] = BI_PHYMODE_ZMII;
-               break;
-       case 3:
-               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(0);
-               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V(2);
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_NONE;
-               bis->bi_phymode[2] = BI_PHYMODE_RGMII;
-               bis->bi_phymode[3] = BI_PHYMODE_NONE;
-               break;
-       case 4:
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V(0);
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V(1);
-               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V (2);
-               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V (3);
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[2] = BI_PHYMODE_RGMII;
-               bis->bi_phymode[3] = BI_PHYMODE_RGMII;
-               break;
-       case 5:
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (0);
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (1);
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (2);
-               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V(3);
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[3] = BI_PHYMODE_RGMII;
-               break;
-       case 6:
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (0);
-               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (1);
-               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V(2);
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[2] = BI_PHYMODE_RGMII;
-               break;
-       case 0:
-       default:
-               zmiifer = ZMII_FER_MII << ZMII_FER_V(devnum);
-               rmiifer = 0x0;
-               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
-               bis->bi_phymode[3] = BI_PHYMODE_ZMII;
-               break;
-       }
-
-       /* Ensure we setup mdio for this devnum and ONLY this devnum */
-       zmiifer |= (ZMII_FER_MDI) << ZMII_FER_V(devnum);
-
-       out32 (ZMII_FER, zmiifer);
-       out32 (RGMII_FER, rmiifer);
-
-       return ((int)pfc1);
-
-}
-#endif
-
-static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis)
-{
-       int i, j;
-       unsigned long reg;
-       unsigned long msr;
-       unsigned long speed;
-       unsigned long duplex;
-       unsigned long failsafe;
-       unsigned mode_reg;
-       unsigned short devnum;
-       unsigned short reg_short;
-       sys_info_t sysinfo;
-#if defined(CONFIG_440GX)
-       int ethgroup;
-#endif
-
-       EMAC_440GX_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;
-
-       /* Need to get the OPB frequency so we can access the PHY */
-       get_sys_info (&sysinfo);
-
-       msr = mfmsr ();
-       mtmsr (msr & ~(MSR_EE));        /* disable interrupts */
-
-       devnum = hw_p->devnum;
-
-#ifdef INFO_440_ENET
-       /* AS.HARNOIS
-        * We should have :
-        * hw_p->stats.pkts_handled <=  hw_p->stats.pkts_rx <= hw_p->stats.pkts_handled+PKTBUFSRX
-        * In the most cases hw_p->stats.pkts_handled = hw_p->stats.pkts_rx, but it
-        * is possible that new packets (without relationship with
-        * current transfer) have got the time to arrived before
-        * netloop calls eth_halt
-        */
-       printf ("About preceeding transfer (eth%d):\n"
-               "- Sent packet number %d\n"
-               "- Received packet number %d\n"
-               "- Handled packet number %d\n",
-               hw_p->devnum,
-               hw_p->stats.pkts_tx,
-               hw_p->stats.pkts_rx, hw_p->stats.pkts_handled);
-
-       hw_p->stats.pkts_tx = 0;
-       hw_p->stats.pkts_rx = 0;
-       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 */
-
-       hw_p->rx_slot = 0;      /* MAL Receive Slot */
-       hw_p->rx_i_index = 0;   /* Receive Interrupt Queue Index */
-       hw_p->rx_u_index = 0;   /* Receive User Queue Index */
-
-       hw_p->tx_slot = 0;      /* MAL Transmit Slot */
-       hw_p->tx_i_index = 0;   /* Transmit Interrupt Queue Index */
-       hw_p->tx_u_index = 0;   /* Transmit User Queue Index */
-
-       /* set RMII mode */
-       /* NOTE: 440GX spec states that mode is mutually exclusive */
-       /* NOTE: Therefore, disable all other EMACS, since we handle */
-       /* NOTE: only one emac at a time */
-       reg = 0;
-       out32 (ZMII_FER, 0);
-       udelay (100);
-
-#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);
-#else
-       if ((devnum == 0) || (devnum == 1)) {
-               out32 (ZMII_FER, (ZMII_FER_SMII | ZMII_FER_MDI) << ZMII_FER_V (devnum));
-       }
-       else { /* ((devnum == 2) || (devnum == 3)) */
-               out32 (ZMII_FER, ZMII_FER_MDI << ZMII_FER_V (devnum));
-               out32 (RGMII_FER, ((RGMII_FER_RGMII << RGMII_FER_V (2)) |
-                                  (RGMII_FER_RGMII << RGMII_FER_V (3))));
-       }
-#endif
-
-       out32 (ZMII_SSR, ZMII_SSR_SP << ZMII_SSR_V(devnum));
-       __asm__ volatile ("eieio");
-
-       /* reset emac so we have access to the phy */
-
-       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_SRST);
-       __asm__ volatile ("eieio");
-
-       failsafe = 1000;
-       while ((in32 (EMAC_M0 + hw_p->hw_addr) & (EMAC_M0_SRST)) && failsafe) {
-               udelay (1000);
-               failsafe--;
-       }
-
-#if defined(CONFIG_440GX)
-       /* Whack the M1 register */
-       mode_reg = 0x0;
-       mode_reg &= ~0x00000038;
-       if (sysinfo.freqOPB <= 50000000);
-       else if (sysinfo.freqOPB <= 66666667)
-               mode_reg |= EMAC_M1_OBCI_66;
-       else if (sysinfo.freqOPB <= 83333333)
-               mode_reg |= EMAC_M1_OBCI_83;
-       else if (sysinfo.freqOPB <= 100000000)
-               mode_reg |= EMAC_M1_OBCI_100;
-       else
-               mode_reg |= EMAC_M1_OBCI_GT100;
-
-       out32 (EMAC_M1 + hw_p->hw_addr, mode_reg);
-#endif /*  defined(CONFIG_440GX) */
-
-       /* wait for PHY to complete auto negotiation */
-       reg_short = 0;
-#ifndef CONFIG_CS8952_PHY
-       switch (devnum) {
-       case 0:
-               reg = CONFIG_PHY_ADDR;
-               break;
-       case 1:
-               reg = CONFIG_PHY1_ADDR;
-               break;
-#if defined (CONFIG_440GX)
-       case 2:
-               reg = CONFIG_PHY2_ADDR;
-               break;
-       case 3:
-               reg = CONFIG_PHY3_ADDR;
-               break;
-#endif
-       default:
-               reg = CONFIG_PHY_ADDR;
-               break;
-       }
-
-       bis->bi_phynum[devnum] = reg;
-
-#ifndef CONFIG_NO_PHY_RESET
-       /*
-        * Reset the phy, only if its the first time through
-        * otherwise, just check the speeds & feeds
-        */
-       if (hw_p->first_init == 0) {
-               miiphy_reset (reg);
-
-#if defined(CONFIG_440GX)
-#if defined(CONFIG_CIS8201_PHY)
-               /*
-                * Cicada 8201 PHY needs to have an extended register whacked
-                * for RGMII mode.
-                */
-               if ( ((devnum == 2) || (devnum ==3)) && (4 == ethgroup) ) {
-#if defined(CONFIG_CIS8201_SHORT_ETCH)
-                       miiphy_write (reg, 23, 0x1300);
-#else
-                       miiphy_write (reg, 23, 0x1000);
-#endif
-                       /*
-                        * Vitesse VSC8201/Cicada CIS8201 errata:
-                        * Interoperability problem with Intel 82547EI phys
-                        * This work around (provided by Vitesse) changes
-                        * the default timer convergence from 8ms to 12ms
-                        */
-                       miiphy_write (reg, 0x1f, 0x2a30);
-                       miiphy_write (reg, 0x08, 0x0200);
-                       miiphy_write (reg, 0x1f, 0x52b5);
-                       miiphy_write (reg, 0x02, 0x0004);
-                       miiphy_write (reg, 0x01, 0x0671);
-                       miiphy_write (reg, 0x00, 0x8fae);
-                       miiphy_write (reg, 0x1f, 0x2a30);
-                       miiphy_write (reg, 0x08, 0x0000);
-                       miiphy_write (reg, 0x1f, 0x0000);
-                       /* end Vitesse/Cicada errata */
-               }
-#endif
-#endif
-               /* Start/Restart autonegotiation */
-               phy_setup_aneg (reg);
-               udelay (1000);
-       }
-#endif /* CONFIG_NO_PHY_RESET */
-
-       miiphy_read (reg, PHY_BMSR, &reg_short);
-
-       /*
-        * Wait if PHY is capable of autonegotiation and autonegotiation is not complete
-        */
-       if ((reg_short & PHY_BMSR_AUTN_ABLE)
-           && !(reg_short & PHY_BMSR_AUTN_COMP)) {
-               puts ("Waiting for PHY auto negotiation to complete");
-               i = 0;
-               while (!(reg_short & PHY_BMSR_AUTN_COMP)) {
-                       /*
-                        * Timeout reached ?
-                        */
-                       if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
-                               puts (" TIMEOUT !\n");
-                               break;
-                       }
-
-                       if ((i++ % 1000) == 0) {
-                               putc ('.');
-                       }
-                       udelay (1000);  /* 1 ms */
-                       miiphy_read (reg, PHY_BMSR, &reg_short);
-
-               }
-               puts (" done\n");
-               udelay (500000);        /* another 500 ms (results in faster booting) */
-       }
-#endif
-       speed = miiphy_speed (reg);
-       duplex = miiphy_duplex (reg);
-
-       if (hw_p->print_speed) {
-               hw_p->print_speed = 0;
-               printf ("ENET Speed is %d Mbps - %s duplex connection\n",
-                       (int) speed, (duplex == HALF) ? "HALF" : "FULL");
-       }
-
-#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
-       mfsdr(sdr_mfr, reg);
-       if (speed == 100) {
-               reg = (reg & ~SDR0_MFR_ZMII_MODE_MASK) | SDR0_MFR_ZMII_MODE_RMII_100M;
-       } else {
-               reg = (reg & ~SDR0_MFR_ZMII_MODE_MASK) | SDR0_MFR_ZMII_MODE_RMII_10M;
-       }
-       mtsdr(sdr_mfr, reg);
-#endif
-
-       /* Set ZMII/RGMII speed according to the phy link speed */
-       reg = in32 (ZMII_SSR);
-       if ( (speed == 100) || (speed == 1000) )
-               out32 (ZMII_SSR, reg | (ZMII_SSR_SP << ZMII_SSR_V (devnum)));
-       else
-               out32 (ZMII_SSR, reg & (~(ZMII_SSR_SP << ZMII_SSR_V (devnum))));
-
-       if ((devnum == 2) || (devnum == 3)) {
-               if (speed == 1000)
-                       reg = (RGMII_SSR_SP_1000MBPS << RGMII_SSR_V (devnum));
-               else if (speed == 100)
-                       reg = (RGMII_SSR_SP_100MBPS << RGMII_SSR_V (devnum));
-               else
-                       reg = (RGMII_SSR_SP_10MBPS << RGMII_SSR_V (devnum));
-
-               out32 (RGMII_SSR, reg);
-       }
-
-       /* set the Mal configuration reg */
-#if defined(CONFIG_440GX)
-       mtdcr (malmcr, MAL_CR_PLBB | MAL_CR_OPBBL | MAL_CR_LEA |
-              MAL_CR_PLBLT_DEFAULT | MAL_CR_EOPIE | 0x00330000);
-#else
-       mtdcr (malmcr, MAL_CR_PLBB | MAL_CR_OPBBL | MAL_CR_LEA | MAL_CR_PLBLT_DEFAULT);
-       /* Errata 1.12: MAL_1 -- Disable MAL bursting */
-       if (get_pvr() == PVR_440GP_RB) {
-               mtdcr (malmcr, mfdcr(malmcr) & ~MAL_CR_PLBB);
-       }
-#endif
-
-       /* Free "old" buffers */
-       if (hw_p->alloc_tx_buf)
-               free (hw_p->alloc_tx_buf);
-       if (hw_p->alloc_rx_buf)
-               free (hw_p->alloc_rx_buf);
-
-       /*
-        * Malloc MAL buffer desciptors, make sure they are
-        * aligned on cache line boundary size
-        * (401/403/IOP480 = 16, 405 = 32)
-        * and doesn't cross cache block boundaries.
-        */
-       hw_p->alloc_tx_buf =
-               (mal_desc_t *) malloc ((sizeof (mal_desc_t) * NUM_TX_BUFF) +
-                                      ((2 * CFG_CACHELINE_SIZE) - 2));
-       if (NULL == hw_p->alloc_tx_buf)
-               return -1;
-       if (((int) hw_p->alloc_tx_buf & CACHELINE_MASK) != 0) {
-               hw_p->tx =
-                       (mal_desc_t *) ((int) hw_p->alloc_tx_buf +
-                                       CFG_CACHELINE_SIZE -
-                                       ((int) hw_p->
-                                        alloc_tx_buf & CACHELINE_MASK));
-       } else {
-               hw_p->tx = hw_p->alloc_tx_buf;
-       }
-
-       hw_p->alloc_rx_buf =
-               (mal_desc_t *) malloc ((sizeof (mal_desc_t) * NUM_RX_BUFF) +
-                                      ((2 * CFG_CACHELINE_SIZE) - 2));
-       if (NULL == hw_p->alloc_rx_buf) {
-               free(hw_p->alloc_tx_buf);
-               hw_p->alloc_tx_buf = NULL;
-               return -1;
-       }
-
-       if (((int) hw_p->alloc_rx_buf & CACHELINE_MASK) != 0) {
-               hw_p->rx =
-                       (mal_desc_t *) ((int) hw_p->alloc_rx_buf +
-                                       CFG_CACHELINE_SIZE -
-                                       ((int) hw_p->
-                                        alloc_rx_buf & CACHELINE_MASK));
-       } else {
-               hw_p->rx = hw_p->alloc_rx_buf;
-       }
-
-       for (i = 0; i < NUM_TX_BUFF; i++) {
-               hw_p->tx[i].ctrl = 0;
-               hw_p->tx[i].data_len = 0;
-               if (hw_p->first_init == 0) {
-                       hw_p->txbuf_ptr =
-                               (char *) malloc (ENET_MAX_MTU_ALIGNED);
-                       if (NULL == hw_p->txbuf_ptr) {
-                               free(hw_p->alloc_rx_buf);
-                               free(hw_p->alloc_tx_buf);
-                               hw_p->alloc_rx_buf = NULL;
-                               hw_p->alloc_tx_buf = NULL;
-                               for(j = 0; j < i; j++) {
-                                       free(hw_p->tx[i].data_ptr);
-                                       hw_p->tx[i].data_ptr = NULL;
-                               }
-                       }
-               }
-               hw_p->tx[i].data_ptr = hw_p->txbuf_ptr;
-               if ((NUM_TX_BUFF - 1) == i)
-                       hw_p->tx[i].ctrl |= MAL_TX_CTRL_WRAP;
-               hw_p->tx_run[i] = -1;
-#if 0
-               printf ("TX_BUFF %d @ 0x%08lx\n", i,
-                       (ulong) hw_p->tx[i].data_ptr);
-#endif
-       }
-
-       for (i = 0; i < NUM_RX_BUFF; i++) {
-               hw_p->rx[i].ctrl = 0;
-               hw_p->rx[i].data_len = 0;
-               /*       rx[i].data_ptr = (char *) &rx_buff[i]; */
-               hw_p->rx[i].data_ptr = (char *) NetRxPackets[i];
-               if ((NUM_RX_BUFF - 1) == i)
-                       hw_p->rx[i].ctrl |= MAL_RX_CTRL_WRAP;
-               hw_p->rx[i].ctrl |= MAL_RX_CTRL_EMPTY | MAL_RX_CTRL_INTR;
-               hw_p->rx_ready[i] = -1;
-#if 0
-               printf ("RX_BUFF %d @ 0x%08lx\n", i, (ulong) rx[i].data_ptr);
-#endif
-       }
-
-       reg = 0x00000000;
-
-       reg |= dev->enetaddr[0];        /* set high address */
-       reg = reg << 8;
-       reg |= dev->enetaddr[1];
-
-       out32 (EMAC_IAH + hw_p->hw_addr, reg);
-
-       reg = 0x00000000;
-       reg |= dev->enetaddr[2];        /* set low address  */
-       reg = reg << 8;
-       reg |= dev->enetaddr[3];
-       reg = reg << 8;
-       reg |= dev->enetaddr[4];
-       reg = reg << 8;
-       reg |= dev->enetaddr[5];
-
-       out32 (EMAC_IAL + hw_p->hw_addr, reg);
-
-       switch (devnum) {
-       case 1:
-               /* setup MAL tx & rx channel pointers */
-#if defined (CONFIG_440EP) || defined (CONFIG_440GR)
-               mtdcr (maltxctp2r, hw_p->tx);
-#else
-               mtdcr (maltxctp1r, hw_p->tx);
-#endif
-               mtdcr (maltxbattr, 0x0);
-               mtdcr (malrxbattr, 0x0);
-               mtdcr (malrxctp1r, hw_p->rx);
-               /* set RX buffer size */
-               mtdcr (malrcbs1, ENET_MAX_MTU_ALIGNED / 16);
-               break;
-#if defined (CONFIG_440GX)
-       case 2:
-               /* setup MAL tx & rx channel pointers */
-               mtdcr (maltxbattr, 0x0);
-               mtdcr (maltxctp2r, hw_p->tx);
-               mtdcr (malrxbattr, 0x0);
-               mtdcr (malrxctp2r, hw_p->rx);
-               /* set RX buffer size */
-               mtdcr (malrcbs2, ENET_MAX_MTU_ALIGNED / 16);
-               break;
-       case 3:
-               /* setup MAL tx & rx channel pointers */
-               mtdcr (maltxbattr, 0x0);
-               mtdcr (maltxctp3r, hw_p->tx);
-               mtdcr (malrxbattr, 0x0);
-               mtdcr (malrxctp3r, hw_p->rx);
-               /* set RX buffer size */
-               mtdcr (malrcbs3, ENET_MAX_MTU_ALIGNED / 16);
-               break;
-#endif /* CONFIG_440GX */
-       case 0:
-       default:
-               /* setup MAL tx & rx channel pointers */
-               mtdcr (maltxbattr, 0x0);
-               mtdcr (maltxctp0r, hw_p->tx);
-               mtdcr (malrxbattr, 0x0);
-               mtdcr (malrxctp0r, hw_p->rx);
-               /* set RX buffer size */
-               mtdcr (malrcbs0, ENET_MAX_MTU_ALIGNED / 16);
-               break;
-       }
-
-       /* Enable MAL transmit and receive channels */
-#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
-       mtdcr (maltxcasr, (MAL_TXRX_CASR >> (hw_p->devnum*2)));
-#else
-       mtdcr (maltxcasr, (MAL_TXRX_CASR >> hw_p->devnum));
-#endif
-       mtdcr (malrxcasr, (MAL_TXRX_CASR >> hw_p->devnum));
-
-       /* set transmit enable & receive enable */
-       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_TXE | EMAC_M0_RXE);
-
-       /* set receive fifo to 4k and tx fifo to 2k */
-       mode_reg = in32 (EMAC_M1 + hw_p->hw_addr);
-       mode_reg |= EMAC_M1_RFS_4K | EMAC_M1_TX_FIFO_2K;
-
-       /* set speed */
-       if (speed == _1000BASET)
-               mode_reg = mode_reg | EMAC_M1_MF_1000MBPS | EMAC_M1_IST;
-       else if (speed == _100BASET)
-               mode_reg = mode_reg | EMAC_M1_MF_100MBPS | EMAC_M1_IST;
-       else
-               mode_reg = mode_reg & ~0x00C00000;      /* 10 MBPS */
-       if (duplex == FULL)
-               mode_reg = mode_reg | 0x80000000 | EMAC_M1_IST;
-
-       out32 (EMAC_M1 + hw_p->hw_addr, mode_reg);
-
-       /* Enable broadcast and indvidual address */
-       /* TBS: enabling runts as some misbehaved nics will send runts */
-       out32 (EMAC_RXM + hw_p->hw_addr, EMAC_RMR_BAE | EMAC_RMR_IAE);
-
-       /* we probably need to set the tx mode1 reg? maybe at tx time */
-
-       /* set transmit request threshold register */
-       out32 (EMAC_TRTR + hw_p->hw_addr, 0x18000000);  /* 256 byte threshold */
-
-       /* set receive  low/high water mark register */
-       /* 440GP has a 64 byte burst length */
-       out32 (EMAC_RX_HI_LO_WMARK + hw_p->hw_addr, 0x80009000);
-       out32 (EMAC_TXM1 + hw_p->hw_addr, 0xf8640000);
-
-       /* Set fifo limit entry in tx mode 0 */
-       out32 (EMAC_TXM0 + hw_p->hw_addr, 0x00000003);
-       /* Frame gap set */
-       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;
-       if (speed == _100BASET)
-               hw_p->emac_ier = hw_p->emac_ier | EMAC_ISR_SYE;
-
-       out32 (EMAC_ISR + hw_p->hw_addr, 0xffffffff);   /* clear pending interrupts */
-       out32 (EMAC_IER + hw_p->hw_addr, hw_p->emac_ier);
-
-       if (hw_p->first_init == 0) {
-               /*
-                * 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);
-       }
-
-       mtmsr (msr);            /* enable interrupts again */
-
-       hw_p->bis = bis;
-       hw_p->first_init = 1;
-
-       return (1);
-}
-
-
-static int ppc_440x_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;
-
-       ef_ptr = (struct enet_frame *) ptr;
-
-       /*-----------------------------------------------------------------------+
-        *  Copy in our address into the frame.
-        *-----------------------------------------------------------------------*/
-       (void) memcpy (ef_ptr->source_addr, dev->enetaddr, ENET_ADDR_LENGTH);
-
-       /*-----------------------------------------------------------------------+
-        * If frame is too long or too short, modify length.
-        *-----------------------------------------------------------------------*/
-       /* TBS: where does the fragment go???? */
-       if (len > ENET_MAX_MTU)
-               len = ENET_MAX_MTU;
-
-       /*   memcpy ((void *) &tx_buff[tx_slot], (const void *) ptr, len); */
-       memcpy ((void *) hw_p->txbuf_ptr, (const void *) ptr, len);
-
-       /*-----------------------------------------------------------------------+
-        * set TX Buffer busy, and send it
-        *-----------------------------------------------------------------------*/
-       hw_p->tx[hw_p->tx_slot].ctrl = (MAL_TX_CTRL_LAST |
-                                       EMAC_TX_CTRL_GFCS | EMAC_TX_CTRL_GP) &
-               ~(EMAC_TX_CTRL_ISA | EMAC_TX_CTRL_RSA);
-       if ((NUM_TX_BUFF - 1) == hw_p->tx_slot)
-               hw_p->tx[hw_p->tx_slot].ctrl |= MAL_TX_CTRL_WRAP;
-
-       hw_p->tx[hw_p->tx_slot].data_len = (short) len;
-       hw_p->tx[hw_p->tx_slot].ctrl |= MAL_TX_CTRL_READY;
-
-       __asm__ volatile ("eieio");
-
-       out32 (EMAC_TXM0 + hw_p->hw_addr,
-              in32 (EMAC_TXM0 + hw_p->hw_addr) | EMAC_TXM0_GNP0);
-#ifdef INFO_440_ENET
-       hw_p->stats.pkts_tx++;
-#endif
-
-       /*-----------------------------------------------------------------------+
-        * poll unitl the packet is sent and then make sure it is OK
-        *-----------------------------------------------------------------------*/
-       time_start = get_timer (0);
-       while (1) {
-               temp_txm0 = in32 (EMAC_TXM0 + hw_p->hw_addr);
-               /* loop until either TINT turns on or 3 seconds elapse */
-               if ((temp_txm0 & EMAC_TXM0_GNP0) != 0) {
-                       /* transmit is done, so now check for errors
-                        * If there is an error, an interrupt should
-                        * happen when we return
-                        */
-                       time_now = get_timer (0);
-                       if ((time_now - time_start) > 3000) {
-                               return (-1);
-                       }
-               } else {
-                       return (len);
-               }
-       }
-}
-
-
-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_uic0msr, my_uic1msr;
-
-#if defined(CONFIG_440GX)
-       unsigned long my_uic2msr;
-#endif
-       EMAC_440GX_HW_PST hw_p;
-
-       /*
-        * Because the mal is generic, we need to get the current
-        * eth device
-        */
-       dev = eth_get_dev ();
-
-       hw_p = dev->priv;
-
-
-       /* enter loop that stays in interrupt code until nothing to service */
-       do {
-               serviced = 0;
-
-               my_uic0msr = mfdcr (uic0msr);
-               my_uic1msr = mfdcr (uic1msr);
-#if defined(CONFIG_440GX)
-               my_uic2msr = mfdcr (uic2msr);
-#endif
-               if (!(my_uic0msr & (UIC_MRE | UIC_MTE))
-                   && !(my_uic1msr &
-                        (UIC_ETH0 | UIC_ETH1 | UIC_MS | UIC_MTDE |
-                         UIC_MRDE))) {
-                       /* not for us */
-                       return (rc);
-               }
-#if defined (CONFIG_440GX)
-               if (!(my_uic0msr & (UIC_MRE | UIC_MTE))
-                   && !(my_uic2msr & (UIC_ETH2 | UIC_ETH3))) {
-                       /* not for us */
-                       return (rc);
-               }
-#endif
-               /* get and clear controller status interrupts */
-               /* look at Mal and EMAC interrupts */
-               if ((my_uic0msr & (UIC_MRE | UIC_MTE))
-                   || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                       /* we have a MAL interrupt */
-                       mal_isr = mfdcr (malesr);
-                       /* look for mal error */
-                       if (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE)) {
-                               mal_err (dev, mal_isr, my_uic0msr,
-                                        MAL_UIC_DEF, MAL_UIC_ERR);
-                               serviced = 1;
-                               rc = 0;
-                       }
-               }
-
-               /* port by port dispatch of emac interrupts */
-               if (hw_p->devnum == 0) {
-                       if (UIC_ETH0 & my_uic1msr) {    /* 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)
-                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
-                               mtdcr (uic1sr, UIC_ETH0 | UIC_MS | UIC_MTDE | UIC_MRDE);        /* Clear */
-                               return (rc);    /* we had errors so get out */
-                       }
-               }
-
-               if (hw_p->devnum == 1) {
-                       if (UIC_ETH1 & my_uic1msr) {    /* 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)
-                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
-                               mtdcr (uic1sr, UIC_ETH1 | UIC_MS | UIC_MTDE | UIC_MRDE);        /* Clear */
-                               return (rc);    /* we had errors so get out */
-                       }
-               }
-#if defined (CONFIG_440GX)
-               if (hw_p->devnum == 2) {
-                       if (UIC_ETH2 & my_uic2msr) {    /* 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)
-                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
-                               mtdcr (uic1sr, UIC_MS | UIC_MTDE | UIC_MRDE);   /* Clear */
-                               mtdcr (uic2sr, UIC_ETH2);
-                               return (rc);    /* we had errors so get out */
-                       }
-               }
-
-               if (hw_p->devnum == 3) {
-                       if (UIC_ETH3 & my_uic2msr) {    /* 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)
-                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
-                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
-                               mtdcr (uic1sr, UIC_MS | UIC_MTDE | UIC_MRDE);   /* Clear */
-                               mtdcr (uic2sr, UIC_ETH3);
-                               return (rc);    /* we had errors so get out */
-                       }
-               }
-#endif /* CONFIG_440GX */
-               /* handle MAX TX EOB interrupt from a tx */
-               if (my_uic0msr & UIC_MTE) {
-                       mal_rx_eob = mfdcr (maltxeobisr);
-                       mtdcr (maltxeobisr, mal_rx_eob);
-                       mtdcr (uic0sr, UIC_MTE);
-               }
-               /* handle MAL RX EOB  interupt from a receive */
-               /* check for EOB on valid channels            */
-               if (my_uic0msr & UIC_MRE) {
-                       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 (uic0sr, UIC_MRE);        /* Clear */
-               mtdcr (uic1sr, UIC_MS | UIC_MTDE | UIC_MRDE);   /* Clear */
-               switch (hw_p->devnum) {
-               case 0:
-                       mtdcr (uic1sr, UIC_ETH0);
-                       break;
-               case 1:
-                       mtdcr (uic1sr, UIC_ETH1);
-                       break;
-#if defined (CONFIG_440GX)
-               case 2:
-                       mtdcr (uic2sr, UIC_ETH2);
-                       break;
-               case 3:
-                       mtdcr (uic2sr, UIC_ETH3);
-                       break;
-#endif /* CONFIG_440GX */
-               default:
-                       break;
-               }
-       } while (serviced);
-
-       return (rc);
-}
-
-/*-----------------------------------------------------------------------------+
- *  MAL Error Routine
- *-----------------------------------------------------------------------------*/
-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;
-
-       mtdcr (malesr, isr);    /* clear interrupt */
-
-       /* clear DE interrupt */
-       mtdcr (maltxdeir, 0xC0000000);
-       mtdcr (malrxdeir, 0x80000000);
-
-#ifdef INFO_440_ENET
-       printf ("\nMAL error occured.... ISR = %lx UIC = = %lx  MAL_DEF = %lx  MAL_ERR= %lx \n", isr, uic, maldef, mal_errr);
-#endif
-
-       eth_init (hw_p->bis);   /* start again... */
-}
-
-/*-----------------------------------------------------------------------------+
- *  EMAC Error Routine
- *-----------------------------------------------------------------------------*/
-static void emac_err (struct eth_device *dev, unsigned long isr)
-{
-       EMAC_440GX_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);
-}
-
-/*-----------------------------------------------------------------------------+
- *  enet_rcv() handles the ethernet receive data
- *-----------------------------------------------------------------------------*/
-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;
-
-       int handled = 0;
-       int i;
-       int loop_count = 0;
-
-       rx_eob_isr = mfdcr (malrxeobisr);
-       if ((0x80000000 >> hw_p->devnum) & rx_eob_isr) {
-               /* clear EOB */
-               mtdcr (malrxeobisr, rx_eob_isr);
-
-               /* EMAC RX done */
-               while (1) {     /* do all */
-                       i = hw_p->rx_slot;
-
-                       if ((MAL_RX_CTRL_EMPTY & hw_p->rx[i].ctrl)
-                           || (loop_count >= NUM_RX_BUFF))
-                               break;
-                       loop_count++;
-                       hw_p->rx_slot++;
-                       if (NUM_RX_BUFF == hw_p->rx_slot)
-                               hw_p->rx_slot = 0;
-                       handled++;
-                       data_len = (unsigned long) hw_p->rx[i].data_len;        /* Get len */
-                       if (data_len) {
-                               if (data_len > ENET_MAX_MTU)    /* Check len */
-                                       data_len = 0;
-                               else {
-                                       if (EMAC_RX_ERRORS & hw_p->rx[i].ctrl) {        /* Check Errors */
-                                               data_len = 0;
-                                               hw_p->stats.rx_err_log[hw_p->
-                                                                      rx_err_index]
-                                                       = hw_p->rx[i].ctrl;
-                                               hw_p->rx_err_index++;
-                                               if (hw_p->rx_err_index ==
-                                                   MAX_ERR_LOG)
-                                                       hw_p->rx_err_index =
-                                                               0;
-                                       }       /* emac_erros */
-                               }       /* data_len < max mtu */
-                       }       /* if data_len */
-                       if (!data_len) {        /* no data */
-                               hw_p->rx[i].ctrl |= MAL_RX_CTRL_EMPTY;  /* Free Recv Buffer */
-
-                               hw_p->stats.data_len_err++;     /* Error at Rx */
-                       }
-
-                       /* !data_len */
-                       /* AS.HARNOIS */
-                       /* Check if user has already eaten buffer */
-                       /* if not => ERROR */
-                       else if (hw_p->rx_ready[hw_p->rx_i_index] != -1) {
-                               if (hw_p->is_receiving)
-                                       printf ("ERROR : Receive buffers are full!\n");
-                               break;
-                       } else {
-                               hw_p->stats.rx_frames++;
-                               hw_p->stats.rx += data_len;
-                               ef_ptr = (struct enet_frame *) hw_p->rx[i].
-                                       data_ptr;
-#ifdef INFO_440_ENET
-                               hw_p->stats.pkts_rx++;
-#endif
-                               /* AS.HARNOIS
-                                * use ring buffer
-                                */
-                               hw_p->rx_ready[hw_p->rx_i_index] = i;
-                               hw_p->rx_i_index++;
-                               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)
-                                rx[i].ctrl |= MAL_RX_CTRL_EMPTY;
-                                */
-                       }       /* if data_len */
-               }               /* while */
-       }                       /* if EMACK_RXCHL */
-}
-
-
-static int ppc_440x_eth_rx (struct eth_device *dev)
-{
-       int length;
-       int user_index;
-       unsigned long msr;
-       EMAC_440GX_HW_PST hw_p = dev->priv;
-
-       hw_p->is_receiving = 1; /* tell driver */
-
-       for (;;) {
-               /* AS.HARNOIS
-                * use ring buffer and
-                * get index from rx buffer desciptor queue
-                */
-               user_index = hw_p->rx_ready[hw_p->rx_u_index];
-               if (user_index == -1) {
-                       length = -1;
-                       break;  /* nothing received - leave for() loop */
-               }
-
-               msr = mfmsr ();
-               mtmsr (msr & ~(MSR_EE));
-
-               length = hw_p->rx[user_index].data_len;
-
-               /* Pass the packet up to the protocol layers. */
-               /*       NetReceive(NetRxPackets[rxIdx], length - 4); */
-               /*       NetReceive(NetRxPackets[i], length); */
-               NetReceive (NetRxPackets[user_index], length - 4);
-               /* Free Recv Buffer */
-               hw_p->rx[user_index].ctrl |= MAL_RX_CTRL_EMPTY;
-               /* Free rx buffer descriptor queue */
-               hw_p->rx_ready[hw_p->rx_u_index] = -1;
-               hw_p->rx_u_index++;
-               if (NUM_RX_BUFF == hw_p->rx_u_index)
-                       hw_p->rx_u_index = 0;
-
-#ifdef INFO_440_ENET
-               hw_p->stats.pkts_handled++;
-#endif
-
-               mtmsr (msr);    /* Enable IRQ's */
-       }
-
-       hw_p->is_receiving = 0; /* tell driver */
-
-       return length;
-}
-
-int ppc_440x_eth_initialize (bd_t * bis)
-{
-       static int virgin = 0;
-       struct eth_device *dev;
-       int eth_num = 0;
-       EMAC_440GX_HW_PST hw = NULL;
-
-#if defined(CONFIG_440GX)
-       unsigned long pfc1;
-
-       mfsdr (sdr_pfc1, pfc1);
-       pfc1 &= ~(0x01e00000);
-       pfc1 |= 0x01200000;
-       mtsdr (sdr_pfc1, pfc1);
-#endif
-       /* set phy num and mode */
-       bis->bi_phynum[0] = CONFIG_PHY_ADDR;
-#if defined(CONFIG_PHY1_ADDR)
-       bis->bi_phynum[1] = CONFIG_PHY1_ADDR;
-#endif
-#if defined(CONFIG_440GX)
-       bis->bi_phynum[2] = CONFIG_PHY2_ADDR;
-       bis->bi_phynum[3] = CONFIG_PHY3_ADDR;
-       bis->bi_phymode[0] = 0;
-       bis->bi_phymode[1] = 0;
-       bis->bi_phymode[2] = 2;
-       bis->bi_phymode[3] = 2;
-
-#if defined (CONFIG_440GX)
-       ppc_440x_eth_setup_bridge(0, bis);
-#endif
-#endif
-
-       for (eth_num = 0; eth_num < EMAC_NUM_DEV; eth_num++) {
-
-               /* See if we can actually bring up the interface, otherwise, skip it */
-               switch (eth_num) {
-               default:                /* fall through */
-               case 0:
-                       if (memcmp (bis->bi_enetaddr, "\0\0\0\0\0\0", 6) == 0) {
-                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
-                               continue;
-                       }
-                       break;
-#ifdef CONFIG_HAS_ETH1
-               case 1:
-                       if (memcmp (bis->bi_enet1addr, "\0\0\0\0\0\0", 6) == 0) {
-                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
-                               continue;
-                       }
-                       break;
-#endif
-#ifdef CONFIG_HAS_ETH2
-               case 2:
-                       if (memcmp (bis->bi_enet2addr, "\0\0\0\0\0\0", 6) == 0) {
-                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
-                               continue;
-                       }
-                       break;
-#endif
-#ifdef CONFIG_HAS_ETH3
-               case 3:
-                       if (memcmp (bis->bi_enet3addr, "\0\0\0\0\0\0", 6) == 0) {
-                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
-                               continue;
-                       }
-                       break;
-#endif
-               }
-
-               /* Allocate device structure */
-               dev = (struct eth_device *) malloc (sizeof (*dev));
-               if (dev == NULL) {
-                       printf ("ppc_440x_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));
-               if (hw == NULL) {
-                       printf ("ppc_440x_eth_initialize: "
-                               "Cannot allocate private hw data for eth_device %d",
-                               eth_num);
-                       free (dev);
-                       return (-1);
-               }
-               memset(hw, 0, sizeof(*hw));
-
-               switch (eth_num) {
-               default:                /* fall through */
-               case 0:
-                       hw->hw_addr = 0;
-                       memcpy (dev->enetaddr, bis->bi_enetaddr, 6);
-                       break;
-#ifdef CONFIG_HAS_ETH1
-               case 1:
-                       hw->hw_addr = 0x100;
-                       memcpy (dev->enetaddr, bis->bi_enet1addr, 6);
-                       break;
-#endif
-#ifdef CONFIG_HAS_ETH2
-               case 2:
-                       hw->hw_addr = 0x400;
-                       memcpy (dev->enetaddr, bis->bi_enet2addr, 6);
-                       break;
-#endif
-#ifdef CONFIG_HAS_ETH3
-               case 3:
-                       hw->hw_addr = 0x600;
-                       memcpy (dev->enetaddr, bis->bi_enet3addr, 6);
-                       break;
-#endif
-               }
-
-               hw->devnum = eth_num;
-               hw->print_speed = 1;
-
-               sprintf (dev->name, "ppc_440x_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;
-
-               if (0 == virgin) {
-                       /* set the MAL IER ??? names may change with new spec ??? */
-                       mal_ier =
-                               MAL_IER_DE | MAL_IER_NE | MAL_IER_TE |
-                               MAL_IER_OPBE | MAL_IER_PLBE;
-                       mtdcr (malesr, 0xffffffff);     /* clear pending interrupts */
-                       mtdcr (maltxdeir, 0xffffffff);  /* clear pending interrupts */
-                       mtdcr (malrxdeir, 0xffffffff);  /* clear pending interrupts */
-                       mtdcr (malier, mal_ier);
-
-                       /* install MAL interrupt handler */
-                       irq_install_handler (VECNUM_MS,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_MTE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_MRE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_TXDE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       irq_install_handler (VECNUM_RXDE,
-                                            (interrupt_handler_t *) enetInt,
-                                            dev);
-                       virgin = 1;
-               }
-
-               eth_register (dev);
-
-       }                       /* end for each supported device */
-       return (1);
-}
-#endif /* CONFIG_440 && CONFIG_NET_MULTI */
diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c
new file mode 100644 (file)
index 0000000..7766f9a
--- /dev/null
@@ -0,0 +1,1501 @@
+/*-----------------------------------------------------------------------------+
+ *
+ *       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:  enetemac.c
+ *
+ *  Function:   Device driver for the ethernet EMAC3 macro on the 405GP.
+ *
+ *  Author:     Mark Wisner
+ *
+ *  Change Activity-
+ *
+ *  Date        Description of Change                                       BY
+ *  ---------   ---------------------                                       ---
+ *  05-May-99   Created                                                     MKW
+ *  27-Jun-99   Clean up                                                    JWB
+ *  16-Jul-99   Added MAL error recovery and better IP packet handling      MKW
+ *  29-Jul-99   Added Full duplex support                                   MKW
+ *  06-Aug-99   Changed names for Mal CR reg                                MKW
+ *  23-Aug-99   Turned off SYE when running at 10Mbs                        MKW
+ *  24-Aug-99   Marked descriptor empty after call_xlc                      MKW
+ *  07-Sep-99   Set MAL RX buffer size reg to ENET_MAX_MTU_ALIGNED / 16     MCG
+ *              to avoid chaining maximum sized packets. Push starting
+ *              RX descriptor address up to the next cache line boundary.
+ *  16-Jan-00   Added support for booting with IP of 0x0                    MKW
+ *  15-Mar-00   Updated enetInit() to enable broadcast addresses in the
+ *             EMAC_RXM register.                                          JWB
+ *  12-Mar-01   anne-sophie.harnois@nextream.fr
+ *               - Variables are compatible with those already defined in
+ *                include/net.h
+ *              - Receive buffer descriptor ring is used to send buffers
+ *                to the user
+ *              - Info print about send/received/handled packet number if
+ *                INFO_405_ENET is set
+ *  17-Apr-01   stefan.roese@esd-electronics.com
+ *              - MAL reset in "eth_halt" included
+ *              - Enet speed and duplex output now in one line
+ *  08-May-01   stefan.roese@esd-electronics.com
+ *              - MAL error handling added (eth_init called again)
+ *  13-Nov-01   stefan.roese@esd-electronics.com
+ *              - Set IST bit in EMAC_M1 reg upon 100MBit or full duplex
+ *  04-Jan-02   stefan.roese@esd-electronics.com
+ *              - Wait for PHY auto negotiation to complete added
+ *  06-Feb-02   stefan.roese@esd-electronics.com
+ *              - Bug fixed in waiting for auto negotiation to complete
+ *  26-Feb-02   stefan.roese@esd-electronics.com
+ *              - rx and tx buffer descriptors now allocated (no fixed address
+ *                used anymore)
+ *  17-Jun-02   stefan.roese@esd-electronics.com
+ *              - MAL error debug printf 'M' removed (rx de interrupt may
+ *                occur upon many incoming packets with only 4 rx buffers).
+ *-----------------------------------------------------------------------------*
+ *  17-Nov-03   travis.sawyer@sandburst.com
+ *              - 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>
+#include <common.h>
+#include <net.h>
+#include <asm/processor.h>
+#include <commproc.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
+ * PKTSIZE and PKTSIZE_ALIGN (include/net.h)
+ */
+#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
+
+/*-----------------------------------------------------------------------------+
+ * Defines for MAL/EMAC interrupt conditions as reported in the UIC (Universal
+ * Interrupt Controller).
+ *-----------------------------------------------------------------------------*/
+#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_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.
+ *-----------------------------------------------------------------------------*/
+static void enet_rcv (struct eth_device *dev, unsigned long malisr);
+
+int enetInt (struct eth_device *dev);
+static void mal_err (struct eth_device *dev, unsigned long isr,
+                    unsigned long uic, unsigned long maldef,
+                    unsigned long mal_errr);
+static void emac_err (struct eth_device *dev, unsigned long isr);
+
+
+/*-----------------------------------------------------------------------------+
+| ppc_4xx_eth_halt
+| Disable MAL channel, and EMACn
++-----------------------------------------------------------------------------*/
+static void ppc_4xx_eth_halt (struct eth_device *dev)
+{
+       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 (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 */
+       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_SRST);
+
+       hw_p->print_speed = 1;  /* print speed message again next time */
+
+       return;
+}
+
+extern int phy_setup_aneg (unsigned char addr);
+extern int miiphy_reset (unsigned char addr);
+
+#if defined (CONFIG_440GX)
+int ppc_4xx_eth_setup_bridge(int devnum, bd_t * bis)
+{
+       unsigned long pfc1;
+       unsigned long zmiifer;
+       unsigned long rmiifer;
+
+       mfsdr(sdr_pfc1, pfc1);
+       pfc1 = SDR0_PFC1_EPS_DECODE(pfc1);
+
+       zmiifer = 0;
+       rmiifer = 0;
+
+       switch (pfc1) {
+       case 1:
+               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(0);
+               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(1);
+               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(2);
+               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(3);
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[3] = BI_PHYMODE_ZMII;
+               break;
+       case 2:
+               zmiifer = ZMII_FER_SMII << ZMII_FER_V(0);
+               zmiifer = ZMII_FER_SMII << ZMII_FER_V(1);
+               zmiifer = ZMII_FER_SMII << ZMII_FER_V(2);
+               zmiifer = ZMII_FER_SMII << ZMII_FER_V(3);
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[3] = BI_PHYMODE_ZMII;
+               break;
+       case 3:
+               zmiifer |= ZMII_FER_RMII << ZMII_FER_V(0);
+               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V(2);
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_NONE;
+               bis->bi_phymode[2] = BI_PHYMODE_RGMII;
+               bis->bi_phymode[3] = BI_PHYMODE_NONE;
+               break;
+       case 4:
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V(0);
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V(1);
+               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V (2);
+               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V (3);
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[2] = BI_PHYMODE_RGMII;
+               bis->bi_phymode[3] = BI_PHYMODE_RGMII;
+               break;
+       case 5:
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (0);
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (1);
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (2);
+               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V(3);
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[3] = BI_PHYMODE_RGMII;
+               break;
+       case 6:
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (0);
+               zmiifer |= ZMII_FER_SMII << ZMII_FER_V (1);
+               rmiifer |= RGMII_FER_RGMII << RGMII_FER_V(2);
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[2] = BI_PHYMODE_RGMII;
+               break;
+       case 0:
+       default:
+               zmiifer = ZMII_FER_MII << ZMII_FER_V(devnum);
+               rmiifer = 0x0;
+               bis->bi_phymode[0] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[1] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[2] = BI_PHYMODE_ZMII;
+               bis->bi_phymode[3] = BI_PHYMODE_ZMII;
+               break;
+       }
+
+       /* Ensure we setup mdio for this devnum and ONLY this devnum */
+       zmiifer |= (ZMII_FER_MDI) << ZMII_FER_V(devnum);
+
+       out32 (ZMII_FER, zmiifer);
+       out32 (RGMII_FER, rmiifer);
+
+       return ((int)pfc1);
+
+}
+#endif
+
+static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
+{
+       int i, j;
+       unsigned long reg = 0;
+       unsigned long msr;
+       unsigned long speed;
+       unsigned long duplex;
+       unsigned long failsafe;
+       unsigned mode_reg;
+       unsigned short devnum;
+       unsigned short reg_short;
+#if defined(CONFIG_440GX)
+       sys_info_t sysinfo;
+       int ethgroup;
+#endif
+
+       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_4XX_ENET
+       /* AS.HARNOIS
+        * We should have :
+        * hw_p->stats.pkts_handled <=  hw_p->stats.pkts_rx <= hw_p->stats.pkts_handled+PKTBUFSRX
+        * In the most cases hw_p->stats.pkts_handled = hw_p->stats.pkts_rx, but it
+        * is possible that new packets (without relationship with
+        * current transfer) have got the time to arrived before
+        * netloop calls eth_halt
+        */
+       printf ("About preceeding transfer (eth%d):\n"
+               "- Sent packet number %d\n"
+               "- Received packet number %d\n"
+               "- Handled packet number %d\n",
+               hw_p->devnum,
+               hw_p->stats.pkts_tx,
+               hw_p->stats.pkts_rx, hw_p->stats.pkts_handled);
+
+       hw_p->stats.pkts_tx = 0;
+       hw_p->stats.pkts_rx = 0;
+       hw_p->stats.pkts_handled = 0;
+#endif
+
+       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 */
+
+       hw_p->rx_slot = 0;      /* MAL Receive Slot */
+       hw_p->rx_i_index = 0;   /* Receive Interrupt Queue Index */
+       hw_p->rx_u_index = 0;   /* Receive User Queue Index */
+
+       hw_p->tx_slot = 0;      /* MAL Transmit Slot */
+       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 */
+       /* NOTE: only one emac at a time */
+       reg = 0;
+       out32 (ZMII_FER, 0);
+       udelay (100);
+
+#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_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));
+       }
+       else { /* ((devnum == 2) || (devnum == 3)) */
+               out32 (ZMII_FER, ZMII_FER_MDI << ZMII_FER_V (devnum));
+               out32 (RGMII_FER, ((RGMII_FER_RGMII << RGMII_FER_V (2)) |
+                                  (RGMII_FER_RGMII << RGMII_FER_V (3))));
+       }
+#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 */
+
+       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_SRST);
+       __asm__ volatile ("eieio");
+
+       failsafe = 1000;
+       while ((in32 (EMAC_M0 + hw_p->hw_addr) & (EMAC_M0_SRST)) && failsafe) {
+               udelay (1000);
+               failsafe--;
+       }
+
+#if defined(CONFIG_440GX)
+       /* Whack the M1 register */
+       mode_reg = 0x0;
+       mode_reg &= ~0x00000038;
+       if (sysinfo.freqOPB <= 50000000);
+       else if (sysinfo.freqOPB <= 66666667)
+               mode_reg |= EMAC_M1_OBCI_66;
+       else if (sysinfo.freqOPB <= 83333333)
+               mode_reg |= EMAC_M1_OBCI_83;
+       else if (sysinfo.freqOPB <= 100000000)
+               mode_reg |= EMAC_M1_OBCI_100;
+       else
+               mode_reg |= EMAC_M1_OBCI_GT100;
+
+       out32 (EMAC_M1 + hw_p->hw_addr, mode_reg);
+#endif /*  defined(CONFIG_440GX) */
+
+       /* wait for PHY to complete auto negotiation */
+       reg_short = 0;
+#ifndef CONFIG_CS8952_PHY
+       switch (devnum) {
+       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;
+               break;
+       case 3:
+               reg = CONFIG_PHY3_ADDR;
+               break;
+#endif
+       default:
+               reg = CONFIG_PHY_ADDR;
+               break;
+       }
+
+       bis->bi_phynum[devnum] = reg;
+
+#if defined(CONFIG_PHY_RESET)
+       /*
+        * Reset the phy, only if its the first time through
+        * otherwise, just check the speeds & feeds
+        */
+       if (hw_p->first_init == 0) {
+               miiphy_reset (reg);
+
+#if defined(CONFIG_440GX)
+#if defined(CONFIG_CIS8201_PHY)
+               /*
+                * Cicada 8201 PHY needs to have an extended register whacked
+                * for RGMII mode.
+                */
+               if ( ((devnum == 2) || (devnum ==3)) && (4 == ethgroup) ) {
+#if defined(CONFIG_CIS8201_SHORT_ETCH)
+                       miiphy_write (reg, 23, 0x1300);
+#else
+                       miiphy_write (reg, 23, 0x1000);
+#endif
+                       /*
+                        * Vitesse VSC8201/Cicada CIS8201 errata:
+                        * Interoperability problem with Intel 82547EI phys
+                        * This work around (provided by Vitesse) changes
+                        * the default timer convergence from 8ms to 12ms
+                        */
+                       miiphy_write (reg, 0x1f, 0x2a30);
+                       miiphy_write (reg, 0x08, 0x0200);
+                       miiphy_write (reg, 0x1f, 0x52b5);
+                       miiphy_write (reg, 0x02, 0x0004);
+                       miiphy_write (reg, 0x01, 0x0671);
+                       miiphy_write (reg, 0x00, 0x8fae);
+                       miiphy_write (reg, 0x1f, 0x2a30);
+                       miiphy_write (reg, 0x08, 0x0000);
+                       miiphy_write (reg, 0x1f, 0x0000);
+                       /* end Vitesse/Cicada errata */
+               }
+#endif
+#endif
+               /* Start/Restart autonegotiation */
+               phy_setup_aneg (reg);
+               udelay (1000);
+       }
+#endif /* defined(CONFIG_PHY_RESET) */
+
+       miiphy_read (reg, PHY_BMSR, &reg_short);
+
+       /*
+        * Wait if PHY is capable of autonegotiation and autonegotiation is not complete
+        */
+       if ((reg_short & PHY_BMSR_AUTN_ABLE)
+           && !(reg_short & PHY_BMSR_AUTN_COMP)) {
+               puts ("Waiting for PHY auto negotiation to complete");
+               i = 0;
+               while (!(reg_short & PHY_BMSR_AUTN_COMP)) {
+                       /*
+                        * Timeout reached ?
+                        */
+                       if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
+                               puts (" TIMEOUT !\n");
+                               break;
+                       }
+
+                       if ((i++ % 1000) == 0) {
+                               putc ('.');
+                       }
+                       udelay (1000);  /* 1 ms */
+                       miiphy_read (reg, PHY_BMSR, &reg_short);
+
+               }
+               puts (" done\n");
+               udelay (500000);        /* another 500 ms (results in faster booting) */
+       }
+#endif /* #ifndef CONFIG_CS8952_PHY */
+
+       speed = miiphy_speed (reg);
+       duplex = miiphy_duplex (reg);
+
+       if (hw_p->print_speed) {
+               hw_p->print_speed = 0;
+               printf ("ENET Speed is %d Mbps - %s duplex connection\n",
+                       (int) speed, (duplex == HALF) ? "HALF" : "FULL");
+       }
+
+#if defined(CONFIG_440)
+#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
+       mfsdr(sdr_mfr, reg);
+       if (speed == 100) {
+               reg = (reg & ~SDR0_MFR_ZMII_MODE_MASK) | SDR0_MFR_ZMII_MODE_RMII_100M;
+       } else {
+               reg = (reg & ~SDR0_MFR_ZMII_MODE_MASK) | SDR0_MFR_ZMII_MODE_RMII_10M;
+       }
+       mtsdr(sdr_mfr, reg);
+#endif
+
+       /* Set ZMII/RGMII speed according to the phy link speed */
+       reg = in32 (ZMII_SSR);
+       if ( (speed == 100) || (speed == 1000) )
+               out32 (ZMII_SSR, reg | (ZMII_SSR_SP << ZMII_SSR_V (devnum)));
+       else
+               out32 (ZMII_SSR, reg & (~(ZMII_SSR_SP << ZMII_SSR_V (devnum))));
+
+       if ((devnum == 2) || (devnum == 3)) {
+               if (speed == 1000)
+                       reg = (RGMII_SSR_SP_1000MBPS << RGMII_SSR_V (devnum));
+               else if (speed == 100)
+                       reg = (RGMII_SSR_SP_100MBPS << RGMII_SSR_V (devnum));
+               else
+                       reg = (RGMII_SSR_SP_10MBPS << RGMII_SSR_V (devnum));
+
+               out32 (RGMII_SSR, reg);
+       }
+#endif /* defined(CONFIG_440) */
+
+       /* set the Mal configuration reg */
+#if defined(CONFIG_440GX)
+       mtdcr (malmcr, MAL_CR_PLBB | MAL_CR_OPBBL | MAL_CR_LEA |
+              MAL_CR_PLBLT_DEFAULT | MAL_CR_EOPIE | 0x00330000);
+#else
+       mtdcr (malmcr, MAL_CR_PLBB | MAL_CR_OPBBL | MAL_CR_LEA | MAL_CR_PLBLT_DEFAULT);
+       /* Errata 1.12: MAL_1 -- Disable MAL bursting */
+       if (get_pvr() == PVR_440GP_RB) {
+               mtdcr (malmcr, mfdcr(malmcr) & ~MAL_CR_PLBB);
+       }
+#endif
+
+       /* Free "old" buffers */
+       if (hw_p->alloc_tx_buf)
+               free (hw_p->alloc_tx_buf);
+       if (hw_p->alloc_rx_buf)
+               free (hw_p->alloc_rx_buf);
+
+       /*
+        * Malloc MAL buffer desciptors, make sure they are
+        * aligned on cache line boundary size
+        * (401/403/IOP480 = 16, 405 = 32)
+        * and doesn't cross cache block boundaries.
+        */
+       hw_p->alloc_tx_buf =
+               (mal_desc_t *) malloc ((sizeof (mal_desc_t) * NUM_TX_BUFF) +
+                                      ((2 * CFG_CACHELINE_SIZE) - 2));
+       if (NULL == hw_p->alloc_tx_buf)
+               return -1;
+       if (((int) hw_p->alloc_tx_buf & CACHELINE_MASK) != 0) {
+               hw_p->tx =
+                       (mal_desc_t *) ((int) hw_p->alloc_tx_buf +
+                                       CFG_CACHELINE_SIZE -
+                                       ((int) hw_p->
+                                        alloc_tx_buf & CACHELINE_MASK));
+       } else {
+               hw_p->tx = hw_p->alloc_tx_buf;
+       }
+
+       hw_p->alloc_rx_buf =
+               (mal_desc_t *) malloc ((sizeof (mal_desc_t) * NUM_RX_BUFF) +
+                                      ((2 * CFG_CACHELINE_SIZE) - 2));
+       if (NULL == hw_p->alloc_rx_buf) {
+               free(hw_p->alloc_tx_buf);
+               hw_p->alloc_tx_buf = NULL;
+               return -1;
+       }
+
+       if (((int) hw_p->alloc_rx_buf & CACHELINE_MASK) != 0) {
+               hw_p->rx =
+                       (mal_desc_t *) ((int) hw_p->alloc_rx_buf +
+                                       CFG_CACHELINE_SIZE -
+                                       ((int) hw_p->
+                                        alloc_rx_buf & CACHELINE_MASK));
+       } else {
+               hw_p->rx = hw_p->alloc_rx_buf;
+       }
+
+       for (i = 0; i < NUM_TX_BUFF; i++) {
+               hw_p->tx[i].ctrl = 0;
+               hw_p->tx[i].data_len = 0;
+               if (hw_p->first_init == 0) {
+                       hw_p->txbuf_ptr =
+                               (char *) malloc (ENET_MAX_MTU_ALIGNED);
+                       if (NULL == hw_p->txbuf_ptr) {
+                               free(hw_p->alloc_rx_buf);
+                               free(hw_p->alloc_tx_buf);
+                               hw_p->alloc_rx_buf = NULL;
+                               hw_p->alloc_tx_buf = NULL;
+                               for(j = 0; j < i; j++) {
+                                       free(hw_p->tx[i].data_ptr);
+                                       hw_p->tx[i].data_ptr = NULL;
+                               }
+                       }
+               }
+               hw_p->tx[i].data_ptr = hw_p->txbuf_ptr;
+               if ((NUM_TX_BUFF - 1) == i)
+                       hw_p->tx[i].ctrl |= MAL_TX_CTRL_WRAP;
+               hw_p->tx_run[i] = -1;
+#if 0
+               printf ("TX_BUFF %d @ 0x%08lx\n", i,
+                       (ulong) hw_p->tx[i].data_ptr);
+#endif
+       }
+
+       for (i = 0; i < NUM_RX_BUFF; i++) {
+               hw_p->rx[i].ctrl = 0;
+               hw_p->rx[i].data_len = 0;
+               /*       rx[i].data_ptr = (char *) &rx_buff[i]; */
+               hw_p->rx[i].data_ptr = (char *) NetRxPackets[i];
+               if ((NUM_RX_BUFF - 1) == i)
+                       hw_p->rx[i].ctrl |= MAL_RX_CTRL_WRAP;
+               hw_p->rx[i].ctrl |= MAL_RX_CTRL_EMPTY | MAL_RX_CTRL_INTR;
+               hw_p->rx_ready[i] = -1;
+#if 0
+               printf ("RX_BUFF %d @ 0x%08lx\n", i, (ulong) rx[i].data_ptr);
+#endif
+       }
+
+       reg = 0x00000000;
+
+       reg |= dev->enetaddr[0];        /* set high address */
+       reg = reg << 8;
+       reg |= dev->enetaddr[1];
+
+       out32 (EMAC_IAH + hw_p->hw_addr, reg);
+
+       reg = 0x00000000;
+       reg |= dev->enetaddr[2];        /* set low address  */
+       reg = reg << 8;
+       reg |= dev->enetaddr[3];
+       reg = reg << 8;
+       reg |= dev->enetaddr[4];
+       reg = reg << 8;
+       reg |= dev->enetaddr[5];
+
+       out32 (EMAC_IAL + hw_p->hw_addr, reg);
+
+       switch (devnum) {
+       case 1:
+               /* setup MAL tx & rx channel pointers */
+#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);
+               break;
+#if defined (CONFIG_440GX)
+       case 2:
+               /* setup MAL tx & rx channel pointers */
+               mtdcr (maltxbattr, 0x0);
+               mtdcr (malrxbattr, 0x0);
+               mtdcr (maltxctp2r, hw_p->tx);
+               mtdcr (malrxctp2r, hw_p->rx);
+               /* set RX buffer size */
+               mtdcr (malrcbs2, ENET_MAX_MTU_ALIGNED / 16);
+               break;
+       case 3:
+               /* setup MAL tx & rx channel pointers */
+               mtdcr (maltxbattr, 0x0);
+               mtdcr (maltxctp3r, hw_p->tx);
+               mtdcr (malrxbattr, 0x0);
+               mtdcr (malrxctp3r, hw_p->rx);
+               /* set RX buffer size */
+               mtdcr (malrcbs3, ENET_MAX_MTU_ALIGNED / 16);
+               break;
+#endif /* CONFIG_440GX */
+       case 0:
+       default:
+               /* setup MAL tx & rx channel pointers */
+#if defined(CONFIG_440)
+               mtdcr (maltxbattr, 0x0);
+               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);
+               break;
+       }
+
+       /* Enable MAL transmit and receive channels */
+#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));
+#endif
+       mtdcr (malrxcasr, (MAL_TXRX_CASR >> hw_p->devnum));
+
+       /* set transmit enable & receive enable */
+       out32 (EMAC_M0 + hw_p->hw_addr, EMAC_M0_TXE | EMAC_M0_RXE);
+
+       /* set receive fifo to 4k and tx fifo to 2k */
+       mode_reg = in32 (EMAC_M1 + hw_p->hw_addr);
+       mode_reg |= EMAC_M1_RFS_4K | EMAC_M1_TX_FIFO_2K;
+
+       /* set speed */
+       if (speed == _1000BASET)
+               mode_reg = mode_reg | EMAC_M1_MF_1000MBPS | EMAC_M1_IST;
+       else if (speed == _100BASET)
+               mode_reg = mode_reg | EMAC_M1_MF_100MBPS | EMAC_M1_IST;
+       else
+               mode_reg = mode_reg & ~0x00C00000;      /* 10 MBPS */
+       if (duplex == FULL)
+               mode_reg = mode_reg | 0x80000000 | EMAC_M1_IST;
+
+       out32 (EMAC_M1 + hw_p->hw_addr, mode_reg);
+
+       /* Enable broadcast and indvidual address */
+       /* TBS: enabling runts as some misbehaved nics will send runts */
+       out32 (EMAC_RXM + hw_p->hw_addr, EMAC_RMR_BAE | EMAC_RMR_IAE);
+
+       /* we probably need to set the tx mode1 reg? maybe at tx time */
+
+       /* set transmit request threshold register */
+       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 */
+       out32 (EMAC_TXM0 + hw_p->hw_addr, 0x00000003);
+       /* Frame gap set */
+       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_ORE | EMAC_ISR_IRE;
+       if (speed == _100BASET)
+               hw_p->emac_ier = hw_p->emac_ier | EMAC_ISR_SYE;
+
+       out32 (EMAC_ISR + hw_p->hw_addr, 0xffffffff);   /* clear pending interrupts */
+       out32 (EMAC_IER + hw_p->hw_addr, hw_p->emac_ier);
+
+       if (hw_p->first_init == 0) {
+               /*
+                * Connect interrupt service routines
+                */
+               irq_install_handler (VECNUM_ETH0 + (hw_p->devnum * 2),
+                                    (interrupt_handler_t *) enetInt, dev);
+       }
+
+       mtmsr (msr);            /* enable interrupts again */
+
+       hw_p->bis = bis;
+       hw_p->first_init = 1;
+
+       return (1);
+}
+
+
+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_4XX_HW_PST hw_p = dev->priv;
+
+       ef_ptr = (struct enet_frame *) ptr;
+
+       /*-----------------------------------------------------------------------+
+        *  Copy in our address into the frame.
+        *-----------------------------------------------------------------------*/
+       (void) memcpy (ef_ptr->source_addr, dev->enetaddr, ENET_ADDR_LENGTH);
+
+       /*-----------------------------------------------------------------------+
+        * If frame is too long or too short, modify length.
+        *-----------------------------------------------------------------------*/
+       /* TBS: where does the fragment go???? */
+       if (len > ENET_MAX_MTU)
+               len = ENET_MAX_MTU;
+
+       /*   memcpy ((void *) &tx_buff[tx_slot], (const void *) ptr, len); */
+       memcpy ((void *) hw_p->txbuf_ptr, (const void *) ptr, len);
+
+       /*-----------------------------------------------------------------------+
+        * set TX Buffer busy, and send it
+        *-----------------------------------------------------------------------*/
+       hw_p->tx[hw_p->tx_slot].ctrl = (MAL_TX_CTRL_LAST |
+                                       EMAC_TX_CTRL_GFCS | EMAC_TX_CTRL_GP) &
+               ~(EMAC_TX_CTRL_ISA | EMAC_TX_CTRL_RSA);
+       if ((NUM_TX_BUFF - 1) == hw_p->tx_slot)
+               hw_p->tx[hw_p->tx_slot].ctrl |= MAL_TX_CTRL_WRAP;
+
+       hw_p->tx[hw_p->tx_slot].data_len = (short) len;
+       hw_p->tx[hw_p->tx_slot].ctrl |= MAL_TX_CTRL_READY;
+
+       __asm__ volatile ("eieio");
+
+       out32 (EMAC_TXM0 + hw_p->hw_addr,
+              in32 (EMAC_TXM0 + hw_p->hw_addr) | EMAC_TXM0_GNP0);
+#ifdef INFO_4XX_ENET
+       hw_p->stats.pkts_tx++;
+#endif
+
+       /*-----------------------------------------------------------------------+
+        * poll unitl the packet is sent and then make sure it is OK
+        *-----------------------------------------------------------------------*/
+       time_start = get_timer (0);
+       while (1) {
+               temp_txm0 = in32 (EMAC_TXM0 + hw_p->hw_addr);
+               /* loop until either TINT turns on or 3 seconds elapse */
+               if ((temp_txm0 & EMAC_TXM0_GNP0) != 0) {
+                       /* transmit is done, so now check for errors
+                        * If there is an error, an interrupt should
+                        * happen when we return
+                        */
+                       time_now = get_timer (0);
+                       if ((time_now - time_start) > 3000) {
+                               return (-1);
+                       }
+               } else {
+                       return (len);
+               }
+       }
+}
+
+#if defined (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_uic0msr, my_uic1msr;
+
+#if defined(CONFIG_440GX)
+       unsigned long my_uic2msr;
+#endif
+       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_uic0msr = mfdcr (uic0msr);
+               my_uic1msr = mfdcr (uic1msr);
+#if defined(CONFIG_440GX)
+               my_uic2msr = mfdcr (uic2msr);
+#endif
+               if (!(my_uic0msr & (UIC_MRE | UIC_MTE))
+                   && !(my_uic1msr &
+                        (UIC_ETH0 | UIC_ETH1 | UIC_MS | UIC_MTDE |
+                         UIC_MRDE))) {
+                       /* not for us */
+                       return (rc);
+               }
+#if defined (CONFIG_440GX)
+               if (!(my_uic0msr & (UIC_MRE | UIC_MTE))
+                   && !(my_uic2msr & (UIC_ETH2 | UIC_ETH3))) {
+                       /* not for us */
+                       return (rc);
+               }
+#endif
+               /* get and clear controller status interrupts */
+               /* look at Mal and EMAC interrupts */
+               if ((my_uic0msr & (UIC_MRE | UIC_MTE))
+                   || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
+                       /* we have a MAL interrupt */
+                       mal_isr = mfdcr (malesr);
+                       /* look for mal error */
+                       if (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE)) {
+                               mal_err (dev, mal_isr, my_uic0msr,
+                                        MAL_UIC_DEF, MAL_UIC_ERR);
+                               serviced = 1;
+                               rc = 0;
+                       }
+               }
+
+               /* port by port dispatch of emac interrupts */
+               if (hw_p->devnum == 0) {
+                       if (UIC_ETH0 & my_uic1msr) {    /* 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)
+                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
+                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
+                               mtdcr (uic1sr, UIC_ETH0 | UIC_MS | UIC_MTDE | UIC_MRDE);        /* Clear */
+                               return (rc);    /* we had errors so get out */
+                       }
+               }
+
+               if (hw_p->devnum == 1) {
+                       if (UIC_ETH1 & my_uic1msr) {    /* 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)
+                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
+                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
+                               mtdcr (uic1sr, UIC_ETH1 | UIC_MS | UIC_MTDE | UIC_MRDE);        /* Clear */
+                               return (rc);    /* we had errors so get out */
+                       }
+               }
+#if defined (CONFIG_440GX)
+               if (hw_p->devnum == 2) {
+                       if (UIC_ETH2 & my_uic2msr) {    /* 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)
+                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
+                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
+                               mtdcr (uic1sr, UIC_MS | UIC_MTDE | UIC_MRDE);   /* Clear */
+                               mtdcr (uic2sr, UIC_ETH2);
+                               return (rc);    /* we had errors so get out */
+                       }
+               }
+
+               if (hw_p->devnum == 3) {
+                       if (UIC_ETH3 & my_uic2msr) {    /* 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)
+                           || (my_uic1msr & (UIC_MS | UIC_MTDE | UIC_MRDE))) {
+                               mtdcr (uic0sr, UIC_MRE | UIC_MTE);      /* Clear */
+                               mtdcr (uic1sr, UIC_MS | UIC_MTDE | UIC_MRDE);   /* Clear */
+                               mtdcr (uic2sr, UIC_ETH3);
+                               return (rc);    /* we had errors so get out */
+                       }
+               }
+#endif /* CONFIG_440GX */
+               /* handle MAX TX EOB interrupt from a tx */
+               if (my_uic0msr & UIC_MTE) {
+                       mal_rx_eob = mfdcr (maltxeobisr);
+                       mtdcr (maltxeobisr, mal_rx_eob);
+                       mtdcr (uic0sr, UIC_MTE);
+               }
+               /* handle MAL RX EOB  interupt from a receive */
+               /* check for EOB on valid channels            */
+               if (my_uic0msr & UIC_MRE) {
+                       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 (uic0sr, UIC_MRE);        /* Clear */
+               mtdcr (uic1sr, UIC_MS | UIC_MTDE | UIC_MRDE);   /* Clear */
+               switch (hw_p->devnum) {
+               case 0:
+                       mtdcr (uic1sr, UIC_ETH0);
+                       break;
+               case 1:
+                       mtdcr (uic1sr, UIC_ETH1);
+                       break;
+#if defined (CONFIG_440GX)
+               case 2:
+                       mtdcr (uic2sr, UIC_ETH2);
+                       break;
+               case 3:
+                       mtdcr (uic2sr, UIC_ETH3);
+                       break;
+#endif /* CONFIG_440GX */
+               default:
+                       break;
+               }
+       } while (serviced);
+
+       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
+ *-----------------------------------------------------------------------------*/
+static void mal_err (struct eth_device *dev, unsigned long isr,
+                    unsigned long uic, unsigned long maldef,
+                    unsigned long mal_errr)
+{
+       EMAC_4XX_HW_PST hw_p = dev->priv;
+
+       mtdcr (malesr, isr);    /* clear interrupt */
+
+       /* clear DE interrupt */
+       mtdcr (maltxdeir, 0xC0000000);
+       mtdcr (malrxdeir, 0x80000000);
+
+#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
+
+       eth_init (hw_p->bis);   /* start again... */
+}
+
+/*-----------------------------------------------------------------------------+
+ *  EMAC Error Routine
+ *-----------------------------------------------------------------------------*/
+static void emac_err (struct eth_device *dev, unsigned long isr)
+{
+       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);
+}
+
+/*-----------------------------------------------------------------------------+
+ *  enet_rcv() handles the ethernet receive data
+ *-----------------------------------------------------------------------------*/
+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_4XX_HW_PST hw_p = dev->priv;
+
+       int handled = 0;
+       int i;
+       int loop_count = 0;
+
+       rx_eob_isr = mfdcr (malrxeobisr);
+       if ((0x80000000 >> hw_p->devnum) & rx_eob_isr) {
+               /* clear EOB */
+               mtdcr (malrxeobisr, rx_eob_isr);
+
+               /* EMAC RX done */
+               while (1) {     /* do all */
+                       i = hw_p->rx_slot;
+
+                       if ((MAL_RX_CTRL_EMPTY & hw_p->rx[i].ctrl)
+                           || (loop_count >= NUM_RX_BUFF))
+                               break;
+                       loop_count++;
+                       hw_p->rx_slot++;
+                       if (NUM_RX_BUFF == hw_p->rx_slot)
+                               hw_p->rx_slot = 0;
+                       handled++;
+                       data_len = (unsigned long) hw_p->rx[i].data_len;        /* Get len */
+                       if (data_len) {
+                               if (data_len > ENET_MAX_MTU)    /* Check len */
+                                       data_len = 0;
+                               else {
+                                       if (EMAC_RX_ERRORS & hw_p->rx[i].ctrl) {        /* Check Errors */
+                                               data_len = 0;
+                                               hw_p->stats.rx_err_log[hw_p->
+                                                                      rx_err_index]
+                                                       = hw_p->rx[i].ctrl;
+                                               hw_p->rx_err_index++;
+                                               if (hw_p->rx_err_index ==
+                                                   MAX_ERR_LOG)
+                                                       hw_p->rx_err_index =
+                                                               0;
+                                       }       /* emac_erros */
+                               }       /* data_len < max mtu */
+                       }       /* if data_len */
+                       if (!data_len) {        /* no data */
+                               hw_p->rx[i].ctrl |= MAL_RX_CTRL_EMPTY;  /* Free Recv Buffer */
+
+                               hw_p->stats.data_len_err++;     /* Error at Rx */
+                       }
+
+                       /* !data_len */
+                       /* AS.HARNOIS */
+                       /* Check if user has already eaten buffer */
+                       /* if not => ERROR */
+                       else if (hw_p->rx_ready[hw_p->rx_i_index] != -1) {
+                               if (hw_p->is_receiving)
+                                       printf ("ERROR : Receive buffers are full!\n");
+                               break;
+                       } else {
+                               hw_p->stats.rx_frames++;
+                               hw_p->stats.rx += data_len;
+                               ef_ptr = (struct enet_frame *) hw_p->rx[i].
+                                       data_ptr;
+#ifdef INFO_4XX_ENET
+                               hw_p->stats.pkts_rx++;
+#endif
+                               /* AS.HARNOIS
+                                * use ring buffer
+                                */
+                               hw_p->rx_ready[hw_p->rx_i_index] = i;
+                               hw_p->rx_i_index++;
+                               if (NUM_RX_BUFF == hw_p->rx_i_index)
+                                       hw_p->rx_i_index = 0;
+
+                               /*  AS.HARNOIS
+                                * free receive buffer only when
+                                * buffer has been handled (eth_rx)
+                                rx[i].ctrl |= MAL_RX_CTRL_EMPTY;
+                                */
+                       }       /* if data_len */
+               }               /* while */
+       }                       /* if EMACK_RXCHL */
+}
+
+
+static int ppc_4xx_eth_rx (struct eth_device *dev)
+{
+       int length;
+       int user_index;
+       unsigned long msr;
+       EMAC_4XX_HW_PST hw_p = dev->priv;
+
+       hw_p->is_receiving = 1; /* tell driver */
+
+       for (;;) {
+               /* AS.HARNOIS
+                * use ring buffer and
+                * get index from rx buffer desciptor queue
+                */
+               user_index = hw_p->rx_ready[hw_p->rx_u_index];
+               if (user_index == -1) {
+                       length = -1;
+                       break;  /* nothing received - leave for() loop */
+               }
+
+               msr = mfmsr ();
+               mtmsr (msr & ~(MSR_EE));
+
+               length = hw_p->rx[user_index].data_len;
+
+               /* Pass the packet up to the protocol layers. */
+               /*       NetReceive(NetRxPackets[rxIdx], length - 4); */
+               /*       NetReceive(NetRxPackets[i], length); */
+               NetReceive (NetRxPackets[user_index], length - 4);
+               /* Free Recv Buffer */
+               hw_p->rx[user_index].ctrl |= MAL_RX_CTRL_EMPTY;
+               /* Free rx buffer descriptor queue */
+               hw_p->rx_ready[hw_p->rx_u_index] = -1;
+               hw_p->rx_u_index++;
+               if (NUM_RX_BUFF == hw_p->rx_u_index)
+                       hw_p->rx_u_index = 0;
+
+#ifdef INFO_4XX_ENET
+               hw_p->stats.pkts_handled++;
+#endif
+
+               mtmsr (msr);    /* Enable IRQ's */
+       }
+
+       hw_p->is_receiving = 0; /* tell driver */
+
+       return length;
+}
+
+int ppc_4xx_eth_initialize (bd_t * bis)
+{
+       static int virgin = 0;
+       struct eth_device *dev;
+       int eth_num = 0;
+       EMAC_4XX_HW_PST hw = NULL;
+
+#if defined(CONFIG_440GX)
+       unsigned long pfc1;
+
+       mfsdr (sdr_pfc1, pfc1);
+       pfc1 &= ~(0x01e00000);
+       pfc1 |= 0x01200000;
+       mtsdr (sdr_pfc1, pfc1);
+#endif
+       /* set phy num and mode */
+       bis->bi_phynum[0] = CONFIG_PHY_ADDR;
+#if defined(CONFIG_PHY1_ADDR)
+       bis->bi_phynum[1] = CONFIG_PHY1_ADDR;
+#endif
+#if defined(CONFIG_440GX)
+       bis->bi_phynum[2] = CONFIG_PHY2_ADDR;
+       bis->bi_phynum[3] = CONFIG_PHY3_ADDR;
+       bis->bi_phymode[0] = 0;
+       bis->bi_phymode[1] = 0;
+       bis->bi_phymode[2] = 2;
+       bis->bi_phymode[3] = 2;
+
+#if defined (CONFIG_440GX)
+       ppc_4xx_eth_setup_bridge(0, bis);
+#endif
+#endif
+
+       for (eth_num = 0; eth_num < EMAC_NUM_DEV; eth_num++) {
+
+               /* See if we can actually bring up the interface, otherwise, skip it */
+               switch (eth_num) {
+               default:                /* fall through */
+               case 0:
+                       if (memcmp (bis->bi_enetaddr, "\0\0\0\0\0\0", 6) == 0) {
+                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
+                               continue;
+                       }
+                       break;
+#ifdef CONFIG_HAS_ETH1
+               case 1:
+                       if (memcmp (bis->bi_enet1addr, "\0\0\0\0\0\0", 6) == 0) {
+                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
+                               continue;
+                       }
+                       break;
+#endif
+#ifdef CONFIG_HAS_ETH2
+               case 2:
+                       if (memcmp (bis->bi_enet2addr, "\0\0\0\0\0\0", 6) == 0) {
+                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
+                               continue;
+                       }
+                       break;
+#endif
+#ifdef CONFIG_HAS_ETH3
+               case 3:
+                       if (memcmp (bis->bi_enet3addr, "\0\0\0\0\0\0", 6) == 0) {
+                               bis->bi_phymode[eth_num] = BI_PHYMODE_NONE;
+                               continue;
+                       }
+                       break;
+#endif
+               }
+
+               /* Allocate device structure */
+               dev = (struct eth_device *) malloc (sizeof (*dev));
+               if (dev == NULL) {
+                       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_4XX_HW_PST) malloc (sizeof (*hw));
+               if (hw == NULL) {
+                       printf ("ppc_4xx_eth_initialize: "
+                               "Cannot allocate private hw data for eth_device %d",
+                               eth_num);
+                       free (dev);
+                       return (-1);
+               }
+               memset(hw, 0, sizeof(*hw));
+
+               switch (eth_num) {
+               default:                /* fall through */
+               case 0:
+                       hw->hw_addr = 0;
+                       memcpy (dev->enetaddr, bis->bi_enetaddr, 6);
+                       break;
+#ifdef CONFIG_HAS_ETH1
+               case 1:
+                       hw->hw_addr = 0x100;
+                       memcpy (dev->enetaddr, bis->bi_enet1addr, 6);
+                       break;
+#endif
+#ifdef CONFIG_HAS_ETH2
+               case 2:
+                       hw->hw_addr = 0x400;
+                       memcpy (dev->enetaddr, bis->bi_enet2addr, 6);
+                       break;
+#endif
+#ifdef CONFIG_HAS_ETH3
+               case 3:
+                       hw->hw_addr = 0x600;
+                       memcpy (dev->enetaddr, bis->bi_enet3addr, 6);
+                       break;
+#endif
+               }
+
+               hw->devnum = eth_num;
+               hw->print_speed = 1;
+
+               sprintf (dev->name, "ppc_4xx_eth%d", eth_num);
+               dev->priv = (void *) hw;
+               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 ??? */
+                       mal_ier =
+                               MAL_IER_DE | MAL_IER_NE | MAL_IER_TE |
+                               MAL_IER_OPBE | MAL_IER_PLBE;
+                       mtdcr (malesr, 0xffffffff);     /* clear pending interrupts */
+                       mtdcr (maltxdeir, 0xffffffff);  /* clear pending interrupts */
+                       mtdcr (malrxdeir, 0xffffffff);  /* clear pending interrupts */
+                       mtdcr (malier, mal_ier);
+
+                       /* install MAL interrupt handler */
+                       irq_install_handler (VECNUM_MS,
+                                            (interrupt_handler_t *) enetInt,
+                                            dev);
+                       irq_install_handler (VECNUM_MTE,
+                                            (interrupt_handler_t *) enetInt,
+                                            dev);
+                       irq_install_handler (VECNUM_MRE,
+                                            (interrupt_handler_t *) enetInt,
+                                            dev);
+                       irq_install_handler (VECNUM_TXDE,
+                                            (interrupt_handler_t *) enetInt,
+                                            dev);
+                       irq_install_handler (VECNUM_RXDE,
+                                            (interrupt_handler_t *) enetInt,
+                                            dev);
+                       virgin = 1;
+               }
+
+#if defined(CONFIG_NET_MULTI)
+               eth_register (dev);
+#else
+               emac0_dev = dev;
+#endif
+
+       }                       /* end for each supported device */
+       return (1);
+}
+
+
+#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) */
index 5b16754c50a1f36a12a713174f06fb0b4900c58e..c5634570054b92169442cb040b56b3f11c70cffc 100644 (file)
@@ -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)
index 68e1a450ca774a959c51f9f5df65dbfbb3b92b34..79cfba3a4511d1892c967e012ba5b352b5878a55 100644 (file)
@@ -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>
 
index cb9dccdc35babb33be34c826c7ca5590b7fb394a..24f91546c62ee2e31b6460fd4afc8aa8c4bfe756 100644 (file)
@@ -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>
   |
   +-----------------------------------------------------------------------------*/
 
 #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 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);
 
-int miiphy_read (unsigned char addr, unsigned char reg,
-                                unsigned short *value)
+       /* 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 sta_reg;          /* STA scratch area */
+#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 */
diff --git a/cpu/ppc4xx/miiphy_440.c b/cpu/ppc4xx/miiphy_440.c
deleted file mode 100644 (file)
index 6320fea..0000000
+++ /dev/null
@@ -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 */
diff --git a/include/405gp_enet.h b/include/405gp_enet.h
deleted file mode 100644 (file)
index b9bdaaf..0000000
+++ /dev/null
@@ -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_ */
diff --git a/include/440gx_enet.h b/include/440gx_enet.h
deleted file mode 100644 (file)
index 45c2f46..0000000
+++ /dev/null
@@ -1,475 +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
-|
-+----------------------------------------------------------------------------*/
-/*----------------------------------------------------------------------------+
-|  19-Nov-03   Travis Sawyer, Sandburst Corporation, tsawyer@sandburst.com
-|             ported to handle 440GP and 440GX multiple EMACs
-+----------------------------------------------------------------------------*/
-
-#ifndef _emacgx_enet_h_
-#define _emacgx_enet_h_
-
-#if defined(CONFIG_440)
-#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
-
-#define NUM_TX_BUFF 1
-#define NUM_RX_BUFF PKTBUFSRX
-
-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;
-};
-
-
-/* Statistic Areas */
-#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_440GX_HW_ST, *EMAC_440GX_HW_PST;
-
-
-#if defined(CONFIG_440GX)
-#define EMAC_NUM_DEV       4
-#elif defined(CONFIG_440) && !defined(CONFIG_440GX)
-#define EMAC_NUM_DEV       2
-#else
-#warning Bad configuration
-#endif
-
-
-/*ZMII Bridge Register addresses */
-#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
-
-/* ZMII FER Register Bit Definitions */
-#define ZMII_FER_MDI           (0x8)
-#define ZMII_FER_SMII          (0x4)
-#define ZMII_FER_RMII          (0x2)
-#define ZMII_FER_MII           (0x1)
-
-#define ZMII_FER_RSVD11                (0x00200000)
-#define ZMII_FER_RSVD10                (0x00100000)
-#define ZMII_FER_RSVD14_31     (0x0003FFFF)
-
-#define ZMII_FER_V(__x)                (((3 - __x) * 4) + 16)
-
-
-/* ZMII Speed Selection Register Bit Definitions */
-#define ZMII_SSR_SCI           (0x4)
-#define ZMII_SSR_FSS           (0x2)
-#define ZMII_SSR_SP            (0x1)
-#define ZMII_SSR_RSVD16_31     (0x0000FFFF)
-
-#define ZMII_SSR_V(__x)                (((3 - __x) * 4) + 16)
-
-
-/* ZMII SMII Status Register Bit Definitions */
-#define ZMII_SMIISR_E1         (0x80)
-#define ZMII_SMIISR_EC         (0x40)
-#define ZMII_SMIISR_EN         (0x20)
-#define ZMII_SMIISR_EJ         (0x10)
-#define ZMII_SMIISR_EL         (0x08)
-#define ZMII_SMIISR_ED         (0x04)
-#define ZMII_SMIISR_ES         (0x02)
-#define ZMII_SMIISR_EF         (0x01)
-
-#define ZMII_SMIISR_V(__x)     ((3 - __x) * 8)
-
-/* RGMII Register Addresses */
-#define RGMII_BASE             (CFG_PERIPHERAL_BASE + 0x0790)
-#define RGMII_FER              (RGMII_BASE + 0x00)
-#define RGMII_SSR              (RGMII_BASE + 0x04)
-
-/* RGMII Function Enable (FER) Register Bit Definitions */
-/* Note: for EMAC 2 and 3 only, 440GX only */
-#define RGMII_FER_DIS          (0x00)
-#define RGMII_FER_RTBI         (0x04)
-#define RGMII_FER_RGMII                (0x05)
-#define RGMII_FER_TBI          (0x06)
-#define RGMII_FER_GMII         (0x07)
-
-#define RGMII_FER_V(__x)       ((__x - 2) * 4)
-
-/* RGMII Speed Selection Register Bit Definitions */
-#define RGMII_SSR_SP_10MBPS    (0x00)
-#define RGMII_SSR_SP_100MBPS   (0x02)
-#define RGMII_SSR_SP_1000MBPS  (0x04)
-
-#define RGMII_SSR_V(__x)       ((__x -2) * 8)
-
-
-/*---------------------------------------------------------------------------+
-|  TCP/IP Acceleration Hardware (TAH) 440GX Only
-+---------------------------------------------------------------------------*/
-#if defined(CONFIG_440GX)
-#define TAH_BASE               (CFG_PERIPHERAL_BASE + 0x0B50)
-#define TAH_REVID              (TAH_BASE + 0x0)    /* Revision ID (RO)*/
-#define TAH_MR                 (TAH_BASE + 0x10)   /* Mode Register (R/W) */
-#define TAH_SSR0               (TAH_BASE + 0x14)   /* Segment Size Reg 0 (R/W) */
-#define TAH_SSR1               (TAH_BASE + 0x18)   /* Segment Size Reg 1 (R/W) */
-#define TAH_SSR2               (TAH_BASE + 0x1C)   /* Segment Size Reg 2 (R/W) */
-#define TAH_SSR3               (TAH_BASE + 0x20)   /* Segment Size Reg 3 (R/W) */
-#define TAH_SSR4               (TAH_BASE + 0x24)   /* Segment Size Reg 4 (R/W) */
-#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 */
-
-#define TAH_REV_RN_V           (8)
-#define TAH_REV_BN_V           (0)
-
-/* TAH Mode Register */
-#define TAH_MR_CVR             (0x80000000)        /* Checksum verification on RX */
-#define TAH_MR_SR              (0x40000000)        /* Software reset */
-#define TAH_MR_ST              (0x3F000000)        /* Send Threshold */
-#define TAH_MR_TFS             (0x00E00000)        /* Transmit FIFO size */
-#define TAH_MR_DTFP            (0x00100000)        /* Disable TX FIFO parity */
-#define TAH_MR_DIG             (0x00080000)        /* Disable interrupt generation */
-#define TAH_MR_RSVD            (0x0007FFFF)        /* Reserved */
-
-#define TAH_MR_ST_V            (20)
-#define TAH_MR_TFS_V           (17)
-
-#define TAH_MR_TFS_2K          (0x1)               /* Transmit FIFO size 2Kbyte */
-#define TAH_MR_TFS_4K          (0x2)               /* Transmit FIFO size 4Kbyte */
-#define TAH_MR_TFS_6K          (0x3)               /* Transmit FIFO size 6Kbyte */
-#define TAH_MR_TFS_8K          (0x4)               /* Transmit FIFO size 8Kbyte */
-#define TAH_MR_TFS_10K         (0x5)               /* Transmit FIFO size 10Kbyte (max)*/
-
-
-/* TAH Segment Size Registers 0:5 */
-#define TAH_SSR_RSVD0          (0xC0000000)        /* Reserved */
-#define TAH_SSR_SS             (0x3FFE0000)        /* Segment size in multiples of 2 */
-#define TAH_SSR_RSVD1          (0x0001FFFF)        /* Reserved */
-
-/* TAH Transmit Status Register */
-#define TAH_TSR_TFTS           (0x80000000)        /* Transmit FIFO too small */
-#define TAH_TSR_UH             (0x40000000)        /* Unrecognized header */
-#define TAH_TSR_NIPF           (0x20000000)        /* Not IPv4 */
-#define TAH_TSR_IPOP           (0x10000000)        /* IP option present */
-#define TAH_TSR_NISF           (0x08000000)        /* No IEEE SNAP format */
-#define TAH_TSR_ILTS           (0x04000000)        /* IP length too short */
-#define TAH_TSR_IPFP           (0x02000000)        /* IP fragment present */
-#define TAH_TSR_UP             (0x01000000)        /* Unsupported protocol */
-#define TAH_TSR_TFP            (0x00800000)        /* TCP flags present */
-#define TAH_TSR_SUDP           (0x00400000)        /* Segmentation for UDP */
-#define TAH_TSR_DLM            (0x00200000)        /* Data length mismatch */
-#define TAH_TSR_SIEEE          (0x00100000)        /* Segmentation for IEEE */
-#define TAH_TSR_TFPE           (0x00080000)        /* Transmit FIFO parity error */
-#define TAH_TSR_SSTS           (0x00040000)        /* Segment size too small */
-#define TAH_TSR_RSVD           (0x0003FFFF)        /* Reserved */
-#endif /* CONFIG_440GX */
-
-
-/* Ethernet MAC Regsiter Addresses */
-#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
-#define EMAC_BASE                          (CFG_PERIPHERAL_BASE + 0x0E00)
-#else
-#define EMAC_BASE                          (CFG_PERIPHERAL_BASE + 0x0800)
-#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)
-
-/* on 440GX EMAC_MR1 has a different layout! */
-#if defined(CONFIG_440GX)
-/* 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_RSVD                   (0x06000000)
-#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_16K                        (0x00280000)    /* ~4k for 512 byte */
-#define EMAC_M1_RFS_8K                 (0x00200000)    /* ~4k for 512 byte */
-#define EMAC_M1_RFS_4K                 (0x00180000)    /* ~4k for 512 byte */
-#define EMAC_M1_RFS_2K                 (0x00100000)
-#define EMAC_M1_RFS_1K                 (0x00080000)
-#define EMAC_M1_TX_FIFO_16K            (0x00050000)    /* 0's for 512 byte */
-#define EMAC_M1_TX_FIFO_8K             (0x00040000)
-#define EMAC_M1_TX_FIFO_4K             (0x00030000)
-#define EMAC_M1_TX_FIFO_2K     (0x00020000)
-#define EMAC_M1_TX_FIFO_1K             (0x00010000)
-#define EMAC_M1_TR_MULTI               (0x00008000)    /* 0'x for single packet */
-#define EMAC_M1_MWSW           (0x00007000)
-#define EMAC_M1_JUMBO_ENABLE   (0x00000800)
-#define EMAC_M1_IPPA           (0x000007c0)
-#define EMAC_M1_OBCI_GT100     (0x00000020)
-#define EMAC_M1_OBCI_100       (0x00000018)
-#define EMAC_M1_OBCI_83                (0x00000010)
-#define EMAC_M1_OBCI_66                (0x00000008)
-#define EMAC_M1_RSVD1          (0x00000007)
-#else /* defined(CONFIG_440GX) */
-/* EMAC_MR1 is the same on 405GP, 405GPr, 405EP, 440GP, 440EP */
-#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
-#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
-#define EMAC_M1_JUMBO_ENABLE           0x00001000
-#endif /* defined(CONFIG_440EP) || defined(CONFIG_440GR) */
-#endif /* defined(CONFIG_440GX) */
-
-/* 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)
-
-#endif /* CONFIG_440 */
-#endif /* _enetLib_h_ */
index 161a29506b1b572c7354b40087132aaf1c4a0c0c..4fcebe7a4fec189132b9d0b697e2cd909b07acfa 100644 (file)
@@ -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__ */
index 331131aba799db89a0bed2b71f2936a22c8d4fd8..00a6e5d55dbffb3616410ece971ca3522f33f9f4 100644 (file)
 #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 */
index 2b4a33f4ca8d668cc28e1f8420bdb8a53f95001a..cf6f00ef923ebca9e97b988637a47c5fa4398843 100644 (file)
 #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 */
index 347bb50332944f91260366261da8d5a9810294e4..2e0b1a45f576f1d9fbe5d46796fd2785ab2a0e3c 100644 (file)
@@ -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"   */
index 64ea6bef91ff602b139a13d013e5c7ed86beb675..910de67efd878c61e794b2ae92eb7608f506dc2b 100644 (file)
 
 #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 */
index 2b0f6874c3b03da2dd314b8418242c9aeb421336..05a575bf6389c589c2df2d286e9de1963695b71e 100644 (file)
 #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  | \
 #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         */
diff --git a/include/ppc4xx_enet.h b/include/ppc4xx_enet.h
new file mode 100644 (file)
index 0000000..eacfb68
--- /dev/null
@@ -0,0 +1,476 @@
+/*----------------------------------------------------------------------------+
+|
+|      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
+|
++----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------+
+|  19-Nov-03   Travis Sawyer, Sandburst Corporation, tsawyer@sandburst.com
+|             ported to handle 440GP and 440GX multiple EMACs
++----------------------------------------------------------------------------*/
+
+#ifndef _PPC4XX_ENET_H_
+#define _PPC4XX_ENET_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
+
+#define NUM_TX_BUFF 1
+#define NUM_RX_BUFF PKTBUFSRX
+
+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;
+};
+
+
+/* Statistic Areas */
+#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 (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;
+    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_4XX_HW_ST, *EMAC_4XX_HW_PST;
+
+
+#if defined(CONFIG_440GX)
+#define EMAC_NUM_DEV       4
+#elif (defined(CONFIG_440) || defined(CONFIG_405EP)) && defined(CONFIG_NET_MULTI)
+#define EMAC_NUM_DEV       2
+#else
+#define EMAC_NUM_DEV       1
+#endif
+
+
+/*ZMII Bridge Register addresses */
+#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
+
+/* ZMII FER Register Bit Definitions */
+#define ZMII_FER_MDI           (0x8)
+#define ZMII_FER_SMII          (0x4)
+#define ZMII_FER_RMII          (0x2)
+#define ZMII_FER_MII           (0x1)
+
+#define ZMII_FER_RSVD11                (0x00200000)
+#define ZMII_FER_RSVD10                (0x00100000)
+#define ZMII_FER_RSVD14_31     (0x0003FFFF)
+
+#define ZMII_FER_V(__x)                (((3 - __x) * 4) + 16)
+
+
+/* ZMII Speed Selection Register Bit Definitions */
+#define ZMII_SSR_SCI           (0x4)
+#define ZMII_SSR_FSS           (0x2)
+#define ZMII_SSR_SP            (0x1)
+#define ZMII_SSR_RSVD16_31     (0x0000FFFF)
+
+#define ZMII_SSR_V(__x)                (((3 - __x) * 4) + 16)
+
+
+/* ZMII SMII Status Register Bit Definitions */
+#define ZMII_SMIISR_E1         (0x80)
+#define ZMII_SMIISR_EC         (0x40)
+#define ZMII_SMIISR_EN         (0x20)
+#define ZMII_SMIISR_EJ         (0x10)
+#define ZMII_SMIISR_EL         (0x08)
+#define ZMII_SMIISR_ED         (0x04)
+#define ZMII_SMIISR_ES         (0x02)
+#define ZMII_SMIISR_EF         (0x01)
+
+#define ZMII_SMIISR_V(__x)     ((3 - __x) * 8)
+
+/* RGMII Register Addresses */
+#define RGMII_BASE             (CFG_PERIPHERAL_BASE + 0x0790)
+#define RGMII_FER              (RGMII_BASE + 0x00)
+#define RGMII_SSR              (RGMII_BASE + 0x04)
+
+/* RGMII Function Enable (FER) Register Bit Definitions */
+/* Note: for EMAC 2 and 3 only, 440GX only */
+#define RGMII_FER_DIS          (0x00)
+#define RGMII_FER_RTBI         (0x04)
+#define RGMII_FER_RGMII                (0x05)
+#define RGMII_FER_TBI          (0x06)
+#define RGMII_FER_GMII         (0x07)
+
+#define RGMII_FER_V(__x)       ((__x - 2) * 4)
+
+/* RGMII Speed Selection Register Bit Definitions */
+#define RGMII_SSR_SP_10MBPS    (0x00)
+#define RGMII_SSR_SP_100MBPS   (0x02)
+#define RGMII_SSR_SP_1000MBPS  (0x04)
+
+#define RGMII_SSR_V(__x)       ((__x -2) * 8)
+
+
+/*---------------------------------------------------------------------------+
+|  TCP/IP Acceleration Hardware (TAH) 440GX Only
++---------------------------------------------------------------------------*/
+#if defined(CONFIG_440GX)
+#define TAH_BASE               (CFG_PERIPHERAL_BASE + 0x0B50)
+#define TAH_REVID              (TAH_BASE + 0x0)    /* Revision ID (RO)*/
+#define TAH_MR                 (TAH_BASE + 0x10)   /* Mode Register (R/W) */
+#define TAH_SSR0               (TAH_BASE + 0x14)   /* Segment Size Reg 0 (R/W) */
+#define TAH_SSR1               (TAH_BASE + 0x18)   /* Segment Size Reg 1 (R/W) */
+#define TAH_SSR2               (TAH_BASE + 0x1C)   /* Segment Size Reg 2 (R/W) */
+#define TAH_SSR3               (TAH_BASE + 0x20)   /* Segment Size Reg 3 (R/W) */
+#define TAH_SSR4               (TAH_BASE + 0x24)   /* Segment Size Reg 4 (R/W) */
+#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 */
+
+#define TAH_REV_RN_V           (8)
+#define TAH_REV_BN_V           (0)
+
+/* TAH Mode Register */
+#define TAH_MR_CVR             (0x80000000)        /* Checksum verification on RX */
+#define TAH_MR_SR              (0x40000000)        /* Software reset */
+#define TAH_MR_ST              (0x3F000000)        /* Send Threshold */
+#define TAH_MR_TFS             (0x00E00000)        /* Transmit FIFO size */
+#define TAH_MR_DTFP            (0x00100000)        /* Disable TX FIFO parity */
+#define TAH_MR_DIG             (0x00080000)        /* Disable interrupt generation */
+#define TAH_MR_RSVD            (0x0007FFFF)        /* Reserved */
+
+#define TAH_MR_ST_V            (20)
+#define TAH_MR_TFS_V           (17)
+
+#define TAH_MR_TFS_2K          (0x1)               /* Transmit FIFO size 2Kbyte */
+#define TAH_MR_TFS_4K          (0x2)               /* Transmit FIFO size 4Kbyte */
+#define TAH_MR_TFS_6K          (0x3)               /* Transmit FIFO size 6Kbyte */
+#define TAH_MR_TFS_8K          (0x4)               /* Transmit FIFO size 8Kbyte */
+#define TAH_MR_TFS_10K         (0x5)               /* Transmit FIFO size 10Kbyte (max)*/
+
+
+/* TAH Segment Size Registers 0:5 */
+#define TAH_SSR_RSVD0          (0xC0000000)        /* Reserved */
+#define TAH_SSR_SS             (0x3FFE0000)        /* Segment size in multiples of 2 */
+#define TAH_SSR_RSVD1          (0x0001FFFF)        /* Reserved */
+
+/* TAH Transmit Status Register */
+#define TAH_TSR_TFTS           (0x80000000)        /* Transmit FIFO too small */
+#define TAH_TSR_UH             (0x40000000)        /* Unrecognized header */
+#define TAH_TSR_NIPF           (0x20000000)        /* Not IPv4 */
+#define TAH_TSR_IPOP           (0x10000000)        /* IP option present */
+#define TAH_TSR_NISF           (0x08000000)        /* No IEEE SNAP format */
+#define TAH_TSR_ILTS           (0x04000000)        /* IP length too short */
+#define TAH_TSR_IPFP           (0x02000000)        /* IP fragment present */
+#define TAH_TSR_UP             (0x01000000)        /* Unsupported protocol */
+#define TAH_TSR_TFP            (0x00800000)        /* TCP flags present */
+#define TAH_TSR_SUDP           (0x00400000)        /* Segmentation for UDP */
+#define TAH_TSR_DLM            (0x00200000)        /* Data length mismatch */
+#define TAH_TSR_SIEEE          (0x00100000)        /* Segmentation for IEEE */
+#define TAH_TSR_TFPE           (0x00080000)        /* Transmit FIFO parity error */
+#define TAH_TSR_SSTS           (0x00040000)        /* Segment size too small */
+#define TAH_TSR_RSVD           (0x0003FFFF)        /* Reserved */
+#endif /* CONFIG_440GX */
+
+
+/* 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)
+#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)
+
+/* on 440GX EMAC_MR1 has a different layout! */
+#if defined(CONFIG_440GX)
+/* 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_RSVD                   (0x06000000)
+#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_16K                        (0x00280000)    /* ~4k for 512 byte */
+#define EMAC_M1_RFS_8K                 (0x00200000)    /* ~4k for 512 byte */
+#define EMAC_M1_RFS_4K                 (0x00180000)    /* ~4k for 512 byte */
+#define EMAC_M1_RFS_2K                 (0x00100000)
+#define EMAC_M1_RFS_1K                 (0x00080000)
+#define EMAC_M1_TX_FIFO_16K            (0x00050000)    /* 0's for 512 byte */
+#define EMAC_M1_TX_FIFO_8K             (0x00040000)
+#define EMAC_M1_TX_FIFO_4K             (0x00030000)
+#define EMAC_M1_TX_FIFO_2K     (0x00020000)
+#define EMAC_M1_TX_FIFO_1K             (0x00010000)
+#define EMAC_M1_TR_MULTI               (0x00008000)    /* 0'x for single packet */
+#define EMAC_M1_MWSW           (0x00007000)
+#define EMAC_M1_JUMBO_ENABLE   (0x00000800)
+#define EMAC_M1_IPPA           (0x000007c0)
+#define EMAC_M1_OBCI_GT100     (0x00000020)
+#define EMAC_M1_OBCI_100       (0x00000018)
+#define EMAC_M1_OBCI_83                (0x00000010)
+#define EMAC_M1_OBCI_66                (0x00000008)
+#define EMAC_M1_RSVD1          (0x00000007)
+#else /* defined(CONFIG_440GX) */
+/* EMAC_MR1 is the same on 405GP, 405GPr, 405EP, 440GP, 440EP */
+#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
+#if defined(CONFIG_440EP) || defined(CONFIG_440GR)
+#define EMAC_M1_JUMBO_ENABLE           0x00001000
+#endif /* defined(CONFIG_440EP) || defined(CONFIG_440GR) */
+#endif /* defined(CONFIG_440GX) */
+
+/* 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)
+
+#endif /* _PPC4XX_ENET_H_ */
index 61862aaba9e2047c59374d7a5280ad42a9cc59e1..68dfcae7a7128ff851e65041fc7839ef9e8c06fa 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -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