From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/1] macb: fix gem_recv circular buffer handling
Date: Wed, 13 Mar 2013 20:13:27 +0100 [thread overview]
Message-ID: <20130313191327.GC3475@pengutronix.de> (raw)
In-Reply-To: <1363189180-6650-1-git-send-email-plagnioj@jcrosoft.com>
On Wed, Mar 13, 2013 at 04:39:40PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> as we use a full buffer no need to check the SOF
> and reset the rx_tail
>
> fix at the same time the gem detection so we can have the rx_buffer
> allocated correctly according to the IP
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> drivers/net/macb.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index 0cfad05..2d4e373 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -172,7 +172,6 @@ static void reclaim_rx_buffers(struct macb_device *macb,
> static int gem_recv(struct eth_device *edev)
> {
> struct macb_device *macb = edev->priv;
> - unsigned int rx_tail = macb->rx_tail;
> void *buffer;
> int length;
> u32 status;
> @@ -181,20 +180,20 @@ static int gem_recv(struct eth_device *edev)
>
> for (;;) {
> barrier();
> - if (!(macb->rx_ring[rx_tail].addr & MACB_BIT(RX_USED)))
> + if (!(macb->rx_ring[macb->rx_tail].addr & MACB_BIT(RX_USED)))
> return -1;
>
> barrier();
> - status = macb->rx_ring[rx_tail].ctrl;
> + status = macb->rx_ring[macb->rx_tail].ctrl;
> length = MACB_BFEXT(RX_FRMLEN, status);
> - if (status & MACB_BIT(RX_SOF)) {
> - buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail;
> - net_receive(buffer, length);
> - macb->rx_ring[rx_tail].ctrl &= ~MACB_BIT(RX_USED);
> - barrier();
> - }
> - rx_tail++;
> + buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail;
> + net_receive(buffer, length);
> + macb->rx_ring[macb->rx_tail].addr &= ~MACB_BIT(RX_USED);
> + barrier();
> +
> macb->rx_tail++;
> + if (macb->rx_tail >= macb->rx_ring_size)
> + macb->rx_tail = 0;
> }
>
> return 0;
> @@ -619,11 +618,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 +632,17 @@ static int macb_probe(struct device_d *dev)
>
> clk_enable(macb->pclk);
>
> + macb->is_gem = read_is_gem(macb);
> +
> if (macb_is_gem(macb))
> edev->recv = gem_recv;
> else
> edev->recv = macb_recv;
> - 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);
>
> macb_reset_hw(macb);
> ncfgr = macb_mdc_clk_div(macb);
I know that the last part is not a very sophisticated patch, but you could at least
mention that I found the error and/or made part of this patch. Don't just
pretend that you came up with this all alone.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-03-13 19:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-13 15:39 Jean-Christophe PLAGNIOL-VILLARD
2013-03-13 19:13 ` Steffen Trumtrar [this message]
2013-03-14 15:47 ` Jean-Christophe PLAGNIOL-VILLARD
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=20130313191327.GC3475@pengutronix.de \
--to=s.trumtrar@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=plagnioj@jcrosoft.com \
/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