Message ID | 20180820141116.9118-17-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
Series | MPS devices: FPGAIO, timer, watchdogs, MSC, DMA, SPI | expand |
On 08/20/2018 11:11 AM, Peter Maydell wrote: > Currently the PL022 calls pl022_reset() from its class init > function. Make it register a DeviceState reset method instead, > so that we reset the device on system reset. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/ssi/pl022.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c > index 379d3093987..0b5f90b857f 100644 > --- a/hw/ssi/pl022.c > +++ b/hw/ssi/pl022.c > @@ -203,8 +203,10 @@ static void pl022_write(void *opaque, hwaddr offset, > } > } > > -static void pl022_reset(PL022State *s) > +static void pl022_reset(DeviceState *dev) > { > + PL022State *s = PL022(dev); > + > s->rx_fifo_len = 0; > s->tx_fifo_len = 0; > s->im = 0; > @@ -277,7 +279,6 @@ static int pl022_init(SysBusDevice *sbd) > sysbus_init_mmio(sbd, &s->iomem); > sysbus_init_irq(sbd, &s->irq); > s->ssi = ssi_create_bus(dev, "ssi"); > - pl022_reset(s); > vmstate_register(dev, -1, &vmstate_pl022, s); > return 0; > } > @@ -285,8 +286,10 @@ static int pl022_init(SysBusDevice *sbd) > static void pl022_class_init(ObjectClass *klass, void *data) > { > SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > sdc->init = pl022_init; > + dc->reset = pl022_reset; > } > > static const TypeInfo pl022_info = { >
On 08/20/2018 07:11 AM, Peter Maydell wrote: > Currently the PL022 calls pl022_reset() from its class init > function. Make it register a DeviceState reset method instead, > so that we reset the device on system reset. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/ssi/pl022.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 379d3093987..0b5f90b857f 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -203,8 +203,10 @@ static void pl022_write(void *opaque, hwaddr offset, } } -static void pl022_reset(PL022State *s) +static void pl022_reset(DeviceState *dev) { + PL022State *s = PL022(dev); + s->rx_fifo_len = 0; s->tx_fifo_len = 0; s->im = 0; @@ -277,7 +279,6 @@ static int pl022_init(SysBusDevice *sbd) sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->irq); s->ssi = ssi_create_bus(dev, "ssi"); - pl022_reset(s); vmstate_register(dev, -1, &vmstate_pl022, s); return 0; } @@ -285,8 +286,10 @@ static int pl022_init(SysBusDevice *sbd) static void pl022_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); sdc->init = pl022_init; + dc->reset = pl022_reset; } static const TypeInfo pl022_info = {
Currently the PL022 calls pl022_reset() from its class init function. Make it register a DeviceState reset method instead, so that we reset the device on system reset. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/ssi/pl022.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)