From: Robert Hancock <hancock@sedsystems.ca>
To: netdev@vger.kernel.org
Cc: anirudh@xilinx.com, John.Linn@xilinx.com, andrew@lunn.ch,
Robert Hancock <hancock@sedsystems.ca>
Subject: [PATCH net-next v4 11/20] net: axienet: Support shared interrupts
Date: Wed, 5 Jun 2019 14:42:24 -0600 [thread overview]
Message-ID: <1559767353-17301-12-git-send-email-hancock@sedsystems.ca> (raw)
In-Reply-To: <1559767353-17301-1-git-send-email-hancock@sedsystems.ca>
Specify IRQF_SHARED to support shared interrupts. If the interrupt
handler is called and the device is not indicating an interrupt,
just return IRQ_NONE rather than spewing error messages.
Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 4df424c..f733a7a 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -809,7 +809,7 @@ static void axienet_recv(struct net_device *ndev)
* @irq: irq number
* @_ndev: net_device pointer
*
- * Return: IRQ_HANDLED for all cases.
+ * Return: IRQ_HANDLED if device generated a TX interrupt, IRQ_NONE otherwise.
*
* This is the Axi DMA Tx done Isr. It invokes "axienet_start_xmit_done"
* to complete the BD processing.
@@ -828,7 +828,7 @@ static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
goto out;
}
if (!(status & XAXIDMA_IRQ_ALL_MASK))
- dev_err(&ndev->dev, "No interrupts asserted in Tx path\n");
+ return IRQ_NONE;
if (status & XAXIDMA_IRQ_ERROR_MASK) {
dev_err(&ndev->dev, "DMA Tx error 0x%x\n", status);
dev_err(&ndev->dev, "Current BD is at: 0x%x\n",
@@ -858,7 +858,7 @@ static irqreturn_t axienet_tx_irq(int irq, void *_ndev)
* @irq: irq number
* @_ndev: net_device pointer
*
- * Return: IRQ_HANDLED for all cases.
+ * Return: IRQ_HANDLED if device generated a RX interrupt, IRQ_NONE otherwise.
*
* This is the Axi DMA Rx Isr. It invokes "axienet_recv" to complete the BD
* processing.
@@ -877,7 +877,7 @@ static irqreturn_t axienet_rx_irq(int irq, void *_ndev)
goto out;
}
if (!(status & XAXIDMA_IRQ_ALL_MASK))
- dev_err(&ndev->dev, "No interrupts asserted in Rx path\n");
+ return IRQ_NONE;
if (status & XAXIDMA_IRQ_ERROR_MASK) {
dev_err(&ndev->dev, "DMA Rx error 0x%x\n", status);
dev_err(&ndev->dev, "Current BD is at: 0x%x\n",
@@ -953,11 +953,13 @@ static int axienet_open(struct net_device *ndev)
(unsigned long) lp);
/* Enable interrupts for Axi DMA Tx */
- ret = request_irq(lp->tx_irq, axienet_tx_irq, 0, ndev->name, ndev);
+ ret = request_irq(lp->tx_irq, axienet_tx_irq, IRQF_SHARED,
+ ndev->name, ndev);
if (ret)
goto err_tx_irq;
/* Enable interrupts for Axi DMA Rx */
- ret = request_irq(lp->rx_irq, axienet_rx_irq, 0, ndev->name, ndev);
+ ret = request_irq(lp->rx_irq, axienet_rx_irq, IRQF_SHARED,
+ ndev->name, ndev);
if (ret)
goto err_rx_irq;
--
1.8.3.1
next prev parent reply other threads:[~2019-06-05 20:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-05 20:42 [PATCH net-next v4 00/20] Xilinx axienet driver updates (v4) Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 01/20] net: axienet: Fix casting of pointers to u32 Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 02/20] net: axienet: Use standard IO accessors Robert Hancock
2019-06-06 14:12 ` Andrew Lunn
2019-06-05 20:42 ` [PATCH net-next v4 03/20] net: axienet: fix MDIO bus naming Robert Hancock
2019-06-06 14:12 ` Andrew Lunn
2019-06-05 20:42 ` [PATCH net-next v4 04/20] net: axienet: add X86 and ARM as supported platforms Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 05/20] net: axienet: Use clock framework to get device clock rate Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 06/20] net: axienet: fix teardown order of MDIO bus Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 07/20] net: axienet: Re-initialize MDIO registers properly after reset Robert Hancock
2019-06-06 21:05 ` David Miller
2019-06-05 20:42 ` [PATCH net-next v4 08/20] net: axienet: Cleanup DMA device reset and halt process Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 09/20] net: axienet: Make RX/TX ring sizes configurable Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 10/20] net: axienet: Add DMA registers to ethtool register dump Robert Hancock
2019-06-05 20:42 ` Robert Hancock [this message]
2019-06-05 20:42 ` [PATCH net-next v4 12/20] net: axienet: Add optional support for Ethernet core interrupt Robert Hancock
2019-06-06 21:06 ` David Miller
2019-06-05 20:42 ` [PATCH net-next v4 13/20] net: axienet: Fix race condition causing TX hang Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 14/20] net: axienet: Make missing MAC address non-fatal Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 15/20] net: axienet: stop interface during shutdown Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 16/20] net: axienet: document device tree mdio child node Robert Hancock
2019-06-06 14:16 ` Andrew Lunn
2019-06-05 20:42 ` [PATCH net-next v4 17/20] net: axienet: Fix MDIO bus parent node detection Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 18/20] net: axienet: document axistream-connected attribute Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 19/20] net: axienet: make use of axistream-connected attribute optional Robert Hancock
2019-06-05 20:42 ` [PATCH net-next v4 20/20] net: axienet: convert to phylink API Robert Hancock
2019-06-06 21:07 ` David Miller
2019-06-06 21:03 ` [PATCH net-next v4 00/20] Xilinx axienet driver updates (v4) 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=1559767353-17301-12-git-send-email-hancock@sedsystems.ca \
--to=hancock@sedsystems.ca \
--cc=John.Linn@xilinx.com \
--cc=andrew@lunn.ch \
--cc=anirudh@xilinx.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).