PCI/ACPI: Report _OSC control mask returned on failure to get control (a246670d) · Commits · 戴 / test

If an attempt to get _OSC control of the PCIe native features from the BIOS fails, report the resulting mask of control flags the BIOS was willing to grant in the error message. Moreover, if the _OSC support mask is insufficient for requesting control of the PCIe native features or pcie_ports_disabled is set, print a diagnostic message containing the _OSC support mask. This helps to diagnose obscure _OSC-related problems on a number machines. Signed-off-by:

Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/acpi/pci_root.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -596,12 +596,18 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
		dev_info(root->bus->bridge,
		"ACPI _OSC control (0x%02x) granted\n", flags);
		} else {
		dev_dbg(root->bus->bridge,
		"ACPI _OSC request failed (code %d)\n", status);
		printk(KERN_INFO "Unable to assume _OSC PCIe control. "
		"Disabling ASPM\n");
		dev_info(root->bus->bridge,
		"ACPI _OSC request failed (%s), "
		"returned control mask: 0x%02x\n",
		acpi_format_exception(status), flags);
		pr_info("ACPI _OSC control for PCIe not granted, "
		"disabling ASPM\n");
		pcie_no_aspm();
		}
		} else {
		dev_info(root->bus->bridge,
		"Unable to request _OSC control "
		"(_OSC support mask: 0x%02x)\n", flags);
		}

		pci_acpi_add_bus_pm_notifier(device, root->bus);

Admin message