* [Qemu-devel] [PATCH 2/3] sonic: fix netcard reset
2011-11-06 21:48 [Qemu-devel] [PATCH 1/3] sonic: fix typo Hervé Poussineau
@ 2011-11-06 21:48 ` Hervé Poussineau
2011-11-07 11:16 ` Andreas Färber
2011-11-06 21:48 ` [Qemu-devel] [PATCH 3/3] sonic: reset all bits of in_use field when required Hervé Poussineau
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Hervé Poussineau @ 2011-11-06 21:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori, Herv Poussineau
From: Herv Poussineau <hpoussin@reactos.org>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dp8393x.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index cfec4cb..acb1604 100644
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -845,8 +845,7 @@ static void nic_reset(void *opaque)
s->regs[SONIC_CR] = SONIC_CR_RST | SONIC_CR_STP | SONIC_CR_RXDIS;
s->regs[SONIC_DCR] &= ~(SONIC_DCR_EXBUS | SONIC_DCR_LBR);
s->regs[SONIC_RCR] &= ~(SONIC_RCR_LB0 | SONIC_RCR_LB1 | SONIC_RCR_BRD | SONIC_RCR_RNT);
- s->regs[SONIC_TCR] |= SONIC_TCR_NCRS | SONIC_TCR_PTX;
- s->regs[SONIC_TCR] &= ~SONIC_TCR_BCM;
+ s->regs[SONIC_TCR] = SONIC_TCR_NCRS | SONIC_TCR_PTX;
s->regs[SONIC_IMR] = 0;
s->regs[SONIC_ISR] = 0;
s->regs[SONIC_DCR2] = 0;
--
1.7.6.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 2/3] sonic: fix netcard reset
2011-11-06 21:48 ` [Qemu-devel] [PATCH 2/3] sonic: fix netcard reset Hervé Poussineau
@ 2011-11-07 11:16 ` Andreas Färber
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Färber @ 2011-11-07 11:16 UTC (permalink / raw)
To: Hervé Poussineau; +Cc: Anthony Liguori, qemu-devel
Am 06.11.2011 22:48, schrieb Hervé Poussineau:
> From: Herv Poussineau <hpoussin@reactos.org>
Typo.
At least to me it's not obvious why this is correct, so please add an
explanatory patch description.
Andreas
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/dp8393x.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/hw/dp8393x.c b/hw/dp8393x.c
> index cfec4cb..acb1604 100644
> --- a/hw/dp8393x.c
> +++ b/hw/dp8393x.c
> @@ -845,8 +845,7 @@ static void nic_reset(void *opaque)
> s->regs[SONIC_CR] = SONIC_CR_RST | SONIC_CR_STP | SONIC_CR_RXDIS;
> s->regs[SONIC_DCR] &= ~(SONIC_DCR_EXBUS | SONIC_DCR_LBR);
> s->regs[SONIC_RCR] &= ~(SONIC_RCR_LB0 | SONIC_RCR_LB1 | SONIC_RCR_BRD | SONIC_RCR_RNT);
> - s->regs[SONIC_TCR] |= SONIC_TCR_NCRS | SONIC_TCR_PTX;
> - s->regs[SONIC_TCR] &= ~SONIC_TCR_BCM;
> + s->regs[SONIC_TCR] = SONIC_TCR_NCRS | SONIC_TCR_PTX;
> s->regs[SONIC_IMR] = 0;
> s->regs[SONIC_ISR] = 0;
> s->regs[SONIC_DCR2] = 0;
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 3/3] sonic: reset all bits of in_use field when required
2011-11-06 21:48 [Qemu-devel] [PATCH 1/3] sonic: fix typo Hervé Poussineau
2011-11-06 21:48 ` [Qemu-devel] [PATCH 2/3] sonic: fix netcard reset Hervé Poussineau
@ 2011-11-06 21:48 ` Hervé Poussineau
2011-11-07 11:15 ` Andreas Färber
2011-11-08 10:46 ` Stefan Hajnoczi
3 siblings, 0 replies; 7+ messages in thread
From: Hervé Poussineau @ 2011-11-06 21:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori, Hervé Poussineau
This field is 16 or 32 bit wide depending of SONIC_DCR_DW bit.
Fixes network in NetBSD 5.1/arc
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dp8393x.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/dp8393x.c b/hw/dp8393x.c
index acb1604..c3e86ce 100644
--- a/hw/dp8393x.c
+++ b/hw/dp8393x.c
@@ -817,7 +817,7 @@ static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size
/* EOL detected */
s->regs[SONIC_ISR] |= SONIC_ISR_RDE;
} else {
- data[0 * width] = 0; /* in_use */
+ memset(&data[0 * width], 0, width * sizeof(uint16_t)); /* in_use */
s->memory_rw(s->mem_opaque,
((s->regs[SONIC_URDA] << 16) | s->regs[SONIC_CRDA]) + sizeof(uint16_t) * 6 * width,
(uint8_t *)data, size, 1);
--
1.7.6.3
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-trivial] [Qemu-devel] [PATCH 1/3] sonic: fix typo
2011-11-06 21:48 [Qemu-devel] [PATCH 1/3] sonic: fix typo Hervé Poussineau
@ 2011-11-07 11:15 ` Andreas Färber
2011-11-06 21:48 ` [Qemu-devel] [PATCH 3/3] sonic: reset all bits of in_use field when required Hervé Poussineau
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Andreas Färber @ 2011-11-07 11:15 UTC (permalink / raw)
To: Hervé Poussineau; +Cc: qemu-trivial, Anthony Liguori, qemu-devel
Would be nice to add description:
Remove a doubled semicolon.
Am 06.11.2011 22:48, schrieb Hervé Poussineau:
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Andreas
> ---
> hw/dp8393x.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/dp8393x.c b/hw/dp8393x.c
> index f66844b..cfec4cb 100644
> --- a/hw/dp8393x.c
> +++ b/hw/dp8393x.c
> @@ -515,7 +515,7 @@ static void write_register(dp8393xState *s, int reg, uint16_t val)
> switch (reg) {
> /* Command register */
> case SONIC_CR:
> - do_command(s, val);;
> + do_command(s, val);
> break;
> /* Prevent write to read-only registers */
> case SONIC_CAP2:
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PATCH 1/3] sonic: fix typo
@ 2011-11-07 11:15 ` Andreas Färber
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Färber @ 2011-11-07 11:15 UTC (permalink / raw)
To: Hervé Poussineau; +Cc: qemu-trivial, Anthony Liguori, qemu-devel
Would be nice to add description:
Remove a doubled semicolon.
Am 06.11.2011 22:48, schrieb Hervé Poussineau:
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Andreas
> ---
> hw/dp8393x.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/dp8393x.c b/hw/dp8393x.c
> index f66844b..cfec4cb 100644
> --- a/hw/dp8393x.c
> +++ b/hw/dp8393x.c
> @@ -515,7 +515,7 @@ static void write_register(dp8393xState *s, int reg, uint16_t val)
> switch (reg) {
> /* Command register */
> case SONIC_CR:
> - do_command(s, val);;
> + do_command(s, val);
> break;
> /* Prevent write to read-only registers */
> case SONIC_CAP2:
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] sonic: fix typo
2011-11-06 21:48 [Qemu-devel] [PATCH 1/3] sonic: fix typo Hervé Poussineau
` (2 preceding siblings ...)
2011-11-07 11:15 ` Andreas Färber
@ 2011-11-08 10:46 ` Stefan Hajnoczi
3 siblings, 0 replies; 7+ messages in thread
From: Stefan Hajnoczi @ 2011-11-08 10:46 UTC (permalink / raw)
To: Hervé Poussineau; +Cc: Anthony Liguori, qemu-devel
On Sun, Nov 06, 2011 at 10:48:50PM +0100, Hervé Poussineau wrote:
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/dp8393x.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches
Stefan
^ permalink raw reply [flat|nested] 7+ messages in thread