From: Jeroen Hofstee <jhofstee@victronenergy.com>
To: "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Cc: Jeroen Hofstee <jhofstee@victronenergy.com>,
Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
"David S. Miller" <davem@davemloft.net>,
"open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/7] can: ti_hecc: add fifo underflow error reporting
Date: Tue, 24 Sep 2019 18:46:00 +0000 [thread overview]
Message-ID: <20190924184437.10607-6-jhofstee@victronenergy.com> (raw)
In-Reply-To: <20190924184437.10607-1-jhofstee@victronenergy.com>
When the rx fifo overflows the ti_hecc would silently drop them since
the overwrite protection is enabled for all mailboxes. So disable it
for the lowest priority mailbox and increment the rx_fifo_errors when
receive message lost is set. Drop the message itself in that case,
since it might be partially updated.
Signed-off-by: Jeroen Hofstee <jhofstee@victronenergy.com>
---
drivers/net/can/ti_hecc.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 35c82289f2a3..4206ad5cb666 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -82,7 +82,7 @@ MODULE_VERSION(HECC_MODULE_VERSION);
#define HECC_CANTA 0x10 /* Transmission acknowledge */
#define HECC_CANAA 0x14 /* Abort acknowledge */
#define HECC_CANRMP 0x18 /* Receive message pending */
-#define HECC_CANRML 0x1C /* Remote message lost */
+#define HECC_CANRML 0x1C /* Receive message lost */
#define HECC_CANRFP 0x20 /* Remote frame pending */
#define HECC_CANGAM 0x24 /* SECC only:Global acceptance mask */
#define HECC_CANMC 0x28 /* Master control */
@@ -385,8 +385,17 @@ static void ti_hecc_start(struct net_device *ndev)
/* Enable tx interrupts */
hecc_set_bit(priv, HECC_CANMIM, BIT(HECC_MAX_TX_MBOX) - 1);
- /* Prevent message over-write & Enable interrupts */
- hecc_write(priv, HECC_CANOPC, HECC_SET_REG);
+ /* Prevent message over-write to create a rx fifo, but not for the
+ * lowest priority mailbox, since that allows detecting overflows
+ * instead of the hardware silently dropping the messages. The lowest
+ * rx mailbox is one above the tx ones, hence its mbxno is the number
+ * of tx mailboxes.
+ */
+ mbxno = HECC_MAX_TX_MBOX;
+ mbx_mask = ~BIT(mbxno);
+ hecc_write(priv, HECC_CANOPC, mbx_mask);
+
+ /* Enable interrupts */
if (priv->use_hecc1int) {
hecc_write(priv, HECC_CANMIL, HECC_SET_REG);
hecc_write(priv, HECC_CANGIM, HECC_CANGIM_DEF_MASK |
@@ -531,6 +540,7 @@ static unsigned int ti_hecc_mailbox_read(struct can_rx_offload *offload,
{
struct ti_hecc_priv *priv = rx_offload_to_priv(offload);
u32 data, mbx_mask;
+ int lost;
mbx_mask = BIT(mbxno);
data = hecc_read_mbx(priv, mbxno, HECC_CANMID);
@@ -552,9 +562,12 @@ static unsigned int ti_hecc_mailbox_read(struct can_rx_offload *offload,
}
*timestamp = hecc_read_stamp(priv, mbxno);
+ lost = hecc_read(priv, HECC_CANRML) & mbx_mask;
+ if (unlikely(lost))
+ priv->offload.dev->stats.rx_fifo_errors++;
hecc_write(priv, HECC_CANRMP, mbx_mask);
- return 1;
+ return !lost;
}
static int ti_hecc_error(struct net_device *ndev, int int_status,
--
2.17.1
next prev parent reply other threads:[~2019-09-24 18:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190924184437.10607-1-jhofstee@victronenergy.com>
2019-09-24 18:45 ` [PATCH 1/7] can: rx-offload: continue on error Jeroen Hofstee
2019-10-09 13:18 ` Marc Kleine-Budde
2019-10-13 21:26 ` Jeroen Hofstee
2019-09-24 18:45 ` [PATCH 2/7] can: ti_hecc: release the mailbox a bit earlier Jeroen Hofstee
2019-09-24 18:45 ` [PATCH 3/7] can: ti_hecc: stop the CPK on down Jeroen Hofstee
2019-09-24 18:45 ` [PATCH 4/7] can: ti_hecc: keep MIM and MD set Jeroen Hofstee
2019-09-24 18:46 ` Jeroen Hofstee [this message]
2019-09-24 18:46 ` [PATCH 6/7] can: ti_hecc: properly report state changes Jeroen Hofstee
2019-09-24 18:46 ` [PATCH 7/7] can: ti_hecc: add missing " Jeroen Hofstee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190924184437.10607-6-jhofstee@victronenergy.com \
--to=jhofstee@victronenergy.com \
--cc=davem@davemloft.net \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).