qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: Finn Thain <fthain@telegraphics.com.au>,
	Jason Wang <jasowang@redhat.com>
Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
Date: Wed, 4 Mar 2020 10:35:04 +0100	[thread overview]
Message-ID: <78bc18b8-817e-fafe-5c31-69c7cedc18fb@vivier.eu> (raw)
In-Reply-To: <alpine.LNX.2.22.394.2003041421280.12@nippy.intranet>

Le 04/03/2020 à 04:23, Finn Thain a écrit :
> A portion of a recent patch got lost due to a merge snafu. That patch is
> now commit 88f632fbb1 ("dp8393x: Mask EOL bit from descriptor addresses").
> This patch restores the portion that got lost.
> 
> Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
> ---
>  hw/net/dp8393x.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
> index 8a3504d962..81fc13ee9f 100644
> --- a/hw/net/dp8393x.c
> +++ b/hw/net/dp8393x.c
> @@ -525,8 +525,8 @@ static void dp8393x_do_transmit_packets(dp8393xState *s)
>                                   * (4 + 3 * s->regs[SONIC_TFC]),
>                                 MEMTXATTRS_UNSPECIFIED, s->data,
>                                 size);
> -            s->regs[SONIC_CTDA] = dp8393x_get(s, width, 0) & ~0x1;
> -            if (dp8393x_get(s, width, 0) & SONIC_DESC_EOL) {
> +            s->regs[SONIC_CTDA] = dp8393x_get(s, width, 0);
> +            if (s->regs[SONIC_CTDA] & SONIC_DESC_EOL) {
>                  /* EOL detected */
>                  break;
>              }
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>


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

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-04  3:23 [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2 Finn Thain
2020-03-04  9:35 ` Laurent Vivier [this message]
2020-03-04 13:26 ` Philippe Mathieu-Daudé
2020-03-08  9:52 ` Laurent Vivier
2020-03-09  2:51   ` Jason Wang
2020-03-09  8:48     ` Laurent Vivier

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=78bc18b8-817e-fafe-5c31-69c7cedc18fb@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=fthain@telegraphics.com.au \
    --cc=jasowang@redhat.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).