From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 5.mo2.mail-out.ovh.net ([87.98.181.248] helo=mo2.mail-out.ovh.net) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFnpt-0005Hz-11 for barebox@lists.infradead.org; Wed, 13 Mar 2013 15:43:25 +0000 Received: from mail180.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo2.mail-out.ovh.net (Postfix) with SMTP id E9851DC235F for ; Wed, 13 Mar 2013 16:54:40 +0100 (CET) Date: Wed, 13 Mar 2013 16:39:06 +0100 From: Jean-Christophe PLAGNIOL-VILLARD Message-ID: <20130313153906.GI1568@game.jcrosoft.org> References: <1363172328-12904-1-git-send-email-s.trumtrar@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1363172328-12904-1-git-send-email-s.trumtrar@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] net: macb: initialize is_gem before usage To: Steffen Trumtrar Cc: barebox@lists.infradead.org On 11:58 Wed 13 Mar , Steffen Trumtrar wrote: > The variable macb->is_gem is evaluated before it is initialized. > That leads to a wrong rx_buffer setup in the gem case. Also, the > function gem_recv will never be used. > > Set the variable first and then use it. > > Signed-off-by: Steffen Trumtrar > --- > drivers/net/macb.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/macb.c b/drivers/net/macb.c > index 0cfad05..30e8476 100644 > --- a/drivers/net/macb.c > +++ b/drivers/net/macb.c > @@ -619,11 +619,6 @@ static int macb_probe(struct device_d *dev) > > macb->phy_flags = pdata->phy_flags; > > - macb_init_rx_buffer_size(macb, PKTSIZE); > - macb->rx_buffer = dma_alloc_coherent(macb->rx_buffer_size * macb->rx_ring_size); > - macb->rx_ring = dma_alloc_coherent(RX_RING_BYTES(macb)); > - macb->tx_ring = dma_alloc_coherent(TX_RING_BYTES); > - > macb->regs = dev_request_mem_region(dev, 0); > > /* > @@ -638,11 +633,17 @@ static int macb_probe(struct device_d *dev) > > clk_enable(macb->pclk); > > + macb->is_gem = read_is_gem(macb); > + > + macb_init_rx_buffer_size(macb, PKTSIZE); > + macb->rx_buffer = dma_alloc_coherent(macb->rx_buffer_size * macb->rx_ring_size); > + macb->rx_ring = dma_alloc_coherent(RX_RING_BYTES(macb)); > + macb->tx_ring = dma_alloc_coherent(TX_RING_BYTES); > + I check you need to update the gem_recv at the same time otherwise this brake the sama5 support Best Regards, J. > if (macb_is_gem(macb)) > edev->recv = gem_recv; > else > edev->recv = macb_recv; > - macb->is_gem = read_is_gem(macb); > > macb_reset_hw(macb); > ncfgr = macb_mdc_clk_div(macb); > -- > 1.8.2.rc2 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox