6 files changed, 34 insertions, 47 deletions

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index b5ac810404c0..c8062494009f 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -55,8 +55,6 @@ acpi_query_osc (
 
         status = acpi_evaluate_object(handle, "_OSC", &input, &output);
         if (ACPI_FAILURE (status)) {
-                printk(KERN_DEBUG  
-                        "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
                 *ret_status = status;
                 return status;
         }
@@ -124,11 +122,9 @@ acpi_run_osc (
         in_params[3].buffer.pointer     = (u8 *)context;
 
         status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-        if (ACPI_FAILURE (status)) {
-                printk(KERN_DEBUG  
-                        "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
+        if (ACPI_FAILURE (status))
                 return status;
-        }
+
         out_obj = output.pointer;
         if (out_obj->type != ACPI_TYPE_BUFFER) {
                 printk(KERN_DEBUG  
diff --git a/drivers/pci/pcie/aer/Kconfig b/drivers/pci/pcie/aer/Kconfig
index 3f37a60a6438..c3bde588aa13 100644
--- a/drivers/pci/pcie/aer/Kconfig
+++ b/drivers/pci/pcie/aer/Kconfig
@@ -4,7 +4,7 @@
 
 config PCIEAER
         boolean "Root Port Advanced Error Reporting support"
-        depends on PCIEPORTBUS && ACPI
+        depends on PCIEPORTBUS
         default y
         help
           This enables PCI Express Root Port Advanced Error Reporting
diff --git a/drivers/pci/pcie/aer/Makefile b/drivers/pci/pcie/aer/Makefile
index 15a4f40d520b..8da3bd8455a8 100644
--- a/drivers/pci/pcie/aer/Makefile
+++ b/drivers/pci/pcie/aer/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_PCIEAER) += aerdriver.o
 
-aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o aerdrv_acpi.o
+aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o
+aerdriver-$(CONFIG_ACPI) += aerdrv_acpi.o
 
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index 5cca394d5999..c7ad68b6c6d6 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -19,10 +19,6 @@
 #define AER_ERROR_MASK                  0x001fffff
 #define AER_ERROR(d)                    (d & AER_ERROR_MASK)
 
-#define OSC_METHOD_RUN_SUCCESS          0
-#define OSC_METHOD_NOT_SUPPORTED        1
-#define OSC_METHOD_RUN_FAILURE          2
-
 /* Root Error Status Register Bits */
 #define ROOT_ERR_STATUS_MASKS                   0x0f
 
@@ -121,6 +117,14 @@ extern void aer_delete_rootport(struct aer_rpc *rpc);
 extern int aer_init(struct pcie_device *dev);
 extern void aer_isr(struct work_struct *work);
 extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
-extern int aer_osc_setup(struct pci_dev *dev);
+
+#ifdef CONFIG_ACPI
+extern int aer_osc_setup(struct pcie_device *pciedev);
+#else
+static inline int aer_osc_setup(struct pcie_device *pciedev)
+{
+        return 0;
+}
+#endif
 
 #endif //_AERDRV_H_
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index fa68e89ebec9..1a1eb45a779e 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -20,19 +20,18 @@
 
 /**
  * aer_osc_setup - run ACPI _OSC method
+ * @pciedev: pcie_device which AER is being enabled on
  *
- * Return:
- *      Zero if success. Nonzero for otherwise.
+ * @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 pci_dev *dev)
+int aer_osc_setup(struct pcie_device *pciedev)
 {
-        int retval = OSC_METHOD_RUN_SUCCESS;
-        acpi_status status;
-        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
-        struct pci_dev *pdev = dev;
+        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) {
@@ -50,19 +49,20 @@ int aer_osc_setup(struct pci_dev *dev)
                 pdev = parent->self;
         }
 
-        if (!handle)
-                return OSC_METHOD_NOT_SUPPORTED;
+        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);
+        }
 
-        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)) {
-                if (status == AE_SUPPORT)
-                        retval = OSC_METHOD_NOT_SUPPORTED;
-                else
-                        retval = OSC_METHOD_RUN_FAILURE;
+                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 retval;
+        return 0;
 }
-
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 08e13033ced8..fef159a68081 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -22,8 +22,6 @@
 #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"
 
@@ -733,20 +731,8 @@ void aer_delete_rootport(struct aer_rpc *rpc)
  **/
 int aer_init(struct pcie_device *dev)
 {
-        int status;
-
-        /* Run _OSC Method */
-        status = aer_osc_setup(dev->port);
-
-        if(status != OSC_METHOD_RUN_SUCCESS) {
-                printk(KERN_DEBUG "%s: AER service init fails - %s\n",
-                __FUNCTION__,
-                (status == OSC_METHOD_NOT_SUPPORTED) ?
-                        "No ACPI _OSC support" : "Run ACPI _OSC fails");
-
-                if (!forceload)
-                        return status;
-        }
+        if (aer_osc_setup(dev) && !forceload)
+                return -ENXIO;
 
         return AER_SUCCESS;
 }