X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lspci.c;h=54317cf5002f3395b8fad76ca0ce87bc88dfafa5;hb=refs%2Ftags%2Fv3.1.7;hp=035cbbba8f34ef8d45e58d40999ac0ac40725f91;hpb=a387042e9c12d5e924dfb19e54253db41980937a;p=pciutils.git diff --git a/lspci.c b/lspci.c index 035cbbb..54317cf 100644 --- a/lspci.c +++ b/lspci.c @@ -1,7 +1,7 @@ /* * The PCI Utilities -- List All PCI Devices * - * Copyright (c) 1997--2007 Martin Mares + * Copyright (c) 1997--2008 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -12,75 +12,75 @@ #include #include -#include "pciutils.h" +#include "lspci.h" /* Options */ -static int verbose; /* Show detailed information */ -static int opt_buscentric; /* Show bus addresses/IRQ's instead of CPU-visible ones */ +int verbose; /* Show detailed information */ 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 */ static int opt_domains; /* Show domain numbers (0=disabled, 1=auto-detected, 2=requested) */ +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 */ +char *opt_pcimap; /* Override path to Linux modules.pcimap */ const char program_name[] = "lspci"; -static char options[] = "nvbxs:d:ti:mgMD" GENERIC_OPTIONS ; - -static char help_msg[] = "\ -Usage: lspci []\n\ -\n\ --v\t\tBe verbose\n\ --n\t\tShow numeric ID's\n\ --nn\t\tShow both textual and numeric ID's (names & numbers)\n\ --b\t\tBus-centric view (PCI addresses and IRQ's instead of those seen by the CPU)\n\ --x\t\tShow hex-dump of the standard portion of config space\n\ --xxx\t\tShow hex-dump of the whole config space (dangerous; root only)\n\ --xxxx\t\tShow hex-dump of the 4096-byte extended config space (root only)\n\ --s [[[[]:]]:][][.[]]\tShow only devices in selected slots\n\ --d []:[]\tShow only selected devices\n\ --t\t\tShow bus tree\n\ --m\t\tProduce machine-readable output\n\ --i \tUse specified ID database instead of %s\n\ --D\t\tAlways show domain numbers\n\ --M\t\tEnable `bus mapping' mode (dangerous; root only)\n" +static char options[] = "nvbxs:d:ti:mgp:qkMDQ" GENERIC_OPTIONS ; + +static char help_msg[] = +"Usage: lspci []\n" +"\n" +"Basic display modes:\n" +"-mm\t\tProduce machine-readable output (single -m for an obsolete format)\n" +"-t\t\tShow bus tree\n" +"\n" +"Display options:\n" +"-v\t\tBe verbose (-vv for very verbose)\n" +#ifdef PCI_OS_LINUX +"-k\t\tShow kernel drivers handling each device\n" +#endif +"-x\t\tShow hex-dump of the standard part of the config space\n" +"-xxx\t\tShow hex-dump of the whole config space (dangerous; root only)\n" +"-xxxx\t\tShow hex-dump of the 4096-byte extended config space (root only)\n" +"-b\t\tBus-centric view (addresses and IRQ's as seen by the bus)\n" +"-D\t\tAlways show domain numbers\n" +"\n" +"Resolving of device ID's to names:\n" +"-n\t\tShow numeric ID's\n" +"-nn\t\tShow both textual and numeric ID's (names & numbers)\n" +#ifdef PCI_USE_DNS +"-q\t\tQuery the PCI ID database for unknown ID's via DNS\n" +"-qq\t\tAs above, but re-query locally cached entries\n" +"-Q\t\tQuery the PCI ID database for all ID's via DNS\n" +#endif +"\n" +"Selection of devices:\n" +"-s [[[[]:]]:][][.[]]\tShow only devices in selected slots\n" +"-d []:[]\t\t\tShow only devices with specified ID's\n" +"\n" +"Other options:\n" +"-i \tUse specified ID database instead of %s\n" +#ifdef PCI_OS_LINUX +"-p \tLook up kernel modules in a given file instead of default modules.pcimap\n" +#endif +"-M\t\tEnable `bus mapping' mode (dangerous; root only)\n" +"\n" +"PCI access options:\n" 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 -#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; @@ -108,7 +108,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; @@ -139,7 +139,7 @@ scan_device(struct pci_dev *p) d->config_cached += 64; } pci_setup_cache(p, d->config, d->config_cached); - pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES); + pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES | PCI_FILL_PHYS_SLOT); return d; } @@ -150,7 +150,7 @@ scan_devices(void) struct pci_dev *p; pci_scan_bus(pacc); - for(p=pacc->devices; p; p=p->next) + for (p=pacc->devices; p; p=p->next) if (d = scan_device(p)) { d->next = first_dev; @@ -170,21 +170,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); @@ -229,10 +229,10 @@ sort_them(void) struct device *d; cnt = 0; - for(d=first_dev; d; d=d->next) + for (d=first_dev; d; d=d->next) cnt++; h = index = alloca(sizeof(struct device *) * cnt); - for(d=first_dev; d; d=d->next) + for (d=first_dev; d; d=d->next) *h++ = d; qsort(index, cnt, sizeof(struct device *), compare_them); last_dev = &first_dev; @@ -248,8 +248,6 @@ sort_them(void) /*** Normal output ***/ -#define FLAG(x,y) ((x & y) ? '+' : '-') - static void show_slot_name(struct device *d) { @@ -260,6 +258,25 @@ show_slot_name(struct device *d) printf("%02x:%02x.%d", p->bus, p->dev, p->func); } +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) { @@ -293,1176 +310,36 @@ show_terse(struct device *d) } } putchar('\n'); -} - -/*** 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, ""); -} - -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 < 0x23 && rid > 0x11) - printf("\t\t!!! Possibly incomplete decoding\n"); - - if (rid >= 0x23) - 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 >= 0x23) - fmt = "\t\tLink Control 0: CFlE%c CST%c CFE%c > 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 >= 0x23) - 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 >= 0x23) - fmt = "\t\tLink Control 1: CFlE%c CST%c CFE%c > 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 >= 0x23) - 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 < 0x23) - 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: 0x11) - printf("\t\t!!! Possibly incomplete decoding\n"); - - if (rid >= 0x23) - fmt = "\t\tCommand: WarmRst%c DblEnd%c DevNum=%u ChainSide%c HostHide%c Slave%c > 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 >= 0x23) - fmt = "\t\tLink Control: CFlE%c CST%c CFE%c > 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 >= 0x23) - 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 < 0x23) - 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: > 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("Message Signalled Interrupts: Mask%c 64bit%c Queue=%d/%d Enable%c\n", - FLAG(cap, PCI_MSI_FLAGS_MASK_BIT), - FLAG(cap, PCI_MSI_FLAGS_64BIT), - (cap & PCI_MSI_FLAGS_QSIZE) >> 4, - (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)); - - /* FIXME: Second set of control/status registers is not supported yet. */ -} - -static char *link_speed(int speed) -{ - switch (speed) + if (verbose || opt_kernel) { - case 1: - return "2.5GT/s"; - case 2: - return "5GT/s"; - default: - return "unknown"; - } -} + word subsys_v, subsys_d; + char ssnamebuf[256]; -static char *aspm_support(int code) -{ - switch (code) - { - case 1: - return "L0s"; - case 3: - return "L0s L1"; - default: - return "unknown"; + 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)); } } -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 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); -} - -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 -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("\n"); - break; - } - switch (id) - { - case PCI_EXT_CAP_ID_AER: - printf("Advanced Error Reporting \n"); - 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: - printf("Access Controls \n"); - 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(""); - 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("\n"); - break; - } - if (id == 0xff) - { - printf("\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: - printf("Vital Product Data \n"); - 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; - default: - printf("#%02x [%04x]\n", id, cap); - } - where = next; - } - } - if (can_have_ext_caps) - show_ext_caps(d); -} - /*** Verbose output ***/ static void show_size(pciaddr_t x) { + static const char suffix[][2] = { "", "K", "M", "G", "T" }; + unsigned i; if (!x) return; - printf(" [size="); - if (x < 1024) - printf("%d", (int) x); - else if (x < 1048576) - printf("%dK", (int)(x / 1024)); - else if (x < 0x80000000) - printf("%dM", (int)(x / 1048576)); - else - printf(PCIADDR_T_FMT, x); - putchar(']'); + for (i = 0; i < (sizeof(suffix) / sizeof(*suffix) - 1); i++) { + if (x < 1024) + break; + x /= 1024; + } + printf(" [size=%u%s]", (unsigned)x, suffix[i]); } static void @@ -1471,8 +348,9 @@ show_bases(struct device *d, int cnt) struct pci_dev *p = d->dev; word cmd = get_conf_word(d, PCI_COMMAND); int i; + int virtual = 0; - for(i=0; ibase_addr[i]; pciaddr_t len = (p->known_fields & PCI_FILL_SIZES) ? p->size[i] : 0; @@ -1489,6 +367,7 @@ show_bases(struct device *d, int cnt) { printf("[virtual] "); flg = pos; + virtual = 1; } if (flg & PCI_BASE_ADDRESS_SPACE_IO) { @@ -1500,7 +379,7 @@ show_bases(struct device *d, int cnt) printf(""); else printf(""); - if (!(cmd & PCI_COMMAND_IO)) + if (!virtual && !(cmd & PCI_COMMAND_IO)) printf(" [disabled]"); } else @@ -1522,15 +401,6 @@ show_bases(struct device *d, int cnt) { i++; z = get_conf_long(d, PCI_BASE_ADDRESS_0 + 4*i); - if (opt_buscentric) - { - u32 y = a & 0xffffffff; - if (a || z) - printf("%08x%08x", z, y); - else - printf(""); - done = 1; - } } } if (!done) @@ -1545,7 +415,7 @@ show_bases(struct device *d, int cnt) (t == PCI_BASE_ADDRESS_MEM_TYPE_64) ? "64-bit" : (t == PCI_BASE_ADDRESS_MEM_TYPE_1M) ? "low-1M" : "type 3", (flg & PCI_BASE_ADDRESS_MEM_PREFETCH) ? "" : "non-"); - if (!(cmd & PCI_COMMAND_MEMORY)) + if (!virtual && !(cmd & PCI_COMMAND_MEMORY)) printf(" [disabled]"); } show_size(len); @@ -1561,6 +431,7 @@ show_rom(struct device *d, int reg) pciaddr_t len = (p->known_fields & PCI_FILL_SIZES) ? p->rom_size : 0; u32 flg = get_conf_long(d, reg); word cmd = get_conf_word(d, PCI_COMMAND); + int virtual = 0; if (!rom && !flg && !len) return; @@ -1569,6 +440,7 @@ show_rom(struct device *d, int reg) { printf("[virtual] "); flg = rom; + virtual = 1; } printf("Expansion ROM at "); if (rom & PCI_ROM_ADDRESS_MASK) @@ -1579,7 +451,7 @@ show_rom(struct device *d, int reg) printf(""); if (!(flg & PCI_ROM_ADDRESS_ENABLE)) printf(" [disabled]"); - else if (!(cmd & PCI_COMMAND_MEMORY)) + else if (!virtual && !(cmd & PCI_COMMAND_MEMORY)) printf(" [disabled by cmd]"); show_size(len); putchar('\n'); @@ -1714,7 +586,7 @@ show_htype2(struct device *d) get_conf_byte(d, PCI_CB_CARD_BUS), get_conf_byte(d, PCI_CB_SUBORDINATE_BUS), get_conf_byte(d, PCI_CB_LATENCY_TIMER)); - for(i=0; i<2; i++) + for (i=0; i<2; i++) { int p = 8*i; u32 base = get_conf_long(d, PCI_CB_MEMORY_BASE_0 + p); @@ -1724,7 +596,7 @@ show_htype2(struct device *d) (cmd & PCI_COMMAND_MEMORY) ? "" : " [disabled]", (brc & (PCI_CB_BRIDGE_CTL_PREFETCH_MEM0 << i)) ? " (prefetchable)" : ""); } - for(i=0; i<2; i++) + for (i=0; i<2; i++) { int p = 8*i; u32 base = get_conf_long(d, PCI_CB_IO_BASE_0 + p); @@ -1779,8 +651,6 @@ show_verbose(struct device *d) byte max_lat, min_gnt; byte int_pin = get_conf_byte(d, PCI_INTERRUPT_PIN); unsigned int irq = p->irq; - word subsys_v = 0, subsys_d = 0; - char ssnamebuf[256]; show_terse(d); @@ -1791,8 +661,6 @@ show_verbose(struct device *d) printf("\t!!! Invalid class %04x for header type %02x\n", class, htype); max_lat = get_conf_byte(d, PCI_MAX_LAT); min_gnt = get_conf_byte(d, PCI_MIN_GNT); - subsys_v = get_conf_word(d, PCI_SUBSYSTEM_VENDOR_ID); - subsys_d = get_conf_word(d, PCI_SUBSYSTEM_ID); break; case PCI_HEADER_TYPE_BRIDGE: if ((class >> 8) != PCI_BASE_CLASS_BRIDGE) @@ -1803,22 +671,14 @@ show_verbose(struct device *d) if ((class >> 8) != PCI_BASE_CLASS_BRIDGE) printf("\t!!! Invalid class %04x for header type %02x\n", class, htype); min_gnt = max_lat = 0; - if (d->config_cached >= 128) - { - subsys_v = get_conf_word(d, PCI_CB_SUBSYSTEM_VENDOR_ID); - subsys_d = get_conf_word(d, PCI_CB_SUBSYSTEM_ID); - } break; default: printf("\t!!! Unknown header type %02x\n", htype); return; } - 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)); + if (p->phy_slot) + printf("\tPhysical Slot: %s\n", p->phy_slot); if (verbose > 1) { @@ -1934,7 +794,7 @@ show_hex_dump(struct device *d) cnt = 4096; } - for(i=0; idev; int c; - word sv_id=0, sd_id=0; + word sv_id, sd_id; char classbuf[128], vendbuf[128], devbuf[128], svbuf[128], sdbuf[128]; - switch (get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f) - { - case PCI_HEADER_TYPE_NORMAL: - sv_id = get_conf_word(d, PCI_SUBSYSTEM_VENDOR_ID); - sd_id = get_conf_word(d, PCI_SUBSYSTEM_ID); - break; - case PCI_HEADER_TYPE_CARDBUS: - if (d->config_cached >= 128) - { - sv_id = get_conf_word(d, PCI_CB_SUBSYSTEM_VENDOR_ID); - sd_id = get_conf_word(d, PCI_CB_SUBSYSTEM_ID); - } - break; - } + get_subid(d, &sv_id, &sd_id); if (verbose) { @@ -1998,10 +845,14 @@ show_machine(struct device *d) printf("SDevice:\t%s\n", pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, sv_id, sd_id)); } + if (p->phy_slot) + printf("PhySlot:\t%s\n", p->phy_slot); if (c = get_conf_byte(d, PCI_REVISION_ID)) printf("Rev:\t%02x\n", c); if (c = get_conf_byte(d, PCI_CLASS_PROG)) printf("ProgIf:\t%02x\n", c); + if (opt_kernel) + show_kernel_machine(d); } else { @@ -2026,15 +877,20 @@ show_machine(struct device *d) /*** Main show function ***/ -static void +void show_device(struct device *d) { if (opt_machine) show_machine(d); - else if (verbose) - show_verbose(d); else - show_terse(d); + { + if (verbose) + show_verbose(d); + else + show_terse(d); + if (opt_kernel || verbose) + show_kernel(d); + } if (opt_hex) show_hex_dump(d); if (verbose || opt_hex) @@ -2046,425 +902,10 @@ show(void) { struct device *d; - for(d=first_dev; d; d=d->next) + for (d=first_dev; d; d=d->next) 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(" "); - break; - case 2: - printf(" "); - 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 @@ -2494,7 +935,6 @@ main(int argc, char **argv) break; case 'b': pacc->buscentric = 1; - opt_buscentric = 1; break; case 's': if (msg = pci_filter_parse_slot(&filter, optarg)) @@ -2516,12 +956,32 @@ main(int argc, char **argv) case 'm': opt_machine++; break; + case 'p': + opt_pcimap = optarg; + break; +#ifdef PCI_OS_LINUX + case 'k': + opt_kernel++; + break; +#endif case 'M': opt_map_mode++; break; case 'D': opt_domains = 2; break; +#ifdef PCI_USE_DNS + case 'q': + opt_query_dns++; + break; + case 'Q': + opt_query_all = 1; + break; +#else + case 'q': + case 'Q': + die("DNS queries are not available in this version"); +#endif default: if (parse_generic_option(i, pacc, optarg)) break; @@ -2532,6 +992,15 @@ main(int argc, char **argv) if (optind < argc) goto bad; + if (opt_query_dns) + { + pacc->id_lookup_mode |= PCI_LOOKUP_NETWORK; + if (opt_query_dns > 1) + pacc->id_lookup_mode |= PCI_LOOKUP_REFRESH_CACHE; + } + if (opt_query_all) + pacc->id_lookup_mode |= PCI_LOOKUP_NETWORK | PCI_LOOKUP_SKIP_LOCAL; + pci_init(pacc); if (opt_map_mode) map_the_bus();