PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND

In PCIe r1.0, sec 5.10.2, bit 0 of the Uncorrectable Error Status, Mask,
and Severity Registers was for "Training Error." In PCIe r1.1, sec 7.10.2,
bit 0 was redefined to be "Undefined."

Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND to reflect this change.

No functional change.

[bhelgaas: changelog]
Signed-off-by: Chen, Gong <gong.chen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index e50790e91f769825fad7284512eb5050b7d3f92a..1de3f94aa7de486d2d0e7bff5b3d603f1aa3bd13 100644 (file)
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -727,7 +727,7 @@ static int __init init_pci_ext_cap_err_perm(struct perm_bits *perm)
        p_setd(perm, 0, ALL_VIRT, NO_WRITE);
 
        /* Writable bits mask */
-       mask =  PCI_ERR_UNC_TRAIN |             /* Training */
+       mask =  PCI_ERR_UNC_UND |               /* Undefined */
                PCI_ERR_UNC_DLP |               /* Data Link Protocol */
                PCI_ERR_UNC_SURPDN |            /* Surprise Down */
                PCI_ERR_UNC_POISON_TLP |        /* Poisoned TLP */

diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 0f04a9755d1e808c8ae6f23bc380272c74507bae..79abb9c71772efa32c41fb448fd3beaddbd3e66e 100644 (file)
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -185,7 +185,7 @@ TRACE_EVENT(mc_event,
        {PCI_ERR_COR_LOG_OVER,  "Header Log Overflow"}
 
 #define aer_uncorrectable_errors                               \
-       {PCI_ERR_UNC_TRAIN,     "Undefined"},                   \
+       {PCI_ERR_UNC_UND,       "Undefined"},                   \
        {PCI_ERR_UNC_DLP,       "Data Link Protocol Error"},    \
        {PCI_ERR_UNC_SURPDN,    "Surprise Down Error"},         \
        {PCI_ERR_UNC_POISON_TLP,"Poisoned TLP"},                \

diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 30db069bce62c6533b72a65e4c89f536a448c79d..99e3182f2c967852c62da610f31d8f0ba3df9ecf 100644 (file)
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -630,7 +630,7 @@
 
 /* Advanced Error Reporting */
 #define PCI_ERR_UNCOR_STATUS   4       /* Uncorrectable Error Status */
-#define  PCI_ERR_UNC_TRAIN     0x00000001      /* Training */
+#define  PCI_ERR_UNC_UND       0x00000001      /* Undefined */
 #define  PCI_ERR_UNC_DLP       0x00000010      /* Data Link Protocol */
 #define  PCI_ERR_UNC_SURPDN    0x00000020      /* Surprise Down */
 #define  PCI_ERR_UNC_POISON_TLP        0x00001000      /* Poisoned TLP */