Module Name: src
Committed By: bouyer
Date: Thu Apr 20 17:30:52 UTC 2017
Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c
Log Message:
Print some informations for error interrupts.
Fix some registers values.
Now we can transmit frames. Receive still doesn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/arm/allwinner/awin_can.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_can.c
diff -u src/sys/arch/arm/allwinner/awin_can.c:1.1.2.3 src/sys/arch/arm/allwinner/awin_can.c:1.1.2.4
--- src/sys/arch/arm/allwinner/awin_can.c:1.1.2.3 Thu Apr 20 13:00:52 2017
+++ src/sys/arch/arm/allwinner/awin_can.c Thu Apr 20 17:30:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_can.c,v 1.1.2.3 2017/04/20 13:00:52 bouyer Exp $ */
+/* $NetBSD: awin_can.c,v 1.1.2.4 2017/04/20 17:30:52 bouyer Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.3 2017/04/20 13:00:52 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.4 2017/04/20 17:30:52 bouyer Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -303,6 +303,7 @@ awin_can_tx_intr(struct awin_can_softc *
printf("can_input2\n");
can_input(ifp, m); /* loopback */
sc->sc_m_transmit = NULL;
+ ifp->if_timer = 0;
}
IF_DEQUEUE(&ifp->if_snd, m);
@@ -382,13 +383,17 @@ awin_can_err_intr(struct awin_can_softc
struct ifnet * const ifp = sc->sc_ifp;
KASSERT(mutex_owned(&sc->sc_intr_lock));
int txerr = 0;
+ uint32_t reg;
if (irq & AWIN_CAN_INT_DATA_OR) {
ifp->if_ierrors++;
awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_CLR_OR);
}
if (irq & AWIN_CAN_INT_ERR) {
- /* XXX todo */
+ reg = awin_can_read(sc, AWIN_CAN_REC_REG);
+ printf("%s: ERR interrupt status 0x%x counters 0x%x\n",
+ device_xname(sc->sc_dev), sts, reg);
+
}
if (irq & AWIN_CAN_INT_BERR) {
if (sts & AWIN_CAN_STA_TX)
@@ -397,7 +402,8 @@ awin_can_err_intr(struct awin_can_softc
ifp->if_ierrors++;
}
if (irq & AWIN_CAN_INT_ERR_PASSIVE) {
- /* XXX todo */
+ printf("%s: PASSV interrupt status 0x%x\n",
+ device_xname(sc->sc_dev), sts);
}
if (irq & AWIN_CAN_INT_ARB_LOST) {
txerr++;
@@ -459,7 +465,7 @@ awin_can_ifup(struct awin_can_softc * co
uint32_t reg;
/* setup timings and mode - has to be done in reset */
- reg = 0;
+ reg = AWIN_CAN_MODSEL_RST;
if (sc->sc_linkmodes & CAN_LINKMODE_LISTENONLY)
reg |= AWIN_CAN_MODSEL_LST_ONLY;
