README: kernel.org does not speak FTP any longer

[thirdparty/pciutils.git] / ls-ecaps.c

diff --git a/ls-ecaps.c b/ls-ecaps.c
index fdb98aa751a7beacfd6e187f457dcd096244fbea..634db21dd1b239ae0c408727bc5136ef0240b66e 100644 (file)
--- a/ls-ecaps.c
+++ b/ls-ecaps.c
@@ -90,15 +90,16 @@ cap_dsn(struct device *d, int where)
 }
 
 static void
-cap_aer(struct device *d, int where)
+cap_aer(struct device *d, int where, int type)
 {
-  u32 l;
+  u32 l, l0, l1, l2, l3;
+  u16 w;
 
   printf("Advanced Error Reporting\n");
   if (verbose < 2)
     return;
 
-  if (!config_fetch(d, where + PCI_ERR_UNCOR_STATUS, 24))
+  if (!config_fetch(d, where + PCI_ERR_UNCOR_STATUS, 40))
     return;
 
   l = get_conf_long(d, where + PCI_ERR_UNCOR_STATUS);
@@ -131,10 +132,48 @@ cap_aer(struct device *d, int where)
        FLAG(l, PCI_ERR_COR_RCVR), FLAG(l, PCI_ERR_COR_BAD_TLP), FLAG(l, PCI_ERR_COR_BAD_DLLP),
        FLAG(l, PCI_ERR_COR_REP_ROLL), FLAG(l, PCI_ERR_COR_REP_TIMER), FLAG(l, PCI_ERR_COR_REP_ANFE));
   l = get_conf_long(d, where + PCI_ERR_CAP);
-  printf("\t\tAERCap:\tFirst Error Pointer: %02x, GenCap%c CGenEn%c ChkCap%c ChkEn%c\n",
+  printf("\t\tAERCap:\tFirst Error Pointer: %02x, ECRCGenCap%c ECRCGenEn%c ECRCChkCap%c ECRCChkEn%c\n"
+       "\t\t\tMultHdrRecCap%c MultHdrRecEn%c TLPPfxPres%c HdrLogCap%c\n",
        PCI_ERR_CAP_FEP(l), FLAG(l, PCI_ERR_CAP_ECRC_GENC), FLAG(l, PCI_ERR_CAP_ECRC_GENE),
-       FLAG(l, PCI_ERR_CAP_ECRC_CHKC), FLAG(l, PCI_ERR_CAP_ECRC_CHKE));
+       FLAG(l, PCI_ERR_CAP_ECRC_CHKC), FLAG(l, PCI_ERR_CAP_ECRC_CHKE),
+       FLAG(l, PCI_ERR_CAP_MULT_HDRC), FLAG(l, PCI_ERR_CAP_MULT_HDRE),
+       FLAG(l, PCI_ERR_CAP_TLP_PFX), FLAG(l, PCI_ERR_CAP_HDR_LOG));
+
+  l0 = get_conf_long(d, where + PCI_ERR_HEADER_LOG);
+  l1 = get_conf_long(d, where + PCI_ERR_HEADER_LOG + 4);
+  l2 = get_conf_long(d, where + PCI_ERR_HEADER_LOG + 8);
+  l3 = get_conf_long(d, where + PCI_ERR_HEADER_LOG + 12);
+  printf("\t\tHeaderLog: %08x %08x %08x %08x\n", l0, l1, l2, l3);
 
+  if (type == PCI_EXP_TYPE_ROOT_PORT || type == PCI_EXP_TYPE_ROOT_EC)
+    {
+      if (!config_fetch(d, where + PCI_ERR_ROOT_COMMAND, 12))
+        return;
+
+      l = get_conf_long(d, where + PCI_ERR_ROOT_COMMAND);
+      printf("\t\tRootCmd: CERptEn%c NFERptEn%c FERptEn%c\n",
+           FLAG(l, PCI_ERR_ROOT_CMD_COR_EN),
+           FLAG(l, PCI_ERR_ROOT_CMD_NONFATAL_EN),
+           FLAG(l, PCI_ERR_ROOT_CMD_FATAL_EN));
+
+      l = get_conf_long(d, where + PCI_ERR_ROOT_STATUS);
+      printf("\t\tRootSta: CERcvd%c MultCERcvd%c UERcvd%c MultUERcvd%c\n"
+           "\t\t\t FirstFatal%c NonFatalMsg%c FatalMsg%c IntMsg %d\n",
+           FLAG(l, PCI_ERR_ROOT_COR_RCV),
+           FLAG(l, PCI_ERR_ROOT_MULTI_COR_RCV),
+           FLAG(l, PCI_ERR_ROOT_UNCOR_RCV),
+           FLAG(l, PCI_ERR_ROOT_MULTI_UNCOR_RCV),
+           FLAG(l, PCI_ERR_ROOT_FIRST_FATAL),
+           FLAG(l, PCI_ERR_ROOT_NONFATAL_RCV),
+           FLAG(l, PCI_ERR_ROOT_FATAL_RCV),
+           PCI_ERR_MSG_NUM(l));
+
+      w = get_conf_word(d, where + PCI_ERR_ROOT_COR_SRC);
+      printf("\t\tErrorSrc: ERR_COR: %04x ", w);
+
+      w = get_conf_word(d, where + PCI_ERR_ROOT_SRC);
+      printf("ERR_FATAL/NONFATAL: %04x\n", w);
+    }
 }
 
 static void cap_dpc(struct device *d, int where)
@@ -670,7 +709,7 @@ cap_ptm(struct device *d, int where)
 }
 
 void
-show_ext_caps(struct device *d)
+show_ext_caps(struct device *d, int type)
 {
   int where = 0x100;
   char been_there[0x1000];
@@ -699,7 +738,7 @@ show_ext_caps(struct device *d)
       switch (id)
        {
          case PCI_EXT_CAP_ID_AER:
-           cap_aer(d, where);
+           cap_aer(d, where, type);
            break;
          case PCI_EXT_CAP_ID_DPC:
            cap_dpc(d, where);