Split lspci to multiple source files.

diff --git a/Makefile b/Makefile
index de28d2d1fab04f1342b11b5b2458fe21c0b12e71..b7ac59b00991a6c4b9c7c8709132e942f547d7ad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,10 +62,18 @@ force:
 lib/config.h lib/config.mk:
        cd lib && ./configure
 
-lspci: lspci.o common.o lib/$(PCILIB)
+lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
 setpci: setpci.o common.o lib/$(PCILIB)
 
-lspci.o: lspci.c pciutils.h $(PCIINC)
+LSPCIINC=lspci.h pciutils.h $(PCIINC)
+lspci.o: lspci.c $(LSPCIINC)
+ls-vpd.o: ls-vpd.c $(LSPCIINC)
+ls-caps.o: ls-caps.c $(LSPCIINC)
+ls-ecaps.o: ls-ecaps.c $(LSPCIINC)
+ls-kernel.o: ls-kernel.c $(LSPCIINC)
+ls-tree.o: ls-tree.c $(LSPCIINC)
+ls-map.o: ls-map.c $(LSPCIINC)
+
 setpci.o: setpci.c pciutils.h $(PCIINC)
 common.o: common.c pciutils.h $(PCIINC)
 

diff --git a/ls-caps.c b/ls-caps.c
new file mode 100644 (file)
index 0000000..0a19d47
--- /dev/null
+++ b/ls-caps.c
@@ -0,0 +1,1250 @@
+/*
+ *     The PCI Utilities -- Show Capabilities
+ *
+ *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "lspci.h"
+
+static void
+cap_pm(struct device *d, int where, int cap)
+{
+  int t, b;
+  static int pm_aux_current[8] = { 0, 55, 100, 160, 220, 270, 320, 375 };
+
+  printf("Power Management version %d\n", cap & PCI_PM_CAP_VER_MASK);
+  if (verbose < 2)
+    return;
+  printf("\t\tFlags: PMEClk%c DSI%c D1%c D2%c AuxCurrent=%dmA PME(D0%c,D1%c,D2%c,D3hot%c,D3cold%c)\n",
+        FLAG(cap, PCI_PM_CAP_PME_CLOCK),
+        FLAG(cap, PCI_PM_CAP_DSI),
+        FLAG(cap, PCI_PM_CAP_D1),
+        FLAG(cap, PCI_PM_CAP_D2),
+        pm_aux_current[(cap >> 6) & 7],
+        FLAG(cap, PCI_PM_CAP_PME_D0),
+        FLAG(cap, PCI_PM_CAP_PME_D1),
+        FLAG(cap, PCI_PM_CAP_PME_D2),
+        FLAG(cap, PCI_PM_CAP_PME_D3_HOT),
+        FLAG(cap, PCI_PM_CAP_PME_D3_COLD));
+  if (!config_fetch(d, where + PCI_PM_CTRL, PCI_PM_SIZEOF - PCI_PM_CTRL))
+    return;
+  t = get_conf_word(d, where + PCI_PM_CTRL);
+  printf("\t\tStatus: D%d PME-Enable%c DSel=%d DScale=%d PME%c\n",
+        t & PCI_PM_CTRL_STATE_MASK,
+        FLAG(t, PCI_PM_CTRL_PME_ENABLE),
+        (t & PCI_PM_CTRL_DATA_SEL_MASK) >> 9,
+        (t & PCI_PM_CTRL_DATA_SCALE_MASK) >> 13,
+        FLAG(t, PCI_PM_CTRL_PME_STATUS));
+  b = get_conf_byte(d, where + PCI_PM_PPB_EXTENSIONS);
+  if (b)
+    printf("\t\tBridge: PM%c B3%c\n",
+          FLAG(t, PCI_PM_BPCC_ENABLE),
+          FLAG(~t, PCI_PM_PPB_B2_B3));
+}
+
+static void
+format_agp_rate(int rate, char *buf, int agp3)
+{
+  char *c = buf;
+  int i;
+
+  for (i=0; i<=2; i++)
+    if (rate & (1 << i))
+      {
+       if (c != buf)
+         *c++ = ',';
+       c += sprintf(c, "x%d", 1 << (i + 2*agp3));
+      }
+  if (c != buf)
+    *c = 0;
+  else
+    strcpy(buf, "<none>");
+}
+
+static void
+cap_agp(struct device *d, int where, int cap)
+{
+  u32 t;
+  char rate[16];
+  int ver, rev;
+  int agp3 = 0;
+
+  ver = (cap >> 4) & 0x0f;
+  rev = cap & 0x0f;
+  printf("AGP version %x.%x\n", ver, rev);
+  if (verbose < 2)
+    return;
+  if (!config_fetch(d, where + PCI_AGP_STATUS, PCI_AGP_SIZEOF - PCI_AGP_STATUS))
+    return;
+  t = get_conf_long(d, where + PCI_AGP_STATUS);
+  if (ver >= 3 && (t & PCI_AGP_STATUS_AGP3))
+    agp3 = 1;
+  format_agp_rate(t & 7, rate, agp3);
+  printf("\t\tStatus: RQ=%d Iso%c ArqSz=%d Cal=%d SBA%c ITACoh%c GART64%c HTrans%c 64bit%c FW%c AGP3%c Rate=%s\n",
+        ((t & PCI_AGP_STATUS_RQ_MASK) >> 24U) + 1,
+        FLAG(t, PCI_AGP_STATUS_ISOCH),
+        ((t & PCI_AGP_STATUS_ARQSZ_MASK) >> 13),
+        ((t & PCI_AGP_STATUS_CAL_MASK) >> 10),
+        FLAG(t, PCI_AGP_STATUS_SBA),
+        FLAG(t, PCI_AGP_STATUS_ITA_COH),
+        FLAG(t, PCI_AGP_STATUS_GART64),
+        FLAG(t, PCI_AGP_STATUS_HTRANS),
+        FLAG(t, PCI_AGP_STATUS_64BIT),
+        FLAG(t, PCI_AGP_STATUS_FW),
+        FLAG(t, PCI_AGP_STATUS_AGP3),
+        rate);
+  t = get_conf_long(d, where + PCI_AGP_COMMAND);
+  format_agp_rate(t & 7, rate, agp3);
+  printf("\t\tCommand: RQ=%d ArqSz=%d Cal=%d SBA%c AGP%c GART64%c 64bit%c FW%c Rate=%s\n",
+        ((t & PCI_AGP_COMMAND_RQ_MASK) >> 24U) + 1,
+        ((t & PCI_AGP_COMMAND_ARQSZ_MASK) >> 13),
+        ((t & PCI_AGP_COMMAND_CAL_MASK) >> 10),
+        FLAG(t, PCI_AGP_COMMAND_SBA),
+        FLAG(t, PCI_AGP_COMMAND_AGP),
+        FLAG(t, PCI_AGP_COMMAND_GART64),
+        FLAG(t, PCI_AGP_COMMAND_64BIT),
+        FLAG(t, PCI_AGP_COMMAND_FW),
+        rate);
+}
+
+static void
+cap_pcix_nobridge(struct device *d, int where)
+{
+  u16 command;
+  u32 status;
+  static const byte max_outstanding[8] = { 1, 2, 3, 4, 8, 12, 16, 32 };
+
+  printf("PCI-X non-bridge device\n");
+
+  if (verbose < 2)
+    return;
+
+  if (!config_fetch(d, where + PCI_PCIX_STATUS, 4))
+    return;
+
+  command = get_conf_word(d, where + PCI_PCIX_COMMAND);
+  status = get_conf_long(d, where + PCI_PCIX_STATUS);
+  printf("\t\tCommand: DPERE%c ERO%c RBC=%d OST=%d\n",
+        FLAG(command, PCI_PCIX_COMMAND_DPERE),
+        FLAG(command, PCI_PCIX_COMMAND_ERO),
+        1 << (9 + ((command & PCI_PCIX_COMMAND_MAX_MEM_READ_BYTE_COUNT) >> 2U)),
+        max_outstanding[(command & PCI_PCIX_COMMAND_MAX_OUTSTANDING_SPLIT_TRANS) >> 4U]);
+  printf("\t\tStatus: Dev=%02x:%02x.%d 64bit%c 133MHz%c SCD%c USC%c DC=%s DMMRBC=%u DMOST=%u DMCRS=%u RSCEM%c 266MHz%c 533MHz%c\n",
+        ((status >> 8) & 0xff),
+        ((status >> 3) & 0x1f),
+        (status & PCI_PCIX_STATUS_FUNCTION),
+        FLAG(status, PCI_PCIX_STATUS_64BIT),
+        FLAG(status, PCI_PCIX_STATUS_133MHZ),
+        FLAG(status, PCI_PCIX_STATUS_SC_DISCARDED),
+        FLAG(status, PCI_PCIX_STATUS_UNEXPECTED_SC),
+        ((status & PCI_PCIX_STATUS_DEVICE_COMPLEXITY) ? "bridge" : "simple"),
+        1 << (9 + ((status >> 21) & 3U)),
+        max_outstanding[(status >> 23) & 7U],
+        1 << (3 + ((status >> 26) & 7U)),
+        FLAG(status, PCI_PCIX_STATUS_RCVD_SC_ERR_MESS),
+        FLAG(status, PCI_PCIX_STATUS_266MHZ),
+        FLAG(status, PCI_PCIX_STATUS_533MHZ));
+}
+
+static void
+cap_pcix_bridge(struct device *d, int where)
+{
+  static const char * const sec_clock_freq[8] = { "conv", "66MHz", "100MHz", "133MHz", "?4", "?5", "?6", "?7" };
+  u16 secstatus;
+  u32 status, upstcr, downstcr;
+
+  printf("PCI-X bridge device\n");
+
+  if (verbose < 2)
+    return;
+
+  if (!config_fetch(d, where + PCI_PCIX_BRIDGE_STATUS, 12))
+    return;
+
+  secstatus = get_conf_word(d, where + PCI_PCIX_BRIDGE_SEC_STATUS);
+  printf("\t\tSecondary Status: 64bit%c 133MHz%c SCD%c USC%c SCO%c SRD%c Freq=%s\n",
+        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_64BIT),
+        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_133MHZ),
+        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SC_DISCARDED),
+        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_UNEXPECTED_SC),
+        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SC_OVERRUN),
+        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SPLIT_REQUEST_DELAYED),
+        sec_clock_freq[(secstatus >> 6) & 7]);
+  status = get_conf_long(d, where + PCI_PCIX_BRIDGE_STATUS);
+  printf("\t\tStatus: Dev=%02x:%02x.%d 64bit%c 133MHz%c SCD%c USC%c SCO%c SRD%c\n",
+        ((status >> 8) & 0xff),
+        ((status >> 3) & 0x1f),
+        (status & PCI_PCIX_BRIDGE_STATUS_FUNCTION),
+        FLAG(status, PCI_PCIX_BRIDGE_STATUS_64BIT),
+        FLAG(status, PCI_PCIX_BRIDGE_STATUS_133MHZ),
+        FLAG(status, PCI_PCIX_BRIDGE_STATUS_SC_DISCARDED),
+        FLAG(status, PCI_PCIX_BRIDGE_STATUS_UNEXPECTED_SC),
+        FLAG(status, PCI_PCIX_BRIDGE_STATUS_SC_OVERRUN),
+        FLAG(status, PCI_PCIX_BRIDGE_STATUS_SPLIT_REQUEST_DELAYED));
+  upstcr = get_conf_long(d, where + PCI_PCIX_BRIDGE_UPSTREAM_SPLIT_TRANS_CTRL);
+  printf("\t\tUpstream: Capacity=%u CommitmentLimit=%u\n",
+        (upstcr & PCI_PCIX_BRIDGE_STR_CAPACITY),
+        (upstcr >> 16) & 0xffff);
+  downstcr = get_conf_long(d, where + PCI_PCIX_BRIDGE_DOWNSTREAM_SPLIT_TRANS_CTRL);
+  printf("\t\tDownstream: Capacity=%u CommitmentLimit=%u\n",
+        (downstcr & PCI_PCIX_BRIDGE_STR_CAPACITY),
+        (downstcr >> 16) & 0xffff);
+}
+
+static void
+cap_pcix(struct device *d, int where)
+{
+  switch (get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f)
+    {
+    case PCI_HEADER_TYPE_NORMAL:
+      cap_pcix_nobridge(d, where);
+      break;
+    case PCI_HEADER_TYPE_BRIDGE:
+      cap_pcix_bridge(d, where);
+      break;
+    }
+}
+
+static inline char *
+ht_link_width(unsigned width)
+{
+  static char * const widths[8] = { "8bit", "16bit", "[2]", "32bit", "2bit", "4bit", "[6]", "N/C" };
+  return widths[width];
+}
+
+static inline char *
+ht_link_freq(unsigned freq)
+{
+  static char * const freqs[16] = { "200MHz", "300MHz", "400MHz", "500MHz", "600MHz", "800MHz", "1.0GHz", "1.2GHz",
+                                   "1.4GHz", "1.6GHz", "[a]", "[b]", "[c]", "[d]", "[e]", "Vend" };
+  return freqs[freq];
+}
+
+static void
+cap_ht_pri(struct device *d, int where, int cmd)
+{
+  u16 lctr0, lcnf0, lctr1, lcnf1, eh;
+  u8 rid, lfrer0, lfcap0, ftr, lfrer1, lfcap1, mbu, mlu, bn;
+  char *fmt;
+
+  printf("HyperTransport: Slave or Primary Interface\n");
+  if (verbose < 2)
+    return;
+
+  if (!config_fetch(d, where + PCI_HT_PRI_LCTR0, PCI_HT_PRI_SIZEOF - PCI_HT_PRI_LCTR0))
+    return;
+  rid = get_conf_byte(d, where + PCI_HT_PRI_RID);
+  if (rid < 0x22 && rid > 0x11)
+    printf("\t\t!!! Possibly incomplete decoding\n");
+
+  if (rid >= 0x22)
+    fmt = "\t\tCommand: BaseUnitID=%u UnitCnt=%u MastHost%c DefDir%c DUL%c\n";
+  else
+    fmt = "\t\tCommand: BaseUnitID=%u UnitCnt=%u MastHost%c DefDir%c\n";
+  printf(fmt,
+        (cmd & PCI_HT_PRI_CMD_BUID),
+        (cmd & PCI_HT_PRI_CMD_UC) >> 5,
+        FLAG(cmd, PCI_HT_PRI_CMD_MH),
+        FLAG(cmd, PCI_HT_PRI_CMD_DD),
+        FLAG(cmd, PCI_HT_PRI_CMD_DUL));
+  lctr0 = get_conf_word(d, where + PCI_HT_PRI_LCTR0);
+  if (rid >= 0x22)
+    fmt = "\t\tLink Control 0: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x IsocEn%c LSEn%c ExtCTL%c 64b%c\n";
+  else
+    fmt = "\t\tLink Control 0: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x\n";
+  printf(fmt,
+        FLAG(lctr0, PCI_HT_LCTR_CFLE),
+        FLAG(lctr0, PCI_HT_LCTR_CST),
+        FLAG(lctr0, PCI_HT_LCTR_CFE),
+        FLAG(lctr0, PCI_HT_LCTR_LKFAIL),
+        FLAG(lctr0, PCI_HT_LCTR_INIT),
+        FLAG(lctr0, PCI_HT_LCTR_EOC),
+        FLAG(lctr0, PCI_HT_LCTR_TXO),
+        (lctr0 & PCI_HT_LCTR_CRCERR) >> 8,
+        FLAG(lctr0, PCI_HT_LCTR_ISOCEN),
+        FLAG(lctr0, PCI_HT_LCTR_LSEN),
+        FLAG(lctr0, PCI_HT_LCTR_EXTCTL),
+        FLAG(lctr0, PCI_HT_LCTR_64B));
+  lcnf0 = get_conf_word(d, where + PCI_HT_PRI_LCNF0);
+  if (rid >= 0x22)
+    fmt = "\t\tLink Config 0: MLWI=%1$s DwFcIn%5$c MLWO=%2$s DwFcOut%6$c LWI=%3$s DwFcInEn%7$c LWO=%4$s DwFcOutEn%8$c\n";
+  else
+    fmt = "\t\tLink Config 0: MLWI=%s MLWO=%s LWI=%s LWO=%s\n";
+  printf(fmt,
+        ht_link_width(lcnf0 & PCI_HT_LCNF_MLWI),
+        ht_link_width((lcnf0 & PCI_HT_LCNF_MLWO) >> 4),
+        ht_link_width((lcnf0 & PCI_HT_LCNF_LWI) >> 8),
+        ht_link_width((lcnf0 & PCI_HT_LCNF_LWO) >> 12),
+        FLAG(lcnf0, PCI_HT_LCNF_DFI),
+        FLAG(lcnf0, PCI_HT_LCNF_DFO),
+        FLAG(lcnf0, PCI_HT_LCNF_DFIE),
+        FLAG(lcnf0, PCI_HT_LCNF_DFOE));
+  lctr1 = get_conf_word(d, where + PCI_HT_PRI_LCTR1);
+  if (rid >= 0x22)
+    fmt = "\t\tLink Control 1: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x IsocEn%c LSEn%c ExtCTL%c 64b%c\n";
+  else
+    fmt = "\t\tLink Control 1: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x\n";
+  printf(fmt,
+        FLAG(lctr1, PCI_HT_LCTR_CFLE),
+        FLAG(lctr1, PCI_HT_LCTR_CST),
+        FLAG(lctr1, PCI_HT_LCTR_CFE),
+        FLAG(lctr1, PCI_HT_LCTR_LKFAIL),
+        FLAG(lctr1, PCI_HT_LCTR_INIT),
+        FLAG(lctr1, PCI_HT_LCTR_EOC),
+        FLAG(lctr1, PCI_HT_LCTR_TXO),
+        (lctr1 & PCI_HT_LCTR_CRCERR) >> 8,
+        FLAG(lctr1, PCI_HT_LCTR_ISOCEN),
+        FLAG(lctr1, PCI_HT_LCTR_LSEN),
+        FLAG(lctr1, PCI_HT_LCTR_EXTCTL),
+        FLAG(lctr1, PCI_HT_LCTR_64B));
+  lcnf1 = get_conf_word(d, where + PCI_HT_PRI_LCNF1);
+  if (rid >= 0x22)
+    fmt = "\t\tLink Config 1: MLWI=%1$s DwFcIn%5$c MLWO=%2$s DwFcOut%6$c LWI=%3$s DwFcInEn%7$c LWO=%4$s DwFcOutEn%8$c\n";
+  else
+    fmt = "\t\tLink Config 1: MLWI=%s MLWO=%s LWI=%s LWO=%s\n";
+  printf(fmt,
+        ht_link_width(lcnf1 & PCI_HT_LCNF_MLWI),
+        ht_link_width((lcnf1 & PCI_HT_LCNF_MLWO) >> 4),
+        ht_link_width((lcnf1 & PCI_HT_LCNF_LWI) >> 8),
+        ht_link_width((lcnf1 & PCI_HT_LCNF_LWO) >> 12),
+        FLAG(lcnf1, PCI_HT_LCNF_DFI),
+        FLAG(lcnf1, PCI_HT_LCNF_DFO),
+        FLAG(lcnf1, PCI_HT_LCNF_DFIE),
+        FLAG(lcnf1, PCI_HT_LCNF_DFOE));
+  printf("\t\tRevision ID: %u.%02u\n",
+        (rid & PCI_HT_RID_MAJ) >> 5, (rid & PCI_HT_RID_MIN));
+  if (rid < 0x22)
+    return;
+  lfrer0 = get_conf_byte(d, where + PCI_HT_PRI_LFRER0);
+  printf("\t\tLink Frequency 0: %s\n", ht_link_freq(lfrer0 & PCI_HT_LFRER_FREQ));
+  printf("\t\tLink Error 0: <Prot%c <Ovfl%c <EOC%c CTLTm%c\n",
+        FLAG(lfrer0, PCI_HT_LFRER_PROT),
+        FLAG(lfrer0, PCI_HT_LFRER_OV),
+        FLAG(lfrer0, PCI_HT_LFRER_EOC),
+        FLAG(lfrer0, PCI_HT_LFRER_CTLT));
+  lfcap0 = get_conf_byte(d, where + PCI_HT_PRI_LFCAP0);
+  printf("\t\tLink Frequency Capability 0: 200MHz%c 300MHz%c 400MHz%c 500MHz%c 600MHz%c 800MHz%c 1.0GHz%c 1.2GHz%c 1.4GHz%c 1.6GHz%c Vend%c\n",
+        FLAG(lfcap0, PCI_HT_LFCAP_200),
+        FLAG(lfcap0, PCI_HT_LFCAP_300),
+        FLAG(lfcap0, PCI_HT_LFCAP_400),
+        FLAG(lfcap0, PCI_HT_LFCAP_500),
+        FLAG(lfcap0, PCI_HT_LFCAP_600),
+        FLAG(lfcap0, PCI_HT_LFCAP_800),
+        FLAG(lfcap0, PCI_HT_LFCAP_1000),
+        FLAG(lfcap0, PCI_HT_LFCAP_1200),
+        FLAG(lfcap0, PCI_HT_LFCAP_1400),
+        FLAG(lfcap0, PCI_HT_LFCAP_1600),
+        FLAG(lfcap0, PCI_HT_LFCAP_VEND));
+  ftr = get_conf_byte(d, where + PCI_HT_PRI_FTR);
+  printf("\t\tFeature Capability: IsocFC%c LDTSTOP%c CRCTM%c ECTLT%c 64bA%c UIDRD%c\n",
+        FLAG(ftr, PCI_HT_FTR_ISOCFC),
+        FLAG(ftr, PCI_HT_FTR_LDTSTOP),
+        FLAG(ftr, PCI_HT_FTR_CRCTM),
+        FLAG(ftr, PCI_HT_FTR_ECTLT),
+        FLAG(ftr, PCI_HT_FTR_64BA),
+        FLAG(ftr, PCI_HT_FTR_UIDRD));
+  lfrer1 = get_conf_byte(d, where + PCI_HT_PRI_LFRER1);
+  printf("\t\tLink Frequency 1: %s\n", ht_link_freq(lfrer1 & PCI_HT_LFRER_FREQ));
+  printf("\t\tLink Error 1: <Prot%c <Ovfl%c <EOC%c CTLTm%c\n",
+        FLAG(lfrer1, PCI_HT_LFRER_PROT),
+        FLAG(lfrer1, PCI_HT_LFRER_OV),
+        FLAG(lfrer1, PCI_HT_LFRER_EOC),
+        FLAG(lfrer1, PCI_HT_LFRER_CTLT));
+  lfcap1 = get_conf_byte(d, where + PCI_HT_PRI_LFCAP1);
+  printf("\t\tLink Frequency Capability 1: 200MHz%c 300MHz%c 400MHz%c 500MHz%c 600MHz%c 800MHz%c 1.0GHz%c 1.2GHz%c 1.4GHz%c 1.6GHz%c Vend%c\n",
+        FLAG(lfcap1, PCI_HT_LFCAP_200),
+        FLAG(lfcap1, PCI_HT_LFCAP_300),
+        FLAG(lfcap1, PCI_HT_LFCAP_400),
+        FLAG(lfcap1, PCI_HT_LFCAP_500),
+        FLAG(lfcap1, PCI_HT_LFCAP_600),
+        FLAG(lfcap1, PCI_HT_LFCAP_800),
+        FLAG(lfcap1, PCI_HT_LFCAP_1000),
+        FLAG(lfcap1, PCI_HT_LFCAP_1200),
+        FLAG(lfcap1, PCI_HT_LFCAP_1400),
+        FLAG(lfcap1, PCI_HT_LFCAP_1600),
+        FLAG(lfcap1, PCI_HT_LFCAP_VEND));
+  eh = get_conf_word(d, where + PCI_HT_PRI_EH);
+  printf("\t\tError Handling: PFlE%c OFlE%c PFE%c OFE%c EOCFE%c RFE%c CRCFE%c SERRFE%c CF%c RE%c PNFE%c ONFE%c EOCNFE%c RNFE%c CRCNFE%c SERRNFE%c\n",
+        FLAG(eh, PCI_HT_EH_PFLE),
+        FLAG(eh, PCI_HT_EH_OFLE),
+        FLAG(eh, PCI_HT_EH_PFE),
+        FLAG(eh, PCI_HT_EH_OFE),
+        FLAG(eh, PCI_HT_EH_EOCFE),
+        FLAG(eh, PCI_HT_EH_RFE),
+        FLAG(eh, PCI_HT_EH_CRCFE),
+        FLAG(eh, PCI_HT_EH_SERRFE),
+        FLAG(eh, PCI_HT_EH_CF),
+        FLAG(eh, PCI_HT_EH_RE),
+        FLAG(eh, PCI_HT_EH_PNFE),
+        FLAG(eh, PCI_HT_EH_ONFE),
+        FLAG(eh, PCI_HT_EH_EOCNFE),
+        FLAG(eh, PCI_HT_EH_RNFE),
+        FLAG(eh, PCI_HT_EH_CRCNFE),
+        FLAG(eh, PCI_HT_EH_SERRNFE));
+  mbu = get_conf_byte(d, where + PCI_HT_PRI_MBU);
+  mlu = get_conf_byte(d, where + PCI_HT_PRI_MLU);
+  printf("\t\tPrefetchable memory behind bridge Upper: %02x-%02x\n", mbu, mlu);
+  bn = get_conf_byte(d, where + PCI_HT_PRI_BN);
+  printf("\t\tBus Number: %02x\n", bn);
+}
+
+static void
+cap_ht_sec(struct device *d, int where, int cmd)
+{
+  u16 lctr, lcnf, ftr, eh;
+  u8 rid, lfrer, lfcap, mbu, mlu;
+  char *fmt;
+
+  printf("HyperTransport: Host or Secondary Interface\n");
+  if (verbose < 2)
+    return;
+
+  if (!config_fetch(d, where + PCI_HT_SEC_LCTR, PCI_HT_SEC_SIZEOF - PCI_HT_SEC_LCTR))
+    return;
+  rid = get_conf_byte(d, where + PCI_HT_SEC_RID);
+  if (rid < 0x22 && rid > 0x11)
+    printf("\t\t!!! Possibly incomplete decoding\n");
+
+  if (rid >= 0x22)
+    fmt = "\t\tCommand: WarmRst%c DblEnd%c DevNum=%u ChainSide%c HostHide%c Slave%c <EOCErr%c DUL%c\n";
+  else
+    fmt = "\t\tCommand: WarmRst%c DblEnd%c\n";
+  printf(fmt,
+        FLAG(cmd, PCI_HT_SEC_CMD_WR),
+        FLAG(cmd, PCI_HT_SEC_CMD_DE),
+        (cmd & PCI_HT_SEC_CMD_DN) >> 2,
+        FLAG(cmd, PCI_HT_SEC_CMD_CS),
+        FLAG(cmd, PCI_HT_SEC_CMD_HH),
+        FLAG(cmd, PCI_HT_SEC_CMD_AS),
+        FLAG(cmd, PCI_HT_SEC_CMD_HIECE),
+        FLAG(cmd, PCI_HT_SEC_CMD_DUL));
+  lctr = get_conf_word(d, where + PCI_HT_SEC_LCTR);
+  if (rid >= 0x22)
+    fmt = "\t\tLink Control: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x IsocEn%c LSEn%c ExtCTL%c 64b%c\n";
+  else
+    fmt = "\t\tLink Control: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x\n";
+  printf(fmt,
+        FLAG(lctr, PCI_HT_LCTR_CFLE),
+        FLAG(lctr, PCI_HT_LCTR_CST),
+        FLAG(lctr, PCI_HT_LCTR_CFE),
+        FLAG(lctr, PCI_HT_LCTR_LKFAIL),
+        FLAG(lctr, PCI_HT_LCTR_INIT),
+        FLAG(lctr, PCI_HT_LCTR_EOC),
+        FLAG(lctr, PCI_HT_LCTR_TXO),
+        (lctr & PCI_HT_LCTR_CRCERR) >> 8,
+        FLAG(lctr, PCI_HT_LCTR_ISOCEN),
+        FLAG(lctr, PCI_HT_LCTR_LSEN),
+        FLAG(lctr, PCI_HT_LCTR_EXTCTL),
+        FLAG(lctr, PCI_HT_LCTR_64B));
+  lcnf = get_conf_word(d, where + PCI_HT_SEC_LCNF);
+  if (rid >= 0x22)
+    fmt = "\t\tLink Config: MLWI=%1$s DwFcIn%5$c MLWO=%2$s DwFcOut%6$c LWI=%3$s DwFcInEn%7$c LWO=%4$s DwFcOutEn%8$c\n";
+  else
+    fmt = "\t\tLink Config: MLWI=%s MLWO=%s LWI=%s LWO=%s\n";
+  printf(fmt,
+        ht_link_width(lcnf & PCI_HT_LCNF_MLWI),
+        ht_link_width((lcnf & PCI_HT_LCNF_MLWO) >> 4),
+        ht_link_width((lcnf & PCI_HT_LCNF_LWI) >> 8),
+        ht_link_width((lcnf & PCI_HT_LCNF_LWO) >> 12),
+        FLAG(lcnf, PCI_HT_LCNF_DFI),
+        FLAG(lcnf, PCI_HT_LCNF_DFO),
+        FLAG(lcnf, PCI_HT_LCNF_DFIE),
+        FLAG(lcnf, PCI_HT_LCNF_DFOE));
+  printf("\t\tRevision ID: %u.%02u\n",
+        (rid & PCI_HT_RID_MAJ) >> 5, (rid & PCI_HT_RID_MIN));
+  if (rid < 0x22)
+    return;
+  lfrer = get_conf_byte(d, where + PCI_HT_SEC_LFRER);
+  printf("\t\tLink Frequency: %s\n", ht_link_freq(lfrer & PCI_HT_LFRER_FREQ));
+  printf("\t\tLink Error: <Prot%c <Ovfl%c <EOC%c CTLTm%c\n",
+        FLAG(lfrer, PCI_HT_LFRER_PROT),
+        FLAG(lfrer, PCI_HT_LFRER_OV),
+        FLAG(lfrer, PCI_HT_LFRER_EOC),
+        FLAG(lfrer, PCI_HT_LFRER_CTLT));
+  lfcap = get_conf_byte(d, where + PCI_HT_SEC_LFCAP);
+  printf("\t\tLink Frequency Capability: 200MHz%c 300MHz%c 400MHz%c 500MHz%c 600MHz%c 800MHz%c 1.0GHz%c 1.2GHz%c 1.4GHz%c 1.6GHz%c Vend%c\n",
+        FLAG(lfcap, PCI_HT_LFCAP_200),
+        FLAG(lfcap, PCI_HT_LFCAP_300),
+        FLAG(lfcap, PCI_HT_LFCAP_400),
+        FLAG(lfcap, PCI_HT_LFCAP_500),
+        FLAG(lfcap, PCI_HT_LFCAP_600),
+        FLAG(lfcap, PCI_HT_LFCAP_800),
+        FLAG(lfcap, PCI_HT_LFCAP_1000),
+        FLAG(lfcap, PCI_HT_LFCAP_1200),
+        FLAG(lfcap, PCI_HT_LFCAP_1400),
+        FLAG(lfcap, PCI_HT_LFCAP_1600),
+        FLAG(lfcap, PCI_HT_LFCAP_VEND));
+  ftr = get_conf_word(d, where + PCI_HT_SEC_FTR);
+  printf("\t\tFeature Capability: IsocFC%c LDTSTOP%c CRCTM%c ECTLT%c 64bA%c UIDRD%c ExtRS%c UCnfE%c\n",
+        FLAG(ftr, PCI_HT_FTR_ISOCFC),
+        FLAG(ftr, PCI_HT_FTR_LDTSTOP),
+        FLAG(ftr, PCI_HT_FTR_CRCTM),
+        FLAG(ftr, PCI_HT_FTR_ECTLT),
+        FLAG(ftr, PCI_HT_FTR_64BA),
+        FLAG(ftr, PCI_HT_FTR_UIDRD),
+        FLAG(ftr, PCI_HT_SEC_FTR_EXTRS),
+        FLAG(ftr, PCI_HT_SEC_FTR_UCNFE));
+  if (ftr & PCI_HT_SEC_FTR_EXTRS)
+    {
+      eh = get_conf_word(d, where + PCI_HT_SEC_EH);
+      printf("\t\tError Handling: PFlE%c OFlE%c PFE%c OFE%c EOCFE%c RFE%c CRCFE%c SERRFE%c CF%c RE%c PNFE%c ONFE%c EOCNFE%c RNFE%c CRCNFE%c SERRNFE%c\n",
+            FLAG(eh, PCI_HT_EH_PFLE),
+            FLAG(eh, PCI_HT_EH_OFLE),
+            FLAG(eh, PCI_HT_EH_PFE),
+            FLAG(eh, PCI_HT_EH_OFE),
+            FLAG(eh, PCI_HT_EH_EOCFE),
+            FLAG(eh, PCI_HT_EH_RFE),
+            FLAG(eh, PCI_HT_EH_CRCFE),
+            FLAG(eh, PCI_HT_EH_SERRFE),
+            FLAG(eh, PCI_HT_EH_CF),
+            FLAG(eh, PCI_HT_EH_RE),
+            FLAG(eh, PCI_HT_EH_PNFE),
+            FLAG(eh, PCI_HT_EH_ONFE),
+            FLAG(eh, PCI_HT_EH_EOCNFE),
+            FLAG(eh, PCI_HT_EH_RNFE),
+            FLAG(eh, PCI_HT_EH_CRCNFE),
+            FLAG(eh, PCI_HT_EH_SERRNFE));
+      mbu = get_conf_byte(d, where + PCI_HT_SEC_MBU);
+      mlu = get_conf_byte(d, where + PCI_HT_SEC_MLU);
+      printf("\t\tPrefetchable memory behind bridge Upper: %02x-%02x\n", mbu, mlu);
+    }
+}
+
+static void
+cap_ht(struct device *d, int where, int cmd)
+{
+  int type;
+
+  switch (cmd & PCI_HT_CMD_TYP_HI)
+    {
+    case PCI_HT_CMD_TYP_HI_PRI:
+      cap_ht_pri(d, where, cmd);
+      return;
+    case PCI_HT_CMD_TYP_HI_SEC:
+      cap_ht_sec(d, where, cmd);
+      return;
+    }
+
+  type = cmd & PCI_HT_CMD_TYP;
+  switch (type)
+    {
+    case PCI_HT_CMD_TYP_SW:
+      printf("HyperTransport: Switch\n");
+      break;
+    case PCI_HT_CMD_TYP_IDC:
+      printf("HyperTransport: Interrupt Discovery and Configuration\n");
+      break;
+    case PCI_HT_CMD_TYP_RID:
+      printf("HyperTransport: Revision ID: %u.%02u\n",
+            (cmd & PCI_HT_RID_MAJ) >> 5, (cmd & PCI_HT_RID_MIN));
+      break;
+    case PCI_HT_CMD_TYP_UIDC:
+      printf("HyperTransport: UnitID Clumping\n");
+      break;
+    case PCI_HT_CMD_TYP_ECSA:
+      printf("HyperTransport: Extended Configuration Space Access\n");
+      break;
+    case PCI_HT_CMD_TYP_AM:
+      printf("HyperTransport: Address Mapping\n");
+      break;
+    case PCI_HT_CMD_TYP_MSIM:
+      printf("HyperTransport: MSI Mapping Enable%c Fixed%c\n",
+            FLAG(cmd, PCI_HT_MSIM_CMD_EN),
+            FLAG(cmd, PCI_HT_MSIM_CMD_FIXD));
+      if (verbose >= 2 && !(cmd & PCI_HT_MSIM_CMD_FIXD))
+       {
+         u32 offl, offh;
+         if (!config_fetch(d, where + PCI_HT_MSIM_ADDR_LO, 8))
+           break;
+         offl = get_conf_long(d, where + PCI_HT_MSIM_ADDR_LO);
+         offh = get_conf_long(d, where + PCI_HT_MSIM_ADDR_HI);
+         printf("\t\tMapping Address Base: %016llx\n", ((unsigned long long)offh << 32) | (offl & ~0xfffff));
+       }
+      break;
+    case PCI_HT_CMD_TYP_DR:
+      printf("HyperTransport: DirectRoute\n");
+      break;
+    case PCI_HT_CMD_TYP_VCS:
+      printf("HyperTransport: VCSet\n");
+      break;
+    case PCI_HT_CMD_TYP_RM:
+      printf("HyperTransport: Retry Mode\n");
+      break;
+    case PCI_HT_CMD_TYP_X86:
+      printf("HyperTransport: X86 (reserved)\n");
+      break;
+    default:
+      printf("HyperTransport: #%02x\n", type >> 11);
+    }
+}
+
+static void
+cap_msi(struct device *d, int where, int cap)
+{
+  int is64;
+  u32 t;
+  u16 w;
+
+  printf("MSI: Mask%c 64bit%c Count=%d/%d Enable%c\n",
+         FLAG(cap, PCI_MSI_FLAGS_MASK_BIT),
+        FLAG(cap, PCI_MSI_FLAGS_64BIT),
+        1 << ((cap & PCI_MSI_FLAGS_QSIZE) >> 4),
+        1 << ((cap & PCI_MSI_FLAGS_QMASK) >> 1),
+        FLAG(cap, PCI_MSI_FLAGS_ENABLE));
+  if (verbose < 2)
+    return;
+  is64 = cap & PCI_MSI_FLAGS_64BIT;
+  if (!config_fetch(d, where + PCI_MSI_ADDRESS_LO, (is64 ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32) + 2 - PCI_MSI_ADDRESS_LO))
+    return;
+  printf("\t\tAddress: ");
+  if (is64)
+    {
+      t = get_conf_long(d, where + PCI_MSI_ADDRESS_HI);
+      w = get_conf_word(d, where + PCI_MSI_DATA_64);
+      printf("%08x", t);
+    }
+  else
+    w = get_conf_word(d, where + PCI_MSI_DATA_32);
+  t = get_conf_long(d, where + PCI_MSI_ADDRESS_LO);
+  printf("%08x  Data: %04x\n", t, w);
+  if (cap & PCI_MSI_FLAGS_MASK_BIT)
+    {
+      u32 mask, pending;
+
+      if (is64)
+       {
+         if (!config_fetch(d, where + PCI_MSI_MASK_BIT_64, 8))
+           return;
+         mask = get_conf_long(d, where + PCI_MSI_MASK_BIT_64);
+         pending = get_conf_long(d, where + PCI_MSI_PENDING_64);
+       }
+      else
+        {
+         if (!config_fetch(d, where + PCI_MSI_MASK_BIT_32, 8))
+           return;
+         mask = get_conf_long(d, where + PCI_MSI_MASK_BIT_32);
+         pending = get_conf_long(d, where + PCI_MSI_PENDING_32);
+       }
+      printf("\t\tMasking: %08x  Pending: %08x\n", mask, pending);
+    }
+}
+
+static float power_limit(int value, int scale)
+{
+  static const float scales[4] = { 1.0, 0.1, 0.01, 0.001 };
+  return value * scales[scale];
+}
+
+static const char *latency_l0s(int value)
+{
+  static const char *latencies[] = { "<64ns", "<128ns", "<256ns", "<512ns", "<1us", "<2us", "<4us", "unlimited" };
+  return latencies[value];
+}
+
+static const char *latency_l1(int value)
+{
+  static const char *latencies[] = { "<1us", "<2us", "<4us", "<8us", "<16us", "<32us", "<64us", "unlimited" };
+  return latencies[value];
+}
+
+static void cap_express_dev(struct device *d, int where, int type)
+{
+  u32 t;
+  u16 w;
+
+  t = get_conf_long(d, where + PCI_EXP_DEVCAP);
+  printf("\t\tDevCap:\tMaxPayload %d bytes, PhantFunc %d, Latency L0s %s, L1 %s\n",
+       128 << (t & PCI_EXP_DEVCAP_PAYLOAD),
+       (1 << ((t & PCI_EXP_DEVCAP_PHANTOM) >> 3)) - 1,
+       latency_l0s((t & PCI_EXP_DEVCAP_L0S) >> 6),
+       latency_l1((t & PCI_EXP_DEVCAP_L1) >> 9));
+  printf("\t\t\tExtTag%c", FLAG(t, PCI_EXP_DEVCAP_EXT_TAG));
+  if ((type == PCI_EXP_TYPE_ENDPOINT) || (type == PCI_EXP_TYPE_LEG_END) ||
+      (type == PCI_EXP_TYPE_UPSTREAM) || (type == PCI_EXP_TYPE_PCI_BRIDGE))
+    printf(" AttnBtn%c AttnInd%c PwrInd%c",
+       FLAG(t, PCI_EXP_DEVCAP_ATN_BUT),
+       FLAG(t, PCI_EXP_DEVCAP_ATN_IND), FLAG(t, PCI_EXP_DEVCAP_PWR_IND));
+  printf(" RBE%c FLReset%c",
+       FLAG(t, PCI_EXP_DEVCAP_RBE),
+       FLAG(t, PCI_EXP_DEVCAP_FLRESET));
+  if (type == PCI_EXP_TYPE_UPSTREAM)
+    printf("SlotPowerLimit %fW",
+       power_limit((t & PCI_EXP_DEVCAP_PWR_VAL) >> 18,
+                   (t & PCI_EXP_DEVCAP_PWR_SCL) >> 26));
+  printf("\n");
+
+  w = get_conf_word(d, where + PCI_EXP_DEVCTL);
+  printf("\t\tDevCtl:\tReport errors: Correctable%c Non-Fatal%c Fatal%c Unsupported%c\n",
+       FLAG(w, PCI_EXP_DEVCTL_CERE),
+       FLAG(w, PCI_EXP_DEVCTL_NFERE),
+       FLAG(w, PCI_EXP_DEVCTL_FERE),
+       FLAG(w, PCI_EXP_DEVCTL_URRE));
+  printf("\t\t\tRlxdOrd%c ExtTag%c PhantFunc%c AuxPwr%c NoSnoop%c",
+       FLAG(w, PCI_EXP_DEVCTL_RELAXED),
+       FLAG(w, PCI_EXP_DEVCTL_EXT_TAG),
+       FLAG(w, PCI_EXP_DEVCTL_PHANTOM),
+       FLAG(w, PCI_EXP_DEVCTL_AUX_PME),
+       FLAG(w, PCI_EXP_DEVCTL_NOSNOOP));
+  if (type == PCI_EXP_TYPE_PCI_BRIDGE || type == PCI_EXP_TYPE_PCIE_BRIDGE)
+    printf(" BrConfRtry%c", FLAG(w, PCI_EXP_DEVCTL_BCRE));
+  if (type == PCI_EXP_TYPE_ENDPOINT && (t & PCI_EXP_DEVCAP_FLRESET))
+    printf(" FLReset%c", FLAG(w, PCI_EXP_DEVCTL_FLRESET));
+  printf("\n\t\t\tMaxPayload %d bytes, MaxReadReq %d bytes\n",
+       128 << ((w & PCI_EXP_DEVCTL_PAYLOAD) >> 5),
+       128 << ((w & PCI_EXP_DEVCTL_READRQ) >> 12));
+
+  w = get_conf_word(d, where + PCI_EXP_DEVSTA);
+  printf("\t\tDevSta:\tCorrErr%c UncorrErr%c FatalErr%c UnsuppReq%c AuxPwr%c TransPend%c\n",
+       FLAG(w, PCI_EXP_DEVSTA_CED),
+       FLAG(w, PCI_EXP_DEVSTA_NFED),
+       FLAG(w, PCI_EXP_DEVSTA_FED),
+       FLAG(w, PCI_EXP_DEVSTA_URD),
+       FLAG(w, PCI_EXP_DEVSTA_AUXPD),
+       FLAG(w, PCI_EXP_DEVSTA_TRPND));
+}
+
+static char *link_speed(int speed)
+{
+  switch (speed)
+    {
+      case 1:
+       return "2.5GT/s";
+      case 2:
+       return "5GT/s";
+      default:
+       return "unknown";
+    }
+}
+
+static char *aspm_support(int code)
+{
+  switch (code)
+    {
+      case 1:
+       return "L0s";
+      case 3:
+       return "L0s L1";
+      default:
+       return "unknown";
+    }
+}
+
+static const char *aspm_enabled(int code)
+{
+  static const char *desc[] = { "Disabled", "L0s Enabled", "L1 Enabled", "L0s L1 Enabled" };
+  return desc[code];
+}
+
+static void cap_express_link(struct device *d, int where, int type)
+{
+  u32 t;
+  u16 w;
+
+  t = get_conf_long(d, where + PCI_EXP_LNKCAP);
+  printf("\t\tLnkCap:\tPort #%d, Speed %s, Width x%d, ASPM %s, Latency L0 %s, L1 %s\n",
+       t >> 24,
+       link_speed(t & PCI_EXP_LNKCAP_SPEED), (t & PCI_EXP_LNKCAP_WIDTH) >> 4,
+       aspm_support((t & PCI_EXP_LNKCAP_ASPM) >> 10),
+       latency_l0s((t & PCI_EXP_LNKCAP_L0S) >> 12),
+       latency_l1((t & PCI_EXP_LNKCAP_L1) >> 15));
+  printf("\t\t\tClockPM%c Suprise%c LLActRep%c BwNot%c\n",
+       FLAG(t, PCI_EXP_LNKCAP_CLOCKPM),
+       FLAG(t, PCI_EXP_LNKCAP_SURPRISE),
+       FLAG(t, PCI_EXP_LNKCAP_DLLA),
+       FLAG(t, PCI_EXP_LNKCAP_LBNC));
+
+  w = get_conf_word(d, where + PCI_EXP_LNKCTL);
+  printf("\t\tLnkCtl:\tASPM %s;", aspm_enabled(w & PCI_EXP_LNKCTL_ASPM));
+  if ((type == PCI_EXP_TYPE_ROOT_PORT) || (type == PCI_EXP_TYPE_ENDPOINT) ||
+      (type == PCI_EXP_TYPE_LEG_END))
+    printf(" RCB %d bytes", w & PCI_EXP_LNKCTL_RCB ? 128 : 64);
+  printf(" Disabled%c Retrain%c CommClk%c\n\t\t\tExtSynch%c ClockPM%c AutWidDis%c BWInt%c AutBWInt%c\n",
+       FLAG(w, PCI_EXP_LNKCTL_DISABLE),
+       FLAG(w, PCI_EXP_LNKCTL_RETRAIN),
+       FLAG(w, PCI_EXP_LNKCTL_CLOCK),
+       FLAG(w, PCI_EXP_LNKCTL_XSYNCH),
+       FLAG(w, PCI_EXP_LNKCTL_CLOCKPM),
+       FLAG(w, PCI_EXP_LNKCTL_HWAUTWD),
+       FLAG(w, PCI_EXP_LNKCTL_BWMIE),
+       FLAG(w, PCI_EXP_LNKCTL_AUTBWIE));
+
+  w = get_conf_word(d, where + PCI_EXP_LNKSTA);
+  printf("\t\tLnkSta:\tSpeed %s, Width x%d, TrErr%c Train%c SlotClk%c DLActive%c BWMgmt%c ABWMgmt%c\n",
+       link_speed(w & PCI_EXP_LNKSTA_SPEED),
+       (w & PCI_EXP_LNKSTA_WIDTH) >> 4,
+       FLAG(w, PCI_EXP_LNKSTA_TR_ERR),
+       FLAG(w, PCI_EXP_LNKSTA_TRAIN),
+       FLAG(w, PCI_EXP_LNKSTA_SL_CLK),
+       FLAG(w, PCI_EXP_LNKSTA_DL_ACT),
+       FLAG(w, PCI_EXP_LNKSTA_BWMGMT),
+       FLAG(w, PCI_EXP_LNKSTA_AUTBW));
+}
+
+static const char *indicator(int code)
+{
+  static const char *names[] = { "Unknown", "On", "Blink", "Off" };
+  return names[code];
+}
+
+static void cap_express_slot(struct device *d, int where)
+{
+  u32 t;
+  u16 w;
+
+  t = get_conf_long(d, where + PCI_EXP_SLTCAP);
+  printf("\t\tSltCap:\tAttnBtn%c PwrCtrl%c MRL%c AttnInd%c PwrInd%c HotPlug%c Surpise%c\n",
+       FLAG(t, PCI_EXP_SLTCAP_ATNB),
+       FLAG(t, PCI_EXP_SLTCAP_PWRC),
+       FLAG(t, PCI_EXP_SLTCAP_MRL),
+       FLAG(t, PCI_EXP_SLTCAP_ATNI),
+       FLAG(t, PCI_EXP_SLTCAP_PWRI),
+       FLAG(t, PCI_EXP_SLTCAP_HPC),
+       FLAG(t, PCI_EXP_SLTCAP_HPS));
+  printf("\t\t\tSlot #%3x, PowerLimit %f; Interlock%c NoCompl%c\n",
+       t >> 19,
+       power_limit((t & PCI_EXP_SLTCAP_PWR_VAL) >> 7, (t & PCI_EXP_SLTCAP_PWR_SCL) >> 15),
+       FLAG(t, PCI_EXP_SLTCAP_INTERLOCK),
+       FLAG(t, PCI_EXP_SLTCAP_NOCMDCOMP));
+
+  w = get_conf_word(d, where + PCI_EXP_SLTCTL);
+  printf("\t\tSltCtl:\tEnable: AttnBtn%c PwrFlt%c MRL%c PresDet%c CmdCplt%c HPIrq%c LinkChg%c\n",
+       FLAG(w, PCI_EXP_SLTCTL_ATNB),
+       FLAG(w, PCI_EXP_SLTCTL_PWRF),
+       FLAG(w, PCI_EXP_SLTCTL_MRLS),
+       FLAG(w, PCI_EXP_SLTCTL_PRSD),
+       FLAG(w, PCI_EXP_SLTCTL_CMDC),
+       FLAG(w, PCI_EXP_SLTCTL_HPIE),
+       FLAG(w, PCI_EXP_SLTCTL_LLCHG));
+  printf("\t\t\tControl: AttnInd %s, PwrInd %s, Power%c Interlock%c\n",
+       indicator((w & PCI_EXP_SLTCTL_ATNI) >> 6),
+       indicator((w & PCI_EXP_SLTCTL_PWRI) >> 8),
+       FLAG(w, PCI_EXP_SLTCTL_PWRC),
+       FLAG(w, PCI_EXP_SLTCTL_INTERLOCK));
+
+  w = get_conf_word(d, where + PCI_EXP_SLTSTA);
+  printf("\t\tSltSta:\tStatus: AttnBtn%c PowerFlt%c MRL%c CmdCplt%c PresDet%c Interlock%c\n",
+       FLAG(w, PCI_EXP_SLTSTA_ATNB),
+       FLAG(w, PCI_EXP_SLTSTA_PWRF),
+       FLAG(w, PCI_EXP_SLTSTA_MRL_ST),
+       FLAG(w, PCI_EXP_SLTSTA_CMDC),
+       FLAG(w, PCI_EXP_SLTSTA_PRES),
+       FLAG(w, PCI_EXP_SLTSTA_INTERLOCK));
+  printf("\t\t\tChanged: MRL%c PresDet%c LinkState%c\n",
+       FLAG(w, PCI_EXP_SLTSTA_MRLS),
+       FLAG(w, PCI_EXP_SLTSTA_PRSD),
+       FLAG(w, PCI_EXP_SLTSTA_LLCHG));
+}
+
+static void cap_express_root(struct device *d, int where)
+{
+  u32 w = get_conf_word(d, where + PCI_EXP_RTCTL);
+  printf("\t\tRootCtl: ErrCorrectable%c ErrNon-Fatal%c ErrFatal%c PMEIntEna%c CRSVisible%c\n",
+       FLAG(w, PCI_EXP_RTCTL_SECEE),
+       FLAG(w, PCI_EXP_RTCTL_SENFEE),
+       FLAG(w, PCI_EXP_RTCTL_SEFEE),
+       FLAG(w, PCI_EXP_RTCTL_PMEIE),
+       FLAG(w, PCI_EXP_RTCTL_CRSVIS));
+
+  w = get_conf_word(d, where + PCI_EXP_RTCAP);
+  printf("\t\tRootCap: CRSVisible%c\n",
+       FLAG(w, PCI_EXP_RTCAP_CRSVIS));
+
+  w = get_conf_word(d, where + PCI_EXP_RTSTA);
+  printf("\t\tRootSta: PME ReqID %04x, PMEStatus%c PMEPending%c\n",
+       w & PCI_EXP_RTSTA_PME_REQID,
+       FLAG(w, PCI_EXP_RTSTA_PME_STATUS),
+       FLAG(w, PCI_EXP_RTSTA_PME_PENDING));
+}
+
+static const char *cap_express_dev2_timeout_range(int type)
+{
+  /* Decode Completion Timeout Ranges. */
+  switch (type)
+    {
+      case 0:
+       return "Not Supported";
+      case 1:
+       return "Range A";
+      case 2:
+       return "Range B";
+      case 3:
+       return "Range AB";
+      case 6:
+       return "Range BC";
+      case 7:
+       return "Range ABC";
+      case 14:
+       return "Range BCD";
+      case 15:
+       return "Range ABCD";
+      default:
+       return "Unknown";
+    }
+}
+
+static const char *cap_express_dev2_timeout_value(int type)
+{
+  /* Decode Completion Timeout Value. */
+  switch (type)
+    {
+      case 0:
+       return "50us to 50ms";
+      case 1:
+       return "50us to 100us";
+      case 2:
+       return "1ms to 10ms";
+      case 5:
+       return "16ms to 55ms";
+      case 6:
+       return "65ms to 210ms";
+      case 9:
+       return "260ms to 900ms";
+      case 10:
+       return "1s to 3.5s";
+      case 13:
+       return "4s to 13s";
+      case 14:
+       return "17s to 64s";
+      default:
+       return "Unknown";
+    }
+}
+
+static void cap_express_dev2(struct device *d, int where, int type)
+{
+  u32 l;
+  u16 w;
+
+  l = get_conf_long(d, where + PCI_EXP_DEVCAP2);
+  printf("\t\tDevCap2: Completion Timeout: %s, TimeoutDis%c",
+       cap_express_dev2_timeout_range(PCI_EXP_DEV2_TIMEOUT_RANGE(l)),
+       FLAG(l, PCI_EXP_DEV2_TIMEOUT_DIS));
+  if (type == PCI_EXP_TYPE_ROOT_PORT || type == PCI_EXP_TYPE_DOWNSTREAM)
+    printf(" ARIFwd%c\n", FLAG(l, PCI_EXP_DEV2_ARI));
+  else
+    printf("\n");
+
+  w = get_conf_word(d, where + PCI_EXP_DEVCTL2);
+  printf("\t\tDevCtl2: Completion Timeout: %s, TimeoutDis%c",
+       cap_express_dev2_timeout_value(PCI_EXP_DEV2_TIMEOUT_VALUE(w)),
+       FLAG(w, PCI_EXP_DEV2_TIMEOUT_DIS));
+  if (type == PCI_EXP_TYPE_ROOT_PORT || type == PCI_EXP_TYPE_DOWNSTREAM)
+    printf(" ARIFwd%c\n", FLAG(w, PCI_EXP_DEV2_ARI));
+  else
+    printf("\n");
+}
+
+static const char *cap_express_link2_speed(int type)
+{
+  switch (type)
+    {
+      case 0: /* hardwire to 0 means only the 2.5GT/s is supported */
+      case 1:
+       return "2.5GT/s";
+      case 2:
+       return "5GT/s";
+      default:
+       return "Unknown";
+    }
+}
+
+static const char *cap_express_link2_deemphasis(int type)
+{
+  switch (type)
+    {
+      case 0:
+       return "-6dB";
+      case 1:
+       return "-3.5dB";
+      default:
+       return "Unknown";
+    }
+}
+
+static const char *cap_express_link2_transmargin(int type)
+{
+  switch (type)
+    {
+      case 0:
+       return "Normal Operating Range";
+      case 1:
+       return "800-1200mV(full-swing)/400-700mV(half-swing)";
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+       return "200-400mV(full-swing)/100-200mV(half-swing)";
+      default:
+       return "Unknown";
+    }
+}
+
+static void cap_express_link2(struct device *d, int where, int type UNUSED)
+{
+  u16 w;
+
+  w = get_conf_word(d, where + PCI_EXP_LNKCTL2);
+  printf("\t\tLnkCtl2: Target Link Speed: %s, EnterCompliance%c SpeedDis%c, Selectable De-emphasis: %s\n"
+       "\t\t\t Transmit Margin: %s, EnterModifiedCompliance%c ComplianceSOS%c\n"
+       "\t\t\t Compliance De-emphasis: %s\n",
+       cap_express_link2_speed(PCI_EXP_LNKCTL2_SPEED(w)),
+       FLAG(w, PCI_EXP_LNKCTL2_CMPLNC),
+       FLAG(w, PCI_EXP_LNKCTL2_SPEED_DIS),
+       cap_express_link2_deemphasis(PCI_EXP_LNKCTL2_DEEMPHASIS(w)),
+       cap_express_link2_transmargin(PCI_EXP_LNKCTL2_MARGIN(w)),
+       FLAG(w, PCI_EXP_LNKCTL2_MOD_CMPLNC),
+       FLAG(w, PCI_EXP_LNKCTL2_CMPLNC_SOS),
+       cap_express_link2_deemphasis(PCI_EXP_LNKCTL2_COM_DEEMPHASIS(w)));
+
+  w = get_conf_word(d, where + PCI_EXP_LNKSTA2);
+  printf("\t\tLnkSta2: Current De-emphasis Level: %s\n",
+       cap_express_link2_deemphasis(PCI_EXP_LINKSTA2_DEEMPHASIS(w)));
+}
+
+static void cap_express_slot2(struct device *d UNUSED, int where UNUSED)
+{
+  /* No capabilities that require this field in PCIe rev2.0 spec. */
+}
+
+static void
+cap_express(struct device *d, int where, int cap)
+{
+  int type = (cap & PCI_EXP_FLAGS_TYPE) >> 4;
+  int size;
+  int slot = 0;
+
+  printf("Express ");
+  if (verbose >= 2)
+    printf("(v%d) ", cap & PCI_EXP_FLAGS_VERS);
+  switch (type)
+    {
+    case PCI_EXP_TYPE_ENDPOINT:
+      printf("Endpoint");
+      break;
+    case PCI_EXP_TYPE_LEG_END:
+      printf("Legacy Endpoint");
+      break;
+    case PCI_EXP_TYPE_ROOT_PORT:
+      slot = cap & PCI_EXP_FLAGS_SLOT;
+      printf("Root Port (Slot%c)", FLAG(cap, PCI_EXP_FLAGS_SLOT));
+      break;
+    case PCI_EXP_TYPE_UPSTREAM:
+      printf("Upstream Port");
+      break;
+    case PCI_EXP_TYPE_DOWNSTREAM:
+      slot = cap & PCI_EXP_FLAGS_SLOT;
+      printf("Downstream Port (Slot%c)", FLAG(cap, PCI_EXP_FLAGS_SLOT));
+      break;
+    case PCI_EXP_TYPE_PCI_BRIDGE:
+      printf("PCI/PCI-X Bridge");
+      break;
+    case PCI_EXP_TYPE_PCIE_BRIDGE:
+      printf("PCI/PCI-X to PCI-Express Bridge");
+      break;
+    case PCI_EXP_TYPE_ROOT_INT_EP:
+      printf("Root Complex Integrated Endpoint");
+      break;
+    case PCI_EXP_TYPE_ROOT_EC:
+      printf("Root Complex Event Collector");
+      break;
+    default:
+      printf("Unknown type %d", type);
+  }
+  printf(", MSI %02x\n", (cap & PCI_EXP_FLAGS_IRQ) >> 9);
+  if (verbose < 2)
+    return;
+
+  size = 16;
+  if (slot)
+    size = 24;
+  if (type == PCI_EXP_TYPE_ROOT_PORT)
+    size = 32;
+  if (!config_fetch(d, where + PCI_EXP_DEVCAP, size))
+    return;
+
+  cap_express_dev(d, where, type);
+  cap_express_link(d, where, type);
+  if (slot)
+    cap_express_slot(d, where);
+  if (type == PCI_EXP_TYPE_ROOT_PORT)
+    cap_express_root(d, where);
+
+  if ((cap & PCI_EXP_FLAGS_VERS) < 2)
+    return;
+
+  size = 16;
+  if (slot)
+    size = 24;
+  if (!config_fetch(d, where + PCI_EXP_DEVCAP2, size))
+    return;
+
+  cap_express_dev2(d, where, type);
+  cap_express_link2(d, where, type);
+  if (slot)
+    cap_express_slot2(d, where);
+}
+
+static void
+cap_msix(struct device *d, int where, int cap)
+{
+  u32 off;
+
+  printf("MSI-X: Enable%c Mask%c TabSize=%d\n",
+        FLAG(cap, PCI_MSIX_ENABLE),
+        FLAG(cap, PCI_MSIX_MASK),
+        (cap & PCI_MSIX_TABSIZE) + 1);
+  if (verbose < 2 || !config_fetch(d, where + PCI_MSIX_TABLE, 8))
+    return;
+
+  off = get_conf_long(d, where + PCI_MSIX_TABLE);
+  printf("\t\tVector table: BAR=%d offset=%08x\n",
+        off & PCI_MSIX_BIR, off & ~PCI_MSIX_BIR);
+  off = get_conf_long(d, where + PCI_MSIX_PBA);
+  printf("\t\tPBA: BAR=%d offset=%08x\n",
+        off & PCI_MSIX_BIR, off & ~PCI_MSIX_BIR);
+}
+
+static void
+cap_slotid(int cap)
+{
+  int esr = cap & 0xff;
+  int chs = cap >> 8;
+
+  printf("Slot ID: %d slots, First%c, chassis %02x\n",
+        esr & PCI_SID_ESR_NSLOTS,
+        FLAG(esr, PCI_SID_ESR_FIC),
+        chs);
+}
+
+static void
+cap_ssvid(struct device *d, int where)
+{
+  u16 subsys_v, subsys_d;
+  char ssnamebuf[256];
+
+  if (!config_fetch(d, where, 8))
+    return;
+  subsys_v = get_conf_word(d, where + PCI_SSVID_VENDOR);
+  subsys_d = get_conf_word(d, where + PCI_SSVID_DEVICE);
+  printf("Subsystem: %s\n",
+          pci_lookup_name(pacc, ssnamebuf, sizeof(ssnamebuf),
+                          PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
+                          d->dev->vendor_id, d->dev->device_id, subsys_v, subsys_d));
+}
+
+static void
+cap_debug_port(int cap)
+{
+  int bar = cap >> 13;
+  int pos = cap & 0x1fff;
+  printf("Debug port: BAR=%d offset=%04x\n", bar, pos);
+}
+
+void
+show_caps(struct device *d)
+{
+  int can_have_ext_caps = 0;
+
+  if (get_conf_word(d, PCI_STATUS) & PCI_STATUS_CAP_LIST)
+    {
+      int where = get_conf_byte(d, PCI_CAPABILITY_LIST) & ~3;
+      byte been_there[256];
+      memset(been_there, 0, 256);
+      while (where)
+       {
+         int id, next, cap;
+         printf("\tCapabilities: ");
+         if (!config_fetch(d, where, 4))
+           {
+             puts("<access denied>");
+             break;
+           }
+         id = get_conf_byte(d, where + PCI_CAP_LIST_ID);
+         next = get_conf_byte(d, where + PCI_CAP_LIST_NEXT) & ~3;
+         cap = get_conf_word(d, where + PCI_CAP_FLAGS);
+         printf("[%02x] ", where);
+         if (been_there[where]++)
+           {
+             printf("<chain looped>\n");
+             break;
+           }
+         if (id == 0xff)
+           {
+             printf("<chain broken>\n");
+             break;
+           }
+         switch (id)
+           {
+           case PCI_CAP_ID_PM:
+             cap_pm(d, where, cap);
+             break;
+           case PCI_CAP_ID_AGP:
+             cap_agp(d, where, cap);
+             break;
+           case PCI_CAP_ID_VPD:
+             cap_vpd(d);
+             break;
+           case PCI_CAP_ID_SLOTID:
+             cap_slotid(cap);
+             break;
+           case PCI_CAP_ID_MSI:
+             cap_msi(d, where, cap);
+             break;
+           case PCI_CAP_ID_CHSWP:
+             printf("CompactPCI hot-swap <?>\n");
+             break;
+           case PCI_CAP_ID_PCIX:
+             cap_pcix(d, where);
+             can_have_ext_caps = 1;
+             break;
+           case PCI_CAP_ID_HT:
+             cap_ht(d, where, cap);
+             break;
+           case PCI_CAP_ID_VNDR:
+             printf("Vendor Specific Information <?>\n");
+             break;
+           case PCI_CAP_ID_DBG:
+             cap_debug_port(cap);
+             break;
+           case PCI_CAP_ID_CCRC:
+             printf("CompactPCI central resource control <?>\n");
+             break;
+           case PCI_CAP_ID_HOTPLUG:
+             printf("Hot-plug capable\n");
+             break;
+           case PCI_CAP_ID_SSVID:
+             cap_ssvid(d, where);
+             break;
+           case PCI_CAP_ID_AGP3:
+             printf("AGP3 <?>\n");
+             break;
+           case PCI_CAP_ID_SECURE:
+             printf("Secure device <?>\n");
+             break;
+           case PCI_CAP_ID_EXP:
+             cap_express(d, where, cap);
+             can_have_ext_caps = 1;
+             break;
+           case PCI_CAP_ID_MSIX:
+             cap_msix(d, where, cap);
+             break;
+           case PCI_CAP_ID_SATA:
+             printf("SATA HBA <?>\n");
+             break;
+           case PCI_CAP_ID_AF:
+             printf("PCIe advanced features <?>\n");
+             break;
+           default:
+             printf("#%02x [%04x]\n", id, cap);
+           }
+         where = next;
+       }
+    }
+  if (can_have_ext_caps)
+    show_ext_caps(d);
+}

diff --git a/ls-ecaps.c b/ls-ecaps.c
new file mode 100644 (file)
index 0000000..f0d1338
--- /dev/null
+++ b/ls-ecaps.c
@@ -0,0 +1,246 @@
+/*
+ *     The PCI Utilities -- Show Extended Capabilities
+ *
+ *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "lspci.h"
+
+static void
+cap_dsn(struct device *d, int where)
+{
+  u32 t1, t2;
+  if (!config_fetch(d, where + 4, 8))
+    return;
+  t1 = get_conf_long(d, where + 4);
+  t2 = get_conf_long(d, where + 8);
+  printf("Device Serial Number %02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x\n",
+       t1 & 0xff, (t1 >> 8) & 0xff, (t1 >> 16) & 0xff, t1 >> 24,
+       t2 & 0xff, (t2 >> 8) & 0xff, (t2 >> 16) & 0xff, t2 >> 24);
+}
+
+static void
+cap_aer(struct device *d, int where)
+{
+  u32 l;
+
+  printf("Advanced Error Reporting\n");
+  if (!config_fetch(d, where + PCI_ERR_UNCOR_STATUS, 24))
+    return;
+
+  l = get_conf_long(d, where + PCI_ERR_UNCOR_STATUS);
+  printf("\t\tUESta:\tDLP%c SDES%c TLP%c FCP%c CmpltTO%c CmpltAbrt%c UnxCmplt%c RxOF%c "
+       "MalfTLP%c ECRC%c UnsupReq%c ACSViol%c\n",
+       FLAG(l, PCI_ERR_UNC_DLP), FLAG(l, PCI_ERR_UNC_SDES), FLAG(l, PCI_ERR_UNC_POISON_TLP),
+       FLAG(l, PCI_ERR_UNC_FCP), FLAG(l, PCI_ERR_UNC_COMP_TIME), FLAG(l, PCI_ERR_UNC_COMP_ABORT),
+       FLAG(l, PCI_ERR_UNC_UNX_COMP), FLAG(l, PCI_ERR_UNC_RX_OVER), FLAG(l, PCI_ERR_UNC_MALF_TLP),
+       FLAG(l, PCI_ERR_UNC_ECRC), FLAG(l, PCI_ERR_UNC_UNSUP), FLAG(l, PCI_ERR_UNC_ACS_VIOL));
+  l = get_conf_long(d, where + PCI_ERR_UNCOR_MASK);
+  printf("\t\tUEMsk:\tDLP%c SDES%c TLP%c FCP%c CmpltTO%c CmpltAbrt%c UnxCmplt%c RxOF%c "
+       "MalfTLP%c ECRC%c UnsupReq%c ACSViol%c\n",
+       FLAG(l, PCI_ERR_UNC_DLP), FLAG(l, PCI_ERR_UNC_SDES), FLAG(l, PCI_ERR_UNC_POISON_TLP),
+       FLAG(l, PCI_ERR_UNC_FCP), FLAG(l, PCI_ERR_UNC_COMP_TIME), FLAG(l, PCI_ERR_UNC_COMP_ABORT),
+       FLAG(l, PCI_ERR_UNC_UNX_COMP), FLAG(l, PCI_ERR_UNC_RX_OVER), FLAG(l, PCI_ERR_UNC_MALF_TLP),
+       FLAG(l, PCI_ERR_UNC_ECRC), FLAG(l, PCI_ERR_UNC_UNSUP), FLAG(l, PCI_ERR_UNC_ACS_VIOL));
+  l = get_conf_long(d, where + PCI_ERR_UNCOR_SEVER);
+  printf("\t\tUESvrt:\tDLP%c SDES%c TLP%c FCP%c CmpltTO%c CmpltAbrt%c UnxCmplt%c RxOF%c "
+       "MalfTLP%c ECRC%c UnsupReq%c ACSViol%c\n",
+       FLAG(l, PCI_ERR_UNC_DLP), FLAG(l, PCI_ERR_UNC_SDES), FLAG(l, PCI_ERR_UNC_POISON_TLP),
+       FLAG(l, PCI_ERR_UNC_FCP), FLAG(l, PCI_ERR_UNC_COMP_TIME), FLAG(l, PCI_ERR_UNC_COMP_ABORT),
+       FLAG(l, PCI_ERR_UNC_UNX_COMP), FLAG(l, PCI_ERR_UNC_RX_OVER), FLAG(l, PCI_ERR_UNC_MALF_TLP),
+       FLAG(l, PCI_ERR_UNC_ECRC), FLAG(l, PCI_ERR_UNC_UNSUP), FLAG(l, PCI_ERR_UNC_ACS_VIOL));
+  l = get_conf_long(d, where + PCI_ERR_COR_STATUS);
+  printf("\t\tCESta:\tRxErr%c BadTLP%c BadDLLP%c Rollover%c Timeout%c NonFatalErr%c\n",
+       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_COR_MASK);
+  printf("\t\tCEMsk:\tRxErr%c BadTLP%c BadDLLP%c Rollover%c Timeout%c NonFatalErr%c\n",
+       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",
+       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));
+
+}
+
+static void
+cap_acs(struct device *d, int where)
+{
+  u16 w;
+
+  printf("Access Control Services\n");
+  if (!config_fetch(d, where + PCI_ACS_CAP, 4))
+    return;
+
+  w = get_conf_word(d, where + PCI_ACS_CAP);
+  printf("\t\tACSCap:\tSrcValid%c TransBlk%c ReqRedir%c CmpltRedir%c UpstreamFwd%c EgressCtrl%c "
+       "DirectTrans%c\n",
+       FLAG(w, PCI_ACS_CAP_VALID), FLAG(w, PCI_ACS_CAP_BLOCK), FLAG(w, PCI_ACS_CAP_REQ_RED),
+       FLAG(w, PCI_ACS_CAP_CMPLT_RED), FLAG(w, PCI_ACS_CAP_FORWARD), FLAG(w, PCI_ACS_CAP_EGRESS),
+       FLAG(w, PCI_ACS_CAP_TRANS));
+  w = get_conf_word(d, where + PCI_ACS_CTRL);
+  printf("\t\tACSCtl:\tSrcValid%c TransBlk%c ReqRedir%c CmpltRedir%c UpstreamFwd%c EgressCtrl%c "
+       "DirectTrans%c\n",
+       FLAG(w, PCI_ACS_CTRL_VALID), FLAG(w, PCI_ACS_CTRL_BLOCK), FLAG(w, PCI_ACS_CTRL_REQ_RED),
+       FLAG(w, PCI_ACS_CTRL_CMPLT_RED), FLAG(w, PCI_ACS_CTRL_FORWARD), FLAG(w, PCI_ACS_CTRL_EGRESS),
+       FLAG(w, PCI_ACS_CTRL_TRANS));
+}
+
+static void
+cap_ari(struct device *d, int where)
+{
+  u16 w;
+
+  printf("Alternative Routing-ID Interpretation (ARI)\n");
+  if (!config_fetch(d, where + PCI_ARI_CAP, 4))
+    return;
+
+  w = get_conf_word(d, where + PCI_ARI_CAP);
+  printf("\t\tARICap:\tMFVC%c ACS%c, Next Function: %d\n",
+       FLAG(w, PCI_ARI_CAP_MFVC), FLAG(w, PCI_ARI_CAP_ACS),
+       PCI_ARI_CAP_NFN(w));
+  w = get_conf_word(d, where + PCI_ARI_CTRL);
+  printf("\t\tARICtl:\tMFVC%c ACS%c, Function Group: %d\n",
+       FLAG(w, PCI_ARI_CTRL_MFVC), FLAG(w, PCI_ARI_CTRL_ACS),
+       PCI_ARI_CTRL_FG(w));
+}
+
+static void
+cap_ats(struct device *d, int where)
+{
+  u16 w;
+
+  printf("Address Translation Service (ATS)\n");
+  if (!config_fetch(d, where + PCI_ATS_CAP, 4))
+    return;
+
+  w = get_conf_word(d, where + PCI_ATS_CAP);
+  printf("\t\tATSCap:\tInvalidate Queue Depth: %02x\n", PCI_ATS_CAP_IQD(w));
+  w = get_conf_word(d, where + PCI_ATS_CTRL);
+  printf("\t\tATSCtl:\tEnable%c, Smallest Translation Unit: %02x\n",
+       FLAG(w, PCI_ATS_CTRL_ENABLE), PCI_ATS_CTRL_STU(w));
+}
+
+static void
+cap_sriov(struct device *d, int where)
+{
+  u16 b;
+  u16 w;
+  u32 l;
+
+  printf("Single Root I/O Virtualization (SR-IOV)\n");
+  if (!config_fetch(d, where + PCI_IOV_CAP, 0x3c))
+    return;
+
+  l = get_conf_long(d, where + PCI_IOV_CAP);
+  printf("\t\tIOVCap:\tMigration%c, Interrupt Message Number: %03x\n",
+       FLAG(l, PCI_IOV_CAP_VFM), PCI_IOV_CAP_IMN(l));
+  w = get_conf_word(d, where + PCI_IOV_CTRL);
+  printf("\t\tIOVCtl:\tEnable%c Migration%c Interrupt%c MSE%c ARIHierarchy%c\n",
+       FLAG(w, PCI_IOV_CTRL_VFE), FLAG(w, PCI_IOV_CTRL_VFME),
+       FLAG(w, PCI_IOV_CTRL_VFMIE), FLAG(w, PCI_IOV_CTRL_MSE),
+       FLAG(w, PCI_IOV_CTRL_ARI));
+  w = get_conf_word(d, where + PCI_IOV_STATUS);
+  printf("\t\tIOVSta:\tMigration%c\n", FLAG(w, PCI_IOV_STATUS_MS));
+  w = get_conf_word(d, where + PCI_IOV_INITIALVF);
+  printf("\t\tInitial VFs: %d, ", w);
+  w = get_conf_word(d, where + PCI_IOV_TOTALVF);
+  printf("Total VFs: %d, ", w);
+  w = get_conf_word(d, where + PCI_IOV_NUMVF);
+  printf("Number of VFs: %d, ", w);
+  b = get_conf_byte(d, where + PCI_IOV_FDL);
+  printf("Function Dependency Link: %02x\n", b);
+  w = get_conf_word(d, where + PCI_IOV_OFFSET);
+  printf("\t\tVF offset: %d, ", w);
+  w = get_conf_word(d, where + PCI_IOV_STRIDE);
+  printf("stride: %d, ", w);
+  w = get_conf_word(d, where + PCI_IOV_DID);
+  printf("Device ID: %04x\n", w);
+  l = get_conf_long(d, where + PCI_IOV_SUPPS);
+  printf("\t\tSupported Page Size: %08x, ", l);
+  l = get_conf_long(d, where + PCI_IOV_SYSPS);
+  printf("System Page Size: %08x\n", l);
+  printf("\t\tVF Migration: offset: %08x, BIR: %x\n", PCI_IOV_MSA_OFFSET(l),
+       PCI_IOV_MSA_BIR(l));
+}
+
+void
+show_ext_caps(struct device *d)
+{
+  int where = 0x100;
+  char been_there[0x1000];
+  memset(been_there, 0, 0x1000);
+  do
+    {
+      u32 header;
+      int id;
+
+      if (!config_fetch(d, where, 4))
+       break;
+      header = get_conf_long(d, where);
+      if (!header)
+       break;
+      id = header & 0xffff;
+      printf("\tCapabilities: [%03x] ", where);
+      if (been_there[where]++)
+       {
+         printf("<chain looped>\n");
+         break;
+       }
+      switch (id)
+       {
+         case PCI_EXT_CAP_ID_AER:
+           cap_aer(d, where);
+           break;
+         case PCI_EXT_CAP_ID_VC:
+           printf("Virtual Channel <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_DSN:
+           cap_dsn(d, where);
+           break;
+         case PCI_EXT_CAP_ID_PB:
+           printf("Power Budgeting <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_RCLINK:
+           printf("Root Complex Link <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_RCILINK:
+           printf("Root Complex Internal Link <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_RCECOLL:
+           printf("Root Complex Event Collector <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_MFVC:
+           printf("Multi-Function Virtual Channel <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_RBCB:
+           printf("Root Bridge Control Block <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_VNDR:
+           printf("Vendor Specific Information <?>\n");
+           break;
+         case PCI_EXT_CAP_ID_ACS:
+           cap_acs(d, where);
+           break;
+         case PCI_EXT_CAP_ID_ARI:
+           cap_ari(d, where);
+           break;
+         case PCI_EXT_CAP_ID_ATS:
+           cap_ats(d, where);
+           break;
+         case PCI_EXT_CAP_ID_SRIOV:
+           cap_sriov(d, where);
+           break;
+         default:
+           printf("#%02x\n", id);
+           break;
+       }
+      where = header >> 20;
+    } while (where);
+}

diff --git a/ls-kernel.c b/ls-kernel.c
new file mode 100644 (file)
index 0000000..41afefe
--- /dev/null
+++ b/ls-kernel.c
@@ -0,0 +1,194 @@
+/*
+ *     The PCI Utilities -- Show Kernel Drivers
+ *
+ *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "lspci.h"
+
+#ifdef PCI_OS_LINUX
+
+#include <sys/utsname.h>
+
+struct pcimap_entry {
+  struct pcimap_entry *next;
+  unsigned int vendor, device;
+  unsigned int subvendor, subdevice;
+  unsigned int class, class_mask;
+  char module[1];
+};
+
+static struct pcimap_entry *pcimap_head;
+
+static void
+load_pcimap(void)
+{
+  static int tried_pcimap;
+  struct utsname uts;
+  char *name, line[1024];
+  FILE *f;
+
+  if (tried_pcimap)
+    return;
+  tried_pcimap = 1;
+
+  if (name = opt_pcimap)
+    {
+      f = fopen(name, "r");
+      if (!f)
+       die("Cannot open pcimap file %s: %m", name);
+    }
+  else
+    {
+      if (uname(&uts) < 0)
+       die("uname() failed: %m");
+      name = alloca(64 + strlen(uts.release));
+      sprintf(name, "/lib/modules/%s/modules.pcimap", uts.release);
+      f = fopen(name, "r");
+      if (!f)
+       return;
+    }
+
+  while (fgets(line, sizeof(line), f))
+    {
+      char *c = strchr(line, '\n');
+      struct pcimap_entry *e;
+
+      if (!c)
+       die("Unterminated or too long line in %s", name);
+      *c = 0;
+      if (!line[0] || line[0] == '#')
+       continue;
+
+      c = line;
+      while (*c && *c != ' ' && *c != '\t')
+       c++;
+      if (!*c)
+       continue;       /* FIXME: Emit warnings! */
+      *c++ = 0;
+
+      e = xmalloc(sizeof(*e) + strlen(line));
+      if (sscanf(c, "%i%i%i%i%i%i",
+                &e->vendor, &e->device,
+                &e->subvendor, &e->subdevice,
+                &e->class, &e->class_mask) != 6)
+       continue;
+      e->next = pcimap_head;
+      pcimap_head = e;
+      strcpy(e->module, line);
+    }
+  fclose(f);
+}
+
+static int
+match_pcimap(struct device *d, struct pcimap_entry *e)
+{
+  struct pci_dev *dev = d->dev;
+  unsigned int class = get_conf_long(d, PCI_REVISION_ID) >> 8;
+  word subv, subd;
+
+#define MATCH(x, y) ((y) > 0xffff || (x) == (y))
+  get_subid(d, &subv, &subd);
+  return
+    MATCH(dev->vendor_id, e->vendor) &&
+    MATCH(dev->device_id, e->device) &&
+    MATCH(subv, e->subvendor) &&
+    MATCH(subd, e->subdevice) &&
+    (class & e->class_mask) == e->class;
+#undef MATCH
+}
+
+#define DRIVER_BUF_SIZE 1024
+
+static char *
+find_driver(struct device *d, char *buf)
+{
+  struct pci_dev *dev = d->dev;
+  char name[1024], *drv, *base;
+  int n;
+
+  if (dev->access->method != PCI_ACCESS_SYS_BUS_PCI)
+    return NULL;
+
+  base = pci_get_param(dev->access, "sysfs.path");
+  if (!base || !base[0])
+    return NULL;
+
+  n = snprintf(name, sizeof(name), "%s/devices/%04x:%02x:%02x.%d/driver",
+              base, dev->domain, dev->bus, dev->dev, dev->func);
+  if (n < 0 || n >= (int)sizeof(name))
+    die("show_driver: sysfs device name too long, why?");
+
+  n = readlink(name, buf, DRIVER_BUF_SIZE);
+  if (n < 0)
+    return NULL;
+  if (n >= DRIVER_BUF_SIZE)
+    return "<name-too-long>";
+  buf[n] = 0;
+
+  if (drv = strrchr(buf, '/'))
+    return drv+1;
+  else
+    return buf;
+}
+
+void
+show_kernel(struct device *d)
+{
+  char buf[DRIVER_BUF_SIZE];
+  char *driver;
+  struct pcimap_entry *e, *last = NULL;
+
+  if (driver = find_driver(d, buf))
+    printf("\tKernel driver in use: %s\n", driver);
+
+  load_pcimap();
+  for (e=pcimap_head; e; e=e->next)
+    if (match_pcimap(d, e) && (!last || strcmp(last->module, e->module)))
+      {
+       printf("%s %s", (last ? "," : "\tKernel modules:"), e->module);
+       last = e;
+      }
+  if (last)
+    putchar('\n');
+}
+
+void
+show_kernel_machine(struct device *d)
+{
+  char buf[DRIVER_BUF_SIZE];
+  char *driver;
+  struct pcimap_entry *e, *last = NULL;
+
+  if (driver = find_driver(d, buf))
+    printf("Driver:\t%s\n", driver);
+
+  load_pcimap();
+  for (e=pcimap_head; e; e=e->next)
+    if (match_pcimap(d, e) && (!last || strcmp(last->module, e->module)))
+      {
+       printf("Module:\t%s\n", e->module);
+       last = e;
+      }
+}
+
+#else
+
+void
+show_kernel(struct device *d UNUSED)
+{
+}
+
+void
+show_kernel_machine(struct device *d UNUSED)
+{
+}
+
+#endif
+

diff --git a/ls-map.c b/ls-map.c
new file mode 100644 (file)
index 0000000..c812f50
--- /dev/null
+++ b/ls-map.c
@@ -0,0 +1,180 @@
+/*
+ *     The PCI Utilities -- Bus Mapping Mode
+ *
+ *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "lspci.h"
+
+struct bus_bridge {
+  struct bus_bridge *next;
+  byte this, dev, func, first, last, bug;
+};
+
+struct bus_info {
+  byte exists;
+  byte guestbook;
+  struct bus_bridge *bridges, *via;
+};
+
+static struct bus_info *bus_info;
+
+static void
+map_bridge(struct bus_info *bi, struct device *d, int np, int ns, int nl)
+{
+  struct bus_bridge *b = xmalloc(sizeof(struct bus_bridge));
+  struct pci_dev *p = d->dev;
+
+  b->next = bi->bridges;
+  bi->bridges = b;
+  b->this = get_conf_byte(d, np);
+  b->dev = p->dev;
+  b->func = p->func;
+  b->first = get_conf_byte(d, ns);
+  b->last = get_conf_byte(d, nl);
+  printf("## %02x.%02x:%d is a bridge from %02x to %02x-%02x\n",
+        p->bus, p->dev, p->func, b->this, b->first, b->last);
+  if (b->this != p->bus)
+    printf("!!! Bridge points to invalid primary bus.\n");
+  if (b->first > b->last)
+    {
+      printf("!!! Bridge points to invalid bus range.\n");
+      b->last = b->first;
+    }
+}
+
+static void
+do_map_bus(int bus)
+{
+  int dev, func;
+  int verbose = pacc->debugging;
+  struct bus_info *bi = bus_info + bus;
+  struct device *d;
+
+  if (verbose)
+    printf("Mapping bus %02x\n", bus);
+  for (dev = 0; dev < 32; dev++)
+    if (filter.slot < 0 || filter.slot == dev)
+      {
+       int func_limit = 1;
+       for (func = 0; func < func_limit; func++)
+         if (filter.func < 0 || filter.func == func)
+           {
+             /* XXX: Bus mapping supports only domain 0 */
+             struct pci_dev *p = pci_get_dev(pacc, 0, bus, dev, func);
+             u16 vendor = pci_read_word(p, PCI_VENDOR_ID);
+             if (vendor && vendor != 0xffff)
+               {
+                 if (!func && (pci_read_byte(p, PCI_HEADER_TYPE) & 0x80))
+                   func_limit = 8;
+                 if (verbose)
+                   printf("Discovered device %02x:%02x.%d\n", bus, dev, func);
+                 bi->exists = 1;
+                 if (d = scan_device(p))
+                   {
+                     show_device(d);
+                     switch (get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f)
+                       {
+                       case PCI_HEADER_TYPE_BRIDGE:
+                         map_bridge(bi, d, PCI_PRIMARY_BUS, PCI_SECONDARY_BUS, PCI_SUBORDINATE_BUS);
+                         break;
+                       case PCI_HEADER_TYPE_CARDBUS:
+                         map_bridge(bi, d, PCI_CB_PRIMARY_BUS, PCI_CB_CARD_BUS, PCI_CB_SUBORDINATE_BUS);
+                         break;
+                       }
+                     free(d);
+                   }
+                 else if (verbose)
+                   printf("But it was filtered out.\n");
+               }
+             pci_free_dev(p);
+           }
+      }
+}
+
+static void
+do_map_bridges(int bus, int min, int max)
+{
+  struct bus_info *bi = bus_info + bus;
+  struct bus_bridge *b;
+
+  bi->guestbook = 1;
+  for (b=bi->bridges; b; b=b->next)
+    {
+      if (bus_info[b->first].guestbook)
+       b->bug = 1;
+      else if (b->first < min || b->last > max)
+       b->bug = 2;
+      else
+       {
+         bus_info[b->first].via = b;
+         do_map_bridges(b->first, b->first, b->last);
+       }
+    }
+}
+
+static void
+map_bridges(void)
+{
+  int i;
+
+  printf("\nSummary of buses:\n\n");
+  for (i=0; i<256; i++)
+    if (bus_info[i].exists && !bus_info[i].guestbook)
+      do_map_bridges(i, 0, 255);
+  for (i=0; i<256; i++)
+    {
+      struct bus_info *bi = bus_info + i;
+      struct bus_bridge *b = bi->via;
+
+      if (bi->exists)
+       {
+         printf("%02x: ", i);
+         if (b)
+           printf("Entered via %02x:%02x.%d\n", b->this, b->dev, b->func);
+         else if (!i)
+           printf("Primary host bus\n");
+         else
+           printf("Secondary host bus (?)\n");
+       }
+      for (b=bi->bridges; b; b=b->next)
+       {
+         printf("\t%02x.%d Bridge to %02x-%02x", b->dev, b->func, b->first, b->last);
+         switch (b->bug)
+           {
+           case 1:
+             printf(" <overlap bug>");
+             break;
+           case 2:
+             printf(" <crossing bug>");
+             break;
+           }
+         putchar('\n');
+       }
+    }
+}
+
+void
+map_the_bus(void)
+{
+  if (pacc->method == PCI_ACCESS_PROC_BUS_PCI ||
+      pacc->method == PCI_ACCESS_DUMP)
+    printf("WARNING: Bus mapping can be reliable only with direct hardware access enabled.\n\n");
+  bus_info = xmalloc(sizeof(struct bus_info) * 256);
+  memset(bus_info, 0, sizeof(struct bus_info) * 256);
+  if (filter.bus >= 0)
+    do_map_bus(filter.bus);
+  else
+    {
+      int bus;
+      for (bus=0; bus<256; bus++)
+       do_map_bus(bus);
+    }
+  map_bridges();
+}

diff --git a/ls-tree.c b/ls-tree.c
new file mode 100644 (file)
index 0000000..5facdd7
--- /dev/null
+++ b/ls-tree.c
@@ -0,0 +1,256 @@
+/*
+ *     The PCI Utilities -- Show Bus Tree
+ *
+ *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "lspci.h"
+
+struct bridge {
+  struct bridge *chain;                        /* Single-linked list of bridges */
+  struct bridge *next, *child;         /* Tree of bridges */
+  struct bus *first_bus;               /* List of buses connected to this bridge */
+  unsigned int domain;
+  unsigned int primary, secondary, subordinate;        /* Bus numbers */
+  struct device *br_dev;
+};
+
+struct bus {
+  unsigned int domain;
+  unsigned int number;
+  struct bus *sibling;
+  struct device *first_dev, **last_dev;
+};
+
+static struct bridge host_bridge = { NULL, NULL, NULL, NULL, 0, ~0, 0, ~0, NULL };
+
+static struct bus *
+find_bus(struct bridge *b, unsigned int domain, unsigned int n)
+{
+  struct bus *bus;
+
+  for (bus=b->first_bus; bus; bus=bus->sibling)
+    if (bus->domain == domain && bus->number == n)
+      break;
+  return bus;
+}
+
+static struct bus *
+new_bus(struct bridge *b, unsigned int domain, unsigned int n)
+{
+  struct bus *bus = xmalloc(sizeof(struct bus));
+  bus->domain = domain;
+  bus->number = n;
+  bus->sibling = b->first_bus;
+  bus->first_dev = NULL;
+  bus->last_dev = &bus->first_dev;
+  b->first_bus = bus;
+  return bus;
+}
+
+static void
+insert_dev(struct device *d, struct bridge *b)
+{
+  struct pci_dev *p = d->dev;
+  struct bus *bus;
+
+  if (! (bus = find_bus(b, p->domain, p->bus)))
+    {
+      struct bridge *c;
+      for (c=b->child; c; c=c->next)
+       if (c->domain == p->domain && c->secondary <= p->bus && p->bus <= c->subordinate)
+          {
+            insert_dev(d, c);
+            return;
+          }
+      bus = new_bus(b, p->domain, p->bus);
+    }
+  /* Simple insertion at the end _does_ guarantee the correct order as the
+   * original device list was sorted by (domain, bus, devfn) lexicographically
+   * and all devices on the new list have the same bus number.
+   */
+  *bus->last_dev = d;
+  bus->last_dev = &d->next;
+  d->next = NULL;
+}
+
+static void
+grow_tree(void)
+{
+  struct device *d, *d2;
+  struct bridge **last_br, *b;
+
+  /* Build list of bridges */
+
+  last_br = &host_bridge.chain;
+  for (d=first_dev; d; d=d->next)
+    {
+      word class = d->dev->device_class;
+      byte ht = get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f;
+      if (class == PCI_CLASS_BRIDGE_PCI &&
+         (ht == PCI_HEADER_TYPE_BRIDGE || ht == PCI_HEADER_TYPE_CARDBUS))
+       {
+         b = xmalloc(sizeof(struct bridge));
+         b->domain = d->dev->domain;
+         if (ht == PCI_HEADER_TYPE_BRIDGE)
+           {
+             b->primary = get_conf_byte(d, PCI_PRIMARY_BUS);
+             b->secondary = get_conf_byte(d, PCI_SECONDARY_BUS);
+             b->subordinate = get_conf_byte(d, PCI_SUBORDINATE_BUS);
+           }
+         else
+           {
+             b->primary = get_conf_byte(d, PCI_CB_PRIMARY_BUS);
+             b->secondary = get_conf_byte(d, PCI_CB_CARD_BUS);
+             b->subordinate = get_conf_byte(d, PCI_CB_SUBORDINATE_BUS);
+           }
+         *last_br = b;
+         last_br = &b->chain;
+         b->next = b->child = NULL;
+         b->first_bus = NULL;
+         b->br_dev = d;
+       }
+    }
+  *last_br = NULL;
+
+  /* Create a bridge tree */
+
+  for (b=&host_bridge; b; b=b->chain)
+    {
+      struct bridge *c, *best;
+      best = NULL;
+      for (c=&host_bridge; c; c=c->chain)
+       if (c != b && (c == &host_bridge || b->domain == c->domain) &&
+           b->primary >= c->secondary && b->primary <= c->subordinate &&
+           (!best || best->subordinate - best->primary > c->subordinate - c->primary))
+         best = c;
+      if (best)
+       {
+         b->next = best->child;
+         best->child = b;
+       }
+    }
+
+  /* Insert secondary bus for each bridge */
+
+  for (b=&host_bridge; b; b=b->chain)
+    if (!find_bus(b, b->domain, b->secondary))
+      new_bus(b, b->domain, b->secondary);
+
+  /* Create bus structs and link devices */
+
+  for (d=first_dev; d;)
+    {
+      d2 = d->next;
+      insert_dev(d, &host_bridge);
+      d = d2;
+    }
+}
+
+static void
+print_it(char *line, char *p)
+{
+  *p++ = '\n';
+  *p = 0;
+  fputs(line, stdout);
+  for (p=line; *p; p++)
+    if (*p == '+' || *p == '|')
+      *p = '|';
+    else
+      *p = ' ';
+}
+
+static void show_tree_bridge(struct bridge *, char *, char *);
+
+static void
+show_tree_dev(struct device *d, char *line, char *p)
+{
+  struct pci_dev *q = d->dev;
+  struct bridge *b;
+  char namebuf[256];
+
+  p += sprintf(p, "%02x.%x", q->dev, q->func);
+  for (b=&host_bridge; b; b=b->chain)
+    if (b->br_dev == d)
+      {
+       if (b->secondary == b->subordinate)
+         p += sprintf(p, "-[%04x:%02x]-", b->domain, b->secondary);
+       else
+         p += sprintf(p, "-[%04x:%02x-%02x]-", b->domain, b->secondary, b->subordinate);
+        show_tree_bridge(b, line, p);
+        return;
+      }
+  if (verbose)
+    p += sprintf(p, "  %s",
+                pci_lookup_name(pacc, namebuf, sizeof(namebuf),
+                                PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
+                                q->vendor_id, q->device_id));
+  print_it(line, p);
+}
+
+static void
+show_tree_bus(struct bus *b, char *line, char *p)
+{
+  if (!b->first_dev)
+    print_it(line, p);
+  else if (!b->first_dev->next)
+    {
+      *p++ = '-';
+      *p++ = '-';
+      show_tree_dev(b->first_dev, line, p);
+    }
+  else
+    {
+      struct device *d = b->first_dev;
+      while (d->next)
+       {
+         p[0] = '+';
+         p[1] = '-';
+         show_tree_dev(d, line, p+2);
+         d = d->next;
+       }
+      p[0] = '\\';
+      p[1] = '-';
+      show_tree_dev(d, line, p+2);
+    }
+}
+
+static void
+show_tree_bridge(struct bridge *b, char *line, char *p)
+{
+  *p++ = '-';
+  if (!b->first_bus->sibling)
+    {
+      if (b == &host_bridge)
+        p += sprintf(p, "[%04x:%02x]-", b->domain, b->first_bus->number);
+      show_tree_bus(b->first_bus, line, p);
+    }
+  else
+    {
+      struct bus *u = b->first_bus;
+      char *k;
+
+      while (u->sibling)
+        {
+          k = p + sprintf(p, "+-[%04x:%02x]-", u->domain, u->number);
+          show_tree_bus(u, line, k);
+          u = u->sibling;
+        }
+      k = p + sprintf(p, "\\-[%04x:%02x]-", u->domain, u->number);
+      show_tree_bus(u, line, k);
+    }
+}
+
+void
+show_forest(void)
+{
+  char line[256];
+
+  grow_tree();
+  show_tree_bridge(&host_bridge, line, line);
+}

diff --git a/ls-vpd.c b/ls-vpd.c
new file mode 100644 (file)
index 0000000..9c7b3d4
--- /dev/null
+++ b/ls-vpd.c
@@ -0,0 +1,166 @@
+/*
+ *     The PCI Utilities -- Show Vital Product Data
+ *
+ *     Copyright (c) 2008 Ben Hutchings <bhutchings@solarflare.com>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+
+#include "lspci.h"
+
+static void
+print_vpd_string(const byte *buf, word len)
+{
+  while (len--)
+    {
+      byte ch = *buf++;
+      if (ch == '\\')
+        printf("\\\\");
+      else if (ch < 32 || ch == 127)
+        printf("\\x%02x", ch);
+      else
+        putchar(ch);
+    }
+}
+
+static int
+read_vpd(struct device *d, int pos, byte *buf, int len, byte *csum)
+{
+  if (!pci_read_vpd(d->dev, pos, buf, len))
+    return 0;
+  while (len--)
+    *csum += *buf++;
+  return 1;
+}
+
+void
+cap_vpd(struct device *d)
+{
+  word res_addr = 0, res_len, part_pos, part_len;
+  byte key[2], buf[256];
+  byte tag;
+  byte csum = 0;
+
+  printf("Vital Product Data\n");
+
+  while (res_addr <= PCI_VPD_ADDR_MASK)
+    {
+      if (!read_vpd(d, res_addr, &tag, 1, &csum))
+       break;
+      if (tag & 0x80)
+       {
+         if (res_addr > PCI_VPD_ADDR_MASK + 1 - 3)
+           break;
+         if (!read_vpd(d, res_addr + 1, buf, 2, &csum))
+           break;
+         res_len = buf[0] + (buf[1] << 8);
+         res_addr += 3;
+       }
+      else
+       {
+         res_len = tag & 7;
+         tag >>= 3;
+         res_addr += 1;
+       }
+      if (res_len > PCI_VPD_ADDR_MASK + 1 - res_addr)
+       break;
+
+      part_pos = 0;
+
+      switch (tag)
+       {
+       case 0x0f:
+         printf("\t\tEnd\n");
+         return;
+
+       case 0x82:
+         printf("\t\tProduct Name: ");
+         while (part_pos < res_len)
+           {
+             part_len = res_len - part_pos;
+             if (part_len > sizeof(buf))
+               part_len = sizeof(buf);
+             if (!read_vpd(d, res_addr + part_pos, buf, part_len, &csum))
+               break;
+             print_vpd_string(buf, part_len);
+             part_pos += part_len;
+           }
+         printf("\n");
+         break;
+
+       case 0x90:
+       case 0x91:
+         printf("\t\t%s fields:\n",
+                (tag == 0x90) ? "Read-only" : "Read/write");
+
+         while (part_pos + 3 <= res_len)
+           {
+             word read_len;
+
+             if (!read_vpd(d, res_addr + part_pos, buf, 3, &csum))
+               break;
+             part_pos += 3;
+             key[0] = buf[0];
+             key[1] = buf[1];
+             part_len = buf[2];
+             if (part_len > res_len - part_pos)
+               break;
+
+             /* Only read the first byte of the RV field because the
+              * remaining bytes are not included in the checksum. */
+             read_len = (key[0] == 'R' && key[1] == 'V') ? 1 : part_len;
+             if (!read_vpd(d, res_addr + part_pos, buf, read_len, &csum))
+               break;
+
+             if ((key[0] == 'E' && key[1] == 'C') ||
+                 (key[0] == 'P' && key[1] == 'N') ||
+                 (key[0] == 'S' && key[1] == 'N') ||
+                 key[0] == 'V' ||
+                 key[0] == 'Y')
+               {
+                 /* Alphanumeric content */
+                 printf("\t\t\t%c%c: ", key[0], key[1]);
+                 print_vpd_string(buf, part_len);
+                 printf("\n");
+               }
+             else if (key[0] == 'R' && key[1] == 'V')
+               {
+                 /* Reserved and checksum */
+                 printf("\t\t\tRV: checksum %s, %d byte(s) reserved\n",
+                        csum ? "bad" : "good", part_len - 1);
+               }
+             else if (key[0] == 'R' && key[1] == 'W')
+               {
+                 /* Read-write area */
+                 printf("\t\t\tRW: %d byte(s) free\n", part_len);
+               }
+             else
+               {
+                 /* Binary or unknown content */
+                 int i;
+                 printf("\t\t\t%c%c:", key[0], key[1]);
+                 for (i = 0; i < part_len; i++)
+                   printf(" %02x", buf[i]);
+                 printf("\n");
+               }
+
+             part_pos += part_len;
+           }
+         break;
+
+       default:
+         printf("\t\tUnknown %s resource type %02x\n",
+                (tag & 0x80) ? "large" : "small", tag & ~0x80);
+         break;
+       }
+
+      res_addr += res_len;
+    }
+
+  if (res_addr == 0)
+    printf("\t\tNot readable\n");
+  else
+    printf("\t\tNo end tag found\n");
+}

diff --git a/lspci.c b/lspci.c
index 9f18a9b466f3ccbe5b318e5520290f5fdae70c6d..d872c75192041bb114f1afeda5fc923c4c8f9282 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -12,15 +12,14 @@
 #include <stdarg.h>
 #include <unistd.h>
 
-#define PCIUTILS_LSPCI
-#include "pciutils.h"
+#include "lspci.h"
 
 /* Options */
 
-static int verbose;                    /* Show detailed information */
+int verbose;                           /* Show detailed information */
 static int opt_buscentric;             /* Show bus addresses/IRQ's instead of CPU-visible ones */
 static int opt_hex;                    /* Show contents of config space as hexadecimal numbers */
-static struct pci_filter filter;       /* Device filter */
+struct pci_filter filter;              /* Device filter */
 static int opt_tree;                   /* Show bus tree */
 static int opt_machine;                        /* Generate machine-readable output */
 static int opt_map_mode;               /* Bus mapping mode enabled */
@@ -28,7 +27,7 @@ static int opt_domains;                       /* Show domain numbers (0=disabled, 1=auto-detected, 2
 static int opt_kernel;                 /* Show kernel drivers */
 static int opt_query_dns;              /* Query the DNS (0=disabled, 1=enabled, 2=refresh cache) */
 static int opt_query_all;              /* Query the DNS for all entries */
-static char *opt_pcimap;               /* Override path to Linux modules.pcimap */
+char *opt_pcimap;                      /* Override path to Linux modules.pcimap */
 
 const char program_name[] = "lspci";
 
@@ -76,38 +75,13 @@ static char help_msg[] =
 GENERIC_HELP
 ;
 
-/*** Communication with libpci ***/
-
-static struct pci_access *pacc;
-
-/*
- *  If we aren't being compiled by GCC, use xmalloc() instead of alloca().
- *  This increases our memory footprint, but only slightly since we don't
- *  use alloca() much.
- */
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__DragonFly__)
-/* alloca() is defined in stdlib.h */
-#elif defined(__GNUC__) && !defined(PCI_OS_WINDOWS)
-#include <alloca.h>
-#else
-#undef alloca
-#define alloca xmalloc
-#endif
-
 /*** Our view of the PCI bus ***/
 
-struct device {
-  struct device *next;
-  struct pci_dev *dev;
-  unsigned int config_cached, config_bufsize;
-  byte *config;                                /* Cached configuration space data */
-  byte *present;                       /* Maps which configuration bytes are present */
-};
-
-static struct device *first_dev;
+struct pci_access *pacc;
+struct device *first_dev;
 static int seen_errors;
 
-static int
+int
 config_fetch(struct device *d, unsigned int pos, unsigned int len)
 {
   unsigned int end = pos+len;
@@ -135,7 +109,7 @@ config_fetch(struct device *d, unsigned int pos, unsigned int len)
   return result;
 }
 
-static struct device *
+struct device *
 scan_device(struct pci_dev *p)
 {
   struct device *d;
@@ -197,21 +171,21 @@ check_conf_range(struct device *d, unsigned int pos, unsigned int len)
       pos++, len--;
 }
 
-static inline byte
+byte
 get_conf_byte(struct device *d, unsigned int pos)
 {
   check_conf_range(d, pos, 1);
   return d->config[pos];
 }
 
-static word
+word
 get_conf_word(struct device *d, unsigned int pos)
 {
   check_conf_range(d, pos, 2);
   return d->config[pos] | (d->config[pos+1] << 8);
 }
 
-static u32
+u32
 get_conf_long(struct device *d, unsigned int pos)
 {
   check_conf_range(d, pos, 4);
@@ -258,1913 +232,100 @@ sort_them(void)
   cnt = 0;
   for (d=first_dev; d; d=d->next)
     cnt++;
-  h = index = alloca(sizeof(struct device *) * cnt);
-  for (d=first_dev; d; d=d->next)
-    *h++ = d;
-  qsort(index, cnt, sizeof(struct device *), compare_them);
-  last_dev = &first_dev;
-  h = index;
-  while (cnt--)
-    {
-      *last_dev = *h;
-      last_dev = &(*h)->next;
-      h++;
-    }
-  *last_dev = NULL;
-}
-
-/*** Normal output ***/
-
-#define FLAG(x,y) ((x & y) ? '+' : '-')
-
-static void
-show_slot_name(struct device *d)
-{
-  struct pci_dev *p = d->dev;
-
-  if (!opt_machine ? opt_domains : (p->domain || opt_domains >= 2))
-    printf("%04x:", p->domain);
-  printf("%02x:%02x.%d", p->bus, p->dev, p->func);
-}
-
-static void
-get_subid(struct device *d, word *subvp, word *subdp)
-{
-  byte htype = get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f;
-
-  if (htype == PCI_HEADER_TYPE_NORMAL)
-    {
-      *subvp = get_conf_word(d, PCI_SUBSYSTEM_VENDOR_ID);
-      *subdp = get_conf_word(d, PCI_SUBSYSTEM_ID);
-    }
-  else if (htype == PCI_HEADER_TYPE_CARDBUS && d->config_cached >= 128)
-    {
-      *subvp = get_conf_word(d, PCI_CB_SUBSYSTEM_VENDOR_ID);
-      *subdp = get_conf_word(d, PCI_CB_SUBSYSTEM_ID);
-    }
-  else
-    *subvp = *subdp = 0xffff;
-}
-
-static void
-show_terse(struct device *d)
-{
-  int c;
-  struct pci_dev *p = d->dev;
-  char classbuf[128], devbuf[128];
-
-  show_slot_name(d);
-  printf(" %s: %s",
-        pci_lookup_name(pacc, classbuf, sizeof(classbuf),
-                        PCI_LOOKUP_CLASS,
-                        p->device_class),
-        pci_lookup_name(pacc, devbuf, sizeof(devbuf),
-                        PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
-                        p->vendor_id, p->device_id));
-  if (c = get_conf_byte(d, PCI_REVISION_ID))
-    printf(" (rev %02x)", c);
-  if (verbose)
-    {
-      char *x;
-      c = get_conf_byte(d, PCI_CLASS_PROG);
-      x = pci_lookup_name(pacc, devbuf, sizeof(devbuf),
-                         PCI_LOOKUP_PROGIF | PCI_LOOKUP_NO_NUMBERS,
-                         p->device_class, c);
-      if (c || x)
-       {
-         printf(" (prog-if %02x", c);
-         if (x)
-           printf(" [%s]", x);
-         putchar(')');
-       }
-    }
-  putchar('\n');
-
-  if (verbose || opt_kernel)
-    {
-      word subsys_v, subsys_d;
-      char ssnamebuf[256];
-
-      get_subid(d, &subsys_v, &subsys_d);
-      if (subsys_v && subsys_v != 0xffff)
-       printf("\tSubsystem: %s\n",
-               pci_lookup_name(pacc, ssnamebuf, sizeof(ssnamebuf),
-                       PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
-                       p->vendor_id, p->device_id, subsys_v, subsys_d));
-    }
-}
-
-/*** Capabilities ***/
-
-static void
-cap_pm(struct device *d, int where, int cap)
-{
-  int t, b;
-  static int pm_aux_current[8] = { 0, 55, 100, 160, 220, 270, 320, 375 };
-
-  printf("Power Management version %d\n", cap & PCI_PM_CAP_VER_MASK);
-  if (verbose < 2)
-    return;
-  printf("\t\tFlags: PMEClk%c DSI%c D1%c D2%c AuxCurrent=%dmA PME(D0%c,D1%c,D2%c,D3hot%c,D3cold%c)\n",
-        FLAG(cap, PCI_PM_CAP_PME_CLOCK),
-        FLAG(cap, PCI_PM_CAP_DSI),
-        FLAG(cap, PCI_PM_CAP_D1),
-        FLAG(cap, PCI_PM_CAP_D2),
-        pm_aux_current[(cap >> 6) & 7],
-        FLAG(cap, PCI_PM_CAP_PME_D0),
-        FLAG(cap, PCI_PM_CAP_PME_D1),
-        FLAG(cap, PCI_PM_CAP_PME_D2),
-        FLAG(cap, PCI_PM_CAP_PME_D3_HOT),
-        FLAG(cap, PCI_PM_CAP_PME_D3_COLD));
-  if (!config_fetch(d, where + PCI_PM_CTRL, PCI_PM_SIZEOF - PCI_PM_CTRL))
-    return;
-  t = get_conf_word(d, where + PCI_PM_CTRL);
-  printf("\t\tStatus: D%d PME-Enable%c DSel=%d DScale=%d PME%c\n",
-        t & PCI_PM_CTRL_STATE_MASK,
-        FLAG(t, PCI_PM_CTRL_PME_ENABLE),
-        (t & PCI_PM_CTRL_DATA_SEL_MASK) >> 9,
-        (t & PCI_PM_CTRL_DATA_SCALE_MASK) >> 13,
-        FLAG(t, PCI_PM_CTRL_PME_STATUS));
-  b = get_conf_byte(d, where + PCI_PM_PPB_EXTENSIONS);
-  if (b)
-    printf("\t\tBridge: PM%c B3%c\n",
-          FLAG(t, PCI_PM_BPCC_ENABLE),
-          FLAG(~t, PCI_PM_PPB_B2_B3));
-}
-
-static void
-format_agp_rate(int rate, char *buf, int agp3)
-{
-  char *c = buf;
-  int i;
-
-  for (i=0; i<=2; i++)
-    if (rate & (1 << i))
-      {
-       if (c != buf)
-         *c++ = ',';
-       c += sprintf(c, "x%d", 1 << (i + 2*agp3));
-      }
-  if (c != buf)
-    *c = 0;
-  else
-    strcpy(buf, "<none>");
-}
-
-static void
-cap_agp(struct device *d, int where, int cap)
-{
-  u32 t;
-  char rate[16];
-  int ver, rev;
-  int agp3 = 0;
-
-  ver = (cap >> 4) & 0x0f;
-  rev = cap & 0x0f;
-  printf("AGP version %x.%x\n", ver, rev);
-  if (verbose < 2)
-    return;
-  if (!config_fetch(d, where + PCI_AGP_STATUS, PCI_AGP_SIZEOF - PCI_AGP_STATUS))
-    return;
-  t = get_conf_long(d, where + PCI_AGP_STATUS);
-  if (ver >= 3 && (t & PCI_AGP_STATUS_AGP3))
-    agp3 = 1;
-  format_agp_rate(t & 7, rate, agp3);
-  printf("\t\tStatus: RQ=%d Iso%c ArqSz=%d Cal=%d SBA%c ITACoh%c GART64%c HTrans%c 64bit%c FW%c AGP3%c Rate=%s\n",
-        ((t & PCI_AGP_STATUS_RQ_MASK) >> 24U) + 1,
-        FLAG(t, PCI_AGP_STATUS_ISOCH),
-        ((t & PCI_AGP_STATUS_ARQSZ_MASK) >> 13),
-        ((t & PCI_AGP_STATUS_CAL_MASK) >> 10),
-        FLAG(t, PCI_AGP_STATUS_SBA),
-        FLAG(t, PCI_AGP_STATUS_ITA_COH),
-        FLAG(t, PCI_AGP_STATUS_GART64),
-        FLAG(t, PCI_AGP_STATUS_HTRANS),
-        FLAG(t, PCI_AGP_STATUS_64BIT),
-        FLAG(t, PCI_AGP_STATUS_FW),
-        FLAG(t, PCI_AGP_STATUS_AGP3),
-        rate);
-  t = get_conf_long(d, where + PCI_AGP_COMMAND);
-  format_agp_rate(t & 7, rate, agp3);
-  printf("\t\tCommand: RQ=%d ArqSz=%d Cal=%d SBA%c AGP%c GART64%c 64bit%c FW%c Rate=%s\n",
-        ((t & PCI_AGP_COMMAND_RQ_MASK) >> 24U) + 1,
-        ((t & PCI_AGP_COMMAND_ARQSZ_MASK) >> 13),
-        ((t & PCI_AGP_COMMAND_CAL_MASK) >> 10),
-        FLAG(t, PCI_AGP_COMMAND_SBA),
-        FLAG(t, PCI_AGP_COMMAND_AGP),
-        FLAG(t, PCI_AGP_COMMAND_GART64),
-        FLAG(t, PCI_AGP_COMMAND_64BIT),
-        FLAG(t, PCI_AGP_COMMAND_FW),
-        rate);
-}
-
-static void
-print_vpd_string(const byte *buf, word len)
-{
-  while (len--)
-    {
-      byte ch = *buf++;
-      if (ch == '\\')
-        printf("\\\\");
-      else if (ch < 32 || ch == 127)
-        printf("\\x%02x", ch);
-      else
-        putchar(ch);
-    }
-}
-
-static int
-read_vpd(struct device *d, int pos, byte *buf, int len, byte *csum)
-{
-  if (!pci_read_vpd(d->dev, pos, buf, len))
-    return 0;
-  while (len--)
-    *csum += *buf++;
-  return 1;
-}
-
-static void
-cap_vpd(struct device *d)
-{
-  word res_addr = 0, res_len, part_pos, part_len;
-  byte key[2], buf[256];
-  byte tag;
-  byte csum = 0;
-
-  printf("Vital Product Data\n");
-
-  while (res_addr <= PCI_VPD_ADDR_MASK)
-    {
-      if (!read_vpd(d, res_addr, &tag, 1, &csum))
-       break;
-      if (tag & 0x80)
-       {
-         if (res_addr > PCI_VPD_ADDR_MASK + 1 - 3)
-           break;
-         if (!read_vpd(d, res_addr + 1, buf, 2, &csum))
-           break;
-         res_len = buf[0] + (buf[1] << 8);
-         res_addr += 3;
-       }
-      else
-       {
-         res_len = tag & 7;
-         tag >>= 3;
-         res_addr += 1;
-       }
-      if (res_len > PCI_VPD_ADDR_MASK + 1 - res_addr)
-       break;
-
-      part_pos = 0;
-
-      switch (tag)
-       {
-       case 0x0f:
-         printf("\t\tEnd\n");
-         return;
-
-       case 0x82:
-         printf("\t\tProduct Name: ");
-         while (part_pos < res_len)
-           {
-             part_len = res_len - part_pos;
-             if (part_len > sizeof(buf))
-               part_len = sizeof(buf);
-             if (!read_vpd(d, res_addr + part_pos, buf, part_len, &csum))
-               break;
-             print_vpd_string(buf, part_len);
-             part_pos += part_len;
-           }
-         printf("\n");
-         break;
-
-       case 0x90:
-       case 0x91:
-         printf("\t\t%s fields:\n",
-                (tag == 0x90) ? "Read-only" : "Read/write");
-
-         while (part_pos + 3 <= res_len)
-           {
-             word read_len;
-
-             if (!read_vpd(d, res_addr + part_pos, buf, 3, &csum))
-               break;
-             part_pos += 3;
-             key[0] = buf[0];
-             key[1] = buf[1];
-             part_len = buf[2];
-             if (part_len > res_len - part_pos)
-               break;
-
-             /* Only read the first byte of the RV field because the
-              * remaining bytes are not included in the checksum. */
-             read_len = (key[0] == 'R' && key[1] == 'V') ? 1 : part_len;
-             if (!read_vpd(d, res_addr + part_pos, buf, read_len, &csum))
-               break;
-
-             if ((key[0] == 'E' && key[1] == 'C') ||
-                 (key[0] == 'P' && key[1] == 'N') ||
-                 (key[0] == 'S' && key[1] == 'N') ||
-                 key[0] == 'V' ||
-                 key[0] == 'Y')
-               {
-                 /* Alphanumeric content */
-                 printf("\t\t\t%c%c: ", key[0], key[1]);
-                 print_vpd_string(buf, part_len);
-                 printf("\n");
-               }
-             else if (key[0] == 'R' && key[1] == 'V')
-               {
-                 /* Reserved and checksum */
-                 printf("\t\t\tRV: checksum %s, %d byte(s) reserved\n",
-                        csum ? "bad" : "good", part_len - 1);
-               }
-             else if (key[0] == 'R' && key[1] == 'W')
-               {
-                 /* Read-write area */
-                 printf("\t\t\tRW: %d byte(s) free\n", part_len);
-               }
-             else
-               {
-                 /* Binary or unknown content */
-                 int i;
-                 printf("\t\t\t%c%c:", key[0], key[1]);
-                 for (i = 0; i < part_len; i++)
-                   printf(" %02x", buf[i]);
-                 printf("\n");
-               }
-
-             part_pos += part_len;
-           }
-         break;
-
-       default:
-         printf("\t\tUnknown %s resource type %02x\n",
-                (tag & 0x80) ? "large" : "small", tag & ~0x80);
-         break;
-       }
-
-      res_addr += res_len;
-    }
-
-  if (res_addr == 0)
-    printf("\t\tNot readable\n");
-  else
-    printf("\t\tNo end tag found\n");
-}
-
-static void
-cap_pcix_nobridge(struct device *d, int where)
-{
-  u16 command;
-  u32 status;
-  static const byte max_outstanding[8] = { 1, 2, 3, 4, 8, 12, 16, 32 };
-
-  printf("PCI-X non-bridge device\n");
-
-  if (verbose < 2)
-    return;
-
-  if (!config_fetch(d, where + PCI_PCIX_STATUS, 4))
-    return;
-
-  command = get_conf_word(d, where + PCI_PCIX_COMMAND);
-  status = get_conf_long(d, where + PCI_PCIX_STATUS);
-  printf("\t\tCommand: DPERE%c ERO%c RBC=%d OST=%d\n",
-        FLAG(command, PCI_PCIX_COMMAND_DPERE),
-        FLAG(command, PCI_PCIX_COMMAND_ERO),
-        1 << (9 + ((command & PCI_PCIX_COMMAND_MAX_MEM_READ_BYTE_COUNT) >> 2U)),
-        max_outstanding[(command & PCI_PCIX_COMMAND_MAX_OUTSTANDING_SPLIT_TRANS) >> 4U]);
-  printf("\t\tStatus: Dev=%02x:%02x.%d 64bit%c 133MHz%c SCD%c USC%c DC=%s DMMRBC=%u DMOST=%u DMCRS=%u RSCEM%c 266MHz%c 533MHz%c\n",
-        ((status >> 8) & 0xff),
-        ((status >> 3) & 0x1f),
-        (status & PCI_PCIX_STATUS_FUNCTION),
-        FLAG(status, PCI_PCIX_STATUS_64BIT),
-        FLAG(status, PCI_PCIX_STATUS_133MHZ),
-        FLAG(status, PCI_PCIX_STATUS_SC_DISCARDED),
-        FLAG(status, PCI_PCIX_STATUS_UNEXPECTED_SC),
-        ((status & PCI_PCIX_STATUS_DEVICE_COMPLEXITY) ? "bridge" : "simple"),
-        1 << (9 + ((status >> 21) & 3U)),
-        max_outstanding[(status >> 23) & 7U],
-        1 << (3 + ((status >> 26) & 7U)),
-        FLAG(status, PCI_PCIX_STATUS_RCVD_SC_ERR_MESS),
-        FLAG(status, PCI_PCIX_STATUS_266MHZ),
-        FLAG(status, PCI_PCIX_STATUS_533MHZ));
-}
-
-static void
-cap_pcix_bridge(struct device *d, int where)
-{
-  static const char * const sec_clock_freq[8] = { "conv", "66MHz", "100MHz", "133MHz", "?4", "?5", "?6", "?7" };
-  u16 secstatus;
-  u32 status, upstcr, downstcr;
-
-  printf("PCI-X bridge device\n");
-
-  if (verbose < 2)
-    return;
-
-  if (!config_fetch(d, where + PCI_PCIX_BRIDGE_STATUS, 12))
-    return;
-
-  secstatus = get_conf_word(d, where + PCI_PCIX_BRIDGE_SEC_STATUS);
-  printf("\t\tSecondary Status: 64bit%c 133MHz%c SCD%c USC%c SCO%c SRD%c Freq=%s\n",
-        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_64BIT),
-        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_133MHZ),
-        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SC_DISCARDED),
-        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_UNEXPECTED_SC),
-        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SC_OVERRUN),
-        FLAG(secstatus, PCI_PCIX_BRIDGE_SEC_STATUS_SPLIT_REQUEST_DELAYED),
-        sec_clock_freq[(secstatus >> 6) & 7]);
-  status = get_conf_long(d, where + PCI_PCIX_BRIDGE_STATUS);
-  printf("\t\tStatus: Dev=%02x:%02x.%d 64bit%c 133MHz%c SCD%c USC%c SCO%c SRD%c\n",
-        ((status >> 8) & 0xff),
-        ((status >> 3) & 0x1f),
-        (status & PCI_PCIX_BRIDGE_STATUS_FUNCTION),
-        FLAG(status, PCI_PCIX_BRIDGE_STATUS_64BIT),
-        FLAG(status, PCI_PCIX_BRIDGE_STATUS_133MHZ),
-        FLAG(status, PCI_PCIX_BRIDGE_STATUS_SC_DISCARDED),
-        FLAG(status, PCI_PCIX_BRIDGE_STATUS_UNEXPECTED_SC),
-        FLAG(status, PCI_PCIX_BRIDGE_STATUS_SC_OVERRUN),
-        FLAG(status, PCI_PCIX_BRIDGE_STATUS_SPLIT_REQUEST_DELAYED));
-  upstcr = get_conf_long(d, where + PCI_PCIX_BRIDGE_UPSTREAM_SPLIT_TRANS_CTRL);
-  printf("\t\tUpstream: Capacity=%u CommitmentLimit=%u\n",
-        (upstcr & PCI_PCIX_BRIDGE_STR_CAPACITY),
-        (upstcr >> 16) & 0xffff);
-  downstcr = get_conf_long(d, where + PCI_PCIX_BRIDGE_DOWNSTREAM_SPLIT_TRANS_CTRL);
-  printf("\t\tDownstream: Capacity=%u CommitmentLimit=%u\n",
-        (downstcr & PCI_PCIX_BRIDGE_STR_CAPACITY),
-        (downstcr >> 16) & 0xffff);
-}
-
-static void
-cap_pcix(struct device *d, int where)
-{
-  switch (get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f)
-    {
-    case PCI_HEADER_TYPE_NORMAL:
-      cap_pcix_nobridge(d, where);
-      break;
-    case PCI_HEADER_TYPE_BRIDGE:
-      cap_pcix_bridge(d, where);
-      break;
-    }
-}
-
-static inline char *
-ht_link_width(unsigned width)
-{
-  static char * const widths[8] = { "8bit", "16bit", "[2]", "32bit", "2bit", "4bit", "[6]", "N/C" };
-  return widths[width];
-}
-
-static inline char *
-ht_link_freq(unsigned freq)
-{
-  static char * const freqs[16] = { "200MHz", "300MHz", "400MHz", "500MHz", "600MHz", "800MHz", "1.0GHz", "1.2GHz",
-                                   "1.4GHz", "1.6GHz", "[a]", "[b]", "[c]", "[d]", "[e]", "Vend" };
-  return freqs[freq];
-}
-
-static void
-cap_ht_pri(struct device *d, int where, int cmd)
-{
-  u16 lctr0, lcnf0, lctr1, lcnf1, eh;
-  u8 rid, lfrer0, lfcap0, ftr, lfrer1, lfcap1, mbu, mlu, bn;
-  char *fmt;
-
-  printf("HyperTransport: Slave or Primary Interface\n");
-  if (verbose < 2)
-    return;
-
-  if (!config_fetch(d, where + PCI_HT_PRI_LCTR0, PCI_HT_PRI_SIZEOF - PCI_HT_PRI_LCTR0))
-    return;
-  rid = get_conf_byte(d, where + PCI_HT_PRI_RID);
-  if (rid < 0x22 && rid > 0x11)
-    printf("\t\t!!! Possibly incomplete decoding\n");
-
-  if (rid >= 0x22)
-    fmt = "\t\tCommand: BaseUnitID=%u UnitCnt=%u MastHost%c DefDir%c DUL%c\n";
-  else
-    fmt = "\t\tCommand: BaseUnitID=%u UnitCnt=%u MastHost%c DefDir%c\n";
-  printf(fmt,
-        (cmd & PCI_HT_PRI_CMD_BUID),
-        (cmd & PCI_HT_PRI_CMD_UC) >> 5,
-        FLAG(cmd, PCI_HT_PRI_CMD_MH),
-        FLAG(cmd, PCI_HT_PRI_CMD_DD),
-        FLAG(cmd, PCI_HT_PRI_CMD_DUL));
-  lctr0 = get_conf_word(d, where + PCI_HT_PRI_LCTR0);
-  if (rid >= 0x22)
-    fmt = "\t\tLink Control 0: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x IsocEn%c LSEn%c ExtCTL%c 64b%c\n";
-  else
-    fmt = "\t\tLink Control 0: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x\n";
-  printf(fmt,
-        FLAG(lctr0, PCI_HT_LCTR_CFLE),
-        FLAG(lctr0, PCI_HT_LCTR_CST),
-        FLAG(lctr0, PCI_HT_LCTR_CFE),
-        FLAG(lctr0, PCI_HT_LCTR_LKFAIL),
-        FLAG(lctr0, PCI_HT_LCTR_INIT),
-        FLAG(lctr0, PCI_HT_LCTR_EOC),
-        FLAG(lctr0, PCI_HT_LCTR_TXO),
-        (lctr0 & PCI_HT_LCTR_CRCERR) >> 8,
-        FLAG(lctr0, PCI_HT_LCTR_ISOCEN),
-        FLAG(lctr0, PCI_HT_LCTR_LSEN),
-        FLAG(lctr0, PCI_HT_LCTR_EXTCTL),
-        FLAG(lctr0, PCI_HT_LCTR_64B));
-  lcnf0 = get_conf_word(d, where + PCI_HT_PRI_LCNF0);
-  if (rid >= 0x22)
-    fmt = "\t\tLink Config 0: MLWI=%1$s DwFcIn%5$c MLWO=%2$s DwFcOut%6$c LWI=%3$s DwFcInEn%7$c LWO=%4$s DwFcOutEn%8$c\n";
-  else
-    fmt = "\t\tLink Config 0: MLWI=%s MLWO=%s LWI=%s LWO=%s\n";
-  printf(fmt,
-        ht_link_width(lcnf0 & PCI_HT_LCNF_MLWI),
-        ht_link_width((lcnf0 & PCI_HT_LCNF_MLWO) >> 4),
-        ht_link_width((lcnf0 & PCI_HT_LCNF_LWI) >> 8),
-        ht_link_width((lcnf0 & PCI_HT_LCNF_LWO) >> 12),
-        FLAG(lcnf0, PCI_HT_LCNF_DFI),
-        FLAG(lcnf0, PCI_HT_LCNF_DFO),
-        FLAG(lcnf0, PCI_HT_LCNF_DFIE),
-        FLAG(lcnf0, PCI_HT_LCNF_DFOE));
-  lctr1 = get_conf_word(d, where + PCI_HT_PRI_LCTR1);
-  if (rid >= 0x22)
-    fmt = "\t\tLink Control 1: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x IsocEn%c LSEn%c ExtCTL%c 64b%c\n";
-  else
-    fmt = "\t\tLink Control 1: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x\n";
-  printf(fmt,
-        FLAG(lctr1, PCI_HT_LCTR_CFLE),
-        FLAG(lctr1, PCI_HT_LCTR_CST),
-        FLAG(lctr1, PCI_HT_LCTR_CFE),
-        FLAG(lctr1, PCI_HT_LCTR_LKFAIL),
-        FLAG(lctr1, PCI_HT_LCTR_INIT),
-        FLAG(lctr1, PCI_HT_LCTR_EOC),
-        FLAG(lctr1, PCI_HT_LCTR_TXO),
-        (lctr1 & PCI_HT_LCTR_CRCERR) >> 8,
-        FLAG(lctr1, PCI_HT_LCTR_ISOCEN),
-        FLAG(lctr1, PCI_HT_LCTR_LSEN),
-        FLAG(lctr1, PCI_HT_LCTR_EXTCTL),
-        FLAG(lctr1, PCI_HT_LCTR_64B));
-  lcnf1 = get_conf_word(d, where + PCI_HT_PRI_LCNF1);
-  if (rid >= 0x22)
-    fmt = "\t\tLink Config 1: MLWI=%1$s DwFcIn%5$c MLWO=%2$s DwFcOut%6$c LWI=%3$s DwFcInEn%7$c LWO=%4$s DwFcOutEn%8$c\n";
-  else
-    fmt = "\t\tLink Config 1: MLWI=%s MLWO=%s LWI=%s LWO=%s\n";
-  printf(fmt,
-        ht_link_width(lcnf1 & PCI_HT_LCNF_MLWI),
-        ht_link_width((lcnf1 & PCI_HT_LCNF_MLWO) >> 4),
-        ht_link_width((lcnf1 & PCI_HT_LCNF_LWI) >> 8),
-        ht_link_width((lcnf1 & PCI_HT_LCNF_LWO) >> 12),
-        FLAG(lcnf1, PCI_HT_LCNF_DFI),
-        FLAG(lcnf1, PCI_HT_LCNF_DFO),
-        FLAG(lcnf1, PCI_HT_LCNF_DFIE),
-        FLAG(lcnf1, PCI_HT_LCNF_DFOE));
-  printf("\t\tRevision ID: %u.%02u\n",
-        (rid & PCI_HT_RID_MAJ) >> 5, (rid & PCI_HT_RID_MIN));
-  if (rid < 0x22)
-    return;
-  lfrer0 = get_conf_byte(d, where + PCI_HT_PRI_LFRER0);
-  printf("\t\tLink Frequency 0: %s\n", ht_link_freq(lfrer0 & PCI_HT_LFRER_FREQ));
-  printf("\t\tLink Error 0: <Prot%c <Ovfl%c <EOC%c CTLTm%c\n",
-        FLAG(lfrer0, PCI_HT_LFRER_PROT),
-        FLAG(lfrer0, PCI_HT_LFRER_OV),
-        FLAG(lfrer0, PCI_HT_LFRER_EOC),
-        FLAG(lfrer0, PCI_HT_LFRER_CTLT));
-  lfcap0 = get_conf_byte(d, where + PCI_HT_PRI_LFCAP0);
-  printf("\t\tLink Frequency Capability 0: 200MHz%c 300MHz%c 400MHz%c 500MHz%c 600MHz%c 800MHz%c 1.0GHz%c 1.2GHz%c 1.4GHz%c 1.6GHz%c Vend%c\n",
-        FLAG(lfcap0, PCI_HT_LFCAP_200),
-        FLAG(lfcap0, PCI_HT_LFCAP_300),
-        FLAG(lfcap0, PCI_HT_LFCAP_400),
-        FLAG(lfcap0, PCI_HT_LFCAP_500),
-        FLAG(lfcap0, PCI_HT_LFCAP_600),
-        FLAG(lfcap0, PCI_HT_LFCAP_800),
-        FLAG(lfcap0, PCI_HT_LFCAP_1000),
-        FLAG(lfcap0, PCI_HT_LFCAP_1200),
-        FLAG(lfcap0, PCI_HT_LFCAP_1400),
-        FLAG(lfcap0, PCI_HT_LFCAP_1600),
-        FLAG(lfcap0, PCI_HT_LFCAP_VEND));
-  ftr = get_conf_byte(d, where + PCI_HT_PRI_FTR);
-  printf("\t\tFeature Capability: IsocFC%c LDTSTOP%c CRCTM%c ECTLT%c 64bA%c UIDRD%c\n",
-        FLAG(ftr, PCI_HT_FTR_ISOCFC),
-        FLAG(ftr, PCI_HT_FTR_LDTSTOP),
-        FLAG(ftr, PCI_HT_FTR_CRCTM),
-        FLAG(ftr, PCI_HT_FTR_ECTLT),
-        FLAG(ftr, PCI_HT_FTR_64BA),
-        FLAG(ftr, PCI_HT_FTR_UIDRD));
-  lfrer1 = get_conf_byte(d, where + PCI_HT_PRI_LFRER1);
-  printf("\t\tLink Frequency 1: %s\n", ht_link_freq(lfrer1 & PCI_HT_LFRER_FREQ));
-  printf("\t\tLink Error 1: <Prot%c <Ovfl%c <EOC%c CTLTm%c\n",
-        FLAG(lfrer1, PCI_HT_LFRER_PROT),
-        FLAG(lfrer1, PCI_HT_LFRER_OV),
-        FLAG(lfrer1, PCI_HT_LFRER_EOC),
-        FLAG(lfrer1, PCI_HT_LFRER_CTLT));
-  lfcap1 = get_conf_byte(d, where + PCI_HT_PRI_LFCAP1);
-  printf("\t\tLink Frequency Capability 1: 200MHz%c 300MHz%c 400MHz%c 500MHz%c 600MHz%c 800MHz%c 1.0GHz%c 1.2GHz%c 1.4GHz%c 1.6GHz%c Vend%c\n",
-        FLAG(lfcap1, PCI_HT_LFCAP_200),
-        FLAG(lfcap1, PCI_HT_LFCAP_300),
-        FLAG(lfcap1, PCI_HT_LFCAP_400),
-        FLAG(lfcap1, PCI_HT_LFCAP_500),
-        FLAG(lfcap1, PCI_HT_LFCAP_600),
-        FLAG(lfcap1, PCI_HT_LFCAP_800),
-        FLAG(lfcap1, PCI_HT_LFCAP_1000),
-        FLAG(lfcap1, PCI_HT_LFCAP_1200),
-        FLAG(lfcap1, PCI_HT_LFCAP_1400),
-        FLAG(lfcap1, PCI_HT_LFCAP_1600),
-        FLAG(lfcap1, PCI_HT_LFCAP_VEND));
-  eh = get_conf_word(d, where + PCI_HT_PRI_EH);
-  printf("\t\tError Handling: PFlE%c OFlE%c PFE%c OFE%c EOCFE%c RFE%c CRCFE%c SERRFE%c CF%c RE%c PNFE%c ONFE%c EOCNFE%c RNFE%c CRCNFE%c SERRNFE%c\n",
-        FLAG(eh, PCI_HT_EH_PFLE),
-        FLAG(eh, PCI_HT_EH_OFLE),
-        FLAG(eh, PCI_HT_EH_PFE),
-        FLAG(eh, PCI_HT_EH_OFE),
-        FLAG(eh, PCI_HT_EH_EOCFE),
-        FLAG(eh, PCI_HT_EH_RFE),
-        FLAG(eh, PCI_HT_EH_CRCFE),
-        FLAG(eh, PCI_HT_EH_SERRFE),
-        FLAG(eh, PCI_HT_EH_CF),
-        FLAG(eh, PCI_HT_EH_RE),
-        FLAG(eh, PCI_HT_EH_PNFE),
-        FLAG(eh, PCI_HT_EH_ONFE),
-        FLAG(eh, PCI_HT_EH_EOCNFE),
-        FLAG(eh, PCI_HT_EH_RNFE),
-        FLAG(eh, PCI_HT_EH_CRCNFE),
-        FLAG(eh, PCI_HT_EH_SERRNFE));
-  mbu = get_conf_byte(d, where + PCI_HT_PRI_MBU);
-  mlu = get_conf_byte(d, where + PCI_HT_PRI_MLU);
-  printf("\t\tPrefetchable memory behind bridge Upper: %02x-%02x\n", mbu, mlu);
-  bn = get_conf_byte(d, where + PCI_HT_PRI_BN);
-  printf("\t\tBus Number: %02x\n", bn);
-}
-
-static void
-cap_ht_sec(struct device *d, int where, int cmd)
-{
-  u16 lctr, lcnf, ftr, eh;
-  u8 rid, lfrer, lfcap, mbu, mlu;
-  char *fmt;
-
-  printf("HyperTransport: Host or Secondary Interface\n");
-  if (verbose < 2)
-    return;
-
-  if (!config_fetch(d, where + PCI_HT_SEC_LCTR, PCI_HT_SEC_SIZEOF - PCI_HT_SEC_LCTR))
-    return;
-  rid = get_conf_byte(d, where + PCI_HT_SEC_RID);
-  if (rid < 0x22 && rid > 0x11)
-    printf("\t\t!!! Possibly incomplete decoding\n");
-
-  if (rid >= 0x22)
-    fmt = "\t\tCommand: WarmRst%c DblEnd%c DevNum=%u ChainSide%c HostHide%c Slave%c <EOCErr%c DUL%c\n";
-  else
-    fmt = "\t\tCommand: WarmRst%c DblEnd%c\n";
-  printf(fmt,
-        FLAG(cmd, PCI_HT_SEC_CMD_WR),
-        FLAG(cmd, PCI_HT_SEC_CMD_DE),
-        (cmd & PCI_HT_SEC_CMD_DN) >> 2,
-        FLAG(cmd, PCI_HT_SEC_CMD_CS),
-        FLAG(cmd, PCI_HT_SEC_CMD_HH),
-        FLAG(cmd, PCI_HT_SEC_CMD_AS),
-        FLAG(cmd, PCI_HT_SEC_CMD_HIECE),
-        FLAG(cmd, PCI_HT_SEC_CMD_DUL));
-  lctr = get_conf_word(d, where + PCI_HT_SEC_LCTR);
-  if (rid >= 0x22)
-    fmt = "\t\tLink Control: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x IsocEn%c LSEn%c ExtCTL%c 64b%c\n";
-  else
-    fmt = "\t\tLink Control: CFlE%c CST%c CFE%c <LkFail%c Init%c EOC%c TXO%c <CRCErr=%x\n";
-  printf(fmt,
-        FLAG(lctr, PCI_HT_LCTR_CFLE),
-        FLAG(lctr, PCI_HT_LCTR_CST),
-        FLAG(lctr, PCI_HT_LCTR_CFE),
-        FLAG(lctr, PCI_HT_LCTR_LKFAIL),
-        FLAG(lctr, PCI_HT_LCTR_INIT),
-        FLAG(lctr, PCI_HT_LCTR_EOC),
-        FLAG(lctr, PCI_HT_LCTR_TXO),
-        (lctr & PCI_HT_LCTR_CRCERR) >> 8,
-        FLAG(lctr, PCI_HT_LCTR_ISOCEN),
-        FLAG(lctr, PCI_HT_LCTR_LSEN),
-        FLAG(lctr, PCI_HT_LCTR_EXTCTL),
-        FLAG(lctr, PCI_HT_LCTR_64B));
-  lcnf = get_conf_word(d, where + PCI_HT_SEC_LCNF);
-  if (rid >= 0x22)
-    fmt = "\t\tLink Config: MLWI=%1$s DwFcIn%5$c MLWO=%2$s DwFcOut%6$c LWI=%3$s DwFcInEn%7$c LWO=%4$s DwFcOutEn%8$c\n";
-  else
-    fmt = "\t\tLink Config: MLWI=%s MLWO=%s LWI=%s LWO=%s\n";
-  printf(fmt,
-        ht_link_width(lcnf & PCI_HT_LCNF_MLWI),
-        ht_link_width((lcnf & PCI_HT_LCNF_MLWO) >> 4),
-        ht_link_width((lcnf & PCI_HT_LCNF_LWI) >> 8),
-        ht_link_width((lcnf & PCI_HT_LCNF_LWO) >> 12),
-        FLAG(lcnf, PCI_HT_LCNF_DFI),
-        FLAG(lcnf, PCI_HT_LCNF_DFO),
-        FLAG(lcnf, PCI_HT_LCNF_DFIE),
-        FLAG(lcnf, PCI_HT_LCNF_DFOE));
-  printf("\t\tRevision ID: %u.%02u\n",
-        (rid & PCI_HT_RID_MAJ) >> 5, (rid & PCI_HT_RID_MIN));
-  if (rid < 0x22)
-    return;
-  lfrer = get_conf_byte(d, where + PCI_HT_SEC_LFRER);
-  printf("\t\tLink Frequency: %s\n", ht_link_freq(lfrer & PCI_HT_LFRER_FREQ));
-  printf("\t\tLink Error: <Prot%c <Ovfl%c <EOC%c CTLTm%c\n",
-        FLAG(lfrer, PCI_HT_LFRER_PROT),
-        FLAG(lfrer, PCI_HT_LFRER_OV),
-        FLAG(lfrer, PCI_HT_LFRER_EOC),
-        FLAG(lfrer, PCI_HT_LFRER_CTLT));
-  lfcap = get_conf_byte(d, where + PCI_HT_SEC_LFCAP);
-  printf("\t\tLink Frequency Capability: 200MHz%c 300MHz%c 400MHz%c 500MHz%c 600MHz%c 800MHz%c 1.0GHz%c 1.2GHz%c 1.4GHz%c 1.6GHz%c Vend%c\n",
-        FLAG(lfcap, PCI_HT_LFCAP_200),
-        FLAG(lfcap, PCI_HT_LFCAP_300),
-        FLAG(lfcap, PCI_HT_LFCAP_400),
-        FLAG(lfcap, PCI_HT_LFCAP_500),
-        FLAG(lfcap, PCI_HT_LFCAP_600),
-        FLAG(lfcap, PCI_HT_LFCAP_800),
-        FLAG(lfcap, PCI_HT_LFCAP_1000),
-        FLAG(lfcap, PCI_HT_LFCAP_1200),
-        FLAG(lfcap, PCI_HT_LFCAP_1400),
-        FLAG(lfcap, PCI_HT_LFCAP_1600),
-        FLAG(lfcap, PCI_HT_LFCAP_VEND));
-  ftr = get_conf_word(d, where + PCI_HT_SEC_FTR);
-  printf("\t\tFeature Capability: IsocFC%c LDTSTOP%c CRCTM%c ECTLT%c 64bA%c UIDRD%c ExtRS%c UCnfE%c\n",
-        FLAG(ftr, PCI_HT_FTR_ISOCFC),
-        FLAG(ftr, PCI_HT_FTR_LDTSTOP),
-        FLAG(ftr, PCI_HT_FTR_CRCTM),
-        FLAG(ftr, PCI_HT_FTR_ECTLT),
-        FLAG(ftr, PCI_HT_FTR_64BA),
-        FLAG(ftr, PCI_HT_FTR_UIDRD),
-        FLAG(ftr, PCI_HT_SEC_FTR_EXTRS),
-        FLAG(ftr, PCI_HT_SEC_FTR_UCNFE));
-  if (ftr & PCI_HT_SEC_FTR_EXTRS)
-    {
-      eh = get_conf_word(d, where + PCI_HT_SEC_EH);
-      printf("\t\tError Handling: PFlE%c OFlE%c PFE%c OFE%c EOCFE%c RFE%c CRCFE%c SERRFE%c CF%c RE%c PNFE%c ONFE%c EOCNFE%c RNFE%c CRCNFE%c SERRNFE%c\n",
-            FLAG(eh, PCI_HT_EH_PFLE),
-            FLAG(eh, PCI_HT_EH_OFLE),
-            FLAG(eh, PCI_HT_EH_PFE),
-            FLAG(eh, PCI_HT_EH_OFE),
-            FLAG(eh, PCI_HT_EH_EOCFE),
-            FLAG(eh, PCI_HT_EH_RFE),
-            FLAG(eh, PCI_HT_EH_CRCFE),
-            FLAG(eh, PCI_HT_EH_SERRFE),
-            FLAG(eh, PCI_HT_EH_CF),
-            FLAG(eh, PCI_HT_EH_RE),
-            FLAG(eh, PCI_HT_EH_PNFE),
-            FLAG(eh, PCI_HT_EH_ONFE),
-            FLAG(eh, PCI_HT_EH_EOCNFE),
-            FLAG(eh, PCI_HT_EH_RNFE),
-            FLAG(eh, PCI_HT_EH_CRCNFE),
-            FLAG(eh, PCI_HT_EH_SERRNFE));
-      mbu = get_conf_byte(d, where + PCI_HT_SEC_MBU);
-      mlu = get_conf_byte(d, where + PCI_HT_SEC_MLU);
-      printf("\t\tPrefetchable memory behind bridge Upper: %02x-%02x\n", mbu, mlu);
-    }
-}
-
-static void
-cap_ht(struct device *d, int where, int cmd)
-{
-  int type;
-
-  switch (cmd & PCI_HT_CMD_TYP_HI)
-    {
-    case PCI_HT_CMD_TYP_HI_PRI:
-      cap_ht_pri(d, where, cmd);
-      return;
-    case PCI_HT_CMD_TYP_HI_SEC:
-      cap_ht_sec(d, where, cmd);
-      return;
-    }
-
-  type = cmd & PCI_HT_CMD_TYP;
-  switch (type)
-    {
-    case PCI_HT_CMD_TYP_SW:
-      printf("HyperTransport: Switch\n");
-      break;
-    case PCI_HT_CMD_TYP_IDC:
-      printf("HyperTransport: Interrupt Discovery and Configuration\n");
-      break;
-    case PCI_HT_CMD_TYP_RID:
-      printf("HyperTransport: Revision ID: %u.%02u\n",
-            (cmd & PCI_HT_RID_MAJ) >> 5, (cmd & PCI_HT_RID_MIN));
-      break;
-    case PCI_HT_CMD_TYP_UIDC:
-      printf("HyperTransport: UnitID Clumping\n");
-      break;
-    case PCI_HT_CMD_TYP_ECSA:
-      printf("HyperTransport: Extended Configuration Space Access\n");
-      break;
-    case PCI_HT_CMD_TYP_AM:
-      printf("HyperTransport: Address Mapping\n");
-      break;
-    case PCI_HT_CMD_TYP_MSIM:
-      printf("HyperTransport: MSI Mapping Enable%c Fixed%c\n",
-            FLAG(cmd, PCI_HT_MSIM_CMD_EN),
-            FLAG(cmd, PCI_HT_MSIM_CMD_FIXD));
-      if (verbose >= 2 && !(cmd & PCI_HT_MSIM_CMD_FIXD))
-       {
-         u32 offl, offh;
-         if (!config_fetch(d, where + PCI_HT_MSIM_ADDR_LO, 8))
-           break;
-         offl = get_conf_long(d, where + PCI_HT_MSIM_ADDR_LO);
-         offh = get_conf_long(d, where + PCI_HT_MSIM_ADDR_HI);
-         printf("\t\tMapping Address Base: %016llx\n", ((unsigned long long)offh << 32) | (offl & ~0xfffff));
-       }
-      break;
-    case PCI_HT_CMD_TYP_DR:
-      printf("HyperTransport: DirectRoute\n");
-      break;
-    case PCI_HT_CMD_TYP_VCS:
-      printf("HyperTransport: VCSet\n");
-      break;
-    case PCI_HT_CMD_TYP_RM:
-      printf("HyperTransport: Retry Mode\n");
-      break;
-    case PCI_HT_CMD_TYP_X86:
-      printf("HyperTransport: X86 (reserved)\n");
-      break;
-    default:
-      printf("HyperTransport: #%02x\n", type >> 11);
-    }
-}
-
-static void
-cap_msi(struct device *d, int where, int cap)
-{
-  int is64;
-  u32 t;
-  u16 w;
-
-  printf("MSI: Mask%c 64bit%c Count=%d/%d Enable%c\n",
-         FLAG(cap, PCI_MSI_FLAGS_MASK_BIT),
-        FLAG(cap, PCI_MSI_FLAGS_64BIT),
-        1 << ((cap & PCI_MSI_FLAGS_QSIZE) >> 4),
-        1 << ((cap & PCI_MSI_FLAGS_QMASK) >> 1),
-        FLAG(cap, PCI_MSI_FLAGS_ENABLE));
-  if (verbose < 2)
-    return;
-  is64 = cap & PCI_MSI_FLAGS_64BIT;
-  if (!config_fetch(d, where + PCI_MSI_ADDRESS_LO, (is64 ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32) + 2 - PCI_MSI_ADDRESS_LO))
-    return;
-  printf("\t\tAddress: ");
-  if (is64)
-    {
-      t = get_conf_long(d, where + PCI_MSI_ADDRESS_HI);
-      w = get_conf_word(d, where + PCI_MSI_DATA_64);
-      printf("%08x", t);
-    }
-  else
-    w = get_conf_word(d, where + PCI_MSI_DATA_32);
-  t = get_conf_long(d, where + PCI_MSI_ADDRESS_LO);
-  printf("%08x  Data: %04x\n", t, w);
-  if (cap & PCI_MSI_FLAGS_MASK_BIT)
-    {
-      u32 mask, pending;
-
-      if (is64)
-       {
-         if (!config_fetch(d, where + PCI_MSI_MASK_BIT_64, 8))
-           return;
-         mask = get_conf_long(d, where + PCI_MSI_MASK_BIT_64);
-         pending = get_conf_long(d, where + PCI_MSI_PENDING_64);
-       }
-      else
-        {
-         if (!config_fetch(d, where + PCI_MSI_MASK_BIT_32, 8))
-           return;
-         mask = get_conf_long(d, where + PCI_MSI_MASK_BIT_32);
-         pending = get_conf_long(d, where + PCI_MSI_PENDING_32);
-       }
-      printf("\t\tMasking: %08x  Pending: %08x\n", mask, pending);
-    }
-}
-
-static float power_limit(int value, int scale)
-{
-  static const float scales[4] = { 1.0, 0.1, 0.01, 0.001 };
-  return value * scales[scale];
-}
-
-static const char *latency_l0s(int value)
-{
-  static const char *latencies[] = { "<64ns", "<128ns", "<256ns", "<512ns", "<1us", "<2us", "<4us", "unlimited" };
-  return latencies[value];
-}
-
-static const char *latency_l1(int value)
-{
-  static const char *latencies[] = { "<1us", "<2us", "<4us", "<8us", "<16us", "<32us", "<64us", "unlimited" };
-  return latencies[value];
-}
-
-static void cap_express_dev(struct device *d, int where, int type)
-{
-  u32 t;
-  u16 w;
-
-  t = get_conf_long(d, where + PCI_EXP_DEVCAP);
-  printf("\t\tDevCap:\tMaxPayload %d bytes, PhantFunc %d, Latency L0s %s, L1 %s\n",
-       128 << (t & PCI_EXP_DEVCAP_PAYLOAD),
-       (1 << ((t & PCI_EXP_DEVCAP_PHANTOM) >> 3)) - 1,
-       latency_l0s((t & PCI_EXP_DEVCAP_L0S) >> 6),
-       latency_l1((t & PCI_EXP_DEVCAP_L1) >> 9));
-  printf("\t\t\tExtTag%c", FLAG(t, PCI_EXP_DEVCAP_EXT_TAG));
-  if ((type == PCI_EXP_TYPE_ENDPOINT) || (type == PCI_EXP_TYPE_LEG_END) ||
-      (type == PCI_EXP_TYPE_UPSTREAM) || (type == PCI_EXP_TYPE_PCI_BRIDGE))
-    printf(" AttnBtn%c AttnInd%c PwrInd%c",
-       FLAG(t, PCI_EXP_DEVCAP_ATN_BUT),
-       FLAG(t, PCI_EXP_DEVCAP_ATN_IND), FLAG(t, PCI_EXP_DEVCAP_PWR_IND));
-  printf(" RBE%c FLReset%c",
-       FLAG(t, PCI_EXP_DEVCAP_RBE),
-       FLAG(t, PCI_EXP_DEVCAP_FLRESET));
-  if (type == PCI_EXP_TYPE_UPSTREAM)
-    printf("SlotPowerLimit %fW",
-       power_limit((t & PCI_EXP_DEVCAP_PWR_VAL) >> 18,
-                   (t & PCI_EXP_DEVCAP_PWR_SCL) >> 26));
-  printf("\n");
-
-  w = get_conf_word(d, where + PCI_EXP_DEVCTL);
-  printf("\t\tDevCtl:\tReport errors: Correctable%c Non-Fatal%c Fatal%c Unsupported%c\n",
-       FLAG(w, PCI_EXP_DEVCTL_CERE),
-       FLAG(w, PCI_EXP_DEVCTL_NFERE),
-       FLAG(w, PCI_EXP_DEVCTL_FERE),
-       FLAG(w, PCI_EXP_DEVCTL_URRE));
-  printf("\t\t\tRlxdOrd%c ExtTag%c PhantFunc%c AuxPwr%c NoSnoop%c",
-       FLAG(w, PCI_EXP_DEVCTL_RELAXED),
-       FLAG(w, PCI_EXP_DEVCTL_EXT_TAG),
-       FLAG(w, PCI_EXP_DEVCTL_PHANTOM),
-       FLAG(w, PCI_EXP_DEVCTL_AUX_PME),
-       FLAG(w, PCI_EXP_DEVCTL_NOSNOOP));
-  if (type == PCI_EXP_TYPE_PCI_BRIDGE || type == PCI_EXP_TYPE_PCIE_BRIDGE)
-    printf(" BrConfRtry%c", FLAG(w, PCI_EXP_DEVCTL_BCRE));
-  if (type == PCI_EXP_TYPE_ENDPOINT && (t & PCI_EXP_DEVCAP_FLRESET))
-    printf(" FLReset%c", FLAG(w, PCI_EXP_DEVCTL_FLRESET));
-  printf("\n\t\t\tMaxPayload %d bytes, MaxReadReq %d bytes\n",
-       128 << ((w & PCI_EXP_DEVCTL_PAYLOAD) >> 5),
-       128 << ((w & PCI_EXP_DEVCTL_READRQ) >> 12));
-
-  w = get_conf_word(d, where + PCI_EXP_DEVSTA);
-  printf("\t\tDevSta:\tCorrErr%c UncorrErr%c FatalErr%c UnsuppReq%c AuxPwr%c TransPend%c\n",
-       FLAG(w, PCI_EXP_DEVSTA_CED),
-       FLAG(w, PCI_EXP_DEVSTA_NFED),
-       FLAG(w, PCI_EXP_DEVSTA_FED),
-       FLAG(w, PCI_EXP_DEVSTA_URD),
-       FLAG(w, PCI_EXP_DEVSTA_AUXPD),
-       FLAG(w, PCI_EXP_DEVSTA_TRPND));
-}
-
-static char *link_speed(int speed)
-{
-  switch (speed)
-    {
-      case 1:
-       return "2.5GT/s";
-      case 2:
-       return "5GT/s";
-      default:
-       return "unknown";
-    }
-}
-
-static char *aspm_support(int code)
-{
-  switch (code)
-    {
-      case 1:
-       return "L0s";
-      case 3:
-       return "L0s L1";
-      default:
-       return "unknown";
-    }
-}
-
-static const char *aspm_enabled(int code)
-{
-  static const char *desc[] = { "Disabled", "L0s Enabled", "L1 Enabled", "L0s L1 Enabled" };
-  return desc[code];
-}
-
-static void cap_express_link(struct device *d, int where, int type)
-{
-  u32 t;
-  u16 w;
-
-  t = get_conf_long(d, where + PCI_EXP_LNKCAP);
-  printf("\t\tLnkCap:\tPort #%d, Speed %s, Width x%d, ASPM %s, Latency L0 %s, L1 %s\n",
-       t >> 24,
-       link_speed(t & PCI_EXP_LNKCAP_SPEED), (t & PCI_EXP_LNKCAP_WIDTH) >> 4,
-       aspm_support((t & PCI_EXP_LNKCAP_ASPM) >> 10),
-       latency_l0s((t & PCI_EXP_LNKCAP_L0S) >> 12),
-       latency_l1((t & PCI_EXP_LNKCAP_L1) >> 15));
-  printf("\t\t\tClockPM%c Suprise%c LLActRep%c BwNot%c\n",
-       FLAG(t, PCI_EXP_LNKCAP_CLOCKPM),
-       FLAG(t, PCI_EXP_LNKCAP_SURPRISE),
-       FLAG(t, PCI_EXP_LNKCAP_DLLA),
-       FLAG(t, PCI_EXP_LNKCAP_LBNC));
-
-  w = get_conf_word(d, where + PCI_EXP_LNKCTL);
-  printf("\t\tLnkCtl:\tASPM %s;", aspm_enabled(w & PCI_EXP_LNKCTL_ASPM));
-  if ((type == PCI_EXP_TYPE_ROOT_PORT) || (type == PCI_EXP_TYPE_ENDPOINT) ||
-      (type == PCI_EXP_TYPE_LEG_END))
-    printf(" RCB %d bytes", w & PCI_EXP_LNKCTL_RCB ? 128 : 64);
-  printf(" Disabled%c Retrain%c CommClk%c\n\t\t\tExtSynch%c ClockPM%c AutWidDis%c BWInt%c AutBWInt%c\n",
-       FLAG(w, PCI_EXP_LNKCTL_DISABLE),
-       FLAG(w, PCI_EXP_LNKCTL_RETRAIN),
-       FLAG(w, PCI_EXP_LNKCTL_CLOCK),
-       FLAG(w, PCI_EXP_LNKCTL_XSYNCH),
-       FLAG(w, PCI_EXP_LNKCTL_CLOCKPM),
-       FLAG(w, PCI_EXP_LNKCTL_HWAUTWD),
-       FLAG(w, PCI_EXP_LNKCTL_BWMIE),
-       FLAG(w, PCI_EXP_LNKCTL_AUTBWIE));
-
-  w = get_conf_word(d, where + PCI_EXP_LNKSTA);
-  printf("\t\tLnkSta:\tSpeed %s, Width x%d, TrErr%c Train%c SlotClk%c DLActive%c BWMgmt%c ABWMgmt%c\n",
-       link_speed(w & PCI_EXP_LNKSTA_SPEED),
-       (w & PCI_EXP_LNKSTA_WIDTH) >> 4,
-       FLAG(w, PCI_EXP_LNKSTA_TR_ERR),
-       FLAG(w, PCI_EXP_LNKSTA_TRAIN),
-       FLAG(w, PCI_EXP_LNKSTA_SL_CLK),
-       FLAG(w, PCI_EXP_LNKSTA_DL_ACT),
-       FLAG(w, PCI_EXP_LNKSTA_BWMGMT),
-       FLAG(w, PCI_EXP_LNKSTA_AUTBW));
-}
-
-static const char *indicator(int code)
-{
-  static const char *names[] = { "Unknown", "On", "Blink", "Off" };
-  return names[code];
-}
-
-static void cap_express_slot(struct device *d, int where)
-{
-  u32 t;
-  u16 w;
-
-  t = get_conf_long(d, where + PCI_EXP_SLTCAP);
-  printf("\t\tSltCap:\tAttnBtn%c PwrCtrl%c MRL%c AttnInd%c PwrInd%c HotPlug%c Surpise%c\n",
-       FLAG(t, PCI_EXP_SLTCAP_ATNB),
-       FLAG(t, PCI_EXP_SLTCAP_PWRC),
-       FLAG(t, PCI_EXP_SLTCAP_MRL),
-       FLAG(t, PCI_EXP_SLTCAP_ATNI),
-       FLAG(t, PCI_EXP_SLTCAP_PWRI),
-       FLAG(t, PCI_EXP_SLTCAP_HPC),
-       FLAG(t, PCI_EXP_SLTCAP_HPS));
-  printf("\t\t\tSlot #%3x, PowerLimit %f; Interlock%c NoCompl%c\n",
-       t >> 19,
-       power_limit((t & PCI_EXP_SLTCAP_PWR_VAL) >> 7, (t & PCI_EXP_SLTCAP_PWR_SCL) >> 15),
-       FLAG(t, PCI_EXP_SLTCAP_INTERLOCK),
-       FLAG(t, PCI_EXP_SLTCAP_NOCMDCOMP));
-
-  w = get_conf_word(d, where + PCI_EXP_SLTCTL);
-  printf("\t\tSltCtl:\tEnable: AttnBtn%c PwrFlt%c MRL%c PresDet%c CmdCplt%c HPIrq%c LinkChg%c\n",
-       FLAG(w, PCI_EXP_SLTCTL_ATNB),
-       FLAG(w, PCI_EXP_SLTCTL_PWRF),
-       FLAG(w, PCI_EXP_SLTCTL_MRLS),
-       FLAG(w, PCI_EXP_SLTCTL_PRSD),
-       FLAG(w, PCI_EXP_SLTCTL_CMDC),
-       FLAG(w, PCI_EXP_SLTCTL_HPIE),
-       FLAG(w, PCI_EXP_SLTCTL_LLCHG));
-  printf("\t\t\tControl: AttnInd %s, PwrInd %s, Power%c Interlock%c\n",
-       indicator((w & PCI_EXP_SLTCTL_ATNI) >> 6),
-       indicator((w & PCI_EXP_SLTCTL_PWRI) >> 8),
-       FLAG(w, PCI_EXP_SLTCTL_PWRC),
-       FLAG(w, PCI_EXP_SLTCTL_INTERLOCK));
-
-  w = get_conf_word(d, where + PCI_EXP_SLTSTA);
-  printf("\t\tSltSta:\tStatus: AttnBtn%c PowerFlt%c MRL%c CmdCplt%c PresDet%c Interlock%c\n",
-       FLAG(w, PCI_EXP_SLTSTA_ATNB),
-       FLAG(w, PCI_EXP_SLTSTA_PWRF),
-       FLAG(w, PCI_EXP_SLTSTA_MRL_ST),
-       FLAG(w, PCI_EXP_SLTSTA_CMDC),
-       FLAG(w, PCI_EXP_SLTSTA_PRES),
-       FLAG(w, PCI_EXP_SLTSTA_INTERLOCK));
-  printf("\t\t\tChanged: MRL%c PresDet%c LinkState%c\n",
-       FLAG(w, PCI_EXP_SLTSTA_MRLS),
-       FLAG(w, PCI_EXP_SLTSTA_PRSD),
-       FLAG(w, PCI_EXP_SLTSTA_LLCHG));
-}
-
-static void cap_express_root(struct device *d, int where)
-{
-  u32 w = get_conf_word(d, where + PCI_EXP_RTCTL);
-  printf("\t\tRootCtl: ErrCorrectable%c ErrNon-Fatal%c ErrFatal%c PMEIntEna%c CRSVisible%c\n",
-       FLAG(w, PCI_EXP_RTCTL_SECEE),
-       FLAG(w, PCI_EXP_RTCTL_SENFEE),
-       FLAG(w, PCI_EXP_RTCTL_SEFEE),
-       FLAG(w, PCI_EXP_RTCTL_PMEIE),
-       FLAG(w, PCI_EXP_RTCTL_CRSVIS));
-
-  w = get_conf_word(d, where + PCI_EXP_RTCAP);
-  printf("\t\tRootCap: CRSVisible%c\n",
-       FLAG(w, PCI_EXP_RTCAP_CRSVIS));
-
-  w = get_conf_word(d, where + PCI_EXP_RTSTA);
-  printf("\t\tRootSta: PME ReqID %04x, PMEStatus%c PMEPending%c\n",
-       w & PCI_EXP_RTSTA_PME_REQID,
-       FLAG(w, PCI_EXP_RTSTA_PME_STATUS),
-       FLAG(w, PCI_EXP_RTSTA_PME_PENDING));
-}
-
-static const char *cap_express_dev2_timeout_range(int type)
-{
-  /* Decode Completion Timeout Ranges. */
-  switch (type)
-    {
-      case 0:
-       return "Not Supported";
-      case 1:
-       return "Range A";
-      case 2:
-       return "Range B";
-      case 3:
-       return "Range AB";
-      case 6:
-       return "Range BC";
-      case 7:
-       return "Range ABC";
-      case 14:
-       return "Range BCD";
-      case 15:
-       return "Range ABCD";
-      default:
-       return "Unknown";
-    }
-}
-
-static const char *cap_express_dev2_timeout_value(int type)
-{
-  /* Decode Completion Timeout Value. */
-  switch (type)
-    {
-      case 0:
-       return "50us to 50ms";
-      case 1:
-       return "50us to 100us";
-      case 2:
-       return "1ms to 10ms";
-      case 5:
-       return "16ms to 55ms";
-      case 6:
-       return "65ms to 210ms";
-      case 9:
-       return "260ms to 900ms";
-      case 10:
-       return "1s to 3.5s";
-      case 13:
-       return "4s to 13s";
-      case 14:
-       return "17s to 64s";
-      default:
-       return "Unknown";
-    }
-}
-
-static void cap_express_dev2(struct device *d, int where, int type)
-{
-  u32 l;
-  u16 w;
-
-  l = get_conf_long(d, where + PCI_EXP_DEVCAP2);
-  printf("\t\tDevCap2: Completion Timeout: %s, TimeoutDis%c",
-       cap_express_dev2_timeout_range(PCI_EXP_DEV2_TIMEOUT_RANGE(l)),
-       FLAG(l, PCI_EXP_DEV2_TIMEOUT_DIS));
-  if (type == PCI_EXP_TYPE_ROOT_PORT || type == PCI_EXP_TYPE_DOWNSTREAM)
-    printf(" ARIFwd%c\n", FLAG(l, PCI_EXP_DEV2_ARI));
-  else
-    printf("\n");
-
-  w = get_conf_word(d, where + PCI_EXP_DEVCTL2);
-  printf("\t\tDevCtl2: Completion Timeout: %s, TimeoutDis%c",
-       cap_express_dev2_timeout_value(PCI_EXP_DEV2_TIMEOUT_VALUE(w)),
-       FLAG(w, PCI_EXP_DEV2_TIMEOUT_DIS));
-  if (type == PCI_EXP_TYPE_ROOT_PORT || type == PCI_EXP_TYPE_DOWNSTREAM)
-    printf(" ARIFwd%c\n", FLAG(w, PCI_EXP_DEV2_ARI));
-  else
-    printf("\n");
-}
-
-static const char *cap_express_link2_speed(int type)
-{
-  switch (type)
-    {
-      case 0: /* hardwire to 0 means only the 2.5GT/s is supported */
-      case 1:
-       return "2.5GT/s";
-      case 2:
-       return "5GT/s";
-      default:
-       return "Unknown";
-    }
-}
-
-static const char *cap_express_link2_deemphasis(int type)
-{
-  switch (type)
-    {
-      case 0:
-       return "-6dB";
-      case 1:
-       return "-3.5dB";
-      default:
-       return "Unknown";
-    }
-}
-
-static const char *cap_express_link2_transmargin(int type)
-{
-  switch (type)
-    {
-      case 0:
-       return "Normal Operating Range";
-      case 1:
-       return "800-1200mV(full-swing)/400-700mV(half-swing)";
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-       return "200-400mV(full-swing)/100-200mV(half-swing)";
-      default:
-       return "Unknown";
-    }
-}
-
-static void cap_express_link2(struct device *d, int where, int type UNUSED)
-{
-  u16 w;
-
-  w = get_conf_word(d, where + PCI_EXP_LNKCTL2);
-  printf("\t\tLnkCtl2: Target Link Speed: %s, EnterCompliance%c SpeedDis%c, Selectable De-emphasis: %s\n"
-       "\t\t\t Transmit Margin: %s, EnterModifiedCompliance%c ComplianceSOS%c\n"
-       "\t\t\t Compliance De-emphasis: %s\n",
-       cap_express_link2_speed(PCI_EXP_LNKCTL2_SPEED(w)),
-       FLAG(w, PCI_EXP_LNKCTL2_CMPLNC),
-       FLAG(w, PCI_EXP_LNKCTL2_SPEED_DIS),
-       cap_express_link2_deemphasis(PCI_EXP_LNKCTL2_DEEMPHASIS(w)),
-       cap_express_link2_transmargin(PCI_EXP_LNKCTL2_MARGIN(w)),
-       FLAG(w, PCI_EXP_LNKCTL2_MOD_CMPLNC),
-       FLAG(w, PCI_EXP_LNKCTL2_CMPLNC_SOS),
-       cap_express_link2_deemphasis(PCI_EXP_LNKCTL2_COM_DEEMPHASIS(w)));
-
-  w = get_conf_word(d, where + PCI_EXP_LNKSTA2);
-  printf("\t\tLnkSta2: Current De-emphasis Level: %s\n",
-       cap_express_link2_deemphasis(PCI_EXP_LINKSTA2_DEEMPHASIS(w)));
-}
-
-static void cap_express_slot2(struct device *d UNUSED, int where UNUSED)
-{
-  /* No capabilities that require this field in PCIe rev2.0 spec. */
-}
-
-static void
-cap_express(struct device *d, int where, int cap)
-{
-  int type = (cap & PCI_EXP_FLAGS_TYPE) >> 4;
-  int size;
-  int slot = 0;
-
-  printf("Express ");
-  if (verbose >= 2)
-    printf("(v%d) ", cap & PCI_EXP_FLAGS_VERS);
-  switch (type)
-    {
-    case PCI_EXP_TYPE_ENDPOINT:
-      printf("Endpoint");
-      break;
-    case PCI_EXP_TYPE_LEG_END:
-      printf("Legacy Endpoint");
-      break;
-    case PCI_EXP_TYPE_ROOT_PORT:
-      slot = cap & PCI_EXP_FLAGS_SLOT;
-      printf("Root Port (Slot%c)", FLAG(cap, PCI_EXP_FLAGS_SLOT));
-      break;
-    case PCI_EXP_TYPE_UPSTREAM:
-      printf("Upstream Port");
-      break;
-    case PCI_EXP_TYPE_DOWNSTREAM:
-      slot = cap & PCI_EXP_FLAGS_SLOT;
-      printf("Downstream Port (Slot%c)", FLAG(cap, PCI_EXP_FLAGS_SLOT));
-      break;
-    case PCI_EXP_TYPE_PCI_BRIDGE:
-      printf("PCI/PCI-X Bridge");
-      break;
-    case PCI_EXP_TYPE_PCIE_BRIDGE:
-      printf("PCI/PCI-X to PCI-Express Bridge");
-      break;
-    case PCI_EXP_TYPE_ROOT_INT_EP:
-      printf("Root Complex Integrated Endpoint");
-      break;
-    case PCI_EXP_TYPE_ROOT_EC:
-      printf("Root Complex Event Collector");
-      break;
-    default:
-      printf("Unknown type %d", type);
-  }
-  printf(", MSI %02x\n", (cap & PCI_EXP_FLAGS_IRQ) >> 9);
-  if (verbose < 2)
-    return;
-
-  size = 16;
-  if (slot)
-    size = 24;
-  if (type == PCI_EXP_TYPE_ROOT_PORT)
-    size = 32;
-  if (!config_fetch(d, where + PCI_EXP_DEVCAP, size))
-    return;
-
-  cap_express_dev(d, where, type);
-  cap_express_link(d, where, type);
-  if (slot)
-    cap_express_slot(d, where);
-  if (type == PCI_EXP_TYPE_ROOT_PORT)
-    cap_express_root(d, where);
-
-  if ((cap & PCI_EXP_FLAGS_VERS) < 2)
-    return;
-
-  size = 16;
-  if (slot)
-    size = 24;
-  if (!config_fetch(d, where + PCI_EXP_DEVCAP2, size))
-    return;
-
-  cap_express_dev2(d, where, type);
-  cap_express_link2(d, where, type);
-  if (slot)
-    cap_express_slot2(d, where);
-}
-
-static void
-cap_msix(struct device *d, int where, int cap)
-{
-  u32 off;
-
-  printf("MSI-X: Enable%c Mask%c TabSize=%d\n",
-        FLAG(cap, PCI_MSIX_ENABLE),
-        FLAG(cap, PCI_MSIX_MASK),
-        (cap & PCI_MSIX_TABSIZE) + 1);
-  if (verbose < 2 || !config_fetch(d, where + PCI_MSIX_TABLE, 8))
-    return;
-
-  off = get_conf_long(d, where + PCI_MSIX_TABLE);
-  printf("\t\tVector table: BAR=%d offset=%08x\n",
-        off & PCI_MSIX_BIR, off & ~PCI_MSIX_BIR);
-  off = get_conf_long(d, where + PCI_MSIX_PBA);
-  printf("\t\tPBA: BAR=%d offset=%08x\n",
-        off & PCI_MSIX_BIR, off & ~PCI_MSIX_BIR);
-}
-
-static void
-cap_slotid(int cap)
-{
-  int esr = cap & 0xff;
-  int chs = cap >> 8;
-
-  printf("Slot ID: %d slots, First%c, chassis %02x\n",
-        esr & PCI_SID_ESR_NSLOTS,
-        FLAG(esr, PCI_SID_ESR_FIC),
-        chs);
-}
-
-static void
-cap_ssvid(struct device *d, int where)
-{
-  u16 subsys_v, subsys_d;
-  char ssnamebuf[256];
-
-  if (!config_fetch(d, where, 8))
-    return;
-  subsys_v = get_conf_word(d, where + PCI_SSVID_VENDOR);
-  subsys_d = get_conf_word(d, where + PCI_SSVID_DEVICE);
-  printf("Subsystem: %s\n",
-          pci_lookup_name(pacc, ssnamebuf, sizeof(ssnamebuf),
-                          PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
-                          d->dev->vendor_id, d->dev->device_id, subsys_v, subsys_d));
-}
-
-static void
-cap_dsn(struct device *d, int where)
-{
-  u32 t1, t2;
-  if (!config_fetch(d, where + 4, 8))
-    return;
-  t1 = get_conf_long(d, where + 4);
-  t2 = get_conf_long(d, where + 8);
-  printf("Device Serial Number %02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x\n",
-       t1 & 0xff, (t1 >> 8) & 0xff, (t1 >> 16) & 0xff, t1 >> 24,
-       t2 & 0xff, (t2 >> 8) & 0xff, (t2 >> 16) & 0xff, t2 >> 24);
-}
-
-static void
-cap_debug_port(int cap)
-{
-  int bar = cap >> 13;
-  int pos = cap & 0x1fff;
-  printf("Debug port: BAR=%d offset=%04x\n", bar, pos);
-}
-
-static void
-cap_aer(struct device *d, int where)
-{
-  u32 l;
-
-  printf("Advanced Error Reporting\n");
-  if (!config_fetch(d, where + PCI_ERR_UNCOR_STATUS, 24))
-    return;
-
-  l = get_conf_long(d, where + PCI_ERR_UNCOR_STATUS);
-  printf("\t\tUESta:\tDLP%c SDES%c TLP%c FCP%c CmpltTO%c CmpltAbrt%c UnxCmplt%c RxOF%c "
-       "MalfTLP%c ECRC%c UnsupReq%c ACSViol%c\n",
-       FLAG(l, PCI_ERR_UNC_DLP), FLAG(l, PCI_ERR_UNC_SDES), FLAG(l, PCI_ERR_UNC_POISON_TLP),
-       FLAG(l, PCI_ERR_UNC_FCP), FLAG(l, PCI_ERR_UNC_COMP_TIME), FLAG(l, PCI_ERR_UNC_COMP_ABORT),
-       FLAG(l, PCI_ERR_UNC_UNX_COMP), FLAG(l, PCI_ERR_UNC_RX_OVER), FLAG(l, PCI_ERR_UNC_MALF_TLP),
-       FLAG(l, PCI_ERR_UNC_ECRC), FLAG(l, PCI_ERR_UNC_UNSUP), FLAG(l, PCI_ERR_UNC_ACS_VIOL));
-  l = get_conf_long(d, where + PCI_ERR_UNCOR_MASK);
-  printf("\t\tUEMsk:\tDLP%c SDES%c TLP%c FCP%c CmpltTO%c CmpltAbrt%c UnxCmplt%c RxOF%c "
-       "MalfTLP%c ECRC%c UnsupReq%c ACSViol%c\n",
-       FLAG(l, PCI_ERR_UNC_DLP), FLAG(l, PCI_ERR_UNC_SDES), FLAG(l, PCI_ERR_UNC_POISON_TLP),
-       FLAG(l, PCI_ERR_UNC_FCP), FLAG(l, PCI_ERR_UNC_COMP_TIME), FLAG(l, PCI_ERR_UNC_COMP_ABORT),
-       FLAG(l, PCI_ERR_UNC_UNX_COMP), FLAG(l, PCI_ERR_UNC_RX_OVER), FLAG(l, PCI_ERR_UNC_MALF_TLP),
-       FLAG(l, PCI_ERR_UNC_ECRC), FLAG(l, PCI_ERR_UNC_UNSUP), FLAG(l, PCI_ERR_UNC_ACS_VIOL));
-  l = get_conf_long(d, where + PCI_ERR_UNCOR_SEVER);
-  printf("\t\tUESvrt:\tDLP%c SDES%c TLP%c FCP%c CmpltTO%c CmpltAbrt%c UnxCmplt%c RxOF%c "
-       "MalfTLP%c ECRC%c UnsupReq%c ACSViol%c\n",
-       FLAG(l, PCI_ERR_UNC_DLP), FLAG(l, PCI_ERR_UNC_SDES), FLAG(l, PCI_ERR_UNC_POISON_TLP),
-       FLAG(l, PCI_ERR_UNC_FCP), FLAG(l, PCI_ERR_UNC_COMP_TIME), FLAG(l, PCI_ERR_UNC_COMP_ABORT),
-       FLAG(l, PCI_ERR_UNC_UNX_COMP), FLAG(l, PCI_ERR_UNC_RX_OVER), FLAG(l, PCI_ERR_UNC_MALF_TLP),
-       FLAG(l, PCI_ERR_UNC_ECRC), FLAG(l, PCI_ERR_UNC_UNSUP), FLAG(l, PCI_ERR_UNC_ACS_VIOL));
-  l = get_conf_long(d, where + PCI_ERR_COR_STATUS);
-  printf("\t\tCESta:\tRxErr%c BadTLP%c BadDLLP%c Rollover%c Timeout%c NonFatalErr%c\n",
-       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_COR_MASK);
-  printf("\t\tCEMsk:\tRxErr%c BadTLP%c BadDLLP%c Rollover%c Timeout%c NonFatalErr%c\n",
-       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",
-       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));
-
-}
-
-static void
-cap_acs(struct device *d, int where)
-{
-  u16 w;
-
-  printf("Access Control Services\n");
-  if (!config_fetch(d, where + PCI_ACS_CAP, 4))
-    return;
-
-  w = get_conf_word(d, where + PCI_ACS_CAP);
-  printf("\t\tACSCap:\tSrcValid%c TransBlk%c ReqRedir%c CmpltRedir%c UpstreamFwd%c EgressCtrl%c "
-       "DirectTrans%c\n",
-       FLAG(w, PCI_ACS_CAP_VALID), FLAG(w, PCI_ACS_CAP_BLOCK), FLAG(w, PCI_ACS_CAP_REQ_RED),
-       FLAG(w, PCI_ACS_CAP_CMPLT_RED), FLAG(w, PCI_ACS_CAP_FORWARD), FLAG(w, PCI_ACS_CAP_EGRESS),
-       FLAG(w, PCI_ACS_CAP_TRANS));
-  w = get_conf_word(d, where + PCI_ACS_CTRL);
-  printf("\t\tACSCtl:\tSrcValid%c TransBlk%c ReqRedir%c CmpltRedir%c UpstreamFwd%c EgressCtrl%c "
-       "DirectTrans%c\n",
-       FLAG(w, PCI_ACS_CTRL_VALID), FLAG(w, PCI_ACS_CTRL_BLOCK), FLAG(w, PCI_ACS_CTRL_REQ_RED),
-       FLAG(w, PCI_ACS_CTRL_CMPLT_RED), FLAG(w, PCI_ACS_CTRL_FORWARD), FLAG(w, PCI_ACS_CTRL_EGRESS),
-       FLAG(w, PCI_ACS_CTRL_TRANS));
-}
-
-static void
-cap_ari(struct device *d, int where)
-{
-  u16 w;
-
-  printf("Alternative Routing-ID Interpretation (ARI)\n");
-  if (!config_fetch(d, where + PCI_ARI_CAP, 4))
-    return;
-
-  w = get_conf_word(d, where + PCI_ARI_CAP);
-  printf("\t\tARICap:\tMFVC%c ACS%c, Next Function: %d\n",
-       FLAG(w, PCI_ARI_CAP_MFVC), FLAG(w, PCI_ARI_CAP_ACS),
-       PCI_ARI_CAP_NFN(w));
-  w = get_conf_word(d, where + PCI_ARI_CTRL);
-  printf("\t\tARICtl:\tMFVC%c ACS%c, Function Group: %d\n",
-       FLAG(w, PCI_ARI_CTRL_MFVC), FLAG(w, PCI_ARI_CTRL_ACS),
-       PCI_ARI_CTRL_FG(w));
-}
-
-static void
-cap_ats(struct device *d, int where)
-{
-  u16 w;
-
-  printf("Address Translation Service (ATS)\n");
-  if (!config_fetch(d, where + PCI_ATS_CAP, 4))
-    return;
-
-  w = get_conf_word(d, where + PCI_ATS_CAP);
-  printf("\t\tATSCap:\tInvalidate Queue Depth: %02x\n", PCI_ATS_CAP_IQD(w));
-  w = get_conf_word(d, where + PCI_ATS_CTRL);
-  printf("\t\tATSCtl:\tEnable%c, Smallest Translation Unit: %02x\n",
-       FLAG(w, PCI_ATS_CTRL_ENABLE), PCI_ATS_CTRL_STU(w));
-}
-
-static void
-cap_sriov(struct device *d, int where)
-{
-  u16 b;
-  u16 w;
-  u32 l;
-
-  printf("Single Root I/O Virtualization (SR-IOV)\n");
-  if (!config_fetch(d, where + PCI_IOV_CAP, 0x3c))
-    return;
-
-  l = get_conf_long(d, where + PCI_IOV_CAP);
-  printf("\t\tIOVCap:\tMigration%c, Interrupt Message Number: %03x\n",
-       FLAG(l, PCI_IOV_CAP_VFM), PCI_IOV_CAP_IMN(l));
-  w = get_conf_word(d, where + PCI_IOV_CTRL);
-  printf("\t\tIOVCtl:\tEnable%c Migration%c Interrupt%c MSE%c ARIHierarchy%c\n",
-       FLAG(w, PCI_IOV_CTRL_VFE), FLAG(w, PCI_IOV_CTRL_VFME),
-       FLAG(w, PCI_IOV_CTRL_VFMIE), FLAG(w, PCI_IOV_CTRL_MSE),
-       FLAG(w, PCI_IOV_CTRL_ARI));
-  w = get_conf_word(d, where + PCI_IOV_STATUS);
-  printf("\t\tIOVSta:\tMigration%c\n", FLAG(w, PCI_IOV_STATUS_MS));
-  w = get_conf_word(d, where + PCI_IOV_INITIALVF);
-  printf("\t\tInitial VFs: %d, ", w);
-  w = get_conf_word(d, where + PCI_IOV_TOTALVF);
-  printf("Total VFs: %d, ", w);
-  w = get_conf_word(d, where + PCI_IOV_NUMVF);
-  printf("Number of VFs: %d, ", w);
-  b = get_conf_byte(d, where + PCI_IOV_FDL);
-  printf("Function Dependency Link: %02x\n", b);
-  w = get_conf_word(d, where + PCI_IOV_OFFSET);
-  printf("\t\tVF offset: %d, ", w);
-  w = get_conf_word(d, where + PCI_IOV_STRIDE);
-  printf("stride: %d, ", w);
-  w = get_conf_word(d, where + PCI_IOV_DID);
-  printf("Device ID: %04x\n", w);
-  l = get_conf_long(d, where + PCI_IOV_SUPPS);
-  printf("\t\tSupported Page Size: %08x, ", l);
-  l = get_conf_long(d, where + PCI_IOV_SYSPS);
-  printf("System Page Size: %08x\n", l);
-  printf("\t\tVF Migration: offset: %08x, BIR: %x\n", PCI_IOV_MSA_OFFSET(l),
-       PCI_IOV_MSA_BIR(l));
-}
-
-static void
-show_ext_caps(struct device *d)
-{
-  int where = 0x100;
-  char been_there[0x1000];
-  memset(been_there, 0, 0x1000);
-  do
-    {
-      u32 header;
-      int id;
-
-      if (!config_fetch(d, where, 4))
-       break;
-      header = get_conf_long(d, where);
-      if (!header)
-       break;
-      id = header & 0xffff;
-      printf("\tCapabilities: [%03x] ", where);
-      if (been_there[where]++)
-       {
-         printf("<chain looped>\n");
-         break;
-       }
-      switch (id)
-       {
-         case PCI_EXT_CAP_ID_AER:
-           cap_aer(d, where);
-           break;
-         case PCI_EXT_CAP_ID_VC:
-           printf("Virtual Channel <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_DSN:
-           cap_dsn(d, where);
-           break;
-         case PCI_EXT_CAP_ID_PB:
-           printf("Power Budgeting <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_RCLINK:
-           printf("Root Complex Link <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_RCILINK:
-           printf("Root Complex Internal Link <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_RCECOLL:
-           printf("Root Complex Event Collector <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_MFVC:
-           printf("Multi-Function Virtual Channel <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_RBCB:
-           printf("Root Bridge Control Block <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_VNDR:
-           printf("Vendor Specific Information <?>\n");
-           break;
-         case PCI_EXT_CAP_ID_ACS:
-           cap_acs(d, where);
-           break;
-         case PCI_EXT_CAP_ID_ARI:
-           cap_ari(d, where);
-           break;
-         case PCI_EXT_CAP_ID_ATS:
-           cap_ats(d, where);
-           break;
-         case PCI_EXT_CAP_ID_SRIOV:
-           cap_sriov(d, where);
-           break;
-         default:
-           printf("#%02x\n", id);
-           break;
-       }
-      where = header >> 20;
-    } while (where);
-}
-
-static void
-show_caps(struct device *d)
-{
-  int can_have_ext_caps = 0;
-
-  if (get_conf_word(d, PCI_STATUS) & PCI_STATUS_CAP_LIST)
-    {
-      int where = get_conf_byte(d, PCI_CAPABILITY_LIST) & ~3;
-      byte been_there[256];
-      memset(been_there, 0, 256);
-      while (where)
-       {
-         int id, next, cap;
-         printf("\tCapabilities: ");
-         if (!config_fetch(d, where, 4))
-           {
-             puts("<access denied>");
-             break;
-           }
-         id = get_conf_byte(d, where + PCI_CAP_LIST_ID);
-         next = get_conf_byte(d, where + PCI_CAP_LIST_NEXT) & ~3;
-         cap = get_conf_word(d, where + PCI_CAP_FLAGS);
-         printf("[%02x] ", where);
-         if (been_there[where]++)
-           {
-             printf("<chain looped>\n");
-             break;
-           }
-         if (id == 0xff)
-           {
-             printf("<chain broken>\n");
-             break;
-           }
-         switch (id)
-           {
-           case PCI_CAP_ID_PM:
-             cap_pm(d, where, cap);
-             break;
-           case PCI_CAP_ID_AGP:
-             cap_agp(d, where, cap);
-             break;
-           case PCI_CAP_ID_VPD:
-             cap_vpd(d);
-             break;
-           case PCI_CAP_ID_SLOTID:
-             cap_slotid(cap);
-             break;
-           case PCI_CAP_ID_MSI:
-             cap_msi(d, where, cap);
-             break;
-           case PCI_CAP_ID_CHSWP:
-             printf("CompactPCI hot-swap <?>\n");
-             break;
-           case PCI_CAP_ID_PCIX:
-             cap_pcix(d, where);
-             can_have_ext_caps = 1;
-             break;
-           case PCI_CAP_ID_HT:
-             cap_ht(d, where, cap);
-             break;
-           case PCI_CAP_ID_VNDR:
-             printf("Vendor Specific Information <?>\n");
-             break;
-           case PCI_CAP_ID_DBG:
-             cap_debug_port(cap);
-             break;
-           case PCI_CAP_ID_CCRC:
-             printf("CompactPCI central resource control <?>\n");
-             break;
-           case PCI_CAP_ID_HOTPLUG:
-             printf("Hot-plug capable\n");
-             break;
-           case PCI_CAP_ID_SSVID:
-             cap_ssvid(d, where);
-             break;
-           case PCI_CAP_ID_AGP3:
-             printf("AGP3 <?>\n");
-             break;
-           case PCI_CAP_ID_SECURE:
-             printf("Secure device <?>\n");
-             break;
-           case PCI_CAP_ID_EXP:
-             cap_express(d, where, cap);
-             can_have_ext_caps = 1;
-             break;
-           case PCI_CAP_ID_MSIX:
-             cap_msix(d, where, cap);
-             break;
-           case PCI_CAP_ID_SATA:
-             printf("SATA HBA <?>\n");
-             break;
-           case PCI_CAP_ID_AF:
-             printf("PCIe advanced features <?>\n");
-             break;
-           default:
-             printf("#%02x [%04x]\n", id, cap);
-           }
-         where = next;
-       }
-    }
-  if (can_have_ext_caps)
-    show_ext_caps(d);
-}
-
-/*** Kernel drivers ***/
-
-#ifdef PCI_OS_LINUX
-
-#include <sys/utsname.h>
-
-struct pcimap_entry {
-  struct pcimap_entry *next;
-  unsigned int vendor, device;
-  unsigned int subvendor, subdevice;
-  unsigned int class, class_mask;
-  char module[1];
-};
-
-static struct pcimap_entry *pcimap_head;
-
-static void
-load_pcimap(void)
-{
-  static int tried_pcimap;
-  struct utsname uts;
-  char *name, line[1024];
-  FILE *f;
-
-  if (tried_pcimap)
-    return;
-  tried_pcimap = 1;
-
-  if (name = opt_pcimap)
-    {
-      f = fopen(name, "r");
-      if (!f)
-       die("Cannot open pcimap file %s: %m", name);
-    }
-  else
-    {
-      if (uname(&uts) < 0)
-       die("uname() failed: %m");
-      name = alloca(64 + strlen(uts.release));
-      sprintf(name, "/lib/modules/%s/modules.pcimap", uts.release);
-      f = fopen(name, "r");
-      if (!f)
-       return;
-    }
-
-  while (fgets(line, sizeof(line), f))
+  h = index = alloca(sizeof(struct device *) * cnt);
+  for (d=first_dev; d; d=d->next)
+    *h++ = d;
+  qsort(index, cnt, sizeof(struct device *), compare_them);
+  last_dev = &first_dev;
+  h = index;
+  while (cnt--)
     {
-      char *c = strchr(line, '\n');
-      struct pcimap_entry *e;
-
-      if (!c)
-       die("Unterminated or too long line in %s", name);
-      *c = 0;
-      if (!line[0] || line[0] == '#')
-       continue;
-
-      c = line;
-      while (*c && *c != ' ' && *c != '\t')
-       c++;
-      if (!*c)
-       continue;       /* FIXME: Emit warnings! */
-      *c++ = 0;
-
-      e = xmalloc(sizeof(*e) + strlen(line));
-      if (sscanf(c, "%i%i%i%i%i%i",
-                &e->vendor, &e->device,
-                &e->subvendor, &e->subdevice,
-                &e->class, &e->class_mask) != 6)
-       continue;
-      e->next = pcimap_head;
-      pcimap_head = e;
-      strcpy(e->module, line);
+      *last_dev = *h;
+      last_dev = &(*h)->next;
+      h++;
     }
-  fclose(f);
-}
-
-static int
-match_pcimap(struct device *d, struct pcimap_entry *e)
-{
-  struct pci_dev *dev = d->dev;
-  unsigned int class = get_conf_long(d, PCI_REVISION_ID) >> 8;
-  word subv, subd;
-
-#define MATCH(x, y) ((y) > 0xffff || (x) == (y))
-  get_subid(d, &subv, &subd);
-  return
-    MATCH(dev->vendor_id, e->vendor) &&
-    MATCH(dev->device_id, e->device) &&
-    MATCH(subv, e->subvendor) &&
-    MATCH(subd, e->subdevice) &&
-    (class & e->class_mask) == e->class;
-#undef MATCH
+  *last_dev = NULL;
 }
 
-#define DRIVER_BUF_SIZE 1024
+/*** Normal output ***/
 
-static char *
-find_driver(struct device *d, char *buf)
+static void
+show_slot_name(struct device *d)
 {
-  struct pci_dev *dev = d->dev;
-  char name[1024], *drv, *base;
-  int n;
-
-  if (dev->access->method != PCI_ACCESS_SYS_BUS_PCI)
-    return NULL;
-
-  base = pci_get_param(dev->access, "sysfs.path");
-  if (!base || !base[0])
-    return NULL;
-
-  n = snprintf(name, sizeof(name), "%s/devices/%04x:%02x:%02x.%d/driver",
-              base, dev->domain, dev->bus, dev->dev, dev->func);
-  if (n < 0 || n >= (int)sizeof(name))
-    die("show_driver: sysfs device name too long, why?");
-
-  n = readlink(name, buf, DRIVER_BUF_SIZE);
-  if (n < 0)
-    return NULL;
-  if (n >= DRIVER_BUF_SIZE)
-    return "<name-too-long>";
-  buf[n] = 0;
+  struct pci_dev *p = d->dev;
 
-  if (drv = strrchr(buf, '/'))
-    return drv+1;
-  else
-    return buf;
+  if (!opt_machine ? opt_domains : (p->domain || opt_domains >= 2))
+    printf("%04x:", p->domain);
+  printf("%02x:%02x.%d", p->bus, p->dev, p->func);
 }
 
-static void
-show_kernel(struct device *d)
+void
+get_subid(struct device *d, word *subvp, word *subdp)
 {
-  char buf[DRIVER_BUF_SIZE];
-  char *driver;
-  struct pcimap_entry *e, *last = NULL;
-
-  if (driver = find_driver(d, buf))
-    printf("\tKernel driver in use: %s\n", driver);
+  byte htype = get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f;
 
-  load_pcimap();
-  for (e=pcimap_head; e; e=e->next)
-    if (match_pcimap(d, e) && (!last || strcmp(last->module, e->module)))
-      {
-       printf("%s %s", (last ? "," : "\tKernel modules:"), e->module);
-       last = e;
-      }
-  if (last)
-    putchar('\n');
+  if (htype == PCI_HEADER_TYPE_NORMAL)
+    {
+      *subvp = get_conf_word(d, PCI_SUBSYSTEM_VENDOR_ID);
+      *subdp = get_conf_word(d, PCI_SUBSYSTEM_ID);
+    }
+  else if (htype == PCI_HEADER_TYPE_CARDBUS && d->config_cached >= 128)
+    {
+      *subvp = get_conf_word(d, PCI_CB_SUBSYSTEM_VENDOR_ID);
+      *subdp = get_conf_word(d, PCI_CB_SUBSYSTEM_ID);
+    }
+  else
+    *subvp = *subdp = 0xffff;
 }
 
 static void
-show_kernel_machine(struct device *d)
+show_terse(struct device *d)
 {
-  char buf[DRIVER_BUF_SIZE];
-  char *driver;
-  struct pcimap_entry *e, *last = NULL;
-
-  if (driver = find_driver(d, buf))
-    printf("Driver:\t%s\n", driver);
-
-  load_pcimap();
-  for (e=pcimap_head; e; e=e->next)
-    if (match_pcimap(d, e) && (!last || strcmp(last->module, e->module)))
-      {
-       printf("Module:\t%s\n", e->module);
-       last = e;
-      }
-}
+  int c;
+  struct pci_dev *p = d->dev;
+  char classbuf[128], devbuf[128];
 
-#else
+  show_slot_name(d);
+  printf(" %s: %s",
+        pci_lookup_name(pacc, classbuf, sizeof(classbuf),
+                        PCI_LOOKUP_CLASS,
+                        p->device_class),
+        pci_lookup_name(pacc, devbuf, sizeof(devbuf),
+                        PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
+                        p->vendor_id, p->device_id));
+  if (c = get_conf_byte(d, PCI_REVISION_ID))
+    printf(" (rev %02x)", c);
+  if (verbose)
+    {
+      char *x;
+      c = get_conf_byte(d, PCI_CLASS_PROG);
+      x = pci_lookup_name(pacc, devbuf, sizeof(devbuf),
+                         PCI_LOOKUP_PROGIF | PCI_LOOKUP_NO_NUMBERS,
+                         p->device_class, c);
+      if (c || x)
+       {
+         printf(" (prog-if %02x", c);
+         if (x)
+           printf(" [%s]", x);
+         putchar(')');
+       }
+    }
+  putchar('\n');
 
-static void
-show_kernel(struct device *d UNUSED)
-{
-}
+  if (verbose || opt_kernel)
+    {
+      word subsys_v, subsys_d;
+      char ssnamebuf[256];
 
-static void
-show_kernel_machine(struct device *d UNUSED)
-{
+      get_subid(d, &subsys_v, &subsys_d);
+      if (subsys_v && subsys_v != 0xffff)
+       printf("\tSubsystem: %s\n",
+               pci_lookup_name(pacc, ssnamebuf, sizeof(ssnamebuf),
+                       PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
+                       p->vendor_id, p->device_id, subsys_v, subsys_d));
+    }
 }
 
-#endif
-
 /*** Verbose output ***/
 
 static void
@@ -2719,7 +880,7 @@ show_machine(struct device *d)
 
 /*** Main show function ***/
 
-static void
+void
 show_device(struct device *d)
 {
   if (opt_machine)
@@ -2748,421 +909,6 @@ show(void)
     show_device(d);
 }
 
-/*** Tree output ***/
-
-struct bridge {
-  struct bridge *chain;                        /* Single-linked list of bridges */
-  struct bridge *next, *child;         /* Tree of bridges */
-  struct bus *first_bus;               /* List of buses connected to this bridge */
-  unsigned int domain;
-  unsigned int primary, secondary, subordinate;        /* Bus numbers */
-  struct device *br_dev;
-};
-
-struct bus {
-  unsigned int domain;
-  unsigned int number;
-  struct bus *sibling;
-  struct device *first_dev, **last_dev;
-};
-
-static struct bridge host_bridge = { NULL, NULL, NULL, NULL, 0, ~0, 0, ~0, NULL };
-
-static struct bus *
-find_bus(struct bridge *b, unsigned int domain, unsigned int n)
-{
-  struct bus *bus;
-
-  for (bus=b->first_bus; bus; bus=bus->sibling)
-    if (bus->domain == domain && bus->number == n)
-      break;
-  return bus;
-}
-
-static struct bus *
-new_bus(struct bridge *b, unsigned int domain, unsigned int n)
-{
-  struct bus *bus = xmalloc(sizeof(struct bus));
-  bus->domain = domain;
-  bus->number = n;
-  bus->sibling = b->first_bus;
-  bus->first_dev = NULL;
-  bus->last_dev = &bus->first_dev;
-  b->first_bus = bus;
-  return bus;
-}
-
-static void
-insert_dev(struct device *d, struct bridge *b)
-{
-  struct pci_dev *p = d->dev;
-  struct bus *bus;
-
-  if (! (bus = find_bus(b, p->domain, p->bus)))
-    {
-      struct bridge *c;
-      for (c=b->child; c; c=c->next)
-       if (c->domain == p->domain && c->secondary <= p->bus && p->bus <= c->subordinate)
-          {
-            insert_dev(d, c);
-            return;
-          }
-      bus = new_bus(b, p->domain, p->bus);
-    }
-  /* Simple insertion at the end _does_ guarantee the correct order as the
-   * original device list was sorted by (domain, bus, devfn) lexicographically
-   * and all devices on the new list have the same bus number.
-   */
-  *bus->last_dev = d;
-  bus->last_dev = &d->next;
-  d->next = NULL;
-}
-
-static void
-grow_tree(void)
-{
-  struct device *d, *d2;
-  struct bridge **last_br, *b;
-
-  /* Build list of bridges */
-
-  last_br = &host_bridge.chain;
-  for (d=first_dev; d; d=d->next)
-    {
-      word class = d->dev->device_class;
-      byte ht = get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f;
-      if (class == PCI_CLASS_BRIDGE_PCI &&
-         (ht == PCI_HEADER_TYPE_BRIDGE || ht == PCI_HEADER_TYPE_CARDBUS))
-       {
-         b = xmalloc(sizeof(struct bridge));
-         b->domain = d->dev->domain;
-         if (ht == PCI_HEADER_TYPE_BRIDGE)
-           {
-             b->primary = get_conf_byte(d, PCI_PRIMARY_BUS);
-             b->secondary = get_conf_byte(d, PCI_SECONDARY_BUS);
-             b->subordinate = get_conf_byte(d, PCI_SUBORDINATE_BUS);
-           }
-         else
-           {
-             b->primary = get_conf_byte(d, PCI_CB_PRIMARY_BUS);
-             b->secondary = get_conf_byte(d, PCI_CB_CARD_BUS);
-             b->subordinate = get_conf_byte(d, PCI_CB_SUBORDINATE_BUS);
-           }
-         *last_br = b;
-         last_br = &b->chain;
-         b->next = b->child = NULL;
-         b->first_bus = NULL;
-         b->br_dev = d;
-       }
-    }
-  *last_br = NULL;
-
-  /* Create a bridge tree */
-
-  for (b=&host_bridge; b; b=b->chain)
-    {
-      struct bridge *c, *best;
-      best = NULL;
-      for (c=&host_bridge; c; c=c->chain)
-       if (c != b && (c == &host_bridge || b->domain == c->domain) &&
-           b->primary >= c->secondary && b->primary <= c->subordinate &&
-           (!best || best->subordinate - best->primary > c->subordinate - c->primary))
-         best = c;
-      if (best)
-       {
-         b->next = best->child;
-         best->child = b;
-       }
-    }
-
-  /* Insert secondary bus for each bridge */
-
-  for (b=&host_bridge; b; b=b->chain)
-    if (!find_bus(b, b->domain, b->secondary))
-      new_bus(b, b->domain, b->secondary);
-
-  /* Create bus structs and link devices */
-
-  for (d=first_dev; d;)
-    {
-      d2 = d->next;
-      insert_dev(d, &host_bridge);
-      d = d2;
-    }
-}
-
-static void
-print_it(char *line, char *p)
-{
-  *p++ = '\n';
-  *p = 0;
-  fputs(line, stdout);
-  for (p=line; *p; p++)
-    if (*p == '+' || *p == '|')
-      *p = '|';
-    else
-      *p = ' ';
-}
-
-static void show_tree_bridge(struct bridge *, char *, char *);
-
-static void
-show_tree_dev(struct device *d, char *line, char *p)
-{
-  struct pci_dev *q = d->dev;
-  struct bridge *b;
-  char namebuf[256];
-
-  p += sprintf(p, "%02x.%x", q->dev, q->func);
-  for (b=&host_bridge; b; b=b->chain)
-    if (b->br_dev == d)
-      {
-       if (b->secondary == b->subordinate)
-         p += sprintf(p, "-[%04x:%02x]-", b->domain, b->secondary);
-       else
-         p += sprintf(p, "-[%04x:%02x-%02x]-", b->domain, b->secondary, b->subordinate);
-        show_tree_bridge(b, line, p);
-        return;
-      }
-  if (verbose)
-    p += sprintf(p, "  %s",
-                pci_lookup_name(pacc, namebuf, sizeof(namebuf),
-                                PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
-                                q->vendor_id, q->device_id));
-  print_it(line, p);
-}
-
-static void
-show_tree_bus(struct bus *b, char *line, char *p)
-{
-  if (!b->first_dev)
-    print_it(line, p);
-  else if (!b->first_dev->next)
-    {
-      *p++ = '-';
-      *p++ = '-';
-      show_tree_dev(b->first_dev, line, p);
-    }
-  else
-    {
-      struct device *d = b->first_dev;
-      while (d->next)
-       {
-         p[0] = '+';
-         p[1] = '-';
-         show_tree_dev(d, line, p+2);
-         d = d->next;
-       }
-      p[0] = '\\';
-      p[1] = '-';
-      show_tree_dev(d, line, p+2);
-    }
-}
-
-static void
-show_tree_bridge(struct bridge *b, char *line, char *p)
-{
-  *p++ = '-';
-  if (!b->first_bus->sibling)
-    {
-      if (b == &host_bridge)
-        p += sprintf(p, "[%04x:%02x]-", b->domain, b->first_bus->number);
-      show_tree_bus(b->first_bus, line, p);
-    }
-  else
-    {
-      struct bus *u = b->first_bus;
-      char *k;
-
-      while (u->sibling)
-        {
-          k = p + sprintf(p, "+-[%04x:%02x]-", u->domain, u->number);
-          show_tree_bus(u, line, k);
-          u = u->sibling;
-        }
-      k = p + sprintf(p, "\\-[%04x:%02x]-", u->domain, u->number);
-      show_tree_bus(u, line, k);
-    }
-}
-
-static void
-show_forest(void)
-{
-  char line[256];
-
-  grow_tree();
-  show_tree_bridge(&host_bridge, line, line);
-}
-
-/*** Bus mapping mode ***/
-
-struct bus_bridge {
-  struct bus_bridge *next;
-  byte this, dev, func, first, last, bug;
-};
-
-struct bus_info {
-  byte exists;
-  byte guestbook;
-  struct bus_bridge *bridges, *via;
-};
-
-static struct bus_info *bus_info;
-
-static void
-map_bridge(struct bus_info *bi, struct device *d, int np, int ns, int nl)
-{
-  struct bus_bridge *b = xmalloc(sizeof(struct bus_bridge));
-  struct pci_dev *p = d->dev;
-
-  b->next = bi->bridges;
-  bi->bridges = b;
-  b->this = get_conf_byte(d, np);
-  b->dev = p->dev;
-  b->func = p->func;
-  b->first = get_conf_byte(d, ns);
-  b->last = get_conf_byte(d, nl);
-  printf("## %02x.%02x:%d is a bridge from %02x to %02x-%02x\n",
-        p->bus, p->dev, p->func, b->this, b->first, b->last);
-  if (b->this != p->bus)
-    printf("!!! Bridge points to invalid primary bus.\n");
-  if (b->first > b->last)
-    {
-      printf("!!! Bridge points to invalid bus range.\n");
-      b->last = b->first;
-    }
-}
-
-static void
-do_map_bus(int bus)
-{
-  int dev, func;
-  int verbose = pacc->debugging;
-  struct bus_info *bi = bus_info + bus;
-  struct device *d;
-
-  if (verbose)
-    printf("Mapping bus %02x\n", bus);
-  for (dev = 0; dev < 32; dev++)
-    if (filter.slot < 0 || filter.slot == dev)
-      {
-       int func_limit = 1;
-       for (func = 0; func < func_limit; func++)
-         if (filter.func < 0 || filter.func == func)
-           {
-             /* XXX: Bus mapping supports only domain 0 */
-             struct pci_dev *p = pci_get_dev(pacc, 0, bus, dev, func);
-             u16 vendor = pci_read_word(p, PCI_VENDOR_ID);
-             if (vendor && vendor != 0xffff)
-               {
-                 if (!func && (pci_read_byte(p, PCI_HEADER_TYPE) & 0x80))
-                   func_limit = 8;
-                 if (verbose)
-                   printf("Discovered device %02x:%02x.%d\n", bus, dev, func);
-                 bi->exists = 1;
-                 if (d = scan_device(p))
-                   {
-                     show_device(d);
-                     switch (get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f)
-                       {
-                       case PCI_HEADER_TYPE_BRIDGE:
-                         map_bridge(bi, d, PCI_PRIMARY_BUS, PCI_SECONDARY_BUS, PCI_SUBORDINATE_BUS);
-                         break;
-                       case PCI_HEADER_TYPE_CARDBUS:
-                         map_bridge(bi, d, PCI_CB_PRIMARY_BUS, PCI_CB_CARD_BUS, PCI_CB_SUBORDINATE_BUS);
-                         break;
-                       }
-                     free(d);
-                   }
-                 else if (verbose)
-                   printf("But it was filtered out.\n");
-               }
-             pci_free_dev(p);
-           }
-      }
-}
-
-static void
-do_map_bridges(int bus, int min, int max)
-{
-  struct bus_info *bi = bus_info + bus;
-  struct bus_bridge *b;
-
-  bi->guestbook = 1;
-  for (b=bi->bridges; b; b=b->next)
-    {
-      if (bus_info[b->first].guestbook)
-       b->bug = 1;
-      else if (b->first < min || b->last > max)
-       b->bug = 2;
-      else
-       {
-         bus_info[b->first].via = b;
-         do_map_bridges(b->first, b->first, b->last);
-       }
-    }
-}
-
-static void
-map_bridges(void)
-{
-  int i;
-
-  printf("\nSummary of buses:\n\n");
-  for (i=0; i<256; i++)
-    if (bus_info[i].exists && !bus_info[i].guestbook)
-      do_map_bridges(i, 0, 255);
-  for (i=0; i<256; i++)
-    {
-      struct bus_info *bi = bus_info + i;
-      struct bus_bridge *b = bi->via;
-
-      if (bi->exists)
-       {
-         printf("%02x: ", i);
-         if (b)
-           printf("Entered via %02x:%02x.%d\n", b->this, b->dev, b->func);
-         else if (!i)
-           printf("Primary host bus\n");
-         else
-           printf("Secondary host bus (?)\n");
-       }
-      for (b=bi->bridges; b; b=b->next)
-       {
-         printf("\t%02x.%d Bridge to %02x-%02x", b->dev, b->func, b->first, b->last);
-         switch (b->bug)
-           {
-           case 1:
-             printf(" <overlap bug>");
-             break;
-           case 2:
-             printf(" <crossing bug>");
-             break;
-           }
-         putchar('\n');
-       }
-    }
-}
-
-static void
-map_the_bus(void)
-{
-  if (pacc->method == PCI_ACCESS_PROC_BUS_PCI ||
-      pacc->method == PCI_ACCESS_DUMP)
-    printf("WARNING: Bus mapping can be reliable only with direct hardware access enabled.\n\n");
-  bus_info = xmalloc(sizeof(struct bus_info) * 256);
-  memset(bus_info, 0, sizeof(struct bus_info) * 256);
-  if (filter.bus >= 0)
-    do_map_bus(filter.bus);
-  else
-    {
-      int bus;
-      for (bus=0; bus<256; bus++)
-       do_map_bus(bus);
-    }
-  map_bridges();
-}
-
 /* Main */
 
 int

diff --git a/lspci.h b/lspci.h
new file mode 100644 (file)
index 0000000..c498b7c
--- /dev/null
+++ b/lspci.h
@@ -0,0 +1,80 @@
+/*
+ *     The PCI Utilities -- List All PCI Devices
+ *
+ *     Copyright (c) 1997--2008 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#define PCIUTILS_LSPCI
+#include "pciutils.h"
+
+/*
+ *  If we aren't being compiled by GCC, use xmalloc() instead of alloca().
+ *  This increases our memory footprint, but only slightly since we don't
+ *  use alloca() much.
+ */
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__DragonFly__)
+/* alloca() is defined in stdlib.h */
+#elif defined(__GNUC__) && !defined(PCI_OS_WINDOWS)
+#include <alloca.h>
+#else
+#undef alloca
+#define alloca xmalloc
+#endif
+
+/*** Options ***/
+
+extern int verbose;
+extern struct pci_filter filter;
+extern char *opt_pcimap;
+
+/*** PCI devices and access to their config space ***/
+
+struct device {
+  struct device *next;
+  struct pci_dev *dev;
+  unsigned int config_cached, config_bufsize;
+  byte *config;                                /* Cached configuration space data */
+  byte *present;                       /* Maps which configuration bytes are present */
+};
+
+extern struct device *first_dev;
+extern struct pci_access *pacc;
+
+struct device *scan_device(struct pci_dev *p);
+void show_device(struct device *d);
+
+int config_fetch(struct device *d, unsigned int pos, unsigned int len);
+u32 get_conf_long(struct device *d, unsigned int pos);
+word get_conf_word(struct device *d, unsigned int pos);
+byte get_conf_byte(struct device *d, unsigned int pos);
+
+void get_subid(struct device *d, word *subvp, word *subdp);
+
+#define FLAG(x,y) ((x & y) ? '+' : '-')
+
+/* ls-vpd.c */
+
+void cap_vpd(struct device *d);
+
+/* ls-caps.c */
+
+void show_caps(struct device *d);
+
+/* ls-ecaps.c */
+
+void show_ext_caps(struct device *d);
+
+/* ls-kernel.c */
+
+void show_kernel_machine(struct device *d UNUSED);
+void show_kernel(struct device *d UNUSED);
+
+/* ls-tree.c */
+
+void show_forest(void);
+
+/* ls-map.c */
+
+void map_the_bus(void);