| Message ID | 20190729145654.14644-13-damien.hedde@greensocs.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multi-phase reset mechanism | expand |
On Mon, 29 Jul 2019 at 15:59, Damien Hedde <damien.hedde@greensocs.com> wrote: > > Replace deprecated qdev/bus_reset_all by device/bus_reset_warm. > > This does not impact the behavior. > > Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> I'll come back to patches 12-28 later. They're all ok in principle, we just need to check that in each individual case: * we've made the right choice of cold vs warm reset * we're ok to switch to 'reset including children' from the legacy 'reset not including children' semantics thanks -- PMM
On 8/7/19 5:31 PM, Peter Maydell wrote: > On Mon, 29 Jul 2019 at 15:59, Damien Hedde <damien.hedde@greensocs.com> wrote: >> >> Replace deprecated qdev/bus_reset_all by device/bus_reset_warm. >> >> This does not impact the behavior. >> >> Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> > > I'll come back to patches 12-28 later. They're all ok > in principle, we just need to check that in each individual > case: > * we've made the right choice of cold vs warm reset > * we're ok to switch to 'reset including children' from > the legacy 'reset not including children' semantics I'm working on a patch reroll to fix what's been reviewed so far. Should I put aside the patches 12-28 for now ? They could be part of 1 or 2 separate following series or I can re-add them later on when we agree on the api. -- Damien
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 8076a80ab3..f2b9d37754 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -325,14 +325,14 @@ static void pci_do_device_reset(PCIDevice *dev) */ void pci_device_reset(PCIDevice *dev) { - qdev_reset_all(&dev->qdev); + device_reset_warm(&dev->qdev); pci_do_device_reset(dev); } /* * Trigger pci bus reset under a given bus. - * Called via qbus_reset_all on RST# assert, after the devices - * have been reset qdev_reset_all-ed already. + * Called via bus_reset on RST# assert, after the devices + * have been reset device_reset-ed already. */ static void pcibus_reset(BusState *qbus) { diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 715b9a4fe6..695242149f 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -274,7 +274,7 @@ void pci_bridge_write_config(PCIDevice *d, newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { /* Trigger hot reset on 0->1 transition. */ - qbus_reset_all(BUS(&s->sec_bus)); + bus_reset_warm(BUS(&s->sec_bus)); } }
Replace deprecated qdev/bus_reset_all by device/bus_reset_warm. This does not impact the behavior. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- hw/pci/pci.c | 6 +++--- hw/pci/pci_bridge.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)