Patchwork bnx2: fix poll_controller method so that proper structures are passed and all rx queues are checked

login
register
mail settings
Submitter Neil Horman
Date Nov. 11, 2008, 8:58 p.m.
Message ID <20081111185559.GD30481@hmsreliant.think-freely.org>
Download mbox | patch
Permalink /patch/8195/
State Accepted
Delegated to: David Miller
Headers show

Comments

Neil Horman - Nov. 11, 2008, 8:58 p.m.
On Tue, Nov 11, 2008 at 09:59:24AM -0800, Michael Chan wrote:
> 
> On Tue, 2008-11-11 at 09:37 -0800, Neil Horman wrote:
> > Copy that.  Here you go, followon patch to change how we pass the irq vector to
> > bnx2_interrupt.  Doesn't do anything super-usefull, but good for the sake of
> > correctness
> 
> Sorry, I missed something earlier.  After looking at this more closely,
> we should also move disable_irq() into the loop and call it with the
> same vector values from irq_tbl.
> 

Oops your right, new comprehensive patch, replacing the previous 2.

Fix bnx2 so that netpoll works properly.  Specifically:

1) Fix parameters to bnx2_interrupt to be a struct bnx2_napi rather than a
struct net_device

2) Fix poll_controller method to check every queue in the rx case so frames
aren't missed

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>


 bnx2.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
David Miller - Nov. 13, 2008, 12:23 a.m.
From: Neil Horman <nhorman@tuxdriver.com>
Date: Tue, 11 Nov 2008 15:58:03 -0500

> Fix bnx2 so that netpoll works properly.  Specifically:
> 
> 1) Fix parameters to bnx2_interrupt to be a struct bnx2_napi rather than a
> struct net_device
> 
> 2) Fix poll_controller method to check every queue in the rx case so frames
> aren't missed
> 
> Signed-off-by: Neil Horman <nhorman@tuxdriver.com>

This looks good, applied, thanks Neil!
--
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
Neil Horman - Nov. 13, 2008, 1:09 a.m.
On Wed, Nov 12, 2008 at 04:23:59PM -0800, David Miller wrote:
> From: Neil Horman <nhorman@tuxdriver.com>
> Date: Tue, 11 Nov 2008 15:58:03 -0500
> 
> > Fix bnx2 so that netpoll works properly.  Specifically:
> > 
> > 1) Fix parameters to bnx2_interrupt to be a struct bnx2_napi rather than a
> > struct net_device
> > 
> > 2) Fix poll_controller method to check every queue in the rx case so frames
> > aren't missed
> > 
> > Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
> 
> This looks good, applied, thanks Neil!
> 
Thank you Dave!
Neil

--
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

Patch

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 430d430..d07e3f1 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7204,10 +7204,13 @@  static void
 poll_bnx2(struct net_device *dev)
 {
 	struct bnx2 *bp = netdev_priv(dev);
+	int i;
 
-	disable_irq(bp->pdev->irq);
-	bnx2_interrupt(bp->pdev->irq, dev);
-	enable_irq(bp->pdev->irq);
+	for (i = 0; i < bp->irq_nvecs; i++) {
+		disable_irq(bp->irq_tbl[i].vector);
+		bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
+		enable_irq(bp->irq_tbl[i].vector);
+	}
 }
 #endif