From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org, linux-can <linux-can@vger.kernel.org>
Cc: davem@davemloft.net, kernel@pengutronix.de,
jhofstee@victronenergy.com,
"Martin Hundebøll" <martin@geanix.com>,
"Kurt Van Dijck" <dev.kurt@vandijck-laurijssen.be>,
"Marc Kleine-Budde" <mkl@pengutronix.de>
Subject: [PATCH 24/29] can: ti_hecc: add fifo underflow error reporting
Date: Thu, 10 Oct 2019 14:17:45 +0200 [thread overview]
Message-ID: <20191010121750.27237-25-mkl@pengutronix.de> (raw)
In-Reply-To: <20191010121750.27237-1-mkl@pengutronix.de>
From: Jeroen Hofstee <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>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
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 6ea29126c60b..c2d83ada203a 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.23.0
next prev parent reply other threads:[~2019-10-10 12:18 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 12:17 linux-can/testing: Request for testing Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 01/29] can: dev: add missing of_node_put() after calling of_get_child_by_name() Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 02/29] can: gs_usb: gs_can_open(): prevent memory leak Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 03/29] can: mcba_usb: fix use-after-free on disconnect Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 04/29] can: usb_8dev: " Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 05/29] can: flexcan: disable completely the ECC mechanism Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 06/29] can: peak_usb: fix a potential out-of-sync while decoding packets Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 07/29] can: peak_usb: report bus recovery as well Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 08/29] can: c_can: c_can_poll(): only read status register after status IRQ Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 09/29] can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 10/29] can: c_can: C_CAN: add bus recovery events Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 11/29] can: xilinx_can: Fix flags field initialization for axi can Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 12/29] can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 13/29] can: rx-offload: can_rx_offload_queue_tail(): " Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 14/29] can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 15/29] can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 16/29] can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 17/29] can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 18/29] can: rx-offload: can_rx_offload_irq_offload_fifo(): " Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 19/29] can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 20/29] can: ti_hecc: ti_hecc_error(): " Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 21/29] can: ti_hecc: ti_hecc_stop(): stop the CPK on down Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 22/29] can: ti_hecc: keep MIM and MD set Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 23/29] can: ti_hecc: release the mailbox a bit earlier Marc Kleine-Budde
2019-10-10 12:17 ` Marc Kleine-Budde [this message]
2019-10-10 15:52 ` [PATCH 24/29] can: ti_hecc: add fifo underflow error reporting Marc Kleine-Budde
2019-10-10 18:04 ` Jeroen Hofstee
[not found] ` <694ef4e8-166b-7eeb-4d6e-39a0ecacc93f@victronenergy.com>
2019-10-10 20:29 ` Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 25/29] can: ti_hecc: properly report state changes Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 26/29] can: ti_hecc: add missing " Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 27/29] can: j1939: fix resource leak of skb on error return paths Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 28/29] can: j1939: fix memory leak if filters was set Marc Kleine-Budde
2019-10-10 12:17 ` [PATCH 29/29] can: don't use deprecated license identifiers Marc Kleine-Budde
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=20191010121750.27237-25-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=dev.kurt@vandijck-laurijssen.be \
--cc=jhofstee@victronenergy.com \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=martin@geanix.com \
--cc=netdev@vger.kernel.org \
/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).