aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/pcie/aer
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-09-07 17:13:42 +0900
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-09 13:49:26 -0700
commite7a0d92b19f438011ad76c41755b56ec2ef05f64 (patch)
treef09cc40211ccf8c1b695d6394d9c184ea12b943d /drivers/pci/pcie/aer
parent0d90c3ac0bb89acfbf481c8b06749b00eade6545 (diff)
PCI: pcie, aer: report multiple/first error on a device
Multiple bits might be set in the Uncorrectable Error Status register. But aer_print_error_source() only report a error of the lowest bit set in the error status register. So print strings for all bits unmasked and set. And check First Error Pointer to mark the error occured first. This FEP is not valid when the corresponing bit of the Uncorrectable Error Status register is not set, or unimplemented or undefined. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pcie/aer')
-rw-r--r--drivers/pci/pcie/aer/aerdrv.h1
-rw-r--r--drivers/pci/pcie/aer/aerdrv_core.c6
-rw-r--r--drivers/pci/pcie/aer/aerdrv_errprint.c8
3 files changed, 10 insertions, 5 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index 0db530db943..436bf79e273 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -61,6 +61,7 @@ struct aer_err_info {
u16 id;
int severity; /* 0:NONFATAL | 1:FATAL | 2:COR */
int flags;
+ int first;
unsigned int status; /* COR/UNCOR Error Status */
unsigned int mask; /* COR/UNCOR Error Mask */
struct header_log_regs tlp; /* TLP Header */
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 38b3933200c..9ba1602aebf 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -698,7 +698,7 @@ static struct aer_err_source *get_e_source(struct aer_rpc *rpc)
static int get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)
{
- int pos;
+ int pos, temp;
info->status = 0;
info->flags &= ~AER_TLP_HEADER_VALID_FLAG;
@@ -727,6 +727,10 @@ static int get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)
if (!(info->status & ~info->mask))
return AER_UNSUCCESS;
+ /* Get First Error Pointer */
+ pci_read_config_dword(dev, pos + PCI_ERR_CAP, &temp);
+ info->first = PCI_ERR_CAP_FEP(temp);
+
if (info->status & AER_LOG_TLP_MASKS) {
info->flags |= AER_TLP_HEADER_VALID_FLAG;
pci_read_config_dword(dev,
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
index 41bd1c753ac..0bb91e28d5f 100644
--- a/drivers/pci/pcie/aer/aerdrv_errprint.c
+++ b/drivers/pci/pcie/aer/aerdrv_errprint.c
@@ -169,11 +169,11 @@ static void aer_print_error_source(struct aer_err_info *info)
errmsg = aer_uncorrectable_error_string[i];
if (errmsg)
- AER_PR(info, "%s\t:\n", errmsg);
+ AER_PR(info, "%s\t: %s\n", errmsg,
+ info->first == i ? "First" : "");
else
- AER_PR(info, "Unknown Error Bit %2d \t:\n", i);
-
- break;
+ AER_PR(info, "Unknown Error Bit %2d \t: %s\n",
+ i, info->first == i ? "First" : "");
}
}