From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 28 Nov 2019 14:54:29 +0000 (-0600)
Subject: Merge branch 'pci/aspm'
X-Git-Tag: Ubuntu-5.13.0-19.19~7148^2~25
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=abd05c97f9711a4baa8cd43832893b8df45d459e;p=mirror_ubuntu-jammy-kernel.git

Merge branch 'pci/aspm'

  - Remove unnecessary ASPM locking (Bjorn Helgaas)

  - Add support for disabling L1 PM Substates (Heiner Kallweit)

  - Allow re-enabling Clock PM after it has been disabled (Heiner Kallweit)

  - Add sysfs attributes for controlling ASPM link states (Heiner Kallweit)

  - Remove CONFIG_PCIEASPM_DEBUG, including "link_state" and "clk_ctl"
    sysfs files (Heiner Kallweit)

* pci/aspm:
  PCI/ASPM: Remove PCIEASPM_DEBUG Kconfig option and related code
  PCI/ASPM: Add sysfs attributes for controlling ASPM link states
  PCI/ASPM: Add pcie_aspm_get_link()
  PCI/ASPM: Allow re-enabling Clock PM
  PCI/ASPM: Add L1 PM substate support to pci_disable_link_state()
  PCI/ASPM: Remove pcie_aspm_enabled() unnecessary locking
---

abd05c97f9711a4baa8cd43832893b8df45d459e