Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

13 files changed, 299 insertions, 169 deletions

diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index dda70981b7a6..dc29348264c6 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -31,7 +31,7 @@ source "drivers/pci/pcie/aer/Kconfig"
 # PCI Express ASPM
 #
 config PCIEASPM
-        bool "PCI Express ASPM control" if EMBEDDED
+        bool "PCI Express ASPM control" if EXPERT
         depends on PCI && PCIEPORTBUS
         default y
         help
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 909924692b8a..95489cd9a555 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -27,6 +27,10 @@
 #include <linux/stddef.h>
 #include "aerdrv.h"
 
+/* Override the existing corrected and uncorrected error masks */
+static int aer_mask_override;
+module_param(aer_mask_override, bool, 0);
+
 struct aer_error_inj {
         u8 bus;
         u8 dev;
@@ -322,7 +326,7 @@ static int aer_inject(struct aer_error_inj *einj)
         unsigned long flags;
         unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn);
         int pos_cap_err, rp_pos_cap_err;
-        u32 sever, cor_mask, uncor_mask;
+        u32 sever, cor_mask, uncor_mask, cor_mask_orig = 0, uncor_mask_orig = 0;
         int ret = 0;
 
         dev = pci_get_domain_bus_and_slot((int)einj->domain, einj->bus, devfn);
@@ -361,6 +365,18 @@ static int aer_inject(struct aer_error_inj *einj)
                 goto out_put;
         }
 
+        if (aer_mask_override) {
+                cor_mask_orig = cor_mask;
+                cor_mask &= !(einj->cor_status);
+                pci_write_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK,
+                                       cor_mask);
+
+                uncor_mask_orig = uncor_mask;
+                uncor_mask &= !(einj->uncor_status);
+                pci_write_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK,
+                                       uncor_mask);
+        }
+
         spin_lock_irqsave(&inject_lock, flags);
 
         err = __find_aer_error_by_dev(dev);
@@ -378,14 +394,16 @@ static int aer_inject(struct aer_error_inj *einj)
         err->header_log2 = einj->header_log2;
         err->header_log3 = einj->header_log3;
 
-        if (einj->cor_status && !(einj->cor_status & ~cor_mask)) {
+        if (!aer_mask_override && einj->cor_status &&
+            !(einj->cor_status & ~cor_mask)) {
                 ret = -EINVAL;
                 printk(KERN_WARNING "The correctable error(s) is masked "
                                 "by device\n");
                 spin_unlock_irqrestore(&inject_lock, flags);
                 goto out_put;
         }
-        if (einj->uncor_status && !(einj->uncor_status & ~uncor_mask)) {
+        if (!aer_mask_override && einj->uncor_status &&
+            !(einj->uncor_status & ~uncor_mask)) {
                 ret = -EINVAL;
                 printk(KERN_WARNING "The uncorrectable error(s) is masked "
                                 "by device\n");
@@ -425,6 +443,13 @@ static int aer_inject(struct aer_error_inj *einj)
         }
         spin_unlock_irqrestore(&inject_lock, flags);
 
+        if (aer_mask_override) {
+                pci_write_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK,
+                                       cor_mask_orig);
+                pci_write_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK,
+                                       uncor_mask_orig);
+        }
+
         ret = pci_bus_set_aer_ops(dev->bus);
         if (ret)
                 goto out_put;
@@ -472,6 +497,7 @@ static ssize_t aer_inject_write(struct file *filp, const char __user *ubuf,
 static const struct file_operations aer_inject_fops = {
         .write = aer_inject_write,
         .owner = THIS_MODULE,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice aer_inject_device = {
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index f409948e1a9b..58ad7917553c 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -17,6 +17,7 @@
 
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci-acpi.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -416,7 +417,7 @@ static void aer_error_resume(struct pci_dev *dev)
  */
 static int __init aer_service_init(void)
 {
-        if (!pci_aer_available())
+        if (!pci_aer_available() || aer_acpi_firmware_first())
                 return -ENXIO;
         return pcie_port_service_register(&aerdriver);
 }
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index 80c11d131499..94a7598eb262 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -35,13 +35,6 @@
                                         PCI_ERR_UNC_UNX_COMP|           \
                                         PCI_ERR_UNC_MALF_TLP)
 
-struct header_log_regs {
-        unsigned int dw0;
-        unsigned int dw1;
-        unsigned int dw2;
-        unsigned int dw3;
-};
-
 #define AER_MAX_MULTI_ERR_DEVICES       5       /* Not likely to have more */
 struct aer_err_info {
         struct pci_dev *dev[AER_MAX_MULTI_ERR_DEVICES];
@@ -59,7 +52,7 @@ struct aer_err_info {
 
         unsigned int status;            /* COR/UNCOR Error Status */
         unsigned int mask;              /* COR/UNCOR Error Mask */
-        struct header_log_regs tlp;     /* TLP Header */
+        struct aer_header_log_regs tlp; /* TLP Header */
 };
 
 struct aer_err_source {
@@ -121,15 +114,6 @@ extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
 extern void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info);
 extern irqreturn_t aer_irq(int irq, void *context);
 
-#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
-
 #ifdef CONFIG_ACPI_APEI
 extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
 #else
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 2bb9b8972211..275bf158ffa7 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -93,4 +93,38 @@ int pcie_aer_get_firmware_first(struct pci_dev *dev)
                 aer_set_firmware_first(dev);
         return dev->__aer_firmware_first;
 }
+
+static bool aer_firmware_first;
+
+static int aer_hest_parse_aff(struct acpi_hest_header *hest_hdr, void *data)
+{
+        struct acpi_hest_aer_common *p;
+
+        if (aer_firmware_first)
+                return 0;
+
+        switch (hest_hdr->type) {
+        case ACPI_HEST_TYPE_AER_ROOT_PORT:
+        case ACPI_HEST_TYPE_AER_ENDPOINT:
+        case ACPI_HEST_TYPE_AER_BRIDGE:
+                p = (struct acpi_hest_aer_common *)(hest_hdr + 1);
+                aer_firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
+        default:
+                return 0;
+        }
+}
+
+/**
+ * aer_acpi_firmware_first - Check if APEI should control AER.
+ */
+bool aer_acpi_firmware_first(void)
+{
+        static bool parsed = false;
+
+        if (!parsed) {
+                apei_hest_parse(aer_hest_parse_aff, NULL);
+                parsed = true;
+        }
+        return aer_firmware_first;
+}
 #endif
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 29e268fadf14..43421fbe080a 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -754,7 +754,7 @@ void aer_isr(struct work_struct *work)
 {
         struct aer_rpc *rpc = container_of(work, struct aer_rpc, dpc_handler);
         struct pcie_device *p_device = rpc->rpd;
-        struct aer_err_source e_src;
+        struct aer_err_source uninitialized_var(e_src);
 
         mutex_lock(&rpc->rpc_mutex);
         while (get_e_source(rpc, &e_src))
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
index 9d3e4c8d0184..b07a42e0b350 100644
--- a/drivers/pci/pcie/aer/aerdrv_errprint.c
+++ b/drivers/pci/pcie/aer/aerdrv_errprint.c
@@ -19,6 +19,7 @@
 #include <linux/errno.h>
 #include <linux/pm.h>
 #include <linux/suspend.h>
+#include <linux/cper.h>
 
 #include "aerdrv.h"
 
@@ -57,86 +58,44 @@
         (e & AER_DATA_LINK_LAYER_ERROR_MASK(t)) ? AER_DATA_LINK_LAYER_ERROR : \
         AER_TRANSACTION_LAYER_ERROR)
 
-#define AER_PR(info, pdev, fmt, args...)                                \
-        printk("%s%s %s: " fmt, (info->severity == AER_CORRECTABLE) ?   \
-                KERN_WARNING : KERN_ERR, dev_driver_string(&pdev->dev), \
-                dev_name(&pdev->dev), ## args)
-
 /*
  * AER error strings
  */
-static char *aer_error_severity_string[] = {
+static const char *aer_error_severity_string[] = {
         "Uncorrected (Non-Fatal)",
         "Uncorrected (Fatal)",
         "Corrected"
 };
 
-static char *aer_error_layer[] = {
+static const char *aer_error_layer[] = {
         "Physical Layer",
         "Data Link Layer",
         "Transaction Layer"
 };
-static char *aer_correctable_error_string[] = {
-        "Receiver Error        ",       /* Bit Position 0       */
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        "Bad TLP               ",       /* Bit Position 6       */
-        "Bad DLLP              ",       /* Bit Position 7       */
-        "RELAY_NUM Rollover    ",       /* Bit Position 8       */
-        NULL,
-        NULL,
-        NULL,
-        "Replay Timer Timeout  ",       /* Bit Position 12      */
-        "Advisory Non-Fatal    ",       /* Bit Position 13      */
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
+
+static const char *aer_correctable_error_string[] = {
+        "Receiver Error",               /* Bit Position 0       */
         NULL,
         NULL,
         NULL,
         NULL,
         NULL,
+        "Bad TLP",                      /* Bit Position 6       */
+        "Bad DLLP",                     /* Bit Position 7       */
+        "RELAY_NUM Rollover",           /* Bit Position 8       */
         NULL,
         NULL,
         NULL,
+        "Replay Timer Timeout",         /* Bit Position 12      */
+        "Advisory Non-Fatal",           /* Bit Position 13      */
 };
 
-static char *aer_uncorrectable_error_string[] = {
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        "Data Link Protocol    ",       /* Bit Position 4       */
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        "Poisoned TLP          ",       /* Bit Position 12      */
-        "Flow Control Protocol ",       /* Bit Position 13      */
-        "Completion Timeout    ",       /* Bit Position 14      */
-        "Completer Abort       ",       /* Bit Position 15      */
-        "Unexpected Completion ",       /* Bit Position 16      */
-        "Receiver Overflow     ",       /* Bit Position 17      */
-        "Malformed TLP         ",       /* Bit Position 18      */
-        "ECRC                  ",       /* Bit Position 19      */
-        "Unsupported Request   ",       /* Bit Position 20      */
+static const char *aer_uncorrectable_error_string[] = {
         NULL,
         NULL,
         NULL,
         NULL,
+        "Data Link Protocol",           /* Bit Position 4       */
         NULL,
         NULL,
         NULL,
@@ -144,19 +103,29 @@ static char *aer_uncorrectable_error_string[] = {
         NULL,
         NULL,
         NULL,
+        "Poisoned TLP",                 /* Bit Position 12      */
+        "Flow Control Protocol",        /* Bit Position 13      */
+        "Completion Timeout",           /* Bit Position 14      */
+        "Completer Abort",              /* Bit Position 15      */
+        "Unexpected Completion",        /* Bit Position 16      */
+        "Receiver Overflow",            /* Bit Position 17      */
+        "Malformed TLP",                /* Bit Position 18      */
+        "ECRC",                         /* Bit Position 19      */
+        "Unsupported Request",          /* Bit Position 20      */
 };
 
-static char *aer_agent_string[] = {
+static const char *aer_agent_string[] = {
         "Receiver ID",
         "Requester ID",
         "Completer ID",
         "Transmitter ID"
 };
 
-static void __aer_print_error(struct aer_err_info *info, struct pci_dev *dev)
+static void __aer_print_error(const char *prefix,
+                              struct aer_err_info *info)
 {
         int i, status;
-        char *errmsg = NULL;
+        const char *errmsg = NULL;
 
         status = (info->status & ~info->mask);
 
@@ -165,15 +134,17 @@ static void __aer_print_error(struct aer_err_info *info, struct pci_dev *dev)
                         continue;
 
                 if (info->severity == AER_CORRECTABLE)
-                        errmsg = aer_correctable_error_string[i];
+                        errmsg = i < ARRAY_SIZE(aer_correctable_error_string) ?
+                                aer_correctable_error_string[i] : NULL;
                 else
-                        errmsg = aer_uncorrectable_error_string[i];
+                        errmsg = i < ARRAY_SIZE(aer_uncorrectable_error_string) ?
+                                aer_uncorrectable_error_string[i] : NULL;
 
                 if (errmsg)
-                        AER_PR(info, dev, "   [%2d] %s%s\n", i, errmsg,
+                        printk("%s""   [%2d] %-22s%s\n", prefix, i, errmsg,
                                 info->first_error == i ? " (First)" : "");
                 else
-                        AER_PR(info, dev, "   [%2d] Unknown Error Bit%s\n", i,
+                        printk("%s""   [%2d] Unknown Error Bit%s\n", prefix, i,
                                 info->first_error == i ? " (First)" : "");
         }
 }
@@ -181,11 +152,15 @@ static void __aer_print_error(struct aer_err_info *info, struct pci_dev *dev)
 void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
 {
         int id = ((dev->bus->number << 8) | dev->devfn);
+        char prefix[44];
+
+        snprintf(prefix, sizeof(prefix), "%s%s %s: ",
+                 (info->severity == AER_CORRECTABLE) ? KERN_WARNING : KERN_ERR,
+                 dev_driver_string(&dev->dev), dev_name(&dev->dev));
 
         if (info->status == 0) {
-                AER_PR(info, dev,
-                        "PCIe Bus Error: severity=%s, type=Unaccessible, "
-                        "id=%04x(Unregistered Agent ID)\n",
+                printk("%s""PCIe Bus Error: severity=%s, type=Unaccessible, "
+                        "id=%04x(Unregistered Agent ID)\n", prefix,
                         aer_error_severity_string[info->severity], id);
         } else {
                 int layer, agent;
@@ -193,23 +168,22 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
                 layer = AER_GET_LAYER_ERROR(info->severity, info->status);
                 agent = AER_GET_AGENT(info->severity, info->status);
 
-                AER_PR(info, dev,
-                        "PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",
-                        aer_error_severity_string[info->severity],
+                printk("%s""PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",
+                        prefix, aer_error_severity_string[info->severity],
                         aer_error_layer[layer], id, aer_agent_string[agent]);
 
-                AER_PR(info, dev,
-                        "  device [%04x:%04x] error status/mask=%08x/%08x\n",
-                        dev->vendor, dev->device, info->status, info->mask);
+                printk("%s""  device [%04x:%04x] error status/mask=%08x/%08x\n",
+                        prefix, dev->vendor, dev->device,
+                        info->status, info->mask);
 
-                __aer_print_error(info, dev);
+                __aer_print_error(prefix, info);
 
                 if (info->tlp_header_valid) {
                         unsigned char *tlp = (unsigned char *) &info->tlp;
-                        AER_PR(info, dev, "  TLP Header:"
+                        printk("%s""  TLP Header:"
                                 " %02x%02x%02x%02x %02x%02x%02x%02x"
                                 " %02x%02x%02x%02x %02x%02x%02x%02x\n",
-                                *(tlp + 3), *(tlp + 2), *(tlp + 1), *tlp,
+                                prefix, *(tlp + 3), *(tlp + 2), *(tlp + 1), *tlp,
                                 *(tlp + 7), *(tlp + 6), *(tlp + 5), *(tlp + 4),
                                 *(tlp + 11), *(tlp + 10), *(tlp + 9),
                                 *(tlp + 8), *(tlp + 15), *(tlp + 14),
@@ -218,8 +192,8 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
         }
 
         if (info->id && info->error_dev_num > 1 && info->id == id)
-                AER_PR(info, dev,
-                        "  Error of this Agent(%04x) is reported first\n", id);
+                printk("%s""  Error of this Agent(%04x) is reported first\n",
+                        prefix, id);
 }
 
 void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info)
@@ -228,3 +202,61 @@ void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info)
                 info->multi_error_valid ? "Multiple " : "",
                 aer_error_severity_string[info->severity], info->id);
 }
+
+#ifdef CONFIG_ACPI_APEI_PCIEAER
+static int cper_severity_to_aer(int cper_severity)
+{
+        switch (cper_severity) {
+        case CPER_SEV_RECOVERABLE:
+                return AER_NONFATAL;
+        case CPER_SEV_FATAL:
+                return AER_FATAL;
+        default:
+                return AER_CORRECTABLE;
+        }
+}
+
+void cper_print_aer(const char *prefix, int cper_severity,
+                    struct aer_capability_regs *aer)
+{
+        int aer_severity, layer, agent, status_strs_size, tlp_header_valid = 0;
+        u32 status, mask;
+        const char **status_strs;
+
+        aer_severity = cper_severity_to_aer(cper_severity);
+        if (aer_severity == AER_CORRECTABLE) {
+                status = aer->cor_status;
+                mask = aer->cor_mask;
+                status_strs = aer_correctable_error_string;
+                status_strs_size = ARRAY_SIZE(aer_correctable_error_string);
+        } else {
+                status = aer->uncor_status;
+                mask = aer->uncor_mask;
+                status_strs = aer_uncorrectable_error_string;
+                status_strs_size = ARRAY_SIZE(aer_uncorrectable_error_string);
+                tlp_header_valid = status & AER_LOG_TLP_MASKS;
+        }
+        layer = AER_GET_LAYER_ERROR(aer_severity, status);
+        agent = AER_GET_AGENT(aer_severity, status);
+        printk("%s""aer_status: 0x%08x, aer_mask: 0x%08x\n",
+               prefix, status, mask);
+        cper_print_bits(prefix, status, status_strs, status_strs_size);
+        printk("%s""aer_layer=%s, aer_agent=%s\n", prefix,
+               aer_error_layer[layer], aer_agent_string[agent]);
+        if (aer_severity != AER_CORRECTABLE)
+                printk("%s""aer_uncor_severity: 0x%08x\n",
+                       prefix, aer->uncor_severity);
+        if (tlp_header_valid) {
+                const unsigned char *tlp;
+                tlp = (const unsigned char *)&aer->header_log;
+                printk("%s""aer_tlp_header:"
+                        " %02x%02x%02x%02x %02x%02x%02x%02x"
+                        " %02x%02x%02x%02x %02x%02x%02x%02x\n",
+                        prefix, *(tlp + 3), *(tlp + 2), *(tlp + 1), *tlp,
+                        *(tlp + 7), *(tlp + 6), *(tlp + 5), *(tlp + 4),
+                        *(tlp + 11), *(tlp + 10), *(tlp + 9),
+                        *(tlp + 8), *(tlp + 15), *(tlp + 14),
+                        *(tlp + 13), *(tlp + 12));
+        }
+}
+#endif
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 71222814c1ec..6892601fc76f 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -68,7 +68,8 @@ struct pcie_link_state {
         struct aspm_latency acceptable[8];
 };
 
-static int aspm_disabled, aspm_force;
+static int aspm_disabled, aspm_force, aspm_clear_state;
+static bool aspm_support_enabled = true;
 static DEFINE_MUTEX(aspm_lock);
 static LIST_HEAD(link_list);
 
@@ -139,7 +140,7 @@ static void pcie_set_clkpm(struct pcie_link_state *link, int enable)
 {
         /* Don't enable Clock PM if the link is not Clock PM capable */
         if (!link->clkpm_capable && enable)
-                return;
+                enable = 0;
         /* Need nothing if the specified equals to current state */
         if (link->clkpm_enabled == enable)
                 return;
@@ -498,6 +499,10 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
         struct pci_dev *child;
         int pos;
         u32 reg32;
+
+        if (aspm_clear_state)
+                return -EINVAL;
+
         /*
          * Some functions in a slot might not all be PCIe functions,
          * very strange. Disable ASPM for the whole slot
@@ -563,12 +568,15 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)
         struct pcie_link_state *link;
         int blacklist = !!pcie_aspm_sanity_check(pdev);
 
-        if (aspm_disabled || !pci_is_pcie(pdev) || pdev->link_state)
+        if (!pci_is_pcie(pdev) || pdev->link_state)
                 return;
         if (pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT &&
             pdev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM)
                 return;
 
+        if (aspm_disabled && !aspm_clear_state)
+                return;
+
         /* VIA has a strange chipset, root port is under a bridge */
         if (pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT &&
             pdev->bus->self)
@@ -600,7 +608,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)
          * the BIOS's expectation, we'll do so once pci_enable_device() is
          * called.
          */
-        if (aspm_policy != POLICY_POWERSAVE) {
+        if (aspm_policy != POLICY_POWERSAVE || aspm_clear_state) {
                 pcie_config_aspm_path(link);
                 pcie_set_clkpm(link, policy_to_clkpm_state(link));
         }
@@ -641,7 +649,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
         struct pci_dev *parent = pdev->bus->self;
         struct pcie_link_state *link, *root, *parent_link;
 
-        if (aspm_disabled || !pci_is_pcie(pdev) ||
+        if ((aspm_disabled && !aspm_clear_state) || !pci_is_pcie(pdev) ||
             !parent || !parent->link_state)
                 return;
         if ((parent->pcie_type != PCI_EXP_TYPE_ROOT_PORT) &&
@@ -700,11 +708,33 @@ void pcie_aspm_pm_state_change(struct pci_dev *pdev)
         up_read(&pci_bus_sem);
 }
 
+void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
+{
+        struct pcie_link_state *link = pdev->link_state;
+
+        if (aspm_disabled || !pci_is_pcie(pdev) || !link)
+                return;
+
+        if (aspm_policy != POLICY_POWERSAVE)
+                return;
+
+        if ((pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT) &&
+            (pdev->pcie_type != PCI_EXP_TYPE_DOWNSTREAM))
+                return;
+
+        down_read(&pci_bus_sem);
+        mutex_lock(&aspm_lock);
+        pcie_config_aspm_path(link);
+        pcie_set_clkpm(link, policy_to_clkpm_state(link));
+        mutex_unlock(&aspm_lock);
+        up_read(&pci_bus_sem);
+}
+
 /*
  * pci_disable_link_state - disable pci device's link state, so the link will
  * never enter specific states
  */
-void pci_disable_link_state(struct pci_dev *pdev, int state)
+static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
 {
         struct pci_dev *parent = pdev->bus->self;
         struct pcie_link_state *link;
@@ -717,7 +747,8 @@ void pci_disable_link_state(struct pci_dev *pdev, int state)
         if (!parent || !parent->link_state)
                 return;
 
-        down_read(&pci_bus_sem);
+        if (sem)
+                down_read(&pci_bus_sem);
         mutex_lock(&aspm_lock);
         link = parent->link_state;
         if (state & PCIE_LINK_STATE_L0S)
@@ -731,7 +762,19 @@ void pci_disable_link_state(struct pci_dev *pdev, int state)
                 pcie_set_clkpm(link, 0);
         }
         mutex_unlock(&aspm_lock);
-        up_read(&pci_bus_sem);
+        if (sem)
+                up_read(&pci_bus_sem);
+}
+
+void pci_disable_link_state_locked(struct pci_dev *pdev, int state)
+{
+        __pci_disable_link_state(pdev, state, false);
+}
+EXPORT_SYMBOL(pci_disable_link_state_locked);
+
+void pci_disable_link_state(struct pci_dev *pdev, int state)
+{
+        __pci_disable_link_state(pdev, state, true);
 }
 EXPORT_SYMBOL(pci_disable_link_state);
 
@@ -740,6 +783,8 @@ static int pcie_aspm_set_policy(const char *val, struct kernel_param *kp)
         int i;
         struct pcie_link_state *link;
 
+        if (aspm_disabled)
+                return -EPERM;
         for (i = 0; i < ARRAY_SIZE(policy_str); i++)
                 if (!strncmp(val, policy_str[i], strlen(policy_str[i])))
                         break;
@@ -794,6 +839,8 @@ static ssize_t link_state_store(struct device *dev,
         struct pcie_link_state *link, *root = pdev->link_state->root;
         u32 val = buf[0] - '0', state = 0;
 
+        if (aspm_disabled)
+                return -EPERM;
         if (n < 1 || val > 3)
                 return -EINVAL;
 
@@ -889,6 +936,7 @@ static int __init pcie_aspm_disable(char *str)
 {
         if (!strcmp(str, "off")) {
                 aspm_disabled = 1;
+                aspm_support_enabled = false;
                 printk(KERN_INFO "PCIe ASPM is disabled\n");
         } else if (!strcmp(str, "force")) {
                 aspm_force = 1;
@@ -899,6 +947,12 @@ static int __init pcie_aspm_disable(char *str)
 
 __setup("pcie_aspm=", pcie_aspm_disable);
 
+void pcie_clear_aspm(void)
+{
+        if (!aspm_force)
+                aspm_clear_state = 1;
+}
+
 void pcie_no_aspm(void)
 {
         if (!aspm_force)
@@ -917,3 +971,8 @@ int pcie_aspm_enabled(void)
 }
 EXPORT_SYMBOL(pcie_aspm_enabled);
 
+bool pcie_aspm_support_enabled(void)
+{
+        return aspm_support_enabled;
+}
+EXPORT_SYMBOL(pcie_aspm_support_enabled);
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index 2f3c90407227..0057344a3fcb 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -26,9 +26,6 @@
 #include "../pci.h"
 #include "portdrv.h"
 
-#define PCI_EXP_RTSTA_PME       0x10000 /* PME status */
-#define PCI_EXP_RTSTA_PENDING   0x20000 /* PME pending */
-
 /*
  * If this switch is set, MSI will not be used for PCIe PME signaling.  This
  * causes the PCIe port driver to use INTx interrupts only, but it turns out
@@ -74,22 +71,6 @@ void pcie_pme_interrupt_enable(struct pci_dev *dev, bool enable)
 }
 
 /**
- * pcie_pme_clear_status - Clear root port PME interrupt status.
- * @dev: PCIe root port or event collector.
- */
-static void pcie_pme_clear_status(struct pci_dev *dev)
-{
-        int rtsta_pos;
-        u32 rtsta;
-
-        rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA;
-
-        pci_read_config_dword(dev, rtsta_pos, &rtsta);
-        rtsta |= PCI_EXP_RTSTA_PME;
-        pci_write_config_dword(dev, rtsta_pos, rtsta);
-}
-
-/**
  * pcie_pme_walk_bus - Scan a PCI bus for devices asserting PME#.
  * @bus: PCI bus to scan.
  *
@@ -103,8 +84,8 @@ static bool pcie_pme_walk_bus(struct pci_bus *bus)
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 /* Skip PCIe devices in case we started from a root port. */
                 if (!pci_is_pcie(dev) && pci_check_pme_status(dev)) {
-                        pm_request_resume(&dev->dev);
                         pci_wakeup_event(dev);
+                        pm_request_resume(&dev->dev);
                         ret = true;
                 }
 
@@ -206,8 +187,8 @@ static void pcie_pme_handle_request(struct pci_dev *port, u16 req_id)
                 /* The device is there, but we have to check its PME status. */
                 found = pci_check_pme_status(dev);
                 if (found) {
-                        pm_request_resume(&dev->dev);
                         pci_wakeup_event(dev);
+                        pm_request_resume(&dev->dev);
                 }
                 pci_dev_put(dev);
         } else if (devfn) {
@@ -253,7 +234,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
                          * Clear PME status of the port.  If there are other
                          * pending PMEs, the status will be set again.
                          */
-                        pcie_pme_clear_status(port);
+                        pcie_clear_root_pme_status(port);
 
                         spin_unlock_irq(&data->lock);
                         pcie_pme_handle_request(port, rtsta & 0xffff);
@@ -378,7 +359,7 @@ static int pcie_pme_probe(struct pcie_device *srv)
 
         port = srv->port;
         pcie_pme_interrupt_enable(port, false);
-        pcie_pme_clear_status(port);
+        pcie_clear_root_pme_status(port);
 
         ret = request_irq(srv->irq, pcie_pme_irq, IRQF_SHARED, "PCIe PME", srv);
         if (ret) {
@@ -402,7 +383,7 @@ static int pcie_pme_suspend(struct pcie_device *srv)
 
         spin_lock_irq(&data->lock);
         pcie_pme_interrupt_enable(port, false);
-        pcie_pme_clear_status(port);
+        pcie_clear_root_pme_status(port);
         data->noirq = true;
         spin_unlock_irq(&data->lock);
 
@@ -422,7 +403,7 @@ static int pcie_pme_resume(struct pcie_device *srv)
 
         spin_lock_irq(&data->lock);
         data->noirq = false;
-        pcie_pme_clear_status(port);
+        pcie_clear_root_pme_status(port);
         pcie_pme_interrupt_enable(port, true);
         spin_unlock_irq(&data->lock);
 
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 7b5aba0a3291..bd00a01aef14 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -20,9 +20,6 @@
 
 #define get_descriptor_id(type, service) (((type - 4) << 4) | service)
 
-extern bool pcie_ports_disabled;
-extern bool pcie_ports_auto;
-
 extern struct bus_type pcie_port_bus_type;
 extern int pcie_port_device_register(struct pci_dev *dev);
 #ifdef CONFIG_PM
@@ -35,6 +32,8 @@ extern void pcie_port_bus_unregister(void);
 
 struct pci_dev;
 
+extern void pcie_clear_root_pme_status(struct pci_dev *dev);
+
 #ifdef CONFIG_PCIE_PME
 extern bool pcie_pme_msi_disabled;
 
diff --git a/drivers/pci/pcie/portdrv_acpi.c b/drivers/pci/pcie/portdrv_acpi.c
index b7c4cb1ccb23..a86b56e5f2f2 100644
--- a/drivers/pci/pcie/portdrv_acpi.c
+++ b/drivers/pci/pcie/portdrv_acpi.c
@@ -33,7 +33,7 @@
  */
 int pcie_port_acpi_setup(struct pci_dev *port, int *srv_mask)
 {
-        acpi_status status;
+        struct acpi_pci_root *root;
         acpi_handle handle;
         u32 flags;
 
@@ -44,26 +44,11 @@ int pcie_port_acpi_setup(struct pci_dev *port, int *srv_mask)
         if (!handle)
                 return -EINVAL;
 
-        flags = OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL
-                | OSC_PCI_EXPRESS_NATIVE_HP_CONTROL
-                | OSC_PCI_EXPRESS_PME_CONTROL;
-
-        if (pci_aer_available()) {
-                if (pcie_aer_get_firmware_first(port))
-                        dev_dbg(&port->dev, "PCIe errors handled by BIOS.\n");
-                else
-                        flags |= OSC_PCI_EXPRESS_AER_CONTROL;
-        }
-
-        status = acpi_pci_osc_control_set(handle, &flags,
-                                        OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
-        if (ACPI_FAILURE(status)) {
-                dev_dbg(&port->dev, "ACPI _OSC request failed (code %d)\n",
-                        status);
+        root = acpi_pci_find_root(handle);
+        if (!root)
                 return -ENODEV;
-        }
 
-        dev_info(&port->dev, "ACPI _OSC control granted for 0x%02x\n", flags);
+        flags = root->osc_control_set;
 
         *srv_mask = PCIE_PORT_SERVICE_VC;
         if (flags & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index a9c222d79ebc..595654a1a6a6 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/pcieport_if.h>
 #include <linux/aer.h>
-#include <linux/pci-aspm.h>
 
 #include "../pci.h"
 #include "portdrv.h"
@@ -241,17 +240,17 @@ static int get_port_device_capability(struct pci_dev *dev)
         int cap_mask;
         int err;
 
+        if (pcie_ports_disabled)
+                return 0;
+
         err = pcie_port_platform_notify(dev, &cap_mask);
-        if (pcie_ports_auto) {
-                if (err) {
-                        pcie_no_aspm();
-                        return 0;
-                }
-        } else {
+        if (!pcie_ports_auto) {
                 cap_mask = PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP
                                 | PCIE_PORT_SERVICE_VC;
                 if (pci_aer_available())
                         cap_mask |= PCIE_PORT_SERVICE_AER;
+        } else if (err) {
+                        return 0;
         }
 
         pos = pci_pcie_cap(dev);
@@ -349,15 +348,16 @@ int pcie_port_device_register(struct pci_dev *dev)
         int status, capabilities, i, nr_service;
         int irqs[PCIE_PORT_DEVICE_MAXSERVICES];
 
-        /* Get and check PCI Express port services */
-        capabilities = get_port_device_capability(dev);
-        if (!capabilities)
-                return -ENODEV;
-
         /* Enable PCI Express port device */
         status = pci_enable_device(dev);
         if (status)
                 return status;
+
+        /* Get and check PCI Express port services */
+        capabilities = get_port_device_capability(dev);
+        if (!capabilities)
+                return 0;
+
         pci_set_master(dev);
         /*
          * Initialize service irqs. Don't use service devices that
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index f9033e190fb6..e0610bda1dea 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -57,6 +57,22 @@ __setup("pcie_ports=", pcie_port_setup);
 
 /* global data */
 
+/**
+ * pcie_clear_root_pme_status - Clear root port PME interrupt status.
+ * @dev: PCIe root port or event collector.
+ */
+void pcie_clear_root_pme_status(struct pci_dev *dev)
+{
+        int rtsta_pos;
+        u32 rtsta;
+
+        rtsta_pos = pci_pcie_cap(dev) + PCI_EXP_RTSTA;
+
+        pci_read_config_dword(dev, rtsta_pos, &rtsta);
+        rtsta |= PCI_EXP_RTSTA_PME;
+        pci_write_config_dword(dev, rtsta_pos, rtsta);
+}
+
 static int pcie_portdrv_restore_config(struct pci_dev *dev)
 {
         int retval;
@@ -69,6 +85,20 @@ static int pcie_portdrv_restore_config(struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PM
+static int pcie_port_resume_noirq(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+
+        /*
+         * Some BIOSes forget to clear Root PME Status bits after system wakeup
+         * which breaks ACPI-based runtime wakeup on PCI Express, so clear those
+         * bits now just in case (shouldn't hurt).
+         */
+        if(pdev->pcie_type == PCI_EXP_TYPE_ROOT_PORT)
+                pcie_clear_root_pme_status(pdev);
+        return 0;
+}
+
 static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .suspend        = pcie_port_device_suspend,
         .resume         = pcie_port_device_resume,
@@ -76,6 +106,7 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .thaw           = pcie_port_device_resume,
         .poweroff       = pcie_port_device_suspend,
         .restore        = pcie_port_device_resume,
+        .resume_noirq   = pcie_port_resume_noirq,
 };
 
 #define PCIE_PORTDRV_PM_OPS     (&pcie_portdrv_pm_ops)
@@ -327,10 +358,8 @@ static int __init pcie_portdrv_init(void)
 {
         int retval;
 
-        if (pcie_ports_disabled) {
-                pcie_no_aspm();
-                return -EACCES;
-        }
+        if (pcie_ports_disabled)
+                return pci_register_driver(&pcie_portdriver);
 
         dmi_check_system(pcie_portdrv_dmi_table);