qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Peter Crosthwaite <peter.crosthwaite@xilinx.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 1/5] net: xilinx_ethlite: Fix Rx-pong interrupt
Date: Mon,  9 Jun 2014 15:43:02 +0200	[thread overview]
Message-ID: <1402321386-17773-2-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1402321386-17773-1-git-send-email-stefanha@redhat.com>

From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

There is no CTRL_I bit in the pong buffer control register. The
CTRL_I bit from the ping buffer masks both ping and pong buffers.
Fix.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/xilinx_ethlite.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 5a434f6..1b177b3 100644
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -196,8 +196,9 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size)
     memcpy(&s->regs[rxbase + R_RX_BUF0], buf, size);
 
     s->regs[rxbase + R_RX_CTRL0] |= CTRL_S;
-    if (s->regs[rxbase + R_RX_CTRL0] & CTRL_I)
+    if (s->regs[R_RX_CTRL0] & CTRL_I) {
         eth_pulse_irq(s);
+    }
 
     /* If c_rx_pingpong was set flip buffers.  */
     s->rxbuf ^= s->c_rx_pingpong;
-- 
1.9.3

  reply	other threads:[~2014-06-09 13:43 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-09 13:43 [Qemu-devel] [PULL 0/5] Net patches Stefan Hajnoczi
2014-06-09 13:43 ` Stefan Hajnoczi [this message]
2014-06-09 13:43 ` [Qemu-devel] [PULL 2/5] vmxnet3: fix msix vectors unuse Stefan Hajnoczi
2014-06-09 13:43 ` [Qemu-devel] [PULL 3/5] e1000: allow command-line selection of card model Stefan Hajnoczi
2014-06-09 13:43 ` [Qemu-devel] [PULL 4/5] tests: e1000: test additional device IDs Stefan Hajnoczi
2014-06-09 13:43 ` [Qemu-devel] [PULL 5/5] e1000: remove broken support for 82573L Stefan Hajnoczi
2014-06-09 14:26 ` [Qemu-devel] [PULL 0/5] Net patches Peter Maydell

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=1402321386-17773-2-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=peter.crosthwaite@xilinx.com \
    --cc=peter.maydell@linaro.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 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).