diff options
Diffstat (limited to 'cpu/mpc8xx/scc.c')
| -rw-r--r-- | cpu/mpc8xx/scc.c | 555 | 
1 files changed, 285 insertions, 270 deletions
| diff --git a/cpu/mpc8xx/scc.c b/cpu/mpc8xx/scc.c index e0fae5d5b..1a15a7bf1 100644 --- a/cpu/mpc8xx/scc.c +++ b/cpu/mpc8xx/scc.c @@ -140,42 +140,43 @@ static int scc_send(struct eth_device* dev, volatile void *packet, int length)  	return i;  } -static int scc_recv(struct eth_device* dev) +static int scc_recv (struct eth_device *dev)  {  	int length; -   for (;;) { -	/* section 16.9.23.2 */ -	if (rtx->rxbd[rxIdx].cbd_sc & BD_ENET_RX_EMPTY) { -		length = -1; -		break;     /* nothing received - leave for() loop */ -	} +	for (;;) { +		/* section 16.9.23.2 */ +		if (rtx->rxbd[rxIdx].cbd_sc & BD_ENET_RX_EMPTY) { +			length = -1; +			break;	/* nothing received - leave for() loop */ +		} -	length = rtx->rxbd[rxIdx].cbd_datlen; +		length = rtx->rxbd[rxIdx].cbd_datlen; -	if (rtx->rxbd[rxIdx].cbd_sc & 0x003f) { +		if (rtx->rxbd[rxIdx].cbd_sc & 0x003f) {  #ifdef ET_DEBUG -		printf("err: %x\n", rtx->rxbd[rxIdx].cbd_sc); +			printf ("err: %x\n", rtx->rxbd[rxIdx].cbd_sc);  #endif -	} else { -		/* Pass the packet up to the protocol layers. */ -		NetReceive(NetRxPackets[rxIdx], length - 4); -	} +		} else { +			/* Pass the packet up to the protocol layers. */ +			NetReceive (NetRxPackets[rxIdx], length - 4); +		} -	/* Give the buffer back to the SCC. */ -	rtx->rxbd[rxIdx].cbd_datlen = 0; +		/* Give the buffer back to the SCC. */ +		rtx->rxbd[rxIdx].cbd_datlen = 0; -	/* wrap around buffer index when necessary */ -	if ((rxIdx + 1) >= PKTBUFSRX) { -	   rtx->rxbd[PKTBUFSRX - 1].cbd_sc = (BD_ENET_RX_WRAP | BD_ENET_RX_EMPTY); -	   rxIdx = 0; -	} else { -	   rtx->rxbd[rxIdx].cbd_sc = BD_ENET_RX_EMPTY; -	   rxIdx++; +		/* wrap around buffer index when necessary */ +		if ((rxIdx + 1) >= PKTBUFSRX) { +			rtx->rxbd[PKTBUFSRX - 1].cbd_sc = +				(BD_ENET_RX_WRAP | BD_ENET_RX_EMPTY); +			rxIdx = 0; +		} else { +			rtx->rxbd[rxIdx].cbd_sc = BD_ENET_RX_EMPTY; +			rxIdx++; +		}  	} -   } -   return length; +	return length;  }  /************************************************************** @@ -184,366 +185,380 @@ static int scc_recv(struct eth_device* dev)    *    *************************************************************/ -static int scc_init(struct eth_device* dev, bd_t *bis) +static int scc_init (struct eth_device *dev, bd_t * bis)  { -    int i; -    scc_enet_t *pram_ptr; +	int i; +	scc_enet_t *pram_ptr; -    volatile immap_t *immr = (immap_t *)CFG_IMMR; +	volatile immap_t *immr = (immap_t *) CFG_IMMR;  #ifdef CONFIG_FADS  #if defined(CONFIG_MPC86xADS) || defined(CONFIG_MPC860T) -    /* The MPC86xADS/FADS860T don't use the MODEM_EN or DATA_VOICE signals. */ -    *((uint *) BCSR4) &= ~BCSR4_ETHLOOP; -    *((uint *) BCSR4) |= BCSR4_TFPLDL|BCSR4_TPSQEL; -    *((uint *) BCSR1) &= ~BCSR1_ETHEN; +	/* The MPC86xADS/FADS860T don't use the MODEM_EN or DATA_VOICE signals. */ +	*((uint *) BCSR4) &= ~BCSR4_ETHLOOP; +	*((uint *) BCSR4) |= BCSR4_TFPLDL | BCSR4_TPSQEL; +	*((uint *) BCSR1) &= ~BCSR1_ETHEN;  #else -    *((uint *) BCSR4) &= ~(BCSR4_ETHLOOP|BCSR4_MODEM_EN); -    *((uint *) BCSR4) |= BCSR4_TFPLDL|BCSR4_TPSQEL|BCSR4_DATA_VOICE; -    *((uint *) BCSR1) &= ~BCSR1_ETHEN; +	*((uint *) BCSR4) &= ~(BCSR4_ETHLOOP | BCSR4_MODEM_EN); +	*((uint *) BCSR4) |= BCSR4_TFPLDL | BCSR4_TPSQEL | BCSR4_DATA_VOICE; +	*((uint *) BCSR1) &= ~BCSR1_ETHEN;  #endif  #endif -    pram_ptr = (scc_enet_t *)&(immr->im_cpm.cp_dparam[PROFF_ENET]); +	pram_ptr = (scc_enet_t *) & (immr->im_cpm.cp_dparam[PROFF_ENET]); -    rxIdx = 0; -    txIdx = 0; +	rxIdx = 0; +	txIdx = 0;  #ifdef CFG_ALLOC_DPRAM -    rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + -		     dpram_alloc_align(sizeof(RTXBD), 8)); +	rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + +			 dpram_alloc_align (sizeof (RTXBD), 8));  #else -    rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE); -#endif	/* 0 */ +	rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE); +#endif /* 0 */  #if (defined(PA_ENET_RXD) && defined(PA_ENET_TXD)) -    /* Configure port A pins for Txd and Rxd. -    */ -    immr->im_ioport.iop_papar |=  (PA_ENET_RXD | PA_ENET_TXD); -    immr->im_ioport.iop_padir &= ~(PA_ENET_RXD | PA_ENET_TXD); -    immr->im_ioport.iop_paodr &=                ~PA_ENET_TXD; +	/* Configure port A pins for Txd and Rxd. +	 */ +	immr->im_ioport.iop_papar |= (PA_ENET_RXD | PA_ENET_TXD); +	immr->im_ioport.iop_padir &= ~(PA_ENET_RXD | PA_ENET_TXD); +	immr->im_ioport.iop_paodr &= ~PA_ENET_TXD;  #elif (defined(PB_ENET_RXD) && defined(PB_ENET_TXD)) -    /* Configure port B pins for Txd and Rxd. -    */ -    immr->im_cpm.cp_pbpar |=  (PB_ENET_RXD | PB_ENET_TXD); -    immr->im_cpm.cp_pbdir &= ~(PB_ENET_RXD | PB_ENET_TXD); -    immr->im_cpm.cp_pbodr &=                ~PB_ENET_TXD; +	/* Configure port B pins for Txd and Rxd. +	 */ +	immr->im_cpm.cp_pbpar |= (PB_ENET_RXD | PB_ENET_TXD); +	immr->im_cpm.cp_pbdir &= ~(PB_ENET_RXD | PB_ENET_TXD); +	immr->im_cpm.cp_pbodr &= ~PB_ENET_TXD;  #else  #error Configuration Error: exactly ONE of PA_ENET_[RT]XD, PB_ENET_[RT]XD must be defined  #endif  #if defined(PC_ENET_LBK) -    /* Configure port C pins to disable External Loopback -     */ -    immr->im_ioport.iop_pcpar &= ~PC_ENET_LBK; -    immr->im_ioport.iop_pcdir |=  PC_ENET_LBK; -    immr->im_ioport.iop_pcso  &= ~PC_ENET_LBK; -    immr->im_ioport.iop_pcdat &= ~PC_ENET_LBK; /* Disable Loopback */ -#endif	/* PC_ENET_LBK */ +	/* Configure port C pins to disable External Loopback +	 */ +	immr->im_ioport.iop_pcpar &= ~PC_ENET_LBK; +	immr->im_ioport.iop_pcdir |= PC_ENET_LBK; +	immr->im_ioport.iop_pcso &= ~PC_ENET_LBK; +	immr->im_ioport.iop_pcdat &= ~PC_ENET_LBK;	/* Disable Loopback */ +#endif /* PC_ENET_LBK */ -    /* Configure port C pins to enable CLSN and RENA. -    */ -    immr->im_ioport.iop_pcpar &= ~(PC_ENET_CLSN | PC_ENET_RENA); -    immr->im_ioport.iop_pcdir &= ~(PC_ENET_CLSN | PC_ENET_RENA); -    immr->im_ioport.iop_pcso  |=  (PC_ENET_CLSN | PC_ENET_RENA); +	/* Configure port C pins to enable CLSN and RENA. +	 */ +	immr->im_ioport.iop_pcpar &= ~(PC_ENET_CLSN | PC_ENET_RENA); +	immr->im_ioport.iop_pcdir &= ~(PC_ENET_CLSN | PC_ENET_RENA); +	immr->im_ioport.iop_pcso |= (PC_ENET_CLSN | PC_ENET_RENA); -    /* Configure port A for TCLK and RCLK. -    */ -    immr->im_ioport.iop_papar |=  (PA_ENET_TCLK | PA_ENET_RCLK); -    immr->im_ioport.iop_padir &= ~(PA_ENET_TCLK | PA_ENET_RCLK); +	/* Configure port A for TCLK and RCLK. +	 */ +	immr->im_ioport.iop_papar |= (PA_ENET_TCLK | PA_ENET_RCLK); +	immr->im_ioport.iop_padir &= ~(PA_ENET_TCLK | PA_ENET_RCLK); -    /* -     * Configure Serial Interface clock routing -- see section 16.7.5.3 -     * First, clear all SCC bits to zero, then set the ones we want. -     */ +	/* +	 * Configure Serial Interface clock routing -- see section 16.7.5.3 +	 * First, clear all SCC bits to zero, then set the ones we want. +	 */ -    immr->im_cpm.cp_sicr &= ~SICR_ENET_MASK; -    immr->im_cpm.cp_sicr |= SICR_ENET_CLKRT; +	immr->im_cpm.cp_sicr &= ~SICR_ENET_MASK; +	immr->im_cpm.cp_sicr |= SICR_ENET_CLKRT; -    /* -     * Initialize SDCR -- see section 16.9.23.7 -     * SDMA configuration register -     */ -    immr->im_siu_conf.sc_sdcr = 0x01; +	/* +	 * Initialize SDCR -- see section 16.9.23.7 +	 * SDMA configuration register +	 */ +	immr->im_siu_conf.sc_sdcr = 0x01; -    /* -     * Setup SCC Ethernet Parameter RAM -     */ +	/* +	 * Setup SCC Ethernet Parameter RAM +	 */ -    pram_ptr->sen_genscc.scc_rfcr = 0x18;  /* Normal Operation and Mot byte ordering */ -    pram_ptr->sen_genscc.scc_tfcr = 0x18;  /* Mot byte ordering, Normal access */ +	pram_ptr->sen_genscc.scc_rfcr = 0x18;	/* Normal Operation and Mot byte ordering */ +	pram_ptr->sen_genscc.scc_tfcr = 0x18;	/* Mot byte ordering, Normal access */ -    pram_ptr->sen_genscc.scc_mrblr = DBUF_LENGTH;	/* max. ET package len 1520 */ +	pram_ptr->sen_genscc.scc_mrblr = DBUF_LENGTH;	/* max. ET package len 1520 */ -    pram_ptr->sen_genscc.scc_rbase = (unsigned int)(&rtx->rxbd[0]);      /* Set RXBD tbl start at Dual Port */ -    pram_ptr->sen_genscc.scc_tbase = (unsigned int)(&rtx->txbd[0]);      /* Set TXBD tbl start at Dual Port */ +	pram_ptr->sen_genscc.scc_rbase = (unsigned int) (&rtx->rxbd[0]);	/* Set RXBD tbl start at Dual Port */ +	pram_ptr->sen_genscc.scc_tbase = (unsigned int) (&rtx->txbd[0]);	/* Set TXBD tbl start at Dual Port */ -    /* -     * Setup Receiver Buffer Descriptors (13.14.24.18) -     * Settings: -     *     Empty, Wrap -     */ +	/* +	 * Setup Receiver Buffer Descriptors (13.14.24.18) +	 * Settings: +	 *     Empty, Wrap +	 */ -    for (i = 0; i < PKTBUFSRX; i++) -    { -      rtx->rxbd[i].cbd_sc = BD_ENET_RX_EMPTY; -      rtx->rxbd[i].cbd_datlen = 0;                                 /* Reset */ -      rtx->rxbd[i].cbd_bufaddr = (uint)NetRxPackets[i]; -    } +	for (i = 0; i < PKTBUFSRX; i++) { +		rtx->rxbd[i].cbd_sc = BD_ENET_RX_EMPTY; +		rtx->rxbd[i].cbd_datlen = 0;	/* Reset */ +		rtx->rxbd[i].cbd_bufaddr = (uint) NetRxPackets[i]; +	} -    rtx->rxbd[PKTBUFSRX - 1].cbd_sc |= BD_ENET_RX_WRAP; +	rtx->rxbd[PKTBUFSRX - 1].cbd_sc |= BD_ENET_RX_WRAP; -    /* -     * Setup Ethernet Transmitter Buffer Descriptors (13.14.24.19) -     * Settings: -     *    Add PADs to Short FRAMES, Wrap, Last, Tx CRC -     */ +	/* +	 * Setup Ethernet Transmitter Buffer Descriptors (13.14.24.19) +	 * Settings: +	 *    Add PADs to Short FRAMES, Wrap, Last, Tx CRC +	 */ -    for (i = 0; i < TX_BUF_CNT; i++) -    { -      rtx->txbd[i].cbd_sc = (BD_ENET_TX_PAD | BD_ENET_TX_LAST | BD_ENET_TX_TC); -      rtx->txbd[i].cbd_datlen = 0;                                 /* Reset */ -      rtx->txbd[i].cbd_bufaddr = (uint) (&txbuf[0]); -    } +	for (i = 0; i < TX_BUF_CNT; i++) { +		rtx->txbd[i].cbd_sc = +			(BD_ENET_TX_PAD | BD_ENET_TX_LAST | BD_ENET_TX_TC); +		rtx->txbd[i].cbd_datlen = 0;	/* Reset */ +		rtx->txbd[i].cbd_bufaddr = (uint) (&txbuf[0]); +	} -    rtx->txbd[TX_BUF_CNT - 1].cbd_sc |= BD_ENET_TX_WRAP; +	rtx->txbd[TX_BUF_CNT - 1].cbd_sc |= BD_ENET_TX_WRAP; -    /* -     * Enter Command:  Initialize Rx Params for SCC -     */ +	/* +	 * Enter Command:  Initialize Rx Params for SCC +	 */ -    do {				/* Spin until ready to issue command	*/ -	__asm__ ("eieio"); -    } while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); -    /* Issue command */ -    immr->im_cpm.cp_cpcr = ((CPM_CR_INIT_RX << 8) | (CPM_CR_ENET << 4) | CPM_CR_FLG); -    do {				/* Spin until command processed		*/ -	__asm__ ("eieio"); -    } while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); +	do {			/* Spin until ready to issue command    */ +		__asm__ ("eieio"); +	} while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); +	/* Issue command */ +	immr->im_cpm.cp_cpcr = +		((CPM_CR_INIT_RX << 8) | (CPM_CR_ENET << 4) | CPM_CR_FLG); +	do {			/* Spin until command processed         */ +		__asm__ ("eieio"); +	} while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); -    /* -     * Ethernet Specific Parameter RAM -     *     see table 13-16, pg. 660, -     *     pg. 681 (example with suggested settings) -     */ +	/* +	 * Ethernet Specific Parameter RAM +	 *     see table 13-16, pg. 660, +	 *     pg. 681 (example with suggested settings) +	 */ -    pram_ptr->sen_cpres  = ~(0x0);	/* Preset CRC */ -    pram_ptr->sen_cmask  = 0xdebb20e3;	/* Constant Mask for CRC */ -    pram_ptr->sen_crcec  = 0x0;		/* Error Counter CRC (unused) */ -    pram_ptr->sen_alec   = 0x0;		/* Alignment Error Counter (unused) */ -    pram_ptr->sen_disfc  = 0x0;		/* Discard Frame Counter (unused) */ -    pram_ptr->sen_pads   = 0x8888;	/* Short Frame PAD Characters */ +	pram_ptr->sen_cpres = ~(0x0);	/* Preset CRC */ +	pram_ptr->sen_cmask = 0xdebb20e3;	/* Constant Mask for CRC */ +	pram_ptr->sen_crcec = 0x0;	/* Error Counter CRC (unused) */ +	pram_ptr->sen_alec = 0x0;	/* Alignment Error Counter (unused) */ +	pram_ptr->sen_disfc = 0x0;	/* Discard Frame Counter (unused) */ +	pram_ptr->sen_pads = 0x8888;	/* Short Frame PAD Characters */ -    pram_ptr->sen_retlim = 15;		/* Retry Limit Threshold */ -    pram_ptr->sen_maxflr = 1518;	/* MAX Frame Length Register */ -    pram_ptr->sen_minflr = 64;		/* MIN Frame Length Register */ +	pram_ptr->sen_retlim = 15;	/* Retry Limit Threshold */ +	pram_ptr->sen_maxflr = 1518;	/* MAX Frame Length Register */ +	pram_ptr->sen_minflr = 64;	/* MIN Frame Length Register */ -    pram_ptr->sen_maxd1  = DBUF_LENGTH;	/* MAX DMA1 Length Register */ -    pram_ptr->sen_maxd2  = DBUF_LENGTH;	/* MAX DMA2 Length Register */ +	pram_ptr->sen_maxd1 = DBUF_LENGTH;	/* MAX DMA1 Length Register */ +	pram_ptr->sen_maxd2 = DBUF_LENGTH;	/* MAX DMA2 Length Register */ -    pram_ptr->sen_gaddr1 = 0x0;		/* Group Address Filter 1 (unused) */ -    pram_ptr->sen_gaddr2 = 0x0;		/* Group Address Filter 2 (unused) */ -    pram_ptr->sen_gaddr3 = 0x0;		/* Group Address Filter 3 (unused) */ -    pram_ptr->sen_gaddr4 = 0x0;		/* Group Address Filter 4 (unused) */ +	pram_ptr->sen_gaddr1 = 0x0;	/* Group Address Filter 1 (unused) */ +	pram_ptr->sen_gaddr2 = 0x0;	/* Group Address Filter 2 (unused) */ +	pram_ptr->sen_gaddr3 = 0x0;	/* Group Address Filter 3 (unused) */ +	pram_ptr->sen_gaddr4 = 0x0;	/* Group Address Filter 4 (unused) */  #define ea eth_get_dev()->enetaddr -    pram_ptr->sen_paddrh = (ea[5] << 8) + ea[4]; -    pram_ptr->sen_paddrm = (ea[3] << 8) + ea[2]; -    pram_ptr->sen_paddrl = (ea[1] << 8) + ea[0]; +	pram_ptr->sen_paddrh = (ea[5] << 8) + ea[4]; +	pram_ptr->sen_paddrm = (ea[3] << 8) + ea[2]; +	pram_ptr->sen_paddrl = (ea[1] << 8) + ea[0];  #undef ea -    pram_ptr->sen_pper   = 0x0;		/* Persistence (unused) */ -    pram_ptr->sen_iaddr1 = 0x0;		/* Individual Address Filter 1 (unused) */ -    pram_ptr->sen_iaddr2 = 0x0;		/* Individual Address Filter 2 (unused) */ -    pram_ptr->sen_iaddr3 = 0x0;		/* Individual Address Filter 3 (unused) */ -    pram_ptr->sen_iaddr4 = 0x0;		/* Individual Address Filter 4 (unused) */ -    pram_ptr->sen_taddrh = 0x0;		/* Tmp Address (MSB) (unused) */ -    pram_ptr->sen_taddrm = 0x0;		/* Tmp Address (unused) */ -    pram_ptr->sen_taddrl = 0x0;		/* Tmp Address (LSB) (unused) */ +	pram_ptr->sen_pper = 0x0;	/* Persistence (unused) */ +	pram_ptr->sen_iaddr1 = 0x0;	/* Individual Address Filter 1 (unused) */ +	pram_ptr->sen_iaddr2 = 0x0;	/* Individual Address Filter 2 (unused) */ +	pram_ptr->sen_iaddr3 = 0x0;	/* Individual Address Filter 3 (unused) */ +	pram_ptr->sen_iaddr4 = 0x0;	/* Individual Address Filter 4 (unused) */ +	pram_ptr->sen_taddrh = 0x0;	/* Tmp Address (MSB) (unused) */ +	pram_ptr->sen_taddrm = 0x0;	/* Tmp Address (unused) */ +	pram_ptr->sen_taddrl = 0x0;	/* Tmp Address (LSB) (unused) */ -    /* -     * Enter Command:  Initialize Tx Params for SCC -     */ +	/* +	 * Enter Command:  Initialize Tx Params for SCC +	 */ -    do {				/* Spin until ready to issue command	*/ -	__asm__ ("eieio"); -    } while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); -    /* Issue command */ -    immr->im_cpm.cp_cpcr = ((CPM_CR_INIT_TX << 8) | (CPM_CR_ENET << 4) | CPM_CR_FLG); -    do {				/* Spin until command processed		*/ -	__asm__ ("eieio"); -    } while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); +	do {			/* Spin until ready to issue command    */ +		__asm__ ("eieio"); +	} while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); +	/* Issue command */ +	immr->im_cpm.cp_cpcr = +		((CPM_CR_INIT_TX << 8) | (CPM_CR_ENET << 4) | CPM_CR_FLG); +	do {			/* Spin until command processed         */ +		__asm__ ("eieio"); +	} while (immr->im_cpm.cp_cpcr & CPM_CR_FLG); -    /* -     * Mask all Events in SCCM - we use polling mode -     */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_sccm = 0; +	/* +	 * Mask all Events in SCCM - we use polling mode +	 */ +	immr->im_cpm.cp_scc[SCC_ENET].scc_sccm = 0; -    /* -     * Clear Events in SCCE -- Clear bits by writing 1's -     */ +	/* +	 * Clear Events in SCCE -- Clear bits by writing 1's +	 */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_scce = ~(0x0); +	immr->im_cpm.cp_scc[SCC_ENET].scc_scce = ~(0x0); -    /* -     * Initialize GSMR High 32-Bits -     * Settings:  Normal Mode -     */ +	/* +	 * Initialize GSMR High 32-Bits +	 * Settings:  Normal Mode +	 */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrh = 0; +	immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrh = 0; -    /* -     * Initialize GSMR Low 32-Bits, but do not Enable Transmit/Receive -     * Settings: -     *     TCI = Invert -     *     TPL =  48 bits -     *     TPP = Repeating 10's -     *     MODE = Ethernet -     */ +	/* +	 * Initialize GSMR Low 32-Bits, but do not Enable Transmit/Receive +	 * Settings: +	 *     TCI = Invert +	 *     TPL =  48 bits +	 *     TPP = Repeating 10's +	 *     MODE = Ethernet +	 */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl = (	SCC_GSMRL_TCI	 |	\ -						SCC_GSMRL_TPL_48 |	\ -						SCC_GSMRL_TPP_10 |	\ -						SCC_GSMRL_MODE_ENET); +	immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl = (SCC_GSMRL_TCI | +						   SCC_GSMRL_TPL_48 | +						   SCC_GSMRL_TPP_10 | +						   SCC_GSMRL_MODE_ENET); -    /* -     * Initialize the DSR -- see section 13.14.4 (pg. 513) v0.4 -     */ +	/* +	 * Initialize the DSR -- see section 13.14.4 (pg. 513) v0.4 +	 */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_dsr = 0xd555; +	immr->im_cpm.cp_scc[SCC_ENET].scc_dsr = 0xd555; -    /* -     * Initialize the PSMR -     * Settings: -     *	CRC = 32-Bit CCITT -     *	NIB = Begin searching for SFD 22 bits after RENA -     *	FDE = Full Duplex Enable -     *	LPB = Loopback Enable (Needed when FDE is set) -     *	BRO = Reject broadcast packets -     *	PROMISCOUS = Catch all packets regardless of dest. MAC adress -     */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_psmr  =	SCC_PSMR_ENCRC	| -						SCC_PSMR_NIB22	| +	/* +	 * Initialize the PSMR +	 * Settings: +	 *  CRC = 32-Bit CCITT +	 *  NIB = Begin searching for SFD 22 bits after RENA +	 *  FDE = Full Duplex Enable +	 *  LPB = Loopback Enable (Needed when FDE is set) +	 *  BRO = Reject broadcast packets +	 *  PROMISCOUS = Catch all packets regardless of dest. MAC adress +	 */ +	immr->im_cpm.cp_scc[SCC_ENET].scc_psmr = SCC_PSMR_ENCRC | +		SCC_PSMR_NIB22 |  #if defined(CONFIG_SCC_ENET_FULL_DUPLEX) -						SCC_PSMR_FDE	| -						SCC_PSMR_LPB	| +		SCC_PSMR_FDE | SCC_PSMR_LPB |  #endif  #if defined(CONFIG_SCC_ENET_NO_BROADCAST) -						SCC_PSMR_BRO	| +		SCC_PSMR_BRO |  #endif  #if defined(CONFIG_SCC_ENET_PROMISCOUS) -						SCC_PSMR_PRO	| +		SCC_PSMR_PRO |  #endif -						0; +		0; -    /* -     * Configure Ethernet TENA Signal -     */ +	/* +	 * Configure Ethernet TENA Signal +	 */  #if (defined(PC_ENET_TENA) && !defined(PB_ENET_TENA)) -    immr->im_ioport.iop_pcpar |=  PC_ENET_TENA; -    immr->im_ioport.iop_pcdir &= ~PC_ENET_TENA; +	immr->im_ioport.iop_pcpar |= PC_ENET_TENA; +	immr->im_ioport.iop_pcdir &= ~PC_ENET_TENA;  #elif (defined(PB_ENET_TENA) && !defined(PC_ENET_TENA)) -    immr->im_cpm.cp_pbpar |= PB_ENET_TENA; -    immr->im_cpm.cp_pbdir |= PB_ENET_TENA; +	immr->im_cpm.cp_pbpar |= PB_ENET_TENA; +	immr->im_cpm.cp_pbdir |= PB_ENET_TENA;  #else  #error Configuration Error: exactly ONE of PB_ENET_TENA, PC_ENET_TENA must be defined  #endif  #if defined(CONFIG_ADS) && defined(CONFIG_MPC860) -    /* -     * Port C is used to control the PHY,MC68160. -     */ -    immr->im_ioport.iop_pcdir |= -	(PC_ENET_ETHLOOP | PC_ENET_TPFLDL | PC_ENET_TPSQEL); +	/* +	 * Port C is used to control the PHY,MC68160. +	 */ +	immr->im_ioport.iop_pcdir |= +		(PC_ENET_ETHLOOP | PC_ENET_TPFLDL | PC_ENET_TPSQEL); -    immr->im_ioport.iop_pcdat |= PC_ENET_TPFLDL; -    immr->im_ioport.iop_pcdat &= ~(PC_ENET_ETHLOOP | PC_ENET_TPSQEL); -    *((uint *) BCSR1) &= ~BCSR1_ETHEN; -#endif	/* MPC860ADS */ +	immr->im_ioport.iop_pcdat |= PC_ENET_TPFLDL; +	immr->im_ioport.iop_pcdat &= ~(PC_ENET_ETHLOOP | PC_ENET_TPSQEL); +	*((uint *) BCSR1) &= ~BCSR1_ETHEN; +#endif /* MPC860ADS */  #if defined(CONFIG_AMX860) -    /* -     * Port B is used to control the PHY,MC68160. -     */ -    immr->im_cpm.cp_pbdir |= -	(PB_ENET_ETHLOOP | PB_ENET_TPFLDL | PB_ENET_TPSQEL); +	/* +	 * Port B is used to control the PHY,MC68160. +	 */ +	immr->im_cpm.cp_pbdir |= +		(PB_ENET_ETHLOOP | PB_ENET_TPFLDL | PB_ENET_TPSQEL); -    immr->im_cpm.cp_pbdat |= PB_ENET_TPFLDL; -    immr->im_cpm.cp_pbdat &= ~(PB_ENET_ETHLOOP | PB_ENET_TPSQEL); +	immr->im_cpm.cp_pbdat |= PB_ENET_TPFLDL; +	immr->im_cpm.cp_pbdat &= ~(PB_ENET_ETHLOOP | PB_ENET_TPSQEL); -    immr->im_ioport.iop_pddir |= PD_ENET_ETH_EN; -    immr->im_ioport.iop_pddat &= ~PD_ENET_ETH_EN; -#endif  /* AMX860 */ +	immr->im_ioport.iop_pddir |= PD_ENET_ETH_EN; +	immr->im_ioport.iop_pddat &= ~PD_ENET_ETH_EN; +#endif /* AMX860 */  #ifdef CONFIG_RPXCLASSIC -    *((uchar *)BCSR0) &= ~BCSR0_ETHLPBK; -    *((uchar *)BCSR0) |= (BCSR0_ETHEN | BCSR0_COLTEST | BCSR0_FULLDPLX); +	*((uchar *) BCSR0) &= ~BCSR0_ETHLPBK; +	*((uchar *) BCSR0) |= (BCSR0_ETHEN | BCSR0_COLTEST | BCSR0_FULLDPLX);  #endif  #ifdef CONFIG_RPXLITE -    *((uchar *)BCSR0) |= BCSR0_ETHEN ; +	*((uchar *) BCSR0) |= BCSR0_ETHEN;  #endif +#if defined(CONFIG_QS860T) +	/* +	 * PB27=FDE-, set output low for full duplex +	 * PB26=Link Test Enable, normally high output +	 */ +	immr->im_cpm.cp_pbdir |= 0x00000030; +	immr->im_cpm.cp_pbdat |= 0x00000020; +	immr->im_cpm.cp_pbdat &= ~0x00000010; +#endif /* QS860T */ +  #ifdef CONFIG_MBX -    board_ether_init(); +	board_ether_init ();  #endif  #if defined(CONFIG_NETVIA)  #if defined(PA_ENET_PDN) -    immr->im_ioport.iop_papar &= ~PA_ENET_PDN; -    immr->im_ioport.iop_padir |=  PA_ENET_PDN; -    immr->im_ioport.iop_padat |=  PA_ENET_PDN; +	immr->im_ioport.iop_papar &= ~PA_ENET_PDN; +	immr->im_ioport.iop_padir |= PA_ENET_PDN; +	immr->im_ioport.iop_padat |= PA_ENET_PDN;  #elif defined(PB_ENET_PDN) -    immr->im_cpm.cp_pbpar &= ~PB_ENET_PDN; -    immr->im_cpm.cp_pbdir |=  PB_ENET_PDN; -    immr->im_cpm.cp_pbdat |=  PB_ENET_PDN; +	immr->im_cpm.cp_pbpar &= ~PB_ENET_PDN; +	immr->im_cpm.cp_pbdir |= PB_ENET_PDN; +	immr->im_cpm.cp_pbdat |= PB_ENET_PDN;  #elif defined(PC_ENET_PDN) -    immr->im_ioport.iop_pcpar &= ~PC_ENET_PDN; -    immr->im_ioport.iop_pcdir |=  PC_ENET_PDN; -    immr->im_ioport.iop_pcdat |=  PC_ENET_PDN; +	immr->im_ioport.iop_pcpar &= ~PC_ENET_PDN; +	immr->im_ioport.iop_pcdir |= PC_ENET_PDN; +	immr->im_ioport.iop_pcdat |= PC_ENET_PDN;  #elif defined(PD_ENET_PDN) -    immr->im_ioport.iop_pdpar &= ~PD_ENET_PDN; -    immr->im_ioport.iop_pddir |=  PD_ENET_PDN; -    immr->im_ioport.iop_pddat |=  PD_ENET_PDN; +	immr->im_ioport.iop_pdpar &= ~PD_ENET_PDN; +	immr->im_ioport.iop_pddir |= PD_ENET_PDN; +	immr->im_ioport.iop_pddat |= PD_ENET_PDN;  #endif  #endif -    /* -     * Set the ENT/ENR bits in the GSMR Low -- Enable Transmit/Receive -     */ +	/* +	 * Set the ENT/ENR bits in the GSMR Low -- Enable Transmit/Receive +	 */ -    immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT); +	immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl |= +		(SCC_GSMRL_ENR | SCC_GSMRL_ENT); -    /* -     * Work around transmit problem with first eth packet -     */ +	/* +	 * Work around transmit problem with first eth packet +	 */  #if defined (CONFIG_FADS) -    udelay(10000);	/* wait 10 ms */ +	udelay (10000);		/* wait 10 ms */  #elif defined (CONFIG_AMX860) || defined(CONFIG_RPXCLASSIC) -    udelay(100000);	/* wait 100 ms */ +	udelay (100000);	/* wait 100 ms */  #endif -    return 1; +	return 1;  } -static void scc_halt(struct eth_device* dev) +static void scc_halt (struct eth_device *dev)  { -    volatile immap_t *immr = (immap_t *)CFG_IMMR; -    immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT); +	volatile immap_t *immr = (immap_t *) CFG_IMMR; + +	immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl &= +		~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);  }  #if 0 -void restart(void) +void restart (void)  { -   volatile immap_t *immr = (immap_t *)CFG_IMMR; -   immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT); +	volatile immap_t *immr = (immap_t *) CFG_IMMR; + +	immr->im_cpm.cp_scc[SCC_ENET].scc_gsmrl |= +		(SCC_GSMRL_ENR | SCC_GSMRL_ENT);  }  #endif -  #endif	/* CFG_CMD_NET, SCC_ENET */ |