motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: Use device_cold_reset() and bus_cold_reset()

Browse source 
In the PCI subsystem we currently use the legacy function
qdev_reset_all() and qbus_reset_all().  These perform a recursive
reset, starting from either a qbus or a qdev.  However they do not
permit any of the devices in the tree to use three-phase reset,
because device reset goes through the device_legacy_reset() function
that only calls the single DeviceClass::reset method.

Switch to using the device_cold_reset() and bus_cold_reset()
functions.  These also perform a recursive reset, where first the
children are reset and then finally the parent, but they use the new
(...in 2020...) Resettable mechanism, which supports both the old
style single-reset method and also the new 3-phase reset handling.

This should be a no-behaviour-change commit which just reduces the
use of a deprecated API.

Commit created with:
 sed -i -e 's/qdev_reset_all/device_cold_reset/g;s/qbus_reset_all/bus_cold_reset/g' hw/pci/*.c

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2022-12-16 15:55:26 +00:00
parent d170529d56
commit 78e4d5cbaf
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/pci/pci.c
View file

@ -378,14 +378,14 @@ static void pci_do_device_reset(PCIDevice *dev)
*/ */
void pci_device_reset(PCIDevice *dev) void pci_device_reset(PCIDevice *dev)
{ {
qdev_reset_all(&dev->qdev); device_cold_reset(&dev->qdev);
pci_do_device_reset(dev); pci_do_device_reset(dev);
} }
/* /*
* Trigger pci bus reset under a given bus. * Trigger pci bus reset under a given bus.
* Called via qbus_reset_all on RST# assert, after the devices * Called via bus_cold_reset on RST# assert, after the devices
* have been reset qdev_reset_all-ed already. * have been reset device_cold_reset-ed already.
*/ */
static void pcibus_reset(BusState *qbus) static void pcibus_reset(BusState *qbus)
{ {

2
hw/pci/pci_bridge.c
View file

@ -275,7 +275,7 @@ void pci_bridge_write_config(PCIDevice *d,
newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
/* Trigger hot reset on 0->1 transition. */ /* Trigger hot reset on 0->1 transition. */
qbus_reset_all(BUS(&s->sec_bus)); bus_cold_reset(BUS(&s->sec_bus));
} }
} }