mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michal Simek <michal.simek@xilinx.com>
To: netdev@vger.kernel.org
Cc: "Peter Crosthwaite" <peter.crosthwaite@xilinx.com>,
	"Sören Brinkmann" <soren.brinkmann@xilinx.com>,
	monstr@monstr.eu, "John Linn" <John.Linn@xilinx.com>,
	"Anirudha Sarangi" <anirudh@xilinx.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] net: axienet: Service completion interrupts ASAP
Date: Tue,  5 May 2015 11:25:56 +0200	[thread overview]
Message-ID: <2effdfc484793a74e6f53ee7e1b2ef5cebb2bfe9.1430817941.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <7fb84f65a61bbe0fdb4b61a871cf4d4f7910955d.1430817941.git.michal.simek@xilinx.com>
In-Reply-To: <7fb84f65a61bbe0fdb4b61a871cf4d4f7910955d.1430817941.git.michal.simek@xilinx.com>

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

The packet completion interrupts for TX and RX should be serviced before
the packets are consumed. This ensures against the degenerate case when a
new completion interrupt is raised after the handler has exited but before
the interrupts are cleared. In this case its possible for the ISR to clear
an unhandled interrupt (leading to potential deadlock).

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Tested-by: Jason Wu <huanyu@xilinx.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index a4840952d372..b83425393a24 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -809,6 +809,7 @@ static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
 
 	status = axienet_dma_in32(lp, XAXIDMA_TX_SR_OFFSET);
 	if (status & (XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK)) {
+		axienet_dma_out32(lp, XAXIDMA_TX_SR_OFFSET, status);
 		axienet_start_xmit_done(lp->ndev);
 		goto out;
 	}
@@ -832,9 +833,9 @@ static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
 		axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
 
 		tasklet_schedule(&lp->dma_err_tasklet);
+		axienet_dma_out32(lp, XAXIDMA_TX_SR_OFFSET, status);
 	}
 out:
-	axienet_dma_out32(lp, XAXIDMA_TX_SR_OFFSET, status);
 	return IRQ_HANDLED;
 }
 
@@ -857,6 +858,7 @@ static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
 
 	status = axienet_dma_in32(lp, XAXIDMA_RX_SR_OFFSET);
 	if (status & (XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK)) {
+		axienet_dma_out32(lp, XAXIDMA_RX_SR_OFFSET, status);
 		axienet_recv(lp->ndev);
 		goto out;
 	}
@@ -880,9 +882,9 @@ static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
 		axienet_dma_out32(lp, XAXIDMA_RX_CR_OFFSET, cr);
 
 		tasklet_schedule(&lp->dma_err_tasklet);
+		axienet_dma_out32(lp, XAXIDMA_RX_SR_OFFSET, status);
 	}
 out:
-	axienet_dma_out32(lp, XAXIDMA_RX_SR_OFFSET, status);
 	return IRQ_HANDLED;
 }
 
-- 
2.3.5


  parent reply	other threads:[~2015-05-05  9:26 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-05  9:25 [PATCH 01/12] net: axienet: Support for RGMII Michal Simek
2015-05-05  9:25 ` [PATCH 02/12] net: axienet: Handle 0 packet receive gracefully Michal Simek
2015-05-05  9:58   ` Shubhrajyoti Datta
2015-05-05 13:57   ` Joe Perches
2015-05-05 18:49     ` Michal Simek
2015-05-05 18:53       ` Joe Perches
2015-05-05  9:25 ` Michal Simek [this message]
2015-05-05  9:25 ` [PATCH 04/12] net: axienet: Handle jumbo frames for lesser frame sizes Michal Simek
2015-05-05  9:25 ` [PATCH 05/12] net: axienet: Support phy-less mode of operation Michal Simek
2015-05-05  9:25 ` [PATCH 06/12] net: axienet: Removed coding style errors and warnings Michal Simek
2015-05-05  9:26 ` [PATCH 07/12] net: axienet: Fix comments blocks Michal Simek
2015-05-05  9:26 ` [PATCH 08/12] net: axienet: Use pdev instead of op Michal Simek
2015-05-05  9:26 ` [PATCH 09/12] net: axienet: Use devm_* calls Michal Simek
2015-05-05  9:26 ` [PATCH 10/12] net: axienet: Use of_property_* calls Michal Simek
2015-05-05  9:26 ` [PATCH 11/12] net: axienet: Removed _of_ prefix in probe and remove functions Michal Simek
2015-05-05  9:26 ` [PATCH 12/12] net: axienet: Fix kernel-doc warnings Michal Simek
2015-05-05 23:35 ` [PATCH 01/12] net: axienet: Support for RGMII David Miller
2015-05-06  5:29   ` Michal Simek

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=2effdfc484793a74e6f53ee7e1b2ef5cebb2bfe9.1430817941.git.michal.simek@xilinx.com \
    --to=michal.simek@xilinx.com \
    --cc=John.Linn@xilinx.com \
    --cc=anirudh@xilinx.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=monstr@monstr.eu \
    --cc=netdev@vger.kernel.org \
    --cc=peter.crosthwaite@xilinx.com \
    --cc=soren.brinkmann@xilinx.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

all inboxes | Powered by JetHome®