mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci: Switch bus reset to 3-phase-reset

Browse Source 
Switch the PCI bus from using BusClass::reset to the Resettable
interface.

This has no behavioural change, because the BusClass code to support
subclasses that use the legacy BusClass::reset will call that method
in the hold phase of 3-phase reset.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-id: 20240119163512.3810301-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-01-19 16:35:08 +00:00
parent f670be1aad
commit e6c03989af
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/pci/pci.c
View File

@ -64,7 +64,7 @@ bool pci_available = true;
static char *pcibus_get_dev_path(DeviceState *dev); static char *pcibus_get_dev_path(DeviceState *dev);
static char *pcibus_get_fw_dev_path(DeviceState *dev); static char *pcibus_get_fw_dev_path(DeviceState *dev);
static void pcibus_reset(BusState *qbus); static void pcibus_reset_hold(Object *obj);
static bool pcie_has_upstream_port(PCIDevice *dev); static bool pcie_has_upstream_port(PCIDevice *dev);
static Property pci_props[] = { static Property pci_props[] = {
@ -202,13 +202,15 @@ static void pci_bus_class_init(ObjectClass *klass, void *data)
{ {
BusClass *k = BUS_CLASS(klass); BusClass *k = BUS_CLASS(klass);
PCIBusClass *pbc = PCI_BUS_CLASS(klass); PCIBusClass *pbc = PCI_BUS_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
k->print_dev = pcibus_dev_print; k->print_dev = pcibus_dev_print;
k->get_dev_path = pcibus_get_dev_path; k->get_dev_path = pcibus_get_dev_path;
k->get_fw_dev_path = pcibus_get_fw_dev_path; k->get_fw_dev_path = pcibus_get_fw_dev_path;
k->realize = pci_bus_realize; k->realize = pci_bus_realize;
k->unrealize = pci_bus_unrealize; k->unrealize = pci_bus_unrealize;
k->reset = pcibus_reset;
rc->phases.hold = pcibus_reset_hold;
pbc->bus_num = pcibus_num; pbc->bus_num = pcibus_num;
pbc->numa_node = pcibus_numa_node; pbc->numa_node = pcibus_numa_node;
@ -424,9 +426,9 @@ void pci_device_reset(PCIDevice *dev)
* Called via bus_cold_reset on RST# assert, after the devices * Called via bus_cold_reset on RST# assert, after the devices
* have been reset device_cold_reset-ed already. * have been reset device_cold_reset-ed already.
*/ */
static void pcibus_reset(BusState *qbus) static void pcibus_reset_hold(Object *obj)
{ {
PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus); PCIBus *bus = PCI_BUS(obj);
int i; int i;
for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) { for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) {