Revert "PCI/AER: Support errors introduced by PCIe r6.0"
This reverts commit 5533169bb25390d9441ba929f390e29284393735 which is
commit 6633875250b38b18b8638cf01e695de031c71f02 upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I4846eb396bb9e1847f4cb5fc5881909f8255ddc7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 81ea196..2908bfd 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -37,7 +37,7 @@
#define AER_ERROR_SOURCES_MAX 128
#define AER_MAX_TYPEOF_COR_ERRS 16 /* as per PCI_ERR_COR_STATUS */
-#define AER_MAX_TYPEOF_UNCOR_ERRS 32 /* as per PCI_ERR_UNCOR_STATUS*/
+#define AER_MAX_TYPEOF_UNCOR_ERRS 27 /* as per PCI_ERR_UNCOR_STATUS*/
struct aer_err_source {
unsigned int status;
@@ -513,11 +513,11 @@ static const char *aer_uncorrectable_error_string[] = {
"AtomicOpBlocked", /* Bit Position 24 */
"TLPBlockedErr", /* Bit Position 25 */
"PoisonTLPBlocked", /* Bit Position 26 */
- "DMWrReqBlocked", /* Bit Position 27 */
- "IDECheck", /* Bit Position 28 */
- "MisIDETLP", /* Bit Position 29 */
- "PCRC_CHECK", /* Bit Position 30 */
- "TLPXlatBlocked", /* Bit Position 31 */
+ NULL, /* Bit Position 27 */
+ NULL, /* Bit Position 28 */
+ NULL, /* Bit Position 29 */
+ NULL, /* Bit Position 30 */
+ NULL, /* Bit Position 31 */
};
static const char *aer_agent_string[] = {
