8d29bfb79e
Below patch fixes aer driver error information and enables aer driver although CONFIG_ACPI=n. As a matter of fact, the new patch is created from below 2 patches plus a minor patch apply fuzz fixing. Because the second patch fixed a compilation error introduced by the first patch, I merge them to facilitate bisect. 1) http://marc.info/?l=linux-kernel&m=117783233918191&w=2; 2) http://marc.info/?l=linux-mm-commits&m=118046936720790&w=2 Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com> Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
69 lines
1.7 KiB
C
69 lines
1.7 KiB
C
/*
|
|
* Access ACPI _OSC method
|
|
*
|
|
* Copyright (C) 2006 Intel Corp.
|
|
* Tom Long Nguyen (tom.l.nguyen@intel.com)
|
|
* Zhang Yanmin (yanmin.zhang@intel.com)
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/pm.h>
|
|
#include <linux/suspend.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/pci-acpi.h>
|
|
#include <linux/delay.h>
|
|
#include "aerdrv.h"
|
|
|
|
/**
|
|
* aer_osc_setup - run ACPI _OSC method
|
|
* @pciedev: pcie_device which AER is being enabled on
|
|
*
|
|
* @return: Zero on success. Nonzero otherwise.
|
|
*
|
|
* Invoked when PCIE bus loads AER service driver. To avoid conflict with
|
|
* BIOS AER support requires BIOS to yield AER control to OS native driver.
|
|
**/
|
|
int aer_osc_setup(struct pcie_device *pciedev)
|
|
{
|
|
acpi_status status = AE_NOT_FOUND;
|
|
struct pci_dev *pdev = pciedev->port;
|
|
acpi_handle handle = DEVICE_ACPI_HANDLE(&pdev->dev);
|
|
struct pci_bus *parent;
|
|
|
|
while (!handle) {
|
|
if (!pdev || !pdev->bus->parent)
|
|
break;
|
|
parent = pdev->bus->parent;
|
|
if (!parent->self)
|
|
/* Parent must be a host bridge */
|
|
handle = acpi_get_pci_rootbridge_handle(
|
|
pci_domain_nr(parent),
|
|
parent->number);
|
|
else
|
|
handle = DEVICE_ACPI_HANDLE(
|
|
&(parent->self->dev));
|
|
pdev = parent->self;
|
|
}
|
|
|
|
if (handle) {
|
|
pci_osc_support_set(OSC_EXT_PCI_CONFIG_SUPPORT);
|
|
status = pci_osc_control_set(handle,
|
|
OSC_PCI_EXPRESS_AER_CONTROL |
|
|
OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
|
|
}
|
|
|
|
if (ACPI_FAILURE(status)) {
|
|
printk(KERN_DEBUG "AER service couldn't init device %s - %s\n",
|
|
pciedev->device.bus_id,
|
|
(status == AE_SUPPORT || status == AE_NOT_FOUND) ?
|
|
"no _OSC support" : "Run ACPI _OSC fails");
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|