From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyrille Pitchen Subject: Re: [PATCH 1/4] net/macb: only probe queues once and use stored values Date: Fri, 27 Mar 2015 17:24:20 +0100 Message-ID: <55158434.2090708@atmel.com> References: <09960ba7389058e026b73409018fe1ee61d6dc57.1427469791.git.nicolas.ferre@atmel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: , , Boris BREZILLON , , , To: Nicolas Ferre , , Return-path: Received: from eusmtp01.atmel.com ([212.144.249.242]:56237 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753160AbbC0QYZ (ORCPT ); Fri, 27 Mar 2015 12:24:25 -0400 In-Reply-To: <09960ba7389058e026b73409018fe1ee61d6dc57.1427469791.git.nicolas.ferre@atmel.com> Sender: netdev-owner@vger.kernel.org List-ID: Hi Nicolas, There is a little mistake in this patch, which will prevent the GEM fro= m=20 working properly: Le 27/03/2015 16:34, Nicolas Ferre a =E9crit : > When merging at91_ether and macb driver during 421d9df0628b (net/macb= : merge > at91_ether driver into macb driver) the probe function has been split= =2E The code > dealing with initialization of queues is now moved in macb_init() whi= ch needs > information computed in the parent macb_probe() function. > So, add the queue_mask information to the private structure and use i= t when > needed in macb_init(). >=20 > Signed-off-by: Nicolas Ferre > Cc: Cyrille Pitchen > Cc: Boris Brezillon > --- > drivers/net/ethernet/cadence/macb.c | 9 ++++----- > drivers/net/ethernet/cadence/macb.h | 1 + > 2 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethern= et/cadence/macb.c > index a0a04b3638e6..b710768172d9 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -2180,7 +2180,7 @@ static void macb_probe_queues(void __iomem *mem= , > static int macb_init(struct platform_device *pdev) > { > struct net_device *dev =3D platform_get_drvdata(pdev); > - unsigned int hw_q, queue_mask, q, num_queues; > + unsigned int hw_q, q; > struct macb *bp =3D netdev_priv(dev); > struct macb_queue *queue; > int err; > @@ -2226,10 +2226,8 @@ static int macb_init(struct platform_device *p= dev) > * register mapping but we don't want to test the queue index then > * compute the corresponding register offset at run time. > */ > - macb_probe_queues(bp->regs, &queue_mask, &num_queues); > - > - for (hw_q =3D 0, q =3D 0; hw_q < MACB_MAX_QUEUES; ++hw_q) { > - if (!(queue_mask & (1 << hw_q))) > + for (hw_q =3D 0, q =3D 0; hw_q < bp->num_queues; ++hw_q) { > + if (!(bp->queue_mask & (1 << hw_q))) > continue; The exit condition of the for loop must remain "hw_q < MACB_MAX_QUEUES"= and=20 should not be replaced by "hw_q < bp->num_queues". Indeed there can be only 2 queues, for instance queue0 and queue7. So i= f you change the exit conditon of the loop, queue7 won't be initialized and H= RESP=20 errors will occur. > =20 > queue =3D &bp->queues[q]; > @@ -2715,6 +2713,7 @@ static int macb_probe(struct platform_device *p= dev) > bp->dev =3D dev; > bp->regs =3D mem; > bp->num_queues =3D num_queues; > + bp->queue_mask =3D queue_mask; > spin_lock_init(&bp->lock); > =20 > platform_set_drvdata(pdev, dev); > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethern= et/cadence/macb.h > index bc6e35c40822..0b6afac91bfe 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -785,6 +785,7 @@ struct macb { > size_t rx_buffer_size; > =20 > unsigned int num_queues; > + unsigned int queue_mask; > struct macb_queue queues[MACB_MAX_QUEUES]; > =20 > spinlock_t lock; >=20 Best Regards, Cyrille