RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2011-02-25 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* mpc83xx/network/tsec.c: New default MAC configuration.  Set MDIO
	clock according to actual CCB frequency.  Print media info only if we
	have a PHY.  Avoid infinite loop in media adaption.
This commit is contained in:
Sebastian Huber
2011-02-25 13:34:41 +00:00
parent d83ae4abe1
commit 06280c35de
2 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libcpu/powerpc/ChangeLog
View File

@@ -1,3 +1,9 @@
2011-02-25 Sebastian Huber <sebastian.huber@embedded-brains.de>
* mpc83xx/network/tsec.c: New default MAC configuration. Set MDIO
clock according to actual CCB frequency. Print media info only if we
have a PHY. Avoid infinite loop in media adaption.
2011-02-17 Sebastian Huber <sebastian.huber@embedded-brains.de> 2011-02-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
* new-exceptions/bspsupport/vectors.h: Added defines PPC_EXC_GPR_TYPE, * new-exceptions/bspsupport/vectors.h: Added defines PPC_EXC_GPR_TYPE,

55
c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c
View File

@@ -279,6 +279,7 @@ static void tsec_hwinit
* init MACCFG2 register * init MACCFG2 register
*/ */
reg_ptr->maccfg2 = ((reg_ptr->maccfg2 & TSEC_MACCFG2_IFMODE_MSK) reg_ptr->maccfg2 = ((reg_ptr->maccfg2 & TSEC_MACCFG2_IFMODE_MSK)
| TSEC_MACCFG2_IFMODE_BYT
| TSEC_MACCFG2_PRELEN( 7) | TSEC_MACCFG2_PRELEN( 7)
| TSEC_MACCFG2_FULLDUPLEX); | TSEC_MACCFG2_FULLDUPLEX);
@@ -330,13 +331,21 @@ static void tsec_mdio_init
| <none> | | <none> |
\*=========================================================================*/ \*=========================================================================*/
{ {
static const uint8_t divider [] = { 64, 64, 96, 128, 160, 224, 320, 448 };
size_t n = sizeof(divider) / sizeof(divider [0]);
size_t i = 0;
uint32_t clock = UINT32_MAX;
/* Set TSEC registers for MDIO communication */ /* Set TSEC registers for MDIO communication */
/* /*
* set clock divider * set clock divider
*/ */
sc->mdio_ptr->miimcfg = 3; for (i = 0; i < n && clock > 2500000; ++i) {
clock = BSP_bus_frequency / divider [i];
}
sc->mdio_ptr->miimcfg = i;
} }
/*=========================================================================*\ /*=========================================================================*\
@@ -1557,19 +1566,23 @@ static void tsec_stats
| <none> | | <none> |
\*=========================================================================*/ \*=========================================================================*/
{ {
int media; if (sc->phy_default >= 0) {
int result; int media;
/* int result;
* fetch/print media info /*
*/ * fetch/print media info
media = IFM_MAKEWORD(0,0,0,sc->phy_default); /* fetch from default phy */ */
media = IFM_MAKEWORD(0,0,0,sc->phy_default); /* fetch from default phy */
result = tsec_ioctl(&(sc->arpcom.ac_if),
SIOCGIFMEDIA, result = tsec_ioctl(&(sc->arpcom.ac_if),
(caddr_t)&media); SIOCGIFMEDIA,
if (result == 0) { (caddr_t)&media);
rtems_ifmedia2str(media,NULL,0); if (result == 0) {
printf ("\n"); rtems_ifmedia2str(media,NULL,0);
printf ("\n");
} else {
printf ("PHY communication error\n");
}
} }
#if 0 /* print all PHY registers */ #if 0 /* print all PHY registers */
{ {
@@ -1740,15 +1753,13 @@ static int tsec_mode_adapt
return result; return result;
} }
/* /*
* wait for auto-negotiation to terminate * check auto-negotiation status
*/ */
do { media = IFM_MAKEWORD(0,0,0,sc->phy_default);
media = IFM_MAKEWORD(0,0,0,sc->phy_default); result = tsec_ioctl(ifp,SIOCGIFMEDIA,(caddr_t)&media);
result = tsec_ioctl(ifp,SIOCGIFMEDIA,(caddr_t)&media); if (result != 0 || IFM_NONE == IFM_SUBTYPE(media)) {
if (result != 0) { return result;
return result; }
}
} while (IFM_NONE == IFM_SUBTYPE(media));
} }
/* /*