Patchwork Implement polling for 5200FEC to make netconsole work.

login
register
mail settings
Submitter Jon Smirl
Date Oct. 18, 2008, 9:40 p.m.
Message ID <20081018214059.1506.28013.stgit@terra>
Download mbox | patch
Permalink /patch/5021/
State Accepted
Delegated to: Jeff Garzik
Headers show

Comments

Jon Smirl - Oct. 18, 2008, 9:40 p.m.
Implement polling for 5200FEC to make netconsole work. Tested on Phytec pcm030 and Efika.

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
---
 drivers/net/fec_mpc52xx.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jon Smirl - Oct. 21, 2008, 11:41 p.m.
Is anyone going to pick this up?

On Sat, Oct 18, 2008 at 5:40 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
> Implement polling for 5200FEC to make netconsole work. Tested on Phytec pcm030 and Efika.
>
> Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
> ---
>  drivers/net/fec_mpc52xx.c |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
> index 4e4f683..aec3b97 100644
> --- a/drivers/net/fec_mpc52xx.c
> +++ b/drivers/net/fec_mpc52xx.c
> @@ -401,6 +401,21 @@ static int mpc52xx_fec_hard_start_xmit(struct sk_buff *skb, struct net_device *d
>        return 0;
>  }
>
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> +static void mpc52xx_fec_poll_controller(struct net_device *dev)
> +{
> +       struct mpc52xx_fec_priv *priv = netdev_priv(dev);
> +
> +       disable_irq(priv->t_irq);
> +       mpc52xx_fec_tx_interrupt(priv->t_irq, dev);
> +       enable_irq(priv->t_irq);
> +       disable_irq(priv->r_irq);
> +       mpc52xx_fec_rx_interrupt(priv->r_irq, dev);
> +       enable_irq(priv->r_irq);
> +}
> +#endif
> +
> +
>  /* This handles BestComm transmit task interrupts
>  */
>  static irqreturn_t mpc52xx_fec_tx_interrupt(int irq, void *dev_id)
> @@ -926,6 +941,9 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
>        ndev->tx_timeout        = mpc52xx_fec_tx_timeout;
>        ndev->watchdog_timeo    = FEC_WATCHDOG_TIMEOUT;
>        ndev->base_addr         = mem.start;
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> +       ndev->poll_controller = mpc52xx_fec_poll_controller;
> +#endif
>
>        priv->t_irq = priv->r_irq = ndev->irq = NO_IRQ; /* IRQ are free for now */
>
>
>
Grant Likely - Oct. 21, 2008, 11:57 p.m.
On Tue, Oct 21, 2008 at 5:41 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
> Is anyone going to pick this up?

I'm looking at it, but I'm not picking it up for .28.  It's
non-trivial enough that I would have needed to have it before the
merge window opened to get it into .28.

g.

>
> On Sat, Oct 18, 2008 at 5:40 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
>> Implement polling for 5200FEC to make netconsole work. Tested on Phytec pcm030 and Efika.
>>
>> Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
>> ---
>>  drivers/net/fec_mpc52xx.c |   18 ++++++++++++++++++
>>  1 files changed, 18 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
>> index 4e4f683..aec3b97 100644
>> --- a/drivers/net/fec_mpc52xx.c
>> +++ b/drivers/net/fec_mpc52xx.c
>> @@ -401,6 +401,21 @@ static int mpc52xx_fec_hard_start_xmit(struct sk_buff *skb, struct net_device *d
>>        return 0;
>>  }
>>
>> +#ifdef CONFIG_NET_POLL_CONTROLLER
>> +static void mpc52xx_fec_poll_controller(struct net_device *dev)
>> +{
>> +       struct mpc52xx_fec_priv *priv = netdev_priv(dev);
>> +
>> +       disable_irq(priv->t_irq);
>> +       mpc52xx_fec_tx_interrupt(priv->t_irq, dev);
>> +       enable_irq(priv->t_irq);
>> +       disable_irq(priv->r_irq);
>> +       mpc52xx_fec_rx_interrupt(priv->r_irq, dev);
>> +       enable_irq(priv->r_irq);
>> +}
>> +#endif
>> +
>> +
>>  /* This handles BestComm transmit task interrupts
>>  */
>>  static irqreturn_t mpc52xx_fec_tx_interrupt(int irq, void *dev_id)
>> @@ -926,6 +941,9 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
>>        ndev->tx_timeout        = mpc52xx_fec_tx_timeout;
>>        ndev->watchdog_timeo    = FEC_WATCHDOG_TIMEOUT;
>>        ndev->base_addr         = mem.start;
>> +#ifdef CONFIG_NET_POLL_CONTROLLER
>> +       ndev->poll_controller = mpc52xx_fec_poll_controller;
>> +#endif
>>
>>        priv->t_irq = priv->r_irq = ndev->irq = NO_IRQ; /* IRQ are free for now */
>>
>>
>>
>
>
>
> --
> Jon Smirl
> jonsmirl@gmail.com
>

Patch

diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 4e4f683..aec3b97 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -401,6 +401,21 @@  static int mpc52xx_fec_hard_start_xmit(struct sk_buff *skb, struct net_device *d
 	return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void mpc52xx_fec_poll_controller(struct net_device *dev)
+{
+	struct mpc52xx_fec_priv *priv = netdev_priv(dev);
+
+	disable_irq(priv->t_irq);
+	mpc52xx_fec_tx_interrupt(priv->t_irq, dev);
+	enable_irq(priv->t_irq);
+	disable_irq(priv->r_irq);
+	mpc52xx_fec_rx_interrupt(priv->r_irq, dev);
+	enable_irq(priv->r_irq);
+}
+#endif
+
+
 /* This handles BestComm transmit task interrupts
  */
 static irqreturn_t mpc52xx_fec_tx_interrupt(int irq, void *dev_id)
@@ -926,6 +941,9 @@  mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
 	ndev->tx_timeout	= mpc52xx_fec_tx_timeout;
 	ndev->watchdog_timeo	= FEC_WATCHDOG_TIMEOUT;
 	ndev->base_addr		= mem.start;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	ndev->poll_controller = mpc52xx_fec_poll_controller;
+#endif
 
 	priv->t_irq = priv->r_irq = ndev->irq = NO_IRQ; /* IRQ are free for now */