Re: [SUNGEM] LLTX support

[Eric Lemoine <eric.lemoine@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

On Wed, 15 Sep 2004 08:35:59 -0700, David S. Miller <davem@davemloft.net> wrote:
> On Wed, 15 Sep 2004 08:45:21 +0200
> Eric Lemoine <eric.lemoine@gmail.com> wrote:
> 
> > The attached patch adds LLTX support to SunGEM NAPI. The tx_lock patch
> > I just sent must be applied first.
> 
> Also applied, thanks Eric.
> 
> I remember you mentioning yesterday that Harald's sungem NAPI
> patch had netpoll support, can you cook up a patch that adds
> it for current sungem?

Patch attached. Unlike Harald's, this patch doesn't disable_irq before
calling gem_interrupt because gem_interrupt is safe to reentrance.
Hopefully this is correct...

-- 
Eric

[-- Attachment #2: rset-sungem_netpoll-2-6-9-rc1.patch --]
[-- Type: application/octet-stream, Size: 1486 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/09/15 23:37:24+02:00 eric.lemoine@gmail.com 
#   [SUNGEM] netpoll support
#   
#   Signed-off-by: Eric Lemoine <eric.lemoine@gmail.com>
# 
# drivers/net/sungem.c
#   2004/09/15 23:37:15+02:00 eric.lemoine@gmail.com +16 -0
#   [SUNGEM] netpoll support
#   
#   Signed-off-by: Eric Lemoine <eric.lemoine@gmail.com>
# 
diff -Nru a/drivers/net/sungem.c b/drivers/net/sungem.c
--- a/drivers/net/sungem.c	2004-09-15 23:38:12 +02:00
+++ b/drivers/net/sungem.c	2004-09-15 23:38:12 +02:00
@@ -5,6 +5,9 @@
  * 
  * Support for Apple GMAC and assorted PHYs by
  * Benjamin Herrenscmidt (benh@kernel.crashing.org)
+ *
+ * NAPI and NETPOLL support
+ * (C) 2004 by Eric Lemoine (eric.lemoine@gmail.com)
  * 
  * TODO: 
  *  - Get rid of all those nasty mdelay's and replace them
@@ -898,6 +901,16 @@
 	return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void gem_poll_controller(struct net_device *dev)
+{
+	/* gem_interrupt is safe to reentrance so no need
+	 * to disable_irq here.
+	 */
+	gem_interrupt(dev->irq, dev, NULL);
+}
+#endif
+
 static void gem_tx_timeout(struct net_device *dev)
 {
 	struct gem *gp = dev->priv;
@@ -2934,6 +2947,9 @@
 	dev->change_mtu = gem_change_mtu;
 	dev->irq = pdev->irq;
 	dev->dma = 0;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        dev->poll_controller = gem_poll_controller;
+#endif
 
 	if (register_netdev(dev)) {
 		printk(KERN_ERR PFX "Cannot register net device, "