Merge branch 'apei-release' into release

2 files changed, 108 insertions, 83 deletions

diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index 80c11d13149..3eb77080366 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 {
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
index 9d3e4c8d018..b07a42e0b35 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