]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 8 Jun 2018 13:39:38 +0000 (08:39 -0500)
committerBjorn Helgaas <helgaas@kernel.org>
Mon, 11 Jun 2018 13:10:45 +0000 (08:10 -0500)
Squash aerdrv_errprint.c into aerdrv.c.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
drivers/pci/pcie/aer/Makefile
drivers/pci/pcie/aer/aerdrv.c
drivers/pci/pcie/aer/aerdrv.h
drivers/pci/pcie/aer/aerdrv_errprint.c [deleted file]

index c85bd08519032be8d120f3fa7869e2551a6e9c79..662fb0d2abfef4c58184372f8c533a3e53460788 100644 (file)
@@ -7,7 +7,7 @@ obj-$(CONFIG_PCIEAER) += aerdriver.o
 
 obj-$(CONFIG_PCIE_ECRC)        += ecrc.o
 
-aerdriver-objs := aerdrv_errprint.o aerdrv.o
+aerdriver-objs := aerdrv.o
 aerdriver-$(CONFIG_ACPI) += aerdrv_acpi.o
 
 obj-$(CONFIG_PCIEAER_INJECT) += aer_inject.o
index c185069ef8803b46f2d38efa958c1da4fdd70f3c..3dca26681eecc88091e94973833ef9ff932e0fb2 100644 (file)
@@ -9,6 +9,7 @@
  *     Zhang Yanmin (yanmin.zhang@intel.com)
  */
 
+#include <linux/cper.h>
 #include <linux/pci.h>
 #include <linux/pci-acpi.h>
 #include <linux/sched.h>
@@ -20,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/kfifo.h>
 #include <linux/slab.h>
+#include <ras/ras_event.h>
 
 #include "aerdrv.h"
 #include "../../pci.h"
@@ -112,6 +114,247 @@ int pci_aer_init(struct pci_dev *dev)
        return pci_cleanup_aer_error_status_regs(dev);
 }
 
+#define AER_AGENT_RECEIVER             0
+#define AER_AGENT_REQUESTER            1
+#define AER_AGENT_COMPLETER            2
+#define AER_AGENT_TRANSMITTER          3
+
+#define AER_AGENT_REQUESTER_MASK(t)    ((t == AER_CORRECTABLE) ?       \
+       0 : (PCI_ERR_UNC_COMP_TIME|PCI_ERR_UNC_UNSUP))
+#define AER_AGENT_COMPLETER_MASK(t)    ((t == AER_CORRECTABLE) ?       \
+       0 : PCI_ERR_UNC_COMP_ABORT)
+#define AER_AGENT_TRANSMITTER_MASK(t)  ((t == AER_CORRECTABLE) ?       \
+       (PCI_ERR_COR_REP_ROLL|PCI_ERR_COR_REP_TIMER) : 0)
+
+#define AER_GET_AGENT(t, e)                                            \
+       ((e & AER_AGENT_COMPLETER_MASK(t)) ? AER_AGENT_COMPLETER :      \
+       (e & AER_AGENT_REQUESTER_MASK(t)) ? AER_AGENT_REQUESTER :       \
+       (e & AER_AGENT_TRANSMITTER_MASK(t)) ? AER_AGENT_TRANSMITTER :   \
+       AER_AGENT_RECEIVER)
+
+#define AER_PHYSICAL_LAYER_ERROR       0
+#define AER_DATA_LINK_LAYER_ERROR      1
+#define AER_TRANSACTION_LAYER_ERROR    2
+
+#define AER_PHYSICAL_LAYER_ERROR_MASK(t) ((t == AER_CORRECTABLE) ?     \
+       PCI_ERR_COR_RCVR : 0)
+#define AER_DATA_LINK_LAYER_ERROR_MASK(t) ((t == AER_CORRECTABLE) ?    \
+       (PCI_ERR_COR_BAD_TLP|                                           \
+       PCI_ERR_COR_BAD_DLLP|                                           \
+       PCI_ERR_COR_REP_ROLL|                                           \
+       PCI_ERR_COR_REP_TIMER) : PCI_ERR_UNC_DLP)
+
+#define AER_GET_LAYER_ERROR(t, e)                                      \
+       ((e & AER_PHYSICAL_LAYER_ERROR_MASK(t)) ? AER_PHYSICAL_LAYER_ERROR : \
+       (e & AER_DATA_LINK_LAYER_ERROR_MASK(t)) ? AER_DATA_LINK_LAYER_ERROR : \
+       AER_TRANSACTION_LAYER_ERROR)
+
+/*
+ * AER error strings
+ */
+static const char *aer_error_severity_string[] = {
+       "Uncorrected (Non-Fatal)",
+       "Uncorrected (Fatal)",
+       "Corrected"
+};
+
+static const char *aer_error_layer[] = {
+       "Physical Layer",
+       "Data Link Layer",
+       "Transaction Layer"
+};
+
+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      */
+       "Corrected Internal Error",     /* Bit Position 14      */
+       "Header Log Overflow",          /* Bit Position 15      */
+};
+
+static const char *aer_uncorrectable_error_string[] = {
+       "Undefined",                    /* Bit Position 0       */
+       NULL,
+       NULL,
+       NULL,
+       "Data Link Protocol",           /* Bit Position 4       */
+       "Surprise Down Error",          /* Bit Position 5       */
+       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      */
+       "ACS Violation",                /* Bit Position 21      */
+       "Uncorrectable Internal Error", /* Bit Position 22      */
+       "MC Blocked TLP",               /* Bit Position 23      */
+       "AtomicOp Egress Blocked",      /* Bit Position 24      */
+       "TLP Prefix Blocked Error",     /* Bit Position 25      */
+};
+
+static const char *aer_agent_string[] = {
+       "Receiver ID",
+       "Requester ID",
+       "Completer ID",
+       "Transmitter ID"
+};
+
+static void __print_tlp_header(struct pci_dev *dev,
+                              struct aer_header_log_regs *t)
+{
+       pci_err(dev, "  TLP Header: %08x %08x %08x %08x\n",
+               t->dw0, t->dw1, t->dw2, t->dw3);
+}
+
+static void __aer_print_error(struct pci_dev *dev,
+                             struct aer_err_info *info)
+{
+       int i, status;
+       const char *errmsg = NULL;
+       status = (info->status & ~info->mask);
+
+       for (i = 0; i < 32; i++) {
+               if (!(status & (1 << i)))
+                       continue;
+
+               if (info->severity == AER_CORRECTABLE)
+                       errmsg = i < ARRAY_SIZE(aer_correctable_error_string) ?
+                               aer_correctable_error_string[i] : NULL;
+               else
+                       errmsg = i < ARRAY_SIZE(aer_uncorrectable_error_string) ?
+                               aer_uncorrectable_error_string[i] : NULL;
+
+               if (errmsg)
+                       pci_err(dev, "   [%2d] %-22s%s\n", i, errmsg,
+                               info->first_error == i ? " (First)" : "");
+               else
+                       pci_err(dev, "   [%2d] Unknown Error Bit%s\n",
+                               i, info->first_error == i ? " (First)" : "");
+       }
+}
+
+static void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
+{
+       int layer, agent;
+       int id = ((dev->bus->number << 8) | dev->devfn);
+
+       if (!info->status) {
+               pci_err(dev, "PCIe Bus Error: severity=%s, type=Inaccessible, (Unregistered Agent ID)\n",
+                       aer_error_severity_string[info->severity]);
+               goto out;
+       }
+
+       layer = AER_GET_LAYER_ERROR(info->severity, info->status);
+       agent = AER_GET_AGENT(info->severity, info->status);
+
+       pci_err(dev, "PCIe Bus Error: severity=%s, type=%s, (%s)\n",
+               aer_error_severity_string[info->severity],
+               aer_error_layer[layer], aer_agent_string[agent]);
+
+       pci_err(dev, "  device [%04x:%04x] error status/mask=%08x/%08x\n",
+               dev->vendor, dev->device,
+               info->status, info->mask);
+
+       __aer_print_error(dev, info);
+
+       if (info->tlp_header_valid)
+               __print_tlp_header(dev, &info->tlp);
+
+out:
+       if (info->id && info->error_dev_num > 1 && info->id == id)
+               pci_err(dev, "  Error of this Agent is reported first\n");
+
+       trace_aer_event(dev_name(&dev->dev), (info->status & ~info->mask),
+                       info->severity, info->tlp_header_valid, &info->tlp);
+}
+
+static void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info)
+{
+       u8 bus = info->id >> 8;
+       u8 devfn = info->id & 0xff;
+
+       pci_info(dev, "AER: %s%s error received: %04x:%02x:%02x.%d\n",
+               info->multi_error_valid ? "Multiple " : "",
+               aer_error_severity_string[info->severity],
+               pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
+}
+
+#ifdef CONFIG_ACPI_APEI_PCIEAER
+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;
+       }
+}
+EXPORT_SYMBOL_GPL(cper_severity_to_aer);
+
+void cper_print_aer(struct pci_dev *dev, int aer_severity,
+                   struct aer_capability_regs *aer)
+{
+       int layer, agent, tlp_header_valid = 0;
+       u32 status, mask;
+       struct aer_err_info info;
+
+       if (aer_severity == AER_CORRECTABLE) {
+               status = aer->cor_status;
+               mask = aer->cor_mask;
+       } else {
+               status = aer->uncor_status;
+               mask = aer->uncor_mask;
+               tlp_header_valid = status & AER_LOG_TLP_MASKS;
+       }
+
+       layer = AER_GET_LAYER_ERROR(aer_severity, status);
+       agent = AER_GET_AGENT(aer_severity, status);
+
+       memset(&info, 0, sizeof(info));
+       info.severity = aer_severity;
+       info.status = status;
+       info.mask = mask;
+       info.first_error = PCI_ERR_CAP_FEP(aer->cap_control);
+
+       pci_err(dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask);
+       __aer_print_error(dev, &info);
+       pci_err(dev, "aer_layer=%s, aer_agent=%s\n",
+               aer_error_layer[layer], aer_agent_string[agent]);
+
+       if (aer_severity != AER_CORRECTABLE)
+               pci_err(dev, "aer_uncor_severity: 0x%08x\n",
+                       aer->uncor_severity);
+
+       if (tlp_header_valid)
+               __print_tlp_header(dev, &aer->header_log);
+
+       trace_aer_event(dev_name(&dev->dev), (status & ~mask),
+                       aer_severity, tlp_header_valid, &aer->header_log);
+}
+#endif
+
 /**
  * add_error_device - list device to be handled
  * @e_info: pointer to error info
index 059b89441acb7c922bc0c577b40bf2a6b943832f..7fa902b1f7c10db9e2660d69c21fa5011fa9b896 100644 (file)
@@ -77,8 +77,6 @@ struct aer_rpc {
 };
 
 extern struct bus_type pcie_port_bus_type;
-void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
-void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info);
 irqreturn_t aer_irq(int irq, void *context);
 
 #ifdef CONFIG_ACPI_APEI
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
deleted file mode 100644 (file)
index 4985bdf..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Format error messages and print them to console.
- *
- * 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/cper.h>
-
-#include "aerdrv.h"
-#include <ras/ras_event.h>
-
-#define AER_AGENT_RECEIVER             0
-#define AER_AGENT_REQUESTER            1
-#define AER_AGENT_COMPLETER            2
-#define AER_AGENT_TRANSMITTER          3
-
-#define AER_AGENT_REQUESTER_MASK(t)    ((t == AER_CORRECTABLE) ?       \
-       0 : (PCI_ERR_UNC_COMP_TIME|PCI_ERR_UNC_UNSUP))
-#define AER_AGENT_COMPLETER_MASK(t)    ((t == AER_CORRECTABLE) ?       \
-       0 : PCI_ERR_UNC_COMP_ABORT)
-#define AER_AGENT_TRANSMITTER_MASK(t)  ((t == AER_CORRECTABLE) ?       \
-       (PCI_ERR_COR_REP_ROLL|PCI_ERR_COR_REP_TIMER) : 0)
-
-#define AER_GET_AGENT(t, e)                                            \
-       ((e & AER_AGENT_COMPLETER_MASK(t)) ? AER_AGENT_COMPLETER :      \
-       (e & AER_AGENT_REQUESTER_MASK(t)) ? AER_AGENT_REQUESTER :       \
-       (e & AER_AGENT_TRANSMITTER_MASK(t)) ? AER_AGENT_TRANSMITTER :   \
-       AER_AGENT_RECEIVER)
-
-#define AER_PHYSICAL_LAYER_ERROR       0
-#define AER_DATA_LINK_LAYER_ERROR      1
-#define AER_TRANSACTION_LAYER_ERROR    2
-
-#define AER_PHYSICAL_LAYER_ERROR_MASK(t) ((t == AER_CORRECTABLE) ?     \
-       PCI_ERR_COR_RCVR : 0)
-#define AER_DATA_LINK_LAYER_ERROR_MASK(t) ((t == AER_CORRECTABLE) ?    \
-       (PCI_ERR_COR_BAD_TLP|                                           \
-       PCI_ERR_COR_BAD_DLLP|                                           \
-       PCI_ERR_COR_REP_ROLL|                                           \
-       PCI_ERR_COR_REP_TIMER) : PCI_ERR_UNC_DLP)
-
-#define AER_GET_LAYER_ERROR(t, e)                                      \
-       ((e & AER_PHYSICAL_LAYER_ERROR_MASK(t)) ? AER_PHYSICAL_LAYER_ERROR : \
-       (e & AER_DATA_LINK_LAYER_ERROR_MASK(t)) ? AER_DATA_LINK_LAYER_ERROR : \
-       AER_TRANSACTION_LAYER_ERROR)
-
-/*
- * AER error strings
- */
-static const char *aer_error_severity_string[] = {
-       "Uncorrected (Non-Fatal)",
-       "Uncorrected (Fatal)",
-       "Corrected"
-};
-
-static const char *aer_error_layer[] = {
-       "Physical Layer",
-       "Data Link Layer",
-       "Transaction Layer"
-};
-
-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      */
-       "Corrected Internal Error",     /* Bit Position 14      */
-       "Header Log Overflow",          /* Bit Position 15      */
-};
-
-static const char *aer_uncorrectable_error_string[] = {
-       "Undefined",                    /* Bit Position 0       */
-       NULL,
-       NULL,
-       NULL,
-       "Data Link Protocol",           /* Bit Position 4       */
-       "Surprise Down Error",          /* Bit Position 5       */
-       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      */
-       "ACS Violation",                /* Bit Position 21      */
-       "Uncorrectable Internal Error", /* Bit Position 22      */
-       "MC Blocked TLP",               /* Bit Position 23      */
-       "AtomicOp Egress Blocked",      /* Bit Position 24      */
-       "TLP Prefix Blocked Error",     /* Bit Position 25      */
-};
-
-static const char *aer_agent_string[] = {
-       "Receiver ID",
-       "Requester ID",
-       "Completer ID",
-       "Transmitter ID"
-};
-
-static void __print_tlp_header(struct pci_dev *dev,
-                              struct aer_header_log_regs *t)
-{
-       pci_err(dev, "  TLP Header: %08x %08x %08x %08x\n",
-               t->dw0, t->dw1, t->dw2, t->dw3);
-}
-
-static void __aer_print_error(struct pci_dev *dev,
-                             struct aer_err_info *info)
-{
-       int i, status;
-       const char *errmsg = NULL;
-       status = (info->status & ~info->mask);
-
-       for (i = 0; i < 32; i++) {
-               if (!(status & (1 << i)))
-                       continue;
-
-               if (info->severity == AER_CORRECTABLE)
-                       errmsg = i < ARRAY_SIZE(aer_correctable_error_string) ?
-                               aer_correctable_error_string[i] : NULL;
-               else
-                       errmsg = i < ARRAY_SIZE(aer_uncorrectable_error_string) ?
-                               aer_uncorrectable_error_string[i] : NULL;
-
-               if (errmsg)
-                       pci_err(dev, "   [%2d] %-22s%s\n", i, errmsg,
-                               info->first_error == i ? " (First)" : "");
-               else
-                       pci_err(dev, "   [%2d] Unknown Error Bit%s\n",
-                               i, info->first_error == i ? " (First)" : "");
-       }
-}
-
-void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
-{
-       int layer, agent;
-       int id = ((dev->bus->number << 8) | dev->devfn);
-
-       if (!info->status) {
-               pci_err(dev, "PCIe Bus Error: severity=%s, type=Inaccessible, (Unregistered Agent ID)\n",
-                       aer_error_severity_string[info->severity]);
-               goto out;
-       }
-
-       layer = AER_GET_LAYER_ERROR(info->severity, info->status);
-       agent = AER_GET_AGENT(info->severity, info->status);
-
-       pci_err(dev, "PCIe Bus Error: severity=%s, type=%s, (%s)\n",
-               aer_error_severity_string[info->severity],
-               aer_error_layer[layer], aer_agent_string[agent]);
-
-       pci_err(dev, "  device [%04x:%04x] error status/mask=%08x/%08x\n",
-               dev->vendor, dev->device,
-               info->status, info->mask);
-
-       __aer_print_error(dev, info);
-
-       if (info->tlp_header_valid)
-               __print_tlp_header(dev, &info->tlp);
-
-out:
-       if (info->id && info->error_dev_num > 1 && info->id == id)
-               pci_err(dev, "  Error of this Agent is reported first\n");
-
-       trace_aer_event(dev_name(&dev->dev), (info->status & ~info->mask),
-                       info->severity, info->tlp_header_valid, &info->tlp);
-}
-
-void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info)
-{
-       u8 bus = info->id >> 8;
-       u8 devfn = info->id & 0xff;
-
-       pci_info(dev, "AER: %s%s error received: %04x:%02x:%02x.%d\n",
-               info->multi_error_valid ? "Multiple " : "",
-               aer_error_severity_string[info->severity],
-               pci_domain_nr(dev->bus), bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
-}
-
-#ifdef CONFIG_ACPI_APEI_PCIEAER
-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;
-       }
-}
-EXPORT_SYMBOL_GPL(cper_severity_to_aer);
-
-void cper_print_aer(struct pci_dev *dev, int aer_severity,
-                   struct aer_capability_regs *aer)
-{
-       int layer, agent, tlp_header_valid = 0;
-       u32 status, mask;
-       struct aer_err_info info;
-
-       if (aer_severity == AER_CORRECTABLE) {
-               status = aer->cor_status;
-               mask = aer->cor_mask;
-       } else {
-               status = aer->uncor_status;
-               mask = aer->uncor_mask;
-               tlp_header_valid = status & AER_LOG_TLP_MASKS;
-       }
-
-       layer = AER_GET_LAYER_ERROR(aer_severity, status);
-       agent = AER_GET_AGENT(aer_severity, status);
-
-       memset(&info, 0, sizeof(info));
-       info.severity = aer_severity;
-       info.status = status;
-       info.mask = mask;
-       info.first_error = PCI_ERR_CAP_FEP(aer->cap_control);
-
-       pci_err(dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask);
-       __aer_print_error(dev, &info);
-       pci_err(dev, "aer_layer=%s, aer_agent=%s\n",
-               aer_error_layer[layer], aer_agent_string[agent]);
-
-       if (aer_severity != AER_CORRECTABLE)
-               pci_err(dev, "aer_uncor_severity: 0x%08x\n",
-                       aer->uncor_severity);
-
-       if (tlp_header_valid)
-               __print_tlp_header(dev, &aer->header_log);
-
-       trace_aer_event(dev_name(&dev->dev), (status & ~mask),
-                       aer_severity, tlp_header_valid, &aer->header_log);
-}
-#endif