All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ramon Fried <rfried.dev@gmail.com>
To: edgar.iglesias@gmail.com, alistair@alistair23.me,
	peter.maydell@linaro.org, jasowang@redhat.com,
	qemu-arm@nongnu.org
Cc: Ramon Fried <rfried.dev@gmail.com>, qemu-devel@nongnu.org
Subject: [PATCH] Cadence: gem: fix wraparound in 64bit descriptors
Date: Thu, 16 Apr 2020 12:02:47 +0300	[thread overview]
Message-ID: <20200416090247.353414-1-rfried.dev@gmail.com> (raw)

Wraparound of TX descriptor cyclic buffer only updated
the low 32 bits of the descriptor.
Fix that by checking if we're working with 64bit descriptors.

Signed-off-by: Ramon Fried <rfried.dev@gmail.com>
---
 hw/net/cadence_gem.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index 51ec5a072d..b8ae21cc0d 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -1238,7 +1238,14 @@ static void gem_transmit(CadenceGEMState *s)
             /* read next descriptor */
             if (tx_desc_get_wrap(desc)) {
                 tx_desc_set_last(desc);
-                packet_desc_addr = s->regs[GEM_TXQBASE];
+
+            if (s->regs[GEM_DMACFG] & GEM_DMACFG_ADDR_64B) {
+                packet_desc_addr = s->regs[GEM_TBQPH];
+                packet_desc_addr <<= 32;
+            } else {
+                packet_desc_addr = 0;
+            }
+                packet_desc_addr |= s->regs[GEM_TXQBASE];
             } else {
                 packet_desc_addr += 4 * gem_get_desc_len(s, false);
             }
-- 
2.26.0


             reply	other threads:[~2020-04-16  9:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-16  9:02 Ramon Fried [this message]
2020-04-16  9:39 ` [PATCH] Cadence: gem: fix wraparound in 64bit descriptors no-reply
2020-04-16  9:39   ` no-reply
2020-04-16 11:09   ` Philippe Mathieu-Daudé
2020-04-17 13:37 ` Peter Maydell
2020-04-17 13:37   ` Peter Maydell
2020-04-17 17:16   ` Ramon Fried
2020-04-17 17:16     ` Ramon Fried
2020-04-17 15:46 ` Edgar E. Iglesias

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=20200416090247.353414-1-rfried.dev@gmail.com \
    --to=rfried.dev@gmail.com \
    --cc=alistair@alistair23.me \
    --cc=edgar.iglesias@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.