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, 5:37 p.m.
Message ID <20081111173708.GC30481@hmsreliant.think-freely.org>
Download mbox | patch
Permalink /patch/8167/
State Superseded
Delegated to: David Miller
Headers show

Comments

Neil Horman - Nov. 11, 2008, 5:37 p.m.
On Tue, Nov 11, 2008 at 09:09:10AM -0800, Michael Chan wrote:
> 
> On Tue, 2008-11-11 at 08:46 -0800, Neil Horman wrote:
> > On Tue, Nov 11, 2008 at 07:12:13AM -0800, Michael Chan wrote:
> > > Neil Horman wrote:
> > > > diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
> > > > index 430d430..9e1f0e3 100644
> > > > --- a/drivers/net/bnx2.c
> > > > +++ b/drivers/net/bnx2.c
> > > > @@ -7203,10 +7203,12 @@ bnx2_change_mtu(struct net_device
> > > > *dev, int new_mtu)
> > > >  static void
> > > >  poll_bnx2(struct net_device *dev)
> > > >  {
> > > > +     int i;
> > > >       struct bnx2 *bp = netdev_priv(dev);
> > > >
> > > >       disable_irq(bp->pdev->irq);
> > > > -     bnx2_interrupt(bp->pdev->irq, dev);
> > > > +     for (i = 0; i < bp->irq_nvecs; i++)
> > > > +             bnx2_interrupt(bp->pdev->irq, &bp->bnx2_napi[i]);
> > > 
> > > Neil, thanks for the patch.
> > > 
> > > We should probably pass bp->irq_tbl[i].vector as 1st parameter
> > > for correctness, even though it doesn't really matter in this
> > > case since it is not used by bnx2_interrupt().
> > > 
> > I thought we overwrote pdev->irq with the value from irq_tbl when we registered
> > for msi interrupts?
> > 
> 
> In MSI and INTA mode, we store pdev->irq into irq_tbl[0].vector.  In
> MSI-X mode, we'll have multiple vectors in the irq_tbl entries and
> pdev->irq is no longer relevant.  So to be correct when we have multiple
> vectors, the irq_tbl values should be used.
> 
> Thanks.
> 


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

Regards
Neil

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


 bnx2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


> 
> --
> 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
>
Michael Chan - Nov. 11, 2008, 5:59 p.m.
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.

Thanks.
> 
> Regards
> Neil
> 
> Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
> 
> 
>  bnx2.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 
> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
> index 9e1f0e3..cad8b7a 100644
> --- a/drivers/net/bnx2.c
> +++ b/drivers/net/bnx2.c
> @@ -7208,7 +7208,7 @@ poll_bnx2(struct net_device *dev)
>  
>         disable_irq(bp->pdev->irq);
>         for (i = 0; i < bp->irq_nvecs; i++)
> -               bnx2_interrupt(bp->pdev->irq, &bp->bnx2_napi[i]);
> +               bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
>         enable_irq(bp->pdev->irq);
>  }
>  #endif


--
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 9e1f0e3..cad8b7a 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7208,7 +7208,7 @@  poll_bnx2(struct net_device *dev)
 
 	disable_irq(bp->pdev->irq);
 	for (i = 0; i < bp->irq_nvecs; i++)
-		bnx2_interrupt(bp->pdev->irq, &bp->bnx2_napi[i]);
+		bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
 	enable_irq(bp->pdev->irq);
 }
 #endif