- Better handling in ethernet MII, applied new DMA functions

Regards, TsiChung Liew

Signed-off by: TsiChung Liew Tsi-Chung.Liew@freescale.com

diff -rupN u-boot-all.git/cpu/mpc8220/MCD_tasksInit.c u-boot-all-8220- fec/cpu/mpc8220/MCD_tasksInit.c --- u-boot-all.git/cpu/mpc8220/MCD_tasksInit.c 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-all-8220-fec/cpu/mpc8220/MCD_tasksInit.c 2007-05-10 17:53:38.000000000 -0500 @@ -0,0 +1,253 @@ +/* + * (C) Copyright 2004 + * Freescale Semiconductor + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* + * File: MCD_tasksInit.c + * Purpose: Functions for initializing variable tables of different + * types of tasks. + * + * Notes: + */ + +/* + * Do not edit! + */ + +#include "MCD_dma.h" + +extern dmaRegs *MCD_dmaBar; + +/* + * Task 0 + */ + +void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 2, (u32) currBD); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) xferSize); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) 0x00000000); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x00000000); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 13, (u32) 0x80000000); /* var[13] */ + MCD_SET_VAR(taskTable + channel, 14, (u32) 0x00000010); /* var[14] */ + MCD_SET_VAR(taskTable + channel, 15, (u32) 0x00000004); /* var[15] */ + MCD_SET_VAR(taskTable + channel, 16, (u32) 0x08000000); /* var[16] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0x80000000); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x80000001); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x40000000); /* inc[6] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 1 + */ + +void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 7, (u32) srcAddr); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) destAddr); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) dmaSize); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) flags); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) currBD); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000004); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x08000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0x80000001); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x40000000); /* inc[5] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 2 + */ + +void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 3, (u32) currBD); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) xferSize); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) 0x00000000); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) 0x00000000); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 13, (u32) 0x00000000); /* var[13] */ + MCD_SET_VAR(taskTable + channel, 14, (u32) 0x80000000); /* var[14] */ + MCD_SET_VAR(taskTable + channel, 15, (u32) 0x00000010); /* var[15] */ + MCD_SET_VAR(taskTable + channel, 16, (u32) 0x00000001); /* var[16] */ + MCD_SET_VAR(taskTable + channel, 17, (u32) 0x00000004); /* var[17] */ + MCD_SET_VAR(taskTable + channel, 18, (u32) 0x08000000); /* var[18] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0x80000000); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0xc0000000); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x80000001); /* inc[6] */ + MCD_SET_VAR(taskTable + channel, 31, (u32) 0x40000000); /* inc[7] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 3 + */ + +void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 8, (u32) srcAddr); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) (0xe000 << 16) | (0xffff & srcIncr)); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) destAddr); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) (0xe000 << 16) | (0xffff & destIncr)); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) dmaSize); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) (0x2000 << 16) | (0xffff & xferSizeIncr)); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) flags); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) currBD); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 0, (u32) cSave); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000001); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) 0x00000004); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x08000000); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x00000000); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0xc0000000); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x80000000); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x80000001); /* inc[6] */ + MCD_SET_VAR(taskTable + channel, 31, (u32) 0x40000000); /* inc[7] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 4 + */ + +void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 0, (u32) bDBase); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) currBD); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) rcvFifoPtr); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) 0x00000000); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x0000ffff); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x30000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) 0x0fffffff); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x00000008); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) 0x00000000); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) 0x60000000); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) 0x20000004); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0x40000000); /* inc[3] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} + +/* + * Task 5 + */ + +void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, + volatile TaskTableEntry * taskTable, int channel) +{ + + MCD_SET_VAR(taskTable + channel, 0, (u32) bDBase); /* var[0] */ + MCD_SET_VAR(taskTable + channel, 3, (u32) currBD); /* var[3] */ + MCD_SET_VAR(taskTable + channel, 11, (u32) xmitFifoPtr); /* var[11] */ + MCD_SET_VAR(taskTable + channel, 1, (u32) 0x00000000); /* var[1] */ + MCD_SET_VAR(taskTable + channel, 2, (u32) 0x00000000); /* var[2] */ + MCD_SET_VAR(taskTable + channel, 4, (u32) 0x00000000); /* var[4] */ + MCD_SET_VAR(taskTable + channel, 5, (u32) 0x00000000); /* var[5] */ + MCD_SET_VAR(taskTable + channel, 6, (u32) 0x00000000); /* var[6] */ + MCD_SET_VAR(taskTable + channel, 7, (u32) 0x00000000); /* var[7] */ + MCD_SET_VAR(taskTable + channel, 8, (u32) 0x00000000); /* var[8] */ + MCD_SET_VAR(taskTable + channel, 9, (u32) 0x00000000); /* var[9] */ + MCD_SET_VAR(taskTable + channel, 10, (u32) 0x00000000); /* var[10] */ + MCD_SET_VAR(taskTable + channel, 12, (u32) 0x00000000); /* var[12] */ + MCD_SET_VAR(taskTable + channel, 13, (u32) 0x0000ffff); /* var[13] */ + MCD_SET_VAR(taskTable + channel, 14, (u32) 0xffffffff); /* var[14] */ + MCD_SET_VAR(taskTable + channel, 15, (u32) 0x00000004); /* var[15] */ + MCD_SET_VAR(taskTable + channel, 16, (u32) 0x00000008); /* var[16] */ + MCD_SET_VAR(taskTable + channel, 24, (u32) 0x00000000); /* inc[0] */ + MCD_SET_VAR(taskTable + channel, 25, (u32) 0x60000000); /* inc[1] */ + MCD_SET_VAR(taskTable + channel, 26, (u32) 0x40000000); /* inc[2] */ + MCD_SET_VAR(taskTable + channel, 27, (u32) 0xc000fffc); /* inc[3] */ + MCD_SET_VAR(taskTable + channel, 28, (u32) 0xe0000004); /* inc[4] */ + MCD_SET_VAR(taskTable + channel, 29, (u32) 0x80000000); /* inc[5] */ + MCD_SET_VAR(taskTable + channel, 30, (u32) 0x4000ffff); /* inc[6] */ + MCD_SET_VAR(taskTable + channel, 31, (u32) 0xe0000001); /* inc[7] */ + + /* Set the task's Enable bit in its Task Control Register */ + MCD_dmaBar->taskControl[channel] |= (u16) 0x8000; +} diff -rupN u-boot-all.git/cpu/mpc8220/MCD_tasksInit.h u-boot-all-8220- fec/cpu/mpc8220/MCD_tasksInit.h --- u-boot-all.git/cpu/mpc8220/MCD_tasksInit.h 1969-12-31 18:00:00.000000000 -0600 +++ u-boot-all-8220-fec/cpu/mpc8220/MCD_tasksInit.h 2007-05-10 17:53:38.000000000 -0500 @@ -0,0 +1,73 @@ +/* + * (C) Copyright 2004 + * Freescale Semiconductor + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef MCD_TSK_INIT_H +#define MCD_TSK_INIT_H 1 + +/* + * Do not edit! + */ + +/* + * Task 0 + */ +void MCD_startDmaChainNoEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 1 + */ +void MCD_startDmaSingleNoEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 2 + */ +void MCD_startDmaChainEu(int *currBD, short srcIncr, short destIncr, + int xferSize, short xferSizeIncr, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 3 + */ +void MCD_startDmaSingleEu(char *srcAddr, short srcIncr, char *destAddr, + short destIncr, int dmaSize, short xferSizeIncr, + int flags, int *currBD, int *cSave, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 4 + */ +void MCD_startDmaENetRcv(char *bDBase, char *currBD, char *rcvFifoPtr, + volatile TaskTableEntry * taskTable, int channel); + +/* + * Task 5 + */ +void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, + volatile TaskTableEntry * taskTable, int channel); + +#endif /* MCD_TSK_INIT_H */ diff -rupN u-boot-all.git/include/configs/Alaska8220.h u-boot-all-8220- fec/include/configs/Alaska8220.h --- u-boot-all.git/include/configs/Alaska8220.h 2007-04-03 19:18:56.000000000 -0500 +++ u-boot-all-8220-fec/include/configs/Alaska8220.h 2007-05-10 19:47:01.438535584 -0500 @@ -274,8 +274,8 @@ */ #define CONFIG_MPC8220_FEC 1 #define CONFIG_FEC_10MBIT 1 /* Workaround for FEC 100Mbit problem */ -#define CONFIG_PHY_ADDR 0x18 - +#define CONFIG_PHY_ADDR 0x00 +#define CONFIG_PHY1_ADDR 0x18

/* * Miscellaneous configurable options