From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] net: macb: initialize is_gem before usage
Date: Wed, 13 Mar 2013 16:39:06 +0100 [thread overview]
Message-ID: <20130313153906.GI1568@game.jcrosoft.org> (raw)
In-Reply-To: <1363172328-12904-1-git-send-email-s.trumtrar@pengutronix.de>
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 <s.trumtrar@pengutronix.de>
> ---
> 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
prev parent reply other threads:[~2013-03-13 15:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-13 10:58 Steffen Trumtrar
2013-03-13 15:39 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130313153906.GI1568@game.jcrosoft.org \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
--cc=s.trumtrar@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox