| From ca8b0778f7f4d126db386e658b97d01461819042 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Aug 2018 04:32:11 +0000 |
| Subject: PCI/ACPI: Correct error message for ASPM disabling |
| |
| From: Sinan Kaya <okaya@kernel.org> |
| |
| [ Upstream commit 1ad61b612b95980a4d970c52022aa01dfc0f6068 ] |
| |
| 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: Michael Kelley <mikelley@microsoft.com> |
| Signed-off-by: Sinan Kaya <okaya@kernel.org> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/acpi/pci_root.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c |
| index 7433035ded955..e465e720eab20 100644 |
| --- a/drivers/acpi/pci_root.c |
| +++ b/drivers/acpi/pci_root.c |
| @@ -455,8 +455,9 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm) |
| decode_osc_support(root, "OS supports", support); |
| status = acpi_pci_osc_support(root, support); |
| if (ACPI_FAILURE(status)) { |
| - dev_info(&device->dev, "_OSC failed (%s); disabling ASPM\n", |
| - acpi_format_exception(status)); |
| + dev_info(&device->dev, "_OSC failed (%s)%s\n", |
| + acpi_format_exception(status), |
| + pcie_aspm_support_enabled() ? "; disabling ASPM" : ""); |
| *no_aspm = 1; |
| return; |
| } |
| -- |
| 2.20.1 |
| |
