| Message ID | 61d9753b631e9071809cdd1bb8e12385aa06c83e.1580290069.git.fthain@telegraphics.com.au |
|---|---|
| State | New |
| Headers | show |
| Series | Fixes for DP8393X SONIC device emulation | expand |
On 1/29/20 10:27 AM, Finn Thain wrote: > The jazzsonic driver in Linux uses the Silicon Revision register value > to probe the chip. The driver fails unless the SR register contains 4. > Unfortunately, reading this register in QEMU usually returns 0 because > the s->regs[] array gets wiped after a software reset. > > Fixes: bd8f1ebce4 ("net/dp8393x: fix hardware reset") > Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > --- > Changed since v3: > - Simplified as per suggestion from Philippe Mathieu-Daudé. > --- > hw/net/dp8393x.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c > index 1b73a8703b..93eb07e6c8 100644 > --- a/hw/net/dp8393x.c > +++ b/hw/net/dp8393x.c > @@ -919,6 +919,7 @@ static void dp8393x_reset(DeviceState *dev) > timer_del(s->watchdog); > > memset(s->regs, 0, sizeof(s->regs)); > + s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux/mips */ > 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); Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > @@ -971,7 +972,6 @@ static void dp8393x_realize(DeviceState *dev, Error **errp) > qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); > > s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s); > - s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */ > > memory_region_init_ram(&s->prom, OBJECT(dev), > "dp8393x-prom", SONIC_PROM_SIZE, &local_err); >
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 1b73a8703b..93eb07e6c8 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -919,6 +919,7 @@ static void dp8393x_reset(DeviceState *dev) timer_del(s->watchdog); memset(s->regs, 0, sizeof(s->regs)); + s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux/mips */ 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); @@ -971,7 +972,6 @@ static void dp8393x_realize(DeviceState *dev, Error **errp) qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); s->watchdog = timer_new_ns(QEMU_CLOCK_VIRTUAL, dp8393x_watchdog, s); - s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */ memory_region_init_ram(&s->prom, OBJECT(dev), "dp8393x-prom", SONIC_PROM_SIZE, &local_err);
The jazzsonic driver in Linux uses the Silicon Revision register value to probe the chip. The driver fails unless the SR register contains 4. Unfortunately, reading this register in QEMU usually returns 0 because the s->regs[] array gets wiped after a software reset. Fixes: bd8f1ebce4 ("net/dp8393x: fix hardware reset") Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> --- Changed since v3: - Simplified as per suggestion from Philippe Mathieu-Daudé. --- hw/net/dp8393x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)