On Sun, May 02, 2021 at 10:31:20PM +0200, Philippe Mathieu-Daudé wrote: > The OR_IRQ device is bus-less, thus isn't reset automatically. > Add the raven_pcihost_reset() handler to manually reset the OR IRQ. > > Fixes: f40b83a4e31 ("40p: use OR gate to wire up raven PCI interrupts") > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Acked-by: David Gibson <da...@gibson.dropbear.id.au> > --- > hw/pci-host/prep.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c > index 0a9162fba97..7481bbf99d4 100644 > --- a/hw/pci-host/prep.c > +++ b/hw/pci-host/prep.c > @@ -230,6 +230,15 @@ static void raven_change_gpio(void *opaque, int n, int > level) > s->contiguous_map = level; > } > > +static void raven_pcihost_reset_enter(Object *obj, ResetType type) > +{ > + PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(obj); > + > + if (!s->is_legacy_prep) { > + device_cold_reset(DEVICE(&s->or_irq)); > + } > +} > + > static void raven_pcihost_realizefn(DeviceState *d, Error **errp) > { > SysBusDevice *dev = SYS_BUS_DEVICE(d); > @@ -419,11 +428,13 @@ static Property raven_pcihost_properties[] = { > static void raven_pcihost_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > + ResettableClass *rc = RESETTABLE_CLASS(klass); > > set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > dc->realize = raven_pcihost_realizefn; > device_class_set_props(dc, raven_pcihost_properties); > dc->fw_name = "pci"; > + rc->phases.enter = raven_pcihost_reset_enter; > } > > static const TypeInfo raven_pcihost_info = { -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature