[PATCH 2.6.19] AT91RM9200 Ethernet update 2

[PATCH 2.6.19] AT91RM9200 Ethernet update 2

[Andrew Victor]

This patch adds NetPoll / NetConsole support to the Atmel AT91RM9200
Ethernet driver.

Original patch from Bill Gatliff.


Signed-off-by: Andrew Victor <andrew@sanpeople.com>


diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c linux-2.6.19-final/drivers/net/arm/at91_ether.c
--- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c	Mon Dec  4 14:27:21 2006
+++ linux-2.6.19-final/drivers/net/arm/at91_ether.c	Mon Dec  4 14:33:35 2006
@@ -925,6 +925,17 @@
 	return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void at91ether_poll_controller(struct net_device *dev)
+{
+	unsigned long flags;
+
+	local_irq_save(flags);
+	at91ether_interrupt(dev->irq, dev, NULL);
+	local_irq_restore(flags);
+}
+#endif
+
 /*
  * Initialize the ethernet interface
  */
@@ -974,6 +985,9 @@
 	dev->set_mac_address = set_mac_address;
 	dev->ethtool_ops = &at91ether_ethtool_ops;
 	dev->do_ioctl = at91ether_ioctl;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	dev->poll_controller = at91ether_poll_controller;
+#endif
 
 	SET_NETDEV_DEV(dev, &pdev->dev);
 

Re: [PATCH 2.6.19] AT91RM9200 Ethernet update 2

[Stephen Hemminger]

On 04 Dec 2006 14:42:08 +0200
Andrew Victor <andrew@sanpeople.com> wrote:

> This patch adds NetPoll / NetConsole support to the Atmel AT91RM9200
> Ethernet driver.
> 
> Original patch from Bill Gatliff.
> 
> 
> Signed-off-by: Andrew Victor <andrew@sanpeople.com>
> 
> 
> diff -urN linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c linux-2.6.19-final/drivers/net/arm/at91_ether.c
> --- linux-2.6.19-final.orig/drivers/net/arm/at91_ether.c	Mon Dec  4 14:27:21 2006
> +++ linux-2.6.19-final/drivers/net/arm/at91_ether.c	Mon Dec  4 14:33:35 2006
> @@ -925,6 +925,17 @@
>  	return IRQ_HANDLED;
>  }
>  
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> +static void at91ether_poll_controller(struct net_device *dev)
> +{
> +	unsigned long flags;
> +
> +	local_irq_save(flags);
> +	at91ether_interrupt(dev->irq, dev, NULL);
> +	local_irq_restore(flags);
> +}
> +#endif

poll_controller is always called with interrupts already disabled.

The third argument to interrupt routines was dropped (struct pt_regs) in 2.6.19.
Maybe that never got fixed in ARM?

-- 
Stephen Hemminger <shemminger@osdl.org>

Re: [PATCH 2.6.19] AT91RM9200 Ethernet update 2

[Jeff Garzik]

Andrew Victor wrote:
> This patch adds NetPoll / NetConsole support to the Atmel AT91RM9200
> Ethernet driver.
> 
> Original patch from Bill Gatliff.
> 
> 
> Signed-off-by: Andrew Victor <andrew@sanpeople.com>

ACK patch content, but comments about email description / subject line 
also apply here.

Re: [PATCH 2.6.19] AT91RM9200 Ethernet update 2

[Andrew Victor]

hi Stephen,

> poll_controller is always called with interrupts already disabled.

All the other network drivers I looked at seem to disable the interrupt.


> The third argument to interrupt routines was dropped (struct pt_regs) in 2.6.19.
> Maybe that never got fixed in ARM?

My mistake - ARM was fixed up.
I rarely compile with netconsole support so this change slipped through.


Regards,
  Andrew Victor