public inbox for linux-pci@vger.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: linux-pci@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Lukas Wunner" <lukas@wunner.de>,
	"Tony Nguyen" <anthony.l.nguyen@intel.com>,
	"Przemek Kitszel" <przemyslaw.kitszel@intel.com>,
	"Andrew Lunn" <andrew+netdev@lunn.ch>,
	"David S . Miller" <davem@davemloft.net>,
	"Eric Dumazet" <edumazet@google.com>,
	"Paolo Abeni" <pabeni@redhat.com>,
	"Saeed Mahameed" <saeedm@nvidia.com>,
	"Leon Romanovsky" <leon@kernel.org>,
	"Tariq Toukan" <tariqt@nvidia.com>,
	"Mark Bloch" <mbloch@nvidia.com>,
	"Richard Cochran" <richardcochran@gmail.com>,
	"Andy Shevchenko" <andriy.shevchenko@intel.com>,
	"Vitaly Lifshits" <vitaly.lifshits@intel.com>,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
	"Vinicius Costa Gomes" <vinicius.gomes@intel.com>,
	"Dima Ruinskiy" <dima.ruinskiy@intel.com>
Subject: Re: [PATCH 2/5] igc: Let the PCI core deal with the PM resume flow
Date: Tue, 24 Feb 2026 10:58:37 -0600	[thread overview]
Message-ID: <20260224165837.GA3736201@bhelgaas> (raw)
In-Reply-To: <20260224111044.3487873-3-mika.westerberg@linux.intel.com>

On Tue, Feb 24, 2026 at 12:10:41PM +0100, Mika Westerberg wrote:
> Currently igc driver calls pci_set_power_state() and pci_restore_state()
> and the like to bring the device back from low power states. However,
> PCI core handles all this on behalf of the driver. Furthermore with PTM
> enabled the PCI core re-enables it on resume but the driver calls
> pci_restore_state() which ends up disabling it again.
> 
> For this reason let the PCI core handle the common PM resume flow.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>

I love it, thanks a lot for doing this!

Do we still need the pci_enable_device_mem() and pci_set_master()
in __igc_resume()?

I suppose some of that is related to the pci_disable_device() in the
suspend path (__igc_shutdown()), but there are only a few dozen
drivers that do this, so I'm not sure it's essential.

> ---
>  drivers/net/ethernet/intel/igc/igc_main.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 7ffd34bfa14e..99a4c99ddd57 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -7526,9 +7526,6 @@ static int __igc_resume(struct device *dev)
>  	struct igc_hw *hw = &adapter->hw;
>  	u32 err, val;
>  
> -	pci_set_power_state(pdev, PCI_D0);
> -	pci_restore_state(pdev);
> -
>  	if (!pci_device_is_present(pdev))
>  		return -ENODEV;
>  	err = pci_enable_device_mem(pdev);
> @@ -7538,9 +7535,6 @@ static int __igc_resume(struct device *dev)
>  	}
>  	pci_set_master(pdev);
>  
> -	pci_enable_wake(pdev, PCI_D3hot, 0);
> -	pci_enable_wake(pdev, PCI_D3cold, 0);
> -
>  	if (igc_is_device_id_i226(hw))
>  		pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2);
>  
> -- 
> 2.50.1
> 

  reply	other threads:[~2026-02-24 16:58 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-24 11:10 [PATCH 0/5] PCI / igc: Improvements related to PTM enabling Mika Westerberg
2026-02-24 11:10 ` [PATCH 1/5] igc: Call netif_queue_set_napi() with rntl locked Mika Westerberg
2026-02-24 21:07   ` Vinicius Costa Gomes
2026-03-09 10:32   ` [Intel-wired-lan] " Dahan, AvigailX
2026-02-24 11:10 ` [PATCH 2/5] igc: Let the PCI core deal with the PM resume flow Mika Westerberg
2026-02-24 16:58   ` Bjorn Helgaas [this message]
2026-02-25 12:26     ` Mika Westerberg
2026-02-25 12:28       ` Mika Westerberg
2026-02-25 23:56       ` Vinicius Costa Gomes
2026-02-26 11:12         ` Mika Westerberg
2026-02-24 21:08   ` Vinicius Costa Gomes
2026-03-09 10:37   ` [Intel-wired-lan] " Dahan, AvigailX
2026-02-24 11:10 ` [PATCH 3/5] igc: Don't reset the hardware on suspend path Mika Westerberg
2026-02-24 21:08   ` Vinicius Costa Gomes
2026-03-09 10:39   ` [Intel-wired-lan] " Dahan, AvigailX
2026-02-24 11:10 ` [PATCH 4/5] PCI/PTM: Drop granularity parameter from pci_enable_ptm() Mika Westerberg
2026-02-24 22:26   ` [Intel-wired-lan] " Jacob Keller
2026-03-09 10:50   ` Dahan, AvigailX
2026-02-24 11:10 ` [PATCH 5/5] PCI/PTM: Do not enable PTM automatically for Root and Switch Upstream Ports Mika Westerberg
2026-03-09 10:54   ` [Intel-wired-lan] " Dahan, AvigailX
2026-02-24 17:13 ` [PATCH 0/5] PCI / igc: Improvements related to PTM enabling Bjorn Helgaas
2026-02-25 12:27   ` Mika Westerberg
2026-02-24 22:28 ` [Intel-wired-lan] " Jacob Keller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260224165837.GA3736201@bhelgaas \
    --to=helgaas@kernel.org \
    --cc=andrew+netdev@lunn.ch \
    --cc=andriy.shevchenko@intel.com \
    --cc=anthony.l.nguyen@intel.com \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=dima.ruinskiy@intel.com \
    --cc=edumazet@google.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=leon@kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lukas@wunner.de \
    --cc=mbloch@nvidia.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=pabeni@redhat.com \
    --cc=przemyslaw.kitszel@intel.com \
    --cc=richardcochran@gmail.com \
    --cc=saeedm@nvidia.com \
    --cc=tariqt@nvidia.com \
    --cc=vinicius.gomes@intel.com \
    --cc=vitaly.lifshits@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox