* [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
@ 2020-03-04 3:23 Finn Thain
2020-03-04 9:35 ` Laurent Vivier
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Finn Thain @ 2020-03-04 3:23 UTC (permalink / raw)
To: Jason Wang; +Cc: peter.maydell, qemu-devel, Laurent Vivier
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;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
2020-03-04 3:23 [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2 Finn Thain
@ 2020-03-04 9:35 ` Laurent Vivier
2020-03-04 13:26 ` Philippe Mathieu-Daudé
2020-03-08 9:52 ` Laurent Vivier
2 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2020-03-04 9:35 UTC (permalink / raw)
To: Finn Thain, Jason Wang; +Cc: peter.maydell, qemu-devel
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
2020-03-04 3:23 [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2 Finn Thain
2020-03-04 9:35 ` Laurent Vivier
@ 2020-03-04 13:26 ` Philippe Mathieu-Daudé
2020-03-08 9:52 ` Laurent Vivier
2 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-03-04 13:26 UTC (permalink / raw)
To: Finn Thain, Jason Wang; +Cc: peter.maydell, qemu-devel, Laurent Vivier
On 3/4/20 4:23 AM, Finn Thain wrote:
> 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: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
2020-03-04 3:23 [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2 Finn Thain
2020-03-04 9:35 ` Laurent Vivier
2020-03-04 13:26 ` Philippe Mathieu-Daudé
@ 2020-03-08 9:52 ` Laurent Vivier
2020-03-09 2:51 ` Jason Wang
2 siblings, 1 reply; 6+ messages in thread
From: Laurent Vivier @ 2020-03-08 9:52 UTC (permalink / raw)
To: Jason Wang; +Cc: qemu-trivial, peter.maydell, qemu-devel, Finn Thain
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;
> }
>
Jason,
as it's a trivial bug fixes (only a diff between the commit and the
patch), will you merge it via the network queue or do you want I take it
via trivial queue?
Thanks,
Laurent
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
2020-03-08 9:52 ` Laurent Vivier
@ 2020-03-09 2:51 ` Jason Wang
2020-03-09 8:48 ` Laurent Vivier
0 siblings, 1 reply; 6+ messages in thread
From: Jason Wang @ 2020-03-09 2:51 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-trivial, peter.maydell, qemu-devel, Finn Thain
On 2020/3/8 下午5:52, Laurent Vivier wrote:
> 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;
>> }
>>
> Jason,
>
> as it's a trivial bug fixes (only a diff between the commit and the
> patch), will you merge it via the network queue or do you want I take it
> via trivial queue?
Hi Laurent:
Please merge it.
Thanks
>
> Thanks,
> Laurent
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2
2020-03-09 2:51 ` Jason Wang
@ 2020-03-09 8:48 ` Laurent Vivier
0 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2020-03-09 8:48 UTC (permalink / raw)
To: Jason Wang; +Cc: qemu-trivial, peter.maydell, qemu-devel, Finn Thain
Le 09/03/2020 à 03:51, Jason Wang a écrit :
>
> On 2020/3/8 下午5:52, Laurent Vivier wrote:
>> 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;
>>> }
>>>
>> Jason,
>>
>> as it's a trivial bug fixes (only a diff between the commit and the
>> patch), will you merge it via the network queue or do you want I take it
>> via trivial queue?
>
>
> Hi Laurent:
>
> Please merge it.
Applied to my trivial-patch branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-09 8:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-04 3:23 [PATCH] dp8393x: Mask EOL bit from descriptor addresses, take 2 Finn Thain
2020-03-04 9:35 ` Laurent Vivier
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
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.