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

Commit 1ad61b61 authored by Sinan Kaya's avatar Sinan Kaya Committed by Bjorn Helgaas
Browse files

PCI/ACPI: Correct error message for ASPM disabling 



If _OSC execution fails today for platforms without an _OSC entry, code is
printing a misleading message saying disabling ASPM as follows:

  acpi PNP0A03:00: _OSC failed (AE_NOT_FOUND); disabling ASPM

We need to ensure that platform supports ASPM to begin with.

Reported-by: default avatarMichael Kelley <mikelley@microsoft.com>
Signed-off-by: default avatarSinan Kaya <okaya@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent aeae4f3e

drivers/acpi/pci_root.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -455,8 +455,9 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm) 
	decode_osc_support(root, "OS supports", support);

	decode_osc_support(root, "OS supports", support);

	status = acpi_pci_osc_support(root, support);

	status = acpi_pci_osc_support(root, support);

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status)) {

		dev_info(&device->dev, "_OSC failed (%s); disabling ASPM\n",

		dev_info(&device->dev, "_OSC failed (%s)%s\n",

			 acpi_format_exception(status));

			 acpi_format_exception(status),

			 pcie_aspm_support_enabled() ? "; disabling ASPM" : "");

		*no_aspm = 1;

		*no_aspm = 1;

		return;

		return;

	}

	}