Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Zeroth version of M68060 support (dont want to cause emulation traps for

Browse Source 
the "Fast Assembler Version of the copy loop)
- Yet another sanity check included: initialize unused receive buffers to
  zero sender id; and test for sender hardware id of zero in the receiver.
  Gives us better error messages in case flaky hardware causes spurious
  receive interupts.
This commit is contained in:
is 1996-03-20 13:28:50 +00:00
parent 8106a55133
commit ab622e51f5
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/arch/amiga/dev/if_bah.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_bah.c,v 1.15 1996/03/17 01:17:30 thorpej Exp $ */ /* $NetBSD: if_bah.c,v 1.16 1996/03/20 13:28:50 is Exp $ */
/* /*
* Copyright (c) 1994, 1995 Ignatios Souvatzis * Copyright (c) 1994, 1995 Ignatios Souvatzis
@ -41,6 +41,12 @@
/* #define BAHTIMINGS */ /* #define BAHTIMINGS */
/* #define BAH_DEBUG 3 */ /* #define BAH_DEBUG 3 */
/* zeroth version of M68060 support */
#if defined(M68060) && defined(BAHASMCOPY)
#undef BAHASMCOPY
#endif
#include "bpfilter.h" #include "bpfilter.h"
#include <sys/param.h> #include <sys/param.h>
@ -882,6 +888,8 @@ cleanup:
if (head != NULL) if (head != NULL)
m_freem(head); m_freem(head);
/* mark buffer as invalid by source id 0 */
sc->sc_base->buffers[buffer*512*2] = 0;
s = splnet(); s = splnet();
if (--sc->sc_rx_fillcount == 2 - 1) { if (--sc->sc_rx_fillcount == 2 - 1) {
@ -1074,13 +1082,23 @@ bahintr(sc)
if (maskedisr & ARC_RI) { if (maskedisr & ARC_RI) {
#if defined(BAH_DEBUG) && (BAH_DEBUG > 1) #if defined(BAH_DEBUG) && (BAH_DEBUG > 1)
printf("%s: intr: hard rint, act %ld 2:%ld 3:%ld\n", printf("%s: intr: hard rint, act %ld\n",
sc->sc_dev.dv_xname, sc->sc_dev.dv_xname, sc->sc_rx_act);
sc->sc_rx_act, sc->sc_bufstat[2], sc->sc_bufstat[3]);
#endif #endif
buffer = sc->sc_rx_act; buffer = sc->sc_rx_act;
if (++sc->sc_rx_fillcount > 1) { /* look if buffer is marked invalid: */
if (sc->sc_base->buffers[buffer*512*2] == 0) {
/* invalid marked buffer (or illegally configured sender) */
log(LOG_WARNING,
"%s: spurious RX interrupt or sender 0 (ignored)\n",
sc->sc_dev.dv_xname);
/*
* restart receiver on same buffer.
*/
sc->sc_base->command = ARC_RXBC(buffer);
} else if (++sc->sc_rx_fillcount > 1) {
sc->sc_intmask &= ~ARC_RI; sc->sc_intmask &= ~ARC_RI;
sc->sc_base->status = sc->sc_intmask; sc->sc_base->status = sc->sc_intmask;
} else { } else {
@ -1195,7 +1213,7 @@ bah_ioctl(ifp, command, data)
* and the int handler will have to decide not to retransmit (in case * and the int handler will have to decide not to retransmit (in case
* retransmission is implemented). * retransmission is implemented).
* *
* This one assumes being called inside splnet(), and that imp >= ipl2 * This one assumes being called inside splnet(), and that net >= ipl2
*/ */
void void

30
sys/dev/ic/smc90cx6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smc90cx6.c,v 1.15 1996/03/17 01:17:30 thorpej Exp $ */ /* $NetBSD: smc90cx6.c,v 1.16 1996/03/20 13:28:50 is Exp $ */
/* /*
* Copyright (c) 1994, 1995 Ignatios Souvatzis * Copyright (c) 1994, 1995 Ignatios Souvatzis
@ -41,6 +41,12 @@
/* #define BAHTIMINGS */ /* #define BAHTIMINGS */
/* #define BAH_DEBUG 3 */ /* #define BAH_DEBUG 3 */
/* zeroth version of M68060 support */
#if defined(M68060) && defined(BAHASMCOPY)
#undef BAHASMCOPY
#endif
#include "bpfilter.h" #include "bpfilter.h"
#include <sys/param.h> #include <sys/param.h>
@ -882,6 +888,8 @@ cleanup:
if (head != NULL) if (head != NULL)
m_freem(head); m_freem(head);
/* mark buffer as invalid by source id 0 */
sc->sc_base->buffers[buffer*512*2] = 0;
s = splnet(); s = splnet();
if (--sc->sc_rx_fillcount == 2 - 1) { if (--sc->sc_rx_fillcount == 2 - 1) {
@ -1074,13 +1082,23 @@ bahintr(sc)
if (maskedisr & ARC_RI) { if (maskedisr & ARC_RI) {
#if defined(BAH_DEBUG) && (BAH_DEBUG > 1) #if defined(BAH_DEBUG) && (BAH_DEBUG > 1)
printf("%s: intr: hard rint, act %ld 2:%ld 3:%ld\n", printf("%s: intr: hard rint, act %ld\n",
sc->sc_dev.dv_xname, sc->sc_dev.dv_xname, sc->sc_rx_act);
sc->sc_rx_act, sc->sc_bufstat[2], sc->sc_bufstat[3]);
#endif #endif
buffer = sc->sc_rx_act; buffer = sc->sc_rx_act;
if (++sc->sc_rx_fillcount > 1) { /* look if buffer is marked invalid: */
if (sc->sc_base->buffers[buffer*512*2] == 0) {
/* invalid marked buffer (or illegally configured sender) */
log(LOG_WARNING,
"%s: spurious RX interrupt or sender 0 (ignored)\n",
sc->sc_dev.dv_xname);
/*
* restart receiver on same buffer.
*/
sc->sc_base->command = ARC_RXBC(buffer);
} else if (++sc->sc_rx_fillcount > 1) {
sc->sc_intmask &= ~ARC_RI; sc->sc_intmask &= ~ARC_RI;
sc->sc_base->status = sc->sc_intmask; sc->sc_base->status = sc->sc_intmask;
} else { } else {
@ -1195,7 +1213,7 @@ bah_ioctl(ifp, command, data)
* and the int handler will have to decide not to retransmit (in case * and the int handler will have to decide not to retransmit (in case
* retransmission is implemented). * retransmission is implemented).
* *
* This one assumes being called inside splnet(), and that imp >= ipl2 * This one assumes being called inside splnet(), and that net >= ipl2
*/ */
void void