|
| 1 | +From f803101a8081466b71cf24df45675f79839bc06e Mon Sep 17 00:00:00 2001 |
| 2 | +From: Antony Pavlov < [email protected]> |
| 3 | +Date: Wed, 25 Aug 2021 17:36:39 -0400 |
| 4 | +Subject: [PATCH 01/19] LiteX: LiteEth: add polling support |
| 5 | + |
| 6 | +Signed-off-by: Antony Pavlov < [email protected]> |
| 7 | +Signed-off-by: Gabriel Somlo < [email protected]> |
| 8 | +--- |
| 9 | + drivers/net/ethernet/litex/litex_liteeth.c | 41 ++++++++++++++++++---- |
| 10 | + 1 file changed, 34 insertions(+), 7 deletions(-) |
| 11 | + |
| 12 | +diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c |
| 13 | +index ff54fbe41bcc..de2c83c1ecfe 100644 |
| 14 | +--- a/drivers/net/ethernet/litex/litex_liteeth.c |
| 15 | ++++ b/drivers/net/ethernet/litex/litex_liteeth.c |
| 16 | +@@ -8,6 +8,7 @@ |
| 17 | + |
| 18 | + #include <linux/etherdevice.h> |
| 19 | + #include <linux/interrupt.h> |
| 20 | ++#include <linux/iopoll.h> |
| 21 | + #include <linux/litex.h> |
| 22 | + #include <linux/module.h> |
| 23 | + #include <linux/of_net.h> |
| 24 | +@@ -43,6 +44,10 @@ struct liteeth { |
| 25 | + struct device *dev; |
| 26 | + u32 slot_size; |
| 27 | + |
| 28 | ++ /* Polling support */ |
| 29 | ++ int use_polling; |
| 30 | ++ struct timer_list poll_timer; |
| 31 | ++ |
| 32 | + /* Tx */ |
| 33 | + u32 tx_slot; |
| 34 | + u32 num_tx_slots; |
| 35 | +@@ -111,6 +116,14 @@ static irqreturn_t liteeth_interrupt(int irq, void *dev_id) |
| 36 | + return IRQ_HANDLED; |
| 37 | + } |
| 38 | + |
| 39 | ++static void liteeth_timeout(struct timer_list *t) |
| 40 | ++{ |
| 41 | ++ struct liteeth *priv = from_timer(priv, t, poll_timer); |
| 42 | ++ |
| 43 | ++ liteeth_interrupt(0, priv->netdev); |
| 44 | ++ mod_timer(&priv->poll_timer, jiffies + msecs_to_jiffies(10)); |
| 45 | ++} |
| 46 | ++ |
| 47 | + static int liteeth_open(struct net_device *netdev) |
| 48 | + { |
| 49 | + struct liteeth *priv = netdev_priv(netdev); |
| 50 | +@@ -120,10 +133,16 @@ static int liteeth_open(struct net_device *netdev) |
| 51 | + litex_write8(priv->base + LITEETH_WRITER_EV_PENDING, 1); |
| 52 | + litex_write8(priv->base + LITEETH_READER_EV_PENDING, 1); |
| 53 | + |
| 54 | +- err = request_irq(netdev->irq, liteeth_interrupt, 0, netdev->name, netdev); |
| 55 | +- if (err) { |
| 56 | +- netdev_err(netdev, "failed to request irq %d\n", netdev->irq); |
| 57 | +- return err; |
| 58 | ++ if (priv->use_polling) { |
| 59 | ++ timer_setup(&priv->poll_timer, liteeth_timeout, 0); |
| 60 | ++ mod_timer(&priv->poll_timer, jiffies + msecs_to_jiffies(50)); |
| 61 | ++ } else { |
| 62 | ++ err = request_irq(netdev->irq, liteeth_interrupt, 0, netdev->name, netdev); |
| 63 | ++ if (err) { |
| 64 | ++ netdev_err(netdev, "failed to request irq %d\n", netdev->irq); |
| 65 | ++ return err; |
| 66 | ++ } |
| 67 | ++ |
| 68 | + } |
| 69 | + |
| 70 | + /* Enable IRQs */ |
| 71 | +@@ -146,7 +165,11 @@ static int liteeth_stop(struct net_device *netdev) |
| 72 | + litex_write8(priv->base + LITEETH_WRITER_EV_ENABLE, 0); |
| 73 | + litex_write8(priv->base + LITEETH_READER_EV_ENABLE, 0); |
| 74 | + |
| 75 | +- free_irq(netdev->irq, netdev); |
| 76 | ++ if (priv->use_polling) { |
| 77 | ++ del_timer_sync(&priv->poll_timer); |
| 78 | ++ } else { |
| 79 | ++ free_irq(netdev->irq, netdev); |
| 80 | ++ } |
| 81 | + |
| 82 | + return 0; |
| 83 | + } |
| 84 | +@@ -253,9 +276,13 @@ static int liteeth_probe(struct platform_device *pdev) |
| 85 | + if (!netdev->tstats) |
| 86 | + return -ENOMEM; |
| 87 | + |
| 88 | ++ priv->use_polling = 0; |
| 89 | + irq = platform_get_irq(pdev, 0); |
| 90 | +- if (irq < 0) |
| 91 | +- return irq; |
| 92 | ++ if (irq < 0) { |
| 93 | ++ dev_err(&pdev->dev, "Failed to get IRQ, using polling\n"); |
| 94 | ++ priv->use_polling = 1; |
| 95 | ++ irq = 0; |
| 96 | ++ } |
| 97 | + netdev->irq = irq; |
| 98 | + |
| 99 | + priv->base = devm_platform_ioremap_resource_byname(pdev, "mac"); |
| 100 | +-- |
| 101 | +2.43.0 |
| 102 | + |
0 commit comments