Merge branch 'pci/aspm'

Browse source

- Fix ASPM link_state teardown on removal (Lukas Wunner)

  - Fix misleading _OSC ASPM message (Sinan Kaya)

  - Make _OSC optional for PCI (Sinan Kaya)

  - Don't initialize ASPM link state when ACPI_FADT_NO_ASPM is set (Patrick
    Talbert)

* pci/aspm:
  PCI/ASPM: Do not initialize link state when aspm_disabled is set
  PCI/ACPI: Allow _OSC presence to be optional for PCI
  PCI/ACPI: Correct error message for ASPM disabling
  PCI/ASPM: Fix link_state teardown on device removal

...

This commit is contained in:

Bjorn Helgaas 2018-10-20 11:45:27 -05:00

parent 7876320f88 17c9148736

commit b1801bf059

3 changed files with 16 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

drivers/acpi/pci_root.c

View file

4

drivers/pci/pcie/aspm.c

View file

4

drivers/pci/remove.c

View file