aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen, Gong <gong.chen@linux.intel.com>2014-08-13 02:22:40 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-09-25 11:42:40 -0400
commit846fc70986a65563a19ae86928c3acf34f12296d (patch)
tree23f5dbab066154b3ecb69ca89b14cf1f8a90452c
parentd179111767aa2a1d594023ce65abf9c81bfbb0cf (diff)
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>
-rw-r--r--drivers/vfio/pci/vfio_pci_config.c2
-rw-r--r--include/ras/ras_event.h2
-rw-r--r--include/uapi/linux/pci_regs.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index e50790e91f76..1de3f94aa7de 100644
--- 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)
727 p_setd(perm, 0, ALL_VIRT, NO_WRITE); 727 p_setd(perm, 0, ALL_VIRT, NO_WRITE);
728 728
729 /* Writable bits mask */ 729 /* Writable bits mask */
730 mask = PCI_ERR_UNC_TRAIN | /* Training */ 730 mask = PCI_ERR_UNC_UND | /* Undefined */
731 PCI_ERR_UNC_DLP | /* Data Link Protocol */ 731 PCI_ERR_UNC_DLP | /* Data Link Protocol */
732 PCI_ERR_UNC_SURPDN | /* Surprise Down */ 732 PCI_ERR_UNC_SURPDN | /* Surprise Down */
733 PCI_ERR_UNC_POISON_TLP | /* Poisoned TLP */ 733 PCI_ERR_UNC_POISON_TLP | /* Poisoned TLP */
diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
index 0f04a9755d1e..79abb9c71772 100644
--- a/include/ras/ras_event.h
+++ b/include/ras/ras_event.h
@@ -185,7 +185,7 @@ TRACE_EVENT(mc_event,
185 {PCI_ERR_COR_LOG_OVER, "Header Log Overflow"} 185 {PCI_ERR_COR_LOG_OVER, "Header Log Overflow"}
186 186
187#define aer_uncorrectable_errors \ 187#define aer_uncorrectable_errors \
188 {PCI_ERR_UNC_TRAIN, "Undefined"}, \ 188 {PCI_ERR_UNC_UND, "Undefined"}, \
189 {PCI_ERR_UNC_DLP, "Data Link Protocol Error"}, \ 189 {PCI_ERR_UNC_DLP, "Data Link Protocol Error"}, \
190 {PCI_ERR_UNC_SURPDN, "Surprise Down Error"}, \ 190 {PCI_ERR_UNC_SURPDN, "Surprise Down Error"}, \
191 {PCI_ERR_UNC_POISON_TLP,"Poisoned TLP"}, \ 191 {PCI_ERR_UNC_POISON_TLP,"Poisoned TLP"}, \
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 30db069bce62..99e3182f2c96 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -630,7 +630,7 @@
630 630
631/* Advanced Error Reporting */ 631/* Advanced Error Reporting */
632#define PCI_ERR_UNCOR_STATUS 4 /* Uncorrectable Error Status */ 632#define PCI_ERR_UNCOR_STATUS 4 /* Uncorrectable Error Status */
633#define PCI_ERR_UNC_TRAIN 0x00000001 /* Training */ 633#define PCI_ERR_UNC_UND 0x00000001 /* Undefined */
634#define PCI_ERR_UNC_DLP 0x00000010 /* Data Link Protocol */ 634#define PCI_ERR_UNC_DLP 0x00000010 /* Data Link Protocol */
635#define PCI_ERR_UNC_SURPDN 0x00000020 /* Surprise Down */ 635#define PCI_ERR_UNC_SURPDN 0x00000020 /* Surprise Down */
636#define PCI_ERR_UNC_POISON_TLP 0x00001000 /* Poisoned TLP */ 636#define PCI_ERR_UNC_POISON_TLP 0x00001000 /* Poisoned TLP */