netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
	kernel@pengutronix.de, Marc Kleine-Budde <mkl@pengutronix.de>,
	linux-stable <stable@vger.kernel.org>
Subject: [PATCH 6/8] can: flexcan: put TX mailbox into TX_INACTIVE mode after tx-complete
Date: Thu, 18 Sep 2014 12:41:00 +0200	[thread overview]
Message-ID: <1411036862-13255-7-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1411036862-13255-1-git-send-email-mkl@pengutronix.de>

After sending a RTR frame the TX mailbox becomes a RX_EMPTY mailbox. To avoid
side effects when the RX-FIFO is full, this patch puts the TX mailbox into
TX_INACTIVE mode in the transmission complete interrupt handler. This, of
course, leaves a race window between the actual completion of the transmission
and the handling of tx-complete interrupt. However this is the best we can do
without busy polling the tx complete interrupt.

Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/flexcan.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 54061c4..c17ae9e 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -765,6 +765,9 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)
 		stats->tx_bytes += can_get_echo_skb(dev, 0);
 		stats->tx_packets++;
 		can_led_event(dev, CAN_LED_EVENT_TX);
+		/* after sending a RTR frame mailbox is in RX mode */
+		flexcan_write(FLEXCAN_MB_CODE_TX_INACTIVE,
+			      &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);
 		flexcan_write((1 << FLEXCAN_TX_BUF_ID), &regs->iflag1);
 		netif_wake_queue(dev);
 	}
-- 
2.1.0

  parent reply	other threads:[~2014-09-18 10:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-18 10:40 pull-request: can 2014-09-18 Marc Kleine-Budde
2014-09-18 10:40 ` [PATCH 1/8] can: c_can_platform: fix parameters of c_can_hw_raminit_ti() Marc Kleine-Budde
2014-09-18 10:40 ` [PATCH 2/8] can: peak_pci: add PCI ID definition pcie card variant Marc Kleine-Budde
2014-09-18 10:40 ` [PATCH 3/8] can: flexcan: mark TX mailbox as TX_INACTIVE Marc Kleine-Budde
2014-09-18 10:40 ` [PATCH 4/8] can: flexcan: correctly initialize mailboxes Marc Kleine-Budde
2014-09-18 10:40 ` [PATCH 5/8] can: flexcan: implement workaround for errata ERR005829 Marc Kleine-Budde
2014-09-18 10:41 ` Marc Kleine-Budde [this message]
2014-09-18 10:41 ` [PATCH 7/8] can: flexcan: increase FLEXCAN_MCR_MAXMB() macro to 7 bits Marc Kleine-Budde
2014-09-18 10:41 ` [PATCH 8/8] can: at91_can: add missing prepare and unprepare of the clock Marc Kleine-Budde
2014-09-19 21:34 ` pull-request: can 2014-09-18 David Miller

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=1411036862-13255-7-git-send-email-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=davem@davemloft.net \
    --cc=kernel@pengutronix.de \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stable@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).