Commit 10ecc818 authored Jan 04, 2019 by Bjorn Helgaas Committed by Bjorn Helgaas Feb 09, 2019

PCI/ASPM: Use LTR if already enabled by platform

RussianNeuroMancer reported that the Intel 7265 wifi on a Dell Venue 11 Pro
7140 table stopped working after wakeup from suspend and bisected the
problem to 9ab105de ("PCI/ASPM: Disable ASPM L1.2 Substate if we don't
have LTR").  David Ward reported the same problem on a Dell Latitude 7350.

After af8bb9f8 ("PCI/ACPI: Request LTR control from platform before
using it"), we don't enable LTR unless the platform has granted LTR control
to us.  In addition, we don't notice if the platform had already enabled
LTR itself.

After 9ab105de ("PCI/ASPM: Disable ASPM L1.2 Substate if we don't have
LTR"), we avoid using LTR if we don't think the path to the device has LTR
enabled.

The combination means that if the platform itself enables LTR but declines
to give the OS control over LTR, we unnecessarily avoided using ASPM L1.2.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=201469


Fixes: 9ab105de ("PCI/ASPM: Disable ASPM L1.2 Substate if we don't have LTR")
Fixes: af8bb9f8 ("PCI/ACPI: Request LTR control from platform before using it")
Reported-by: RussianNeuroMancer <russianneuromancer@ya.ru>
Reported-by: David Ward <david.ward@ll.mit.edu>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# v4.18+

parent bfeffd15

drivers/pci/probe.c

+23 −13

Original line number	Diff line number	Diff line
		@@ -2071,11 +2071,8 @@ static void pci_configure_ltr(struct pci_dev *dev)
		{
		#ifdef CONFIG_PCIEASPM
		struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
		u32 cap;
		struct pci_dev *bridge;

		if (!host->native_ltr)
		return;
		u32 cap, ctl;

		if (!pci_is_pcie(dev))
		return;
		@@ -2084,22 +2081,35 @@ static void pci_configure_ltr(struct pci_dev *dev)
		if (!(cap & PCI_EXP_DEVCAP2_LTR))
		return;

		/*
		* Software must not enable LTR in an Endpoint unless the Root
		* Complex and all intermediate Switches indicate support for LTR.
		* PCIe r3.1, sec 6.18.
		*/
		if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
		pcie_capability_read_dword(dev, PCI_EXP_DEVCTL2, &ctl);
		if (ctl & PCI_EXP_DEVCTL2_LTR_EN) {
		if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) {
		dev->ltr_path = 1;
		else {
		return;
		}

		bridge = pci_upstream_bridge(dev);
		if (bridge && bridge->ltr_path)
		dev->ltr_path = 1;

		return;
		}

		if (dev->ltr_path)
		if (!host->native_ltr)
		return;

		/*
		* Software must not enable LTR in an Endpoint unless the Root
		* Complex and all intermediate Switches indicate support for LTR.
		* PCIe r4.0, sec 6.18.
		*/
		if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT \|\|
		((bridge = pci_upstream_bridge(dev)) &&
		bridge->ltr_path)) {
		pcie_capability_set_word(dev, PCI_EXP_DEVCTL2,
		PCI_EXP_DEVCTL2_LTR_EN);
		dev->ltr_path = 1;
		}
		#endif
		}

Admin message