netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jakub Kiciński" <moorray3@wp.pl>
To: Felix Fietkau <nbd@openwrt.org>
Cc: netdev@vger.kernel.org, zajec5@gmail.com, hauke@hauke-m.de
Subject: Re: [PATCH 4/4] bgmac: fix DMA rx corruption
Date: Sun, 12 Apr 2015 12:31:34 +0200	[thread overview]
Message-ID: <20150412123134.3e1c4fea@north> (raw)
In-Reply-To: <1428833292-15356-4-git-send-email-nbd@openwrt.org>

On Sun, 12 Apr 2015 12:08:12 +0200, Felix Fietkau wrote:
> The driver needs to inform the hardware about the first invalid (not yet
> filled) rx slot, by writing its DMA descriptor pointer offset to the
> BGMAC_DMA_RX_INDEX register.
> 
> This register was set to a value exceeding the rx ring size, effectively
> allowing the hardware constant access to the full ring, regardless of
> which slots are initialized.
> 
> Fix this by updating the register in bgmac_dma_rx_setup_desc.
> 
> Signed-off-by: Felix Fietkau <nbd@openwrt.org>
> ---
>  drivers/net/ethernet/broadcom/bgmac.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
> index e332de8..856ceee 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.c
> +++ b/drivers/net/ethernet/broadcom/bgmac.c
> @@ -380,6 +380,12 @@ static void bgmac_dma_rx_setup_desc(struct bgmac *bgmac,
>  	dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[desc_idx].dma_addr));
>  	dma_desc->ctl0 = cpu_to_le32(ctl0);
>  	dma_desc->ctl1 = cpu_to_le32(ctl1);
> +
> +	desc_idx = (desc_idx + 1) % BGMAC_RX_RING_SLOTS;
> +
> +	bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX,
> +			ring->index_base +
> +			desc_idx * sizeof(struct bgmac_dma_desc));
>  }

Newb question if I may: why is no mem barrier necessary in this case?

  parent reply	other threads:[~2015-04-12 10:38 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-12 10:08 [PATCH 1/4] bgmac: simplify tx ring index handling Felix Fietkau
2015-04-12 10:08 ` [PATCH 2/4] bgmac: leave interrupts disabled as long as there is work to do Felix Fietkau
2015-04-12 10:08 ` [PATCH 3/4] bgmac: set received skb headroom to NET_SKB_PAD Felix Fietkau
2015-04-12 10:08 ` [PATCH 4/4] bgmac: fix DMA rx corruption Felix Fietkau
2015-04-12 10:31   ` Eric Dumazet
2015-04-12 10:43     ` Felix Fietkau
2015-04-12 17:24       ` Eric Dumazet
2015-04-12 17:28         ` Felix Fietkau
2015-04-12 10:31   ` Jakub Kiciński [this message]
2015-04-12 11:11   ` Sergei Shtylyov

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=20150412123134.3e1c4fea@north \
    --to=moorray3@wp.pl \
    --cc=hauke@hauke-m.de \
    --cc=nbd@openwrt.org \
    --cc=netdev@vger.kernel.org \
    --cc=zajec5@gmail.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;
as well as URLs for NNTP newsgroup(s).