Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43613a1f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/ACPI: Separate out _OSC "PCIe port services disabled" path 



Test "pcie_ports_disabled" separately so we can give a better message.
Previously we said "Unable to request _OSC control..."; now we'll
say "PCIe port services disabled; not requesting _OSC control".

"pcie_ports_disabled" is true when CONFIG_PCIEPORTBUS=n or we boot
with "pcie_ports=compat".

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 65afe916

drivers/acpi/pci_root.c

+6 −2
Original line number Diff line number Diff line
@@ -387,8 +387,12 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm, 
		return;

	}



	if (!pcie_ports_disabled

	    && (support & ACPI_PCIE_REQ_SUPPORT) == ACPI_PCIE_REQ_SUPPORT) {

	if (pcie_ports_disabled) {

		dev_info(&device->dev, "PCIe port services disabled; not requesting _OSC control\n");

		return;

	}



	if ((support & ACPI_PCIE_REQ_SUPPORT) == ACPI_PCIE_REQ_SUPPORT) {

		control = OSC_PCI_EXPRESS_CAPABILITY_CONTROL

			| OSC_PCI_EXPRESS_NATIVE_HP_CONTROL

			| OSC_PCI_EXPRESS_PME_CONTROL;