Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 23:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up transmit buffer realignment.

Browse Source 
Many thanks to Mr. Kolja Waschk for identifying the problem.
This commit is contained in:
Eric Norum
2005-06-20 20:48:48 +00:00
parent 3f0bb34c6e
commit f077cc96df
3 changed files with 85 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/m68k/uC5282/ChangeLog
View File

@@ -1,3 +1,8 @@
2005-06-20 Eric Norum <norume@aps.anl.gov>
* network/network.c: Clean up transmit buffer realignment. Many thanks to
Mr. Kolja Waschk for identifying the problem.
2005-05-26 Ralf Corsepius <ralf.corsepius@rtems.org> 2005-05-26 Ralf Corsepius <ralf.corsepius@rtems.org>
* include/bsp.h: New header guard. * include/bsp.h: New header guard.

12
c/src/lib/libbsp/m68k/uC5282/README
View File

@@ -78,16 +78,16 @@ port into RAM then executed or programmed into flash memory.
2) (first time only) 2) (first time only)
Set the uC5282 board Internet configuration: Set the uC5282 board Internet configuration:
setenv IPADDR0 www.xxx.yyy.zzz (Your board's address) setenv IPADDR0 www.xxx.yyy.zzz (Your board's address)
setenv NETMASK ppp.qqq.rrr.sss (Your local network address mask) setenv NETMASK ppp.qqq.rrr.sss (Your local network address mask)
setenv HOSTNAME somename (Your board's name) setenv HOSTNAME somename (Your board's name)
3) Type 'tftp<CR>' 3) Type 'tftp<CR>'
4) Run 'tftp' on your host machine: 4) Run 'tftp' on your host machine:
tftp> binary tftp> binary
tftp> connect www.xxx.yyy.zzz (Your ucDIMM's address) tftp> connect www.xxx.yyy.zzz (Your ucDIMM's address)
tftp> put someFile.exe tftp> put someFile.exe (someFile.boot for the EPICS build system)
5) When the file has downloaded press the <ESC> key to terminate 5) When the file has downloaded press the <ESC> key to terminate
the uCDIMM tftp command. the uCDIMM tftp command.

143
c/src/lib/libbsp/m68k/uC5282/network/network.c
View File

@@ -1,10 +1,5 @@
/* /*
* RTEMS/TCPIP driver for MCF5282 Fast Ethernet Controller * RTEMS/TCPIP driver for MCF5282 Fast Ethernet Controller
*
* TO DO: Check network stack code -- Is it possible force longword alignment
* of all tx mbufs? If so, the stupid
* realignment code in the output routine
* could be removed.
*/ */
#include <bsp.h> #include <bsp.h>
@@ -103,7 +98,7 @@ struct mcf5282_enet_struct {
unsigned long txInterrupts; unsigned long txInterrupts;
unsigned long txRawWait; unsigned long txRawWait;
unsigned long txRealign; unsigned long txRealign;
unsigned long txRealignBytes; unsigned long txRealignDrop;
}; };
static struct mcf5282_enet_struct enet_driver[NIFACES]; static struct mcf5282_enet_struct enet_driver[NIFACES];
@@ -320,11 +315,14 @@ static void
fec_retire_tx_bd(volatile struct mcf5282_enet_struct *sc ) fec_retire_tx_bd(volatile struct mcf5282_enet_struct *sc )
{ {
struct mbuf *m, *n; struct mbuf *m, *n;
uint16_t status;
while ((sc->txBdActiveCount != 0) while ((sc->txBdActiveCount != 0)
&& ((sc->txBdBase[sc->txBdTail].status & MCF5282_FEC_TxBD_R) == 0)) { && (((status = sc->txBdBase[sc->txBdTail].status) & MCF5282_FEC_TxBD_R) == 0)) {
m = sc->txMbuf[sc->txBdTail]; if ((status & MCF5282_FEC_TxBD_TO1) == 0) {
MFREE(m, n); m = sc->txMbuf[sc->txBdTail];
MFREE(m, n);
}
if (++sc->txBdTail == sc->txBdCount) if (++sc->txBdTail == sc->txBdCount)
sc->txBdTail = 0; sc->txBdTail = 0;
sc->txBdActiveCount--; sc->txBdActiveCount--;
@@ -337,7 +335,7 @@ fec_rxDaemon (void *arg)
volatile struct mcf5282_enet_struct *sc = (volatile struct mcf5282_enet_struct *)arg; volatile struct mcf5282_enet_struct *sc = (volatile struct mcf5282_enet_struct *)arg;
struct ifnet *ifp = (struct ifnet* )&sc->arpcom.ac_if; struct ifnet *ifp = (struct ifnet* )&sc->arpcom.ac_if;
struct mbuf *m; struct mbuf *m;
volatile uint16_t status; uint16_t status;
volatile mcf5282BufferDescriptor_t *rxBd; volatile mcf5282BufferDescriptor_t *rxBd;
int rxBdIndex; int rxBdIndex;
@@ -454,6 +452,7 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
struct mcf5282_enet_struct *sc = ifp->if_softc; struct mcf5282_enet_struct *sc = ifp->if_softc;
volatile mcf5282BufferDescriptor_t *firstTxBd, *txBd; volatile mcf5282BufferDescriptor_t *firstTxBd, *txBd;
uint16_t status; uint16_t status;
int offset;
int nAdded; int nAdded;
/* /*
@@ -471,7 +470,7 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
nAdded = 0; nAdded = 0;
firstTxBd = sc->txBdBase + sc->txBdHead; firstTxBd = sc->txBdBase + sc->txBdHead;
for (;;) { while (m != NULL) {
/* /*
* Wait for buffer descriptor to become available * Wait for buffer descriptor to become available
*/ */
@@ -517,56 +516,62 @@ fec_sendpacket(struct ifnet *ifp, struct mbuf *m)
txBd = sc->txBdBase + sc->txBdHead; txBd = sc->txBdBase + sc->txBdHead;
if (m->m_len) { if (m->m_len) {
char *p = mtod(m, char *); char *p = mtod(m, char *);
/* if ((offset = (int)p & 0x3) == 0) {
* Stupid FEC can't handle misaligned data! txBd->buffer = p;
* Given the way that mbuf's are layed out it should be txBd->length = m->m_len;
* safe to shuffle the data down like this..... sc->txMbuf[sc->txBdHead] = m;
* Perhaps this code could be improved with a "Duff's Device". m = m->m_next;
*/ }
if ((int)p & 0x3) { else {
int l = m->m_len; /*
char *dest = p - ((int)p & 0x3); * Stupid FEC can't handle misaligned data!
uint16_t *o = (uint16_t *)dest, *i = (uint16_t *)p; * Move offending bytes to a local buffer.
while (l > 0) { * Use buffer descriptor TO1 bit to indicate this.
*o++ = *i++; */
l -= sizeof(uint16_t); int nmove = 4 - offset;
} char *d = (char *)&sc->txMbuf[sc->txBdHead];
p = dest; status |= MCF5282_FEC_TxBD_TO1;
sc->txRealign++; sc->txRealign++;
sc->txRealignBytes += m->m_len; if (nmove > m->m_len)
nmove = m->m_len;
m->m_data += nmove;
m->m_len -= nmove;
txBd->buffer = d;
txBd->length = nmove;
while (nmove--)
*d++ = *p++;
if (m->m_len == 0) {
struct mbuf *n;
sc->txRealignDrop++;
MFREE(m, n);
m = n;
}
} }
txBd->buffer = p;
txBd->length = m->m_len;
sc->txMbuf[sc->txBdHead] = m;
nAdded++; nAdded++;
if (++sc->txBdHead == sc->txBdCount) { if (++sc->txBdHead == sc->txBdCount) {
status |= MCF5282_FEC_TxBD_W; status |= MCF5282_FEC_TxBD_W;
sc->txBdHead = 0; sc->txBdHead = 0;
} }
m = m->m_next; txBd->status = status;
} }
else { else {
/* /*
* Just toss empty mbufs * Toss empty mbufs.
*/ */
struct mbuf *n; struct mbuf *n;
MFREE(m, n); MFREE(m, n);
m = n; m = n;
} }
if (m == NULL) {
if (nAdded) {
txBd->status = status | MCF5282_FEC_TxBD_R
| MCF5282_FEC_TxBD_L
| MCF5282_FEC_TxBD_TC;
if (nAdded > 1)
firstTxBd->status |= MCF5282_FEC_TxBD_R;
MCF5282_FEC_TDAR = 0;
sc->txBdActiveCount += nAdded;
}
break;
}
txBd->status = status;
} }
if (nAdded) {
txBd->status = status | MCF5282_FEC_TxBD_R
| MCF5282_FEC_TxBD_L
| MCF5282_FEC_TxBD_TC;
if (nAdded > 1)
firstTxBd->status |= MCF5282_FEC_TxBD_R;
MCF5282_FEC_TDAR = 0;
sc->txBdActiveCount += nAdded;
}
} }
void void
@@ -699,37 +704,37 @@ enet_stats(struct mcf5282_enet_struct *sc)
printf(" Rx Octets OK:%-10lu\n", MCF5282_FEC_IEEE_R_OCTETS_OK); printf(" Rx Octets OK:%-10lu\n", MCF5282_FEC_IEEE_R_OCTETS_OK);
printf(" Tx Interrupts:%-10lu", sc->txInterrupts); printf(" Tx Interrupts:%-10lu", sc->txInterrupts);
printf("Tx Output Waits:%-10lu", sc->txRawWait); printf("Tx Output Waits:%-10lu", sc->txRawWait);
printf("Tx Realignments:%-10lu\n", sc->txRealign); printf("Tx mbuf realign:%-10lu\n", sc->txRealign);
printf(" Tx RealignByte:%-10lu", sc->txRealignBytes); printf("Tx realign drop:%-10lu", sc->txRealignDrop);
printf(" Tx Unaccounted:%-10lu", MCF5282_FEC_RMON_T_DROP); printf(" Tx Unaccounted:%-10lu", MCF5282_FEC_RMON_T_DROP);
printf("Tx Packet Count:%-10lu\n", MCF5282_FEC_RMON_T_PACKETS); printf("Tx Packet Count:%-10lu\n", MCF5282_FEC_RMON_T_PACKETS);
printf(" Tx Broadcast:%-10lu", MCF5282_FEC_RMON_T_BC_PKT); printf(" Tx Broadcast:%-10lu", MCF5282_FEC_RMON_T_BC_PKT);
printf(" Tx Multicast:%-10lu", MCF5282_FEC_RMON_T_MC_PKT); printf(" Tx Multicast:%-10lu", MCF5282_FEC_RMON_T_MC_PKT);
printf("CRC/Align error:%-10lu\n", MCF5282_FEC_RMON_T_CRC_ALIGN); printf("CRC/Align error:%-10lu\n", MCF5282_FEC_RMON_T_CRC_ALIGN);
printf(" Tx Undersize:%-10lu", MCF5282_FEC_RMON_T_UNDERSIZE); printf(" Tx Undersize:%-10lu", MCF5282_FEC_RMON_T_UNDERSIZE);
printf(" Tx Oversize:%-10lu", MCF5282_FEC_RMON_T_OVERSIZE); printf(" Tx Oversize:%-10lu", MCF5282_FEC_RMON_T_OVERSIZE);
printf(" Tx Fragment:%-10lu\n", MCF5282_FEC_RMON_T_FRAG); printf(" Tx Fragment:%-10lu\n", MCF5282_FEC_RMON_T_FRAG);
printf(" Tx Jabber:%-10lu", MCF5282_FEC_RMON_T_JAB); printf(" Tx Jabber:%-10lu", MCF5282_FEC_RMON_T_JAB);
printf(" Tx Collisions:%-10lu", MCF5282_FEC_RMON_T_COL); printf(" Tx Collisions:%-10lu", MCF5282_FEC_RMON_T_COL);
printf(" Tx 64:%-10lu\n", MCF5282_FEC_RMON_T_P64); printf(" Tx 64:%-10lu\n", MCF5282_FEC_RMON_T_P64);
printf(" Tx 65-127:%-10lu", MCF5282_FEC_RMON_T_P65TO127); printf(" Tx 65-127:%-10lu", MCF5282_FEC_RMON_T_P65TO127);
printf(" Tx 128-255:%-10lu", MCF5282_FEC_RMON_T_P128TO255); printf(" Tx 128-255:%-10lu", MCF5282_FEC_RMON_T_P128TO255);
printf(" Tx 256-511:%-10lu\n", MCF5282_FEC_RMON_T_P256TO511); printf(" Tx 256-511:%-10lu\n", MCF5282_FEC_RMON_T_P256TO511);
printf(" Tx 511-1023:%-10lu", MCF5282_FEC_RMON_T_P512TO1023); printf(" Tx 511-1023:%-10lu", MCF5282_FEC_RMON_T_P512TO1023);
printf(" Tx 1024-2047:%-10lu", MCF5282_FEC_RMON_T_P1024TO2047); printf(" Tx 1024-2047:%-10lu", MCF5282_FEC_RMON_T_P1024TO2047);
printf(" Tx >=2048:%-10lu\n", MCF5282_FEC_RMON_T_P_GTE2048); printf(" Tx >=2048:%-10lu\n", MCF5282_FEC_RMON_T_P_GTE2048);
printf(" Tx Octets:%-10lu", MCF5282_FEC_RMON_T_OCTETS); printf(" Tx Octets:%-10lu", MCF5282_FEC_RMON_T_OCTETS);
printf(" Tx Dropped:%-10lu", MCF5282_FEC_IEEE_T_DROP); printf(" Tx Dropped:%-10lu", MCF5282_FEC_IEEE_T_DROP);
printf(" Tx Frame OK:%-10lu\n", MCF5282_FEC_IEEE_T_FRAME_OK); printf(" Tx Frame OK:%-10lu\n", MCF5282_FEC_IEEE_T_FRAME_OK);
printf(" Tx 1 Collision:%-10lu", MCF5282_FEC_IEEE_T_1COL); printf(" Tx 1 Collision:%-10lu", MCF5282_FEC_IEEE_T_1COL);
printf("Tx >1 Collision:%-10lu", MCF5282_FEC_IEEE_T_MCOL); printf("Tx >1 Collision:%-10lu", MCF5282_FEC_IEEE_T_MCOL);
printf(" Tx Deferred:%-10lu\n", MCF5282_FEC_IEEE_T_DEF); printf(" Tx Deferred:%-10lu\n", MCF5282_FEC_IEEE_T_DEF);
printf(" Late Collision:%-10lu", MCF5282_FEC_IEEE_T_LCOL); printf(" Late Collision:%-10lu", MCF5282_FEC_IEEE_T_LCOL);
printf(" Excessive Coll:%-10lu", MCF5282_FEC_IEEE_T_EXCOL); printf(" Excessive Coll:%-10lu", MCF5282_FEC_IEEE_T_EXCOL);
printf(" FIFO Underrun:%-10lu\n", MCF5282_FEC_IEEE_T_MACERR); printf(" FIFO Underrun:%-10lu\n", MCF5282_FEC_IEEE_T_MACERR);
printf(" Carrier Error:%-10lu", MCF5282_FEC_IEEE_T_CSERR); printf(" Carrier Error:%-10lu", MCF5282_FEC_IEEE_T_CSERR);
printf(" Tx SQE Error:%-10lu", MCF5282_FEC_IEEE_T_SQE); printf(" Tx SQE Error:%-10lu", MCF5282_FEC_IEEE_T_SQE);
printf("Tx Pause Frames:%-10lu\n", MCF5282_FEC_IEEE_T_FDXFC); printf("Tx Pause Frames:%-10lu\n", MCF5282_FEC_IEEE_T_FDXFC);
printf(" Tx Octets OK:%-10lu\n", MCF5282_FEC_IEEE_T_OCTETS_OK); printf(" Tx Octets OK:%-10lu\n", MCF5282_FEC_IEEE_T_OCTETS_OK);
printf(" EIR:%8.8lx ", MCF5282_FEC_EIR); printf(" EIR:%8.8lx ", MCF5282_FEC_EIR);
printf("EIMR:%8.8lx ", MCF5282_FEC_EIMR); printf("EIMR:%8.8lx ", MCF5282_FEC_EIMR);
@@ -746,7 +751,7 @@ enet_stats(struct mcf5282_enet_struct *sc)
* Yes, there are races here with adding and retiring descriptors, * Yes, there are races here with adding and retiring descriptors,
* but this diagnostic is more for when things have backed up. * but this diagnostic is more for when things have backed up.
*/ */
printf("Transmit Buffer Descriptors (Tail %d, Head %d, Active %d):\n", printf("Transmit Buffer Descriptors (Tail %d, Head %d, Unretired %d):\n",
sc->txBdTail, sc->txBdTail,
sc->txBdHead, sc->txBdHead,
sc->txBdActiveCount); sc->txBdActiveCount);