[PATCH 4/8] hw/acpi/pcihp: Add forced slot unplug helper
Dongli Zhang <[email protected]>
| Newsgroups | org.xenproject.lists.xen-devel,org.nongnu.qemu-devel |
|---|---|
| Message-ID | <[email protected]> |
Add acpi_pcihp_device_force_unplug_cb() to complete PCI slot removal through the existing ACPI PCI hotplug eject path. Forced unplug intentionally does not introduce a separate teardown sequence. It lets management trigger the same slot completion helper that is already reachable when the guest writes the ACPI EJ register. Signed-off-by: Dongli Zhang <[email protected]> --- hw/acpi/acpi-pci-hotplug-stub.c | 6 ++++++ hw/acpi/pcihp.c | 17 +++++++++++++++++ include/hw/acpi/pcihp.h | 3 +++ 3 files changed, 26 insertions(+) diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c index d58ea726a8..9451a45c0b 100644 --- a/hw/acpi/acpi-pci-hotplug-stub.c +++ b/hw/acpi/acpi-pci-hotplug-stub.c @@ -30,6 +30,12 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, { } +void acpi_pcihp_device_force_unplug_cb(HotplugHandler *hotplug_dev, + AcpiPciHpState *s, DeviceState *dev, + Error **errp) +{ +} + void acpi_pcihp_reset(AcpiPciHpState *s) { } diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 87162ff2c0..7a1f2b873a 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -367,6 +367,23 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS); } +void acpi_pcihp_device_force_unplug_cb(HotplugHandler *hotplug_dev, + AcpiPciHpState *s, DeviceState *dev, + Error **errp) +{ + PCIDevice *pdev = PCI_DEVICE(dev); + int slot = PCI_SLOT(pdev->devfn); + int bsel = acpi_pcihp_get_bsel(pci_get_bus(pdev)); + + if (bsel < 0) { + error_setg(errp, "Unsupported bus. Bus doesn't have property '" + ACPI_PCIHP_PROP_BSEL "' set"); + return; + } + + acpi_pcihp_eject_slot(s, bsel, 1U << slot); +} + bool acpi_pcihp_is_hotpluggable_bus(AcpiPciHpState *s, BusState *bus) { Object *o = OBJECT(bus->parent); diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index efce5fd2e1..13c131b8e8 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -75,6 +75,9 @@ void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, DeviceState *dev, Error **errp); +void acpi_pcihp_device_force_unplug_cb(HotplugHandler *hotplug_dev, + AcpiPciHpState *s, DeviceState *dev, + Error **errp); void build_acpi_pci_hotplug(Aml *table, AmlRegionSpace rs, uint64_t pcihp_addr); void build_append_pci_dsm_func0_common(Aml *ctx, Aml *retvar); -- 2.43.5