On Thu, 1 May 2025 23:04:48 +0200
Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> VIRTIO_PCI_FLAG_INIT_PM was only used by the hw_compat_2_8[]
> array, via the 'x-pcie-pm-init=off' property. We removed all
> machines using that array, lets remove all the code around
> VIRTIO_PCI_FLAG_INIT_PM (see commit 9a4c0e220d8 for similar
> VIRTIO_PCI_FLAG_* enum removal).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> include/hw/virtio/virtio-pci.h | 4 ----
> hw/virtio/virtio-pci.c | 19 +++++--------------
> 2 files changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h
> index a8dd613ffbc..d1f7403cbdf 100644
> --- a/include/hw/virtio/virtio-pci.h
> +++ b/include/hw/virtio/virtio-pci.h
> @@ -34,7 +34,6 @@ enum {
> VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT,
> VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT,
> VIRTIO_PCI_FLAG_ATS_BIT,
> - VIRTIO_PCI_FLAG_INIT_PM_BIT,
> VIRTIO_PCI_FLAG_INIT_FLR_BIT,
> VIRTIO_PCI_FLAG_AER_BIT,
> VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT,
> @@ -60,9 +59,6 @@ enum {
> /* address space translation service */
> #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT)
>
> -/* Init Power Management */
> -#define VIRTIO_PCI_FLAG_INIT_PM (1 << VIRTIO_PCI_FLAG_INIT_PM_BIT)
> -
> /* Init The No_Soft_Reset bit of Power Management */
> #define VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET \
> (1 << VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET_BIT)
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 5b86a9a447c..9ec92d5a736 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -2226,11 +2226,9 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
> PCI_PM_CTRL_NO_SOFT_RESET);
> }
>
> - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {
> - /* Init Power Management Control Register */
> - pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL,
> - PCI_PM_CTRL_STATE_MASK);
> - }
> + /* Init Power Management Control Register */
> + pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL,
> + PCI_PM_CTRL_STATE_MASK);
>
> if (proxy->flags & VIRTIO_PCI_FLAG_ATS) {
> pcie_ats_init(pci_dev, last_pcie_cap_offset,
> @@ -2323,16 +2321,11 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type)
> virtio_pci_reset(qdev);
>
> if (pci_is_express(dev)) {
> - VirtIOPCIProxy *proxy = VIRTIO_PCI(dev);
> -
> pcie_cap_deverr_reset(dev);
> pcie_cap_lnkctl_reset(dev);
>
> - if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {
> - pci_word_test_and_clear_mask(
> - dev->config + dev->pm_cap + PCI_PM_CTRL,
> - PCI_PM_CTRL_STATE_MASK);
> - }
> + pci_word_test_and_clear_mask(dev->config + dev->pm_cap + PCI_PM_CTRL,
> + PCI_PM_CTRL_STATE_MASK);
> }
> }
>
> @@ -2345,8 +2338,6 @@ static const Property virtio_pci_properties[] = {
> VIRTIO_PCI_FLAG_ATS_BIT, false),
> DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags,
> VIRTIO_PCI_FLAG_ATS_PAGE_ALIGNED_BIT, true),
> - DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags,
> - VIRTIO_PCI_FLAG_INIT_PM_BIT, true),
> DEFINE_PROP_BIT("x-pcie-pm-no-soft-reset", VirtIOPCIProxy, flags,
> VIRTIO_PCI_FLAG_PM_NO_SOFT_RESET_BIT, false),
> DEFINE_PROP_BIT("x-pcie-flr-init", VirtIOPCIProxy, flags,