From patchwork Thu May 1 21:04:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886379 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514991wrq; Thu, 1 May 2025 14:09:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRs40liq69C+BUZeZeEolidcKxWMTFaMOdXyDlgfxvZQNYsshhHR1Xz0hHhQ5w6Bt+lh4T2g==@linaro.org X-Google-Smtp-Source: AGHT+IGbIxGX0JMKg6lvXP3vpurQIAOyVj+VhUSAQSOnRd24CB3gbQVzO7ZcMkvMUYZhNEyaCiA9 X-Received: by 2002:a05:620a:4707:b0:7c5:99f9:6ada with SMTP id af79cd13be357-7cad5ba3f1bmr81161185a.50.1746133753707; Thu, 01 May 2025 14:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133753; cv=none; d=google.com; s=arc-20240605; b=eeBtS2woCcIVr8Am7h+mr+fCnvCLKXebCcQzGPomsL9V5yoeXAauIDvxBooDEsblmn kBIp3HC/WTlk7Sx8X939illx/mXSQ80NzrVw1szOXuD5qHMcTxzBAFznvXsyHmtxHQUs hhxJARHNteRJtqxpngmx2WxEjO9LZP0i3r19h5yhb9vaSI+gWX9k3VklyUVb3aWdBtqU Vu5C2hSoVG+9c9wzwaSIumemue2dqoYr3KLu39UGOi+XzTPLmGrO6+o8o7Bp8cJpk7Kf SoJekIzimgHTKGGduut7bDaN/Zg/5xoLH5VoshNDtxH+sJaDN6xBGiwQ74qv3s0Eml8j SMUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LMeOw16G5YJoFKNLKg7ffX48/cP4PPOz2cimaZ7eFnY=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=ARRC7F2wZAe8/+qRTJjVOjZ94nnp5d6P6fDWnyYw+u/TQni/L25xvhiucPse3Rei3W G+98lvq2q0Poll9Y1iMl4OU8155i4kEZOfajSriF9+ZsSto4dUM9O7X1/X7SLV/VjEPt PyFM/OxFVaziZ3qniCXtgC29UensXF1DXznoPXVhUvTIWXcXHsmJVYFITTS4CppLUS0W 2eehYRQlzDwwsh4Jsw1vKgdyOIWqNsasX0WQChlIySzYl9j7qPETjD0AbkvQuoDroieL y1hiud/w2DNmDuG7dVnZmW1PXxOdh5V5luLHXQgveT1WxkUWXTz6TDHcU3GBW6n8mtBP /GKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uJeoy0To; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2448381si144153185a.557.2025.05.01.14.09.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:09:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uJeoy0To; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAb7R-0002jP-32; Thu, 01 May 2025 17:06:57 -0400 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 1uAb71-0002IT-Po for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:31 -0400 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6z-0006hb-Tm for qemu-devel@nongnu.org; Thu, 01 May 2025 17:06:31 -0400 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-3d57143ee39so12492415ab.1 for ; Thu, 01 May 2025 14:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133588; x=1746738388; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LMeOw16G5YJoFKNLKg7ffX48/cP4PPOz2cimaZ7eFnY=; b=uJeoy0Toqw1Sx0ZbDY69SUTez5FKtpyUF/vyXj0MMLRfTIbNUAWD5KPxww22tlrgmP hoNoM4d2eAlu48pK4j1k+yMG1aX1vt8lQSjJiNoJtN4TE5P+Zey/epSS+yTPXcS/JZAj y0TsoZorucbgUTEVtmqht+JUs5PvqoSQgfs0ZLNkRgWxRTzFKUfb7k8fmyDcjiP0+QR6 UPA4tFbB01kbZOJ44UXjO3+Ot5NxZlSZz8a5dIQ+tbNNVnEvkYchdLvq+V46JVjLPKgk xdnI2aYqdCBeXBOiCBZpNI6MpgkJNDkb8pcQVsNd86pYMJWr/3bynfRrNzln/HYh6mYA GRFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133588; x=1746738388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LMeOw16G5YJoFKNLKg7ffX48/cP4PPOz2cimaZ7eFnY=; b=cD/f/BKN6Jsv+cOCsOrFpmyGDK3Y+znvaTrjn5HTAmJB6Ta6oXQW7IHevq6njlXLxo ClbZ7wZkWEJylh18+ufc9dIjkkgjQAFle7DXesB9LfvwZDTnpNcHd2mO9jkTVw2hKbR2 r3Wa5wU3W4Yo2fVJYBSSjr4P+mcMjS9/Df9KfObKlqt9NoMhNXmpg4oZCtWylHLj0rba p19eRCzBiAgUI09JhM1+7idQKhFUP0GiqKbaQpV4gPpbB42laSOKGmbOM/bFHfpZnJaK v4uQv7IacwGhWZx4QRwfin+Udf5hEZ1CMAwmQ2p/wz2mYJSSWd6XgZE+tob3zZByxx3p D+fA== X-Gm-Message-State: AOJu0YxoOZ5xQbWcyVaL/2c8cyxO6tzKT15z2edx2Enb6OiwwJFmxReI ty1ccrQWkkBJAfa0r1qFx+DL4Af2BYnafzKSq/UlSoZJcjgLHbJVH13yQgOKxvSovk99PWG9QL0 4 X-Gm-Gg: ASbGnctO3hLZo1v+MNBbONg5Cgdq1FCTbZ/E21eCOdmUyqFuXmE7yv6c+h0eJLvKL6W MzfthAYsGkhpZAPLu+kp1/Bmb87yWH4QGlfei6d+D7QWG4QAa4UBRA3dfHhBrQE5Tln4oTWoNvJ RsJmcnBJNhK5Qx054AqswrWb6N3ZkZuROR1zwkRHmKRO4QRDCS8F9P5IHxLNCXP9c6bSWQYUNig povTIhyDbQNWHfunRoYTuyBnYsINj5/psbteCHy6lIdLp2f02FxUJmVDi33BvAvP5CTOSgBF93t 7oe/CT8UJpIXc0mKWzXdukevz1el6jks/vsiG7A9D90Pvtrm5YZ9Cn0lXpTmS+pa9hfl16+FiZi F9fxIFI8UxeWvcB2GjuKgvj6jKA== X-Received: by 2002:a05:6e02:19cf:b0:3d4:244b:db20 with SMTP id e9e14a558f8ab-3d97c22820emr4819675ab.16.1746133588571; Thu, 01 May 2025 14:06:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588afsm45456173.75.2025.05.01.14.06.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:06:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 10/18] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_INIT_PM definition Date: Thu, 1 May 2025 23:04:48 +0200 Message-ID: <20250501210456.89071-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::135; envelope-from=philmd@linaro.org; helo=mail-il1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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,