From nobody Sun Apr 12 05:56:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772011332; cv=none; d=zohomail.com; s=zohoarc; b=lCeEAwIyIr+om+enKuvx+X/syWwb6nsUtq+TVKZD/MvAOwnFwc+teJe1rxL1fL126jCfxQo+KlTAuOH+adW1MBewV9zmszy0d86wX6zqRUL/Jsukz1XxNXhzDMX0jPxzkEAPz4VxJyxNBl9JTRqY1LynMv7/o+s9RIICXr/2rrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772011332; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kfYt1JX7P7UcegZJCCAL+bP1oiBEmYYEu/q0y4ElGW0=; b=Fz6tEg2LE6lRv4LOkZdBQrGC/h31W5pC/PlefR2e+ylb+xOaLCr5YJSkJZDdBXQ44o2ze1Vhwgnho0hrJi5XExgQuz3CrQOH8tw4EgQm2oJzvVsaj37IUAZfT6K8hvRoOlEu+/KpZP7us/fK4FOZrEhIVnqHeBMIp8SPjwIMM84= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772011332258350.8462119440936; Wed, 25 Feb 2026 01:22:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvB5T-0000oE-MA; Wed, 25 Feb 2026 04:21:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvB5O-0000iu-Vv for qemu-devel@nongnu.org; Wed, 25 Feb 2026 04:21:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vvB5N-0003Ue-Ek for qemu-devel@nongnu.org; Wed, 25 Feb 2026 04:21:38 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-538-joN9PsG6Nc2mNKw6wviovQ-1; Wed, 25 Feb 2026 04:21:32 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DEA6319560BA; Wed, 25 Feb 2026 09:21:30 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.158]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 39C7E19560A2; Wed, 25 Feb 2026 09:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772011296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kfYt1JX7P7UcegZJCCAL+bP1oiBEmYYEu/q0y4ElGW0=; b=ZQlK9faGwgu4eiSOKeZnVjGJDKiYyk21KYj8mwcWDG8HiPRnltDTlrsuwW41Bz/NRurgbd r3c4c8GdUg/r2pSQnbPFMhXKSl3u4eIGB6kU/YkfRqPfMgcHgDESUb5ayBUp0+3IZtZV5J xwgyjb9SsEtp/OsZavnkJFrgdS8ve2k= X-MC-Unique: joN9PsG6Nc2mNKw6wviovQ-1 X-Mimecast-MFC-AGG-ID: joN9PsG6Nc2mNKw6wviovQ_1772011291 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini , Igor Mammedov , "Michael S . Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Eduardo Habkost , Yanan Wang , Zhao Liu , Jason Wang , Yi Liu , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , Fabiano Rosas , Laurent Vivier Subject: [PATCH v2 09/16] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_PM definition Date: Wed, 25 Feb 2026 10:20:17 +0100 Message-ID: <20260225092024.794595-10-thuth@redhat.com> In-Reply-To: <20260225092024.794595-1-thuth@redhat.com> References: <20260225092024.794595-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.358, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.659, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1772011333971158500 From: Philippe Mathieu-Daud=C3=A9 VIRTIO_PCI_FLAG_INIT_PM was only used by the hw_compat_2_8[] array, via the 'x-pcie-pm-init=3Doff' 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=C3=A9 Message-ID: <20250501210456.89071-11-philmd@linaro.org> Reviewed-by: Igor Mammedov Signed-off-by: Thomas Huth --- 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 9760a3837fa..5cb20b73f62 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -35,7 +35,6 @@ enum { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_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, @@ -61,9 +60,6 @@ enum { /* address space translation service */ #define VIRTIO_PCI_FLAG_ATS (1 << VIRTIO_PCI_FLAG_ATS_BIT) =20 -/* 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 9e2201be13c..0f5654f459e 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2318,11 +2318,9 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) PCI_PM_CTRL_NO_SOFT_RESET); } =20 - 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); =20 if (proxy->flags & VIRTIO_PCI_FLAG_ATS) { pcie_ats_init(pci_dev, proxy->last_pcie_cap_offset, @@ -2418,16 +2416,11 @@ static void virtio_pci_bus_reset_hold(Object *obj, = ResetType type) virtio_pci_reset(qdev); =20 if (pci_is_express(dev)) { - VirtIOPCIProxy *proxy =3D VIRTIO_PCI(dev); - pcie_cap_deverr_reset(dev); pcie_cap_lnkctl_reset(dev); =20 - 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_CT= RL, + PCI_PM_CTRL_STATE_MASK); } } =20 @@ -2442,8 +2435,6 @@ static const Property virtio_pci_properties[] =3D { 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, --=20 2.53.0