mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Ruinskiy, Dima" <dima.ruinskiy@intel.com>
To: "Daniel Viaño" <danividanivi@gmail.com>,
	intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org
Cc: <anthony.l.nguyen@intel.com>, <przemyslaw.kitszel@intel.com>,
	<bhelgaas@google.com>, <linux-pci@vger.kernel.org>,
	<andrew+netdev@lunn.ch>, <davem@davemloft.net>,
	<edumazet@kernel.org>, <kuba@kernel.org>, <pabeni@redhat.com>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH iwl-net v2 1/2] igc: don't disable ASPM L1.2 from __igc_resume()
Date: Wed, 18 Nov 2026 09:08:44 +0200	[thread overview]
Message-ID: <3216f9d6-a07c-4af3-a2f8-1bdb43be3d3b@intel.com> (raw)
In-Reply-To: <20261111093035.513635-2-danividanivi@gmail.com>

On 11/11/2026 11:30, Daniel Viaño wrote:
> Commit 0325143b59c6 ("igc: disable L1.2 PCI-E link substate to avoid
> performance issue") disables L1.2 on I226 in probe, in __igc_resume()
> and in igc_io_slot_reset(). The resume path uses
> pci_disable_link_state(), which takes pci_bus_sem for read.
> 
> __igc_resume() is also the runtime resume callback, and it can be
> called with pci_bus_sem already held: pcie_do_recovery() runtime-
> resumes all affected devices through
> 
>    pci_walk_bridge(bridge, pci_pm_runtime_get_sync, NULL)
> 
> i.e. from within pci_walk_bus(), which holds pci_bus_sem for read. If
> the igc device is runtime-suspended at that point, the call chain is
> 
>    pci_walk_bus()                      down_read(&pci_bus_sem)
>      pci_pm_runtime_get_sync()
>        igc_runtime_resume()
>          __igc_resume()
>            pci_disable_link_state()    down_read(&pci_bus_sem)
> 
> A recursive down_read() deadlocks if a writer (e.g. a hot-plug event
> adding or removing a device) queues on pci_bus_sem between the two
> acquisitions. pci_disable_link_state_locked() cannot be used instead,
> because on the system suspend/resume and ordinary runtime resume paths
> the lock is not held.
> 
> The call is not needed on resume in the first place. The disable done
> in igc_probe() is recorded in the link's aspm_disable mask, which is
> only cleared through the ASPM sysfs interface. The PCI core honours
> that mask whenever it reconfigures the link, including when the device
> returns to D0 (pcie_aspm_pm_state_change()), and pci_restore_state()
> restores the L1 PM Substates control registers saved with L1.2
> already disabled. Drop the call from __igc_resume().
> 
> The issue was found by the Sashiko AI review of an earlier version of
> this series.
> 
> Fixes: 0325143b59c6 ("igc: disable L1.2 PCI-E link substate to avoid performance issue")
> Signed-off-by: Daniel Viaño <danividanivi@gmail.com>
> ---
>   drivers/net/ethernet/intel/igc/igc_main.c | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
> index 62a7c5178..1b5dcc166 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -7585,9 +7585,6 @@ static int __igc_resume(struct device *dev, bool rpm)
>   	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);
> -
>   	if (igc_init_interrupt_scheme(adapter, true)) {
>   		netdev_err(netdev, "Unable to allocate memory for queues\n");
>   		return -ENOMEM;

Reviewed-by: Dima Ruinskiy <dima.ruinskiy@intel.com>

  reply	other threads:[~2026-11-18  7:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-11  9:30 [PATCH iwl-net v2 0/2] igc: fix L1.2 disable on resume, add I226-LMvP to I226 helper Daniel Viaño
2026-11-11  9:30 ` [PATCH iwl-net v2 1/2] igc: don't disable ASPM L1.2 from __igc_resume() Daniel Viaño
2026-11-18  7:08   ` Ruinskiy, Dima [this message]
2026-11-11  9:30 ` [PATCH iwl-net v2 2/2] igc: treat I226-LMvP as an I226 device Daniel Viaño
2026-11-18  7:09   ` Ruinskiy, Dima

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=3216f9d6-a07c-4af3-a2f8-1bdb43be3d3b@intel.com \
    --to=dima.ruinskiy@intel.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=anthony.l.nguyen@intel.com \
    --cc=bhelgaas@google.com \
    --cc=danividanivi@gmail.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=przemyslaw.kitszel@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

all inboxes | Powered by JetHome®