* [PATCH/RFC] add netpoll support for gianfar
@ 2006-11-06 11:19 Vitaly Wool
2006-11-06 21:26 ` Andy Fleming
2006-11-07 9:30 ` Jeff Garzik
0 siblings, 2 replies; 4+ messages in thread
From: Vitaly Wool @ 2006-11-06 11:19 UTC (permalink / raw)
To: jgarzik; +Cc: netdev
The patch inlined below adds NET_POLL_CONTROLLER support for gianfar network driver.
drivers/net/gianfar.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
Signed-off-by: Vitaly Wool <vwool@ru.mvista.com>
Index: powerpc/drivers/net/gianfar.c
===================================================================
--- powerpc.orig/drivers/net/gianfar.c
+++ powerpc/drivers/net/gianfar.c
@@ -133,6 +133,9 @@ static void gfar_set_hash_for_addr(struc
#ifdef CONFIG_GFAR_NAPI
static int gfar_poll(struct net_device *dev, int *budget);
#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void gfar_netpoll(struct net_device *dev);
+#endif
int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit);
static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length);
static void gfar_vlan_rx_register(struct net_device *netdev,
@@ -260,6 +263,9 @@ static int gfar_probe(struct platform_de
dev->poll = gfar_poll;
dev->weight = GFAR_DEV_WEIGHT;
#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ dev->poll_controller = gfar_netpoll;
+#endif
dev->stop = gfar_close;
dev->get_stats = gfar_get_stats;
dev->change_mtu = gfar_change_mtu;
@@ -1536,6 +1542,34 @@ static int gfar_poll(struct net_device *
}
#endif
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void gfar_netpoll(struct net_device *dev)
+{
+ struct gfar_private *priv = netdev_priv(dev);
+
+ /* If the device has multiple interrupts, run tx/rx */
+ if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
+ disable_irq(priv->interruptTransmit);
+ disable_irq(priv->interruptReceive);
+ disable_irq(priv->interruptError);
+ gfar_transmit(priv->interruptTransmit, dev, NULL);
+ gfar_receive(priv->interruptReceive, dev, NULL);
+ enable_irq(priv->interruptError);
+ enable_irq(priv->interruptReceive);
+ enable_irq(priv->interruptTransmit);
+ } else {
+ disable_irq(priv->interruptTransmit);
+ gfar_interrupt(priv->interruptTransmit, dev, NULL);
+ enable_irq(priv->interruptTransmit);
+ }
+}
+#endif
+
/* The interrupt handler for devices with one interrupt */
static irqreturn_t gfar_interrupt(int irq, void *dev_id)
{
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH/RFC] add netpoll support for gianfar
2006-11-06 11:19 [PATCH/RFC] add netpoll support for gianfar Vitaly Wool
@ 2006-11-06 21:26 ` Andy Fleming
2006-11-07 10:25 ` Vitaly Wool
2006-11-07 9:30 ` Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Andy Fleming @ 2006-11-06 21:26 UTC (permalink / raw)
To: Vitaly Wool; +Cc: jgarzik, netdev
On Nov 6, 2006, at 05:19, Vitaly Wool wrote:
> The patch inlined below adds NET_POLL_CONTROLLER support for
> gianfar network driver.
>
> drivers/net/gianfar.c | 34 ++++++++++++++++++++++++++++++++++
> 1 file changed, 34 insertions(+)
>
> Signed-off-by: Vitaly Wool <vwool@ru.mvista.com>
>
> Index: powerpc/drivers/net/gianfar.c
> ===================================================================
> --- powerpc.orig/drivers/net/gianfar.c
> +++ powerpc/drivers/net/gianfar.c
> @@ -133,6 +133,9 @@ static void gfar_set_hash_for_addr(struc
> #ifdef CONFIG_GFAR_NAPI
> static int gfar_poll(struct net_device *dev, int *budget);
> #endif
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> +static void gfar_netpoll(struct net_device *dev);
> +#endif
> int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit);
> static int gfar_process_frame(struct net_device *dev, struct
> sk_buff *skb, int length);
> static void gfar_vlan_rx_register(struct net_device *netdev,
> @@ -260,6 +263,9 @@ static int gfar_probe(struct platform_de
> dev->poll = gfar_poll;
> dev->weight = GFAR_DEV_WEIGHT;
> #endif
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> + dev->poll_controller = gfar_netpoll;
> +#endif
> dev->stop = gfar_close;
> dev->get_stats = gfar_get_stats;
> dev->change_mtu = gfar_change_mtu;
> @@ -1536,6 +1542,34 @@ static int gfar_poll(struct net_device *
> }
> #endif
>
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> +/*
> + * Polling 'interrupt' - used by things like netconsole to send skbs
> + * without having to re-enable interrupts. It's not called while
> + * the interrupt routine is executing.
> + */
> +static void gfar_netpoll(struct net_device *dev)
> +{
> + struct gfar_private *priv = netdev_priv(dev);
> +
> + /* If the device has multiple interrupts, run tx/rx */
> + if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
> + disable_irq(priv->interruptTransmit);
> + disable_irq(priv->interruptReceive);
> + disable_irq(priv->interruptError);
> + gfar_transmit(priv->interruptTransmit, dev, NULL);
> + gfar_receive(priv->interruptReceive, dev, NULL);
You are passing extra arguments, here
> + enable_irq(priv->interruptError);
> + enable_irq(priv->interruptReceive);
> + enable_irq(priv->interruptTransmit);
> + } else {
> + disable_irq(priv->interruptTransmit);
> + gfar_interrupt(priv->interruptTransmit, dev, NULL);
and here (pt_regs got eliminated).
Also, a few more comments:
1) Do we need the disable/enable irq stuff? It seems like we should
be able to either just *mask* the interrupts at the controller, or
rely on the locks to disable the interrupts.
2) If we are calling gfar_transmit and gfar_receive, shouldn't we
call gfar_error?
3) I think it should be possible to just call gfar_interrupt() in
every situation, but I'm not very familiar with net poll's
requirements (You can add that into your evaluation of #1, too).
Andy
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH/RFC] add netpoll support for gianfar
2006-11-06 21:26 ` Andy Fleming
@ 2006-11-07 10:25 ` Vitaly Wool
0 siblings, 0 replies; 4+ messages in thread
From: Vitaly Wool @ 2006-11-07 10:25 UTC (permalink / raw)
To: Andy Fleming; +Cc: jgarzik, netdev
On Mon, 6 Nov 2006 15:26:33 -0600
Andy Fleming <afleming@freescale.com> wrote:
> You are passing extra arguments, here
Oh yes, thanks. I was out of sync here.
> 1) Do we need the disable/enable irq stuff? It seems like we should
> be able to either just *mask* the interrupts at the controller, or
> rely on the locks to disable the interrupts.
I don't see how masking the ints at the controller differs much from disable_irq.
Locking all the interrupts is definitely worse than disabling selected ones. Also, introducing locks here means that we'll need to handle that specifically for -rt kernels.
> 2) If we are calling gfar_transmit and gfar_receive, shouldn't we
> call gfar_error?
>
> 3) I think it should be possible to just call gfar_interrupt() in
> every situation, but I'm not very familiar with net poll's
> requirements (You can add that into your evaluation of #1, too).
Oh yes, that's a nice idea, thanks.
Vitaly
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH/RFC] add netpoll support for gianfar
2006-11-06 11:19 [PATCH/RFC] add netpoll support for gianfar Vitaly Wool
2006-11-06 21:26 ` Andy Fleming
@ 2006-11-07 9:30 ` Jeff Garzik
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2006-11-07 9:30 UTC (permalink / raw)
To: Vitaly Wool; +Cc: netdev
Vitaly Wool wrote:
> The patch inlined below adds NET_POLL_CONTROLLER support for gianfar network driver.
As noted, this patch is out of date. 2.6.19-rc kernels removed the
pt_regs argument from all irq handlers.
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-11-07 10:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-06 11:19 [PATCH/RFC] add netpoll support for gianfar Vitaly Wool
2006-11-06 21:26 ` Andy Fleming
2006-11-07 10:25 ` Vitaly Wool
2006-11-07 9:30 ` Jeff Garzik
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).