Revert "PCI/ASPM: Refactor L1 PM Substates Control Register programming"
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 3 Feb 2023 19:57:39 +0000 (13:57 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 10 Feb 2023 21:30:24 +0000 (15:30 -0600)
commitff209ecc376a2ea8dd106a1f594427a5d94b7dd3
treeab801ba4ec178a2cae2feea852406a47c76eb5df
parenta7152be79b627428c628da2a887ca4b2512a78fd
Revert "PCI/ASPM: Refactor L1 PM Substates Control Register programming"

This reverts commit 5e85eba6f50dc288c22083a7e213152bcc4b8208.

Thomas Witt reported that 5e85eba6f50d ("PCI/ASPM: Refactor L1 PM Substates
Control Register programming") broke suspend/resume on a Tuxedo
Infinitybook S 14 v5, which seems to use a Clevo L140CU Mainboard.

The main symptom is:

  iwlwifi 0000:02:00.0: Unable to change power state from D3hot to D0, device inaccessible
  nvme 0000:03:00.0: Unable to change power state from D3hot to D0, device inaccessible

and the machine is only partially usable after resume.  It can't run dmesg
and can't do a clean reboot.  This happens on every suspend/resume cycle.

Revert 5e85eba6f50d until we can figure out the root cause.

Fixes: 5e85eba6f50d ("PCI/ASPM: Refactor L1 PM Substates Control Register programming")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216877
Reported-by: Thomas Witt <kernel@witt.link>
Tested-by: Thomas Witt <kernel@witt.link>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org # v6.1+
Cc: Vidya Sagar <vidyas@nvidia.com>
drivers/pci/pcie/aspm.c