X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lspci.c;h=39a464772f8e8649e19d2e8438ffd85d7f94887d;hb=001b9ac6d7b706a223faa7d2dd1bd7d50393e2c9;hp=ab987cde9a3356981fffa0700c966a73a32bee9e;hpb=b801b390765b7d2064e176d4dcd66baa46aebe80;p=pciutils.git diff --git a/lspci.c b/lspci.c index ab987cd..39a4647 100644 --- a/lspci.c +++ b/lspci.c @@ -1,9 +1,7 @@ /* - * $Id: lspci.c,v 1.24 1999/04/18 19:07:16 mj Exp $ + * The PCI Utilities -- List All PCI Devices * - * Linux PCI Utilities -- List All PCI Devices - * - * Copyright (c) 1997--1999 Martin Mares + * Copyright (c) 1997--2008 Martin Mares * * Can be freely distributed and used under the terms of the GNU GPL. */ @@ -12,90 +10,135 @@ #include #include #include -#include -#include "pciutils.h" +#include "lspci.h" /* Options */ -static int verbose; /* Show detailed information */ -static int buscentric_view; /* Show bus addresses/IRQ's instead of CPU-visible ones */ -static int show_hex; /* Show contents of config space as hexadecimal numbers */ -static struct pci_filter filter; /* Device filter */ -static int show_tree; /* Show bus tree */ -static int machine_readable; /* Generate machine-readable output */ -static int map_mode; /* Bus mapping mode enabled */ - -static char options[] = "nvbxs:d:ti:mgM" GENERIC_OPTIONS ; - -static char help_msg[] = "\ -Usage: lspci []\n\ -\n\ --v\t\tBe verbose\n\ --n\t\tShow numeric ID's\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 config space\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\ --M\t\tEnable `bus mapping' mode (dangerous; root only)\n" +int verbose; /* Show detailed information */ +static int opt_hex; /* Show contents of config space as hexadecimal numbers */ +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: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; +/*** Our view of the PCI bus ***/ -/* Format strings used for IRQ numbers and memory addresses */ +struct pci_access *pacc; +struct device *first_dev; +static int seen_errors; -#ifdef ARCH_SPARC64 -#define IRQ_FORMAT "%08x" -#else -#define IRQ_FORMAT "%d" -#endif - -#ifdef HAVE_64BIT_ADDRESS -#define ADDR_FORMAT "%016Lx" -#else -#define ADDR_FORMAT "%08lx" -#endif - -/* Our view of the PCI bus */ +int +config_fetch(struct device *d, unsigned int pos, unsigned int len) +{ + unsigned int end = pos+len; + int result; -struct device { - struct device *next; - struct pci_dev *dev; - unsigned int config_cnt; - byte config[256]; -}; + while (pos < d->config_bufsize && len && d->present[pos]) + pos++, len--; + while (pos+len <= d->config_bufsize && len && d->present[pos+len-1]) + len--; + if (!len) + return 1; -static struct device *first_dev; + if (end > d->config_bufsize) + { + int orig_size = d->config_bufsize; + while (end > d->config_bufsize) + d->config_bufsize *= 2; + d->config = xrealloc(d->config, d->config_bufsize); + d->present = xrealloc(d->present, d->config_bufsize); + memset(d->present + orig_size, 0, d->config_bufsize - orig_size); + } + result = pci_read_block(d->dev, pos, d->config + pos, len); + if (result) + memset(d->present + pos, 1, len); + return result; +} -static struct device * +struct device * scan_device(struct pci_dev *p) { - int how_much = (show_hex > 2) ? 256 : 64; struct device *d; + if (p->domain && !opt_domains) + opt_domains = 1; if (!pci_filter_match(&filter, p)) return NULL; d = xmalloc(sizeof(struct device)); - bzero(d, sizeof(*d)); + memset(d, 0, sizeof(*d)); d->dev = p; - if (!pci_read_block(p, 0, d->config, how_much)) - die("Unable to read %d bytes of configuration space.", how_much); - if (how_much < 128 && (d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS) - { - /* For cardbus bridges, we need to fetch 64 bytes more to get the full standard header... */ - if (!pci_read_block(p, 0, d->config+64, 64)) - die("Unable to read cardbus bridge extension data."); - how_much = 128; - } - d->config_cnt = how_much; - pci_setup_cache(p, d->config, d->config_cnt); - pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE); + d->config_cached = d->config_bufsize = 64; + d->config = xmalloc(64); + d->present = xmalloc(64); + memset(d->present, 1, 64); + if (!pci_read_block(p, 0, d->config, 64)) + { + fprintf(stderr, "lspci: Unable to read the standard configuration space header of device %04x:%02x:%02x.%d\n", + p->domain, p->bus, p->dev, p->func); + seen_errors++; + return NULL; + } + if ((d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS) + { + /* For cardbus bridges, we need to fetch 64 bytes more to get the + * full standard header... */ + if (config_fetch(d, 64, 64)) + 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_PHYS_SLOT); return d; } @@ -106,7 +149,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; @@ -114,50 +157,43 @@ scan_devices(void) } } -static int -check_root(void) -{ - static int is_root = -1; - - if (is_root < 0) - is_root = !geteuid(); - return is_root; -} +/*** Config space accesses ***/ -static int -config_fetch(struct device *d, unsigned int pos, unsigned int len) +static void +check_conf_range(struct device *d, unsigned int pos, unsigned int len) { - if (pos + len < d->config_cnt) - return 1; - if (pacc->method != PCI_ACCESS_DUMP && !check_root()) - return 0; - return pci_read_block(d->dev, pos, d->config + pos, len); + while (len) + if (!d->present[pos]) + die("Internal bug: Accessing non-read configuration byte at position %x", pos); + else + pos++, len--; } -/* Config space accesses */ - -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); return d->config[pos] | (d->config[pos+1] << 8) | (d->config[pos+2] << 16) | (d->config[pos+3] << 24); } -/* Sorting */ +/*** Sorting ***/ static int compare_them(const void *A, const void *B) @@ -165,6 +201,10 @@ compare_them(const void *A, const void *B) const struct pci_dev *a = (*(const struct device **)A)->dev; const struct pci_dev *b = (*(const struct device **)B)->dev; + if (a->domain < b->domain) + return -1; + if (a->domain > b->domain) + return 1; if (a->bus < b->bus) return -1; if (a->bus > b->bus) @@ -188,10 +228,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; @@ -205,32 +245,102 @@ sort_them(void) *last_dev = NULL; } -/* Normal output */ +/*** 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); +} + +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; - byte classbuf[128], devbuf[128]; + char classbuf[128], devbuf[128]; - printf("%02x:%02x.%x %s: %s", - p->bus, - p->dev, - p->func, + show_slot_name(d); + printf(" %s: %s", pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, - get_conf_word(d, PCI_CLASS_DEVICE), 0), + 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 && (c = get_conf_byte(d, PCI_CLASS_PROG))) - printf(" (prog-if %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]; + + if (p->label) + printf("\tDeviceName: %s", p->label); + 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)); + } +} + +/*** Verbose output ***/ + +static void +show_size(pciaddr_t x) +{ + static const char suffix[][2] = { "", "K", "M", "G", "T" }; + unsigned i; + if (!x) + return; + 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 @@ -239,14 +349,16 @@ 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; u32 flg = get_conf_long(d, PCI_BASE_ADDRESS_0 + 4*i); if (flg == 0xffffffff) flg = 0; - if (!pos && !flg) + if (!pos && !flg && !len) continue; if (verbose > 1) printf("\tRegion %d: ", i); @@ -256,18 +368,19 @@ show_bases(struct device *d, int cnt) { printf("[virtual] "); flg = pos; + virtual = 1; } if (flg & PCI_BASE_ADDRESS_SPACE_IO) { - unsigned long a = pos & PCI_BASE_ADDRESS_IO_MASK; + pciaddr_t a = pos & PCI_BASE_ADDRESS_IO_MASK; printf("I/O ports at "); - if (a) - printf("%04lx", a); + if (a || (cmd & PCI_COMMAND_IO)) + printf(PCIADDR_PORT_FMT, a); else if (flg & PCI_BASE_ADDRESS_IO_MASK) printf(""); else printf(""); - if (!(cmd & PCI_COMMAND_IO)) + if (!virtual && !(cmd & PCI_COMMAND_IO)) printf(" [disabled]"); } else @@ -282,27 +395,19 @@ show_bases(struct device *d, int cnt) { if (i >= cnt - 1) { - printf("\n"); + printf(""); done = 1; } else { i++; z = get_conf_long(d, PCI_BASE_ADDRESS_0 + 4*i); - if (buscentric_view) - { - if (a || z) - printf("%08x" ADDR_FORMAT, z, a); - else - printf(""); - done = 1; - } } } if (!done) { if (a) - printf(ADDR_FORMAT, a); + printf(PCIADDR_T_FMT, a); else printf(((flg & PCI_BASE_ADDRESS_MEM_MASK) || z) ? "" : ""); } @@ -311,118 +416,59 @@ 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); putchar('\n'); } } static void -show_pm(struct device *d, int where, int cap) -{ - int t; - - printf("Power Management version %d\n", cap & PCI_PM_CAP_VER_MASK); - if (verbose < 2) - return; - printf("\t\tFlags: PMEClk%c AuxPwr%c DSI%c D1%c D2%c PME%c\n", - FLAG(cap, PCI_PM_CAP_PME_CLOCK), - FLAG(cap, PCI_PM_CAP_AUX_POWER), - FLAG(cap, PCI_PM_CAP_DSI), - FLAG(cap, PCI_PM_CAP_D1), - FLAG(cap, PCI_PM_CAP_D2), - FLAG(cap, PCI_PM_CAP_PME)); - config_fetch(d, where + PCI_PM_CTRL, PCI_PM_SIZEOF - PCI_PM_CTRL); - t = get_conf_word(d, where + PCI_PM_CTRL); - printf("\t\tStatus: D%d PME-Enable%c DSel=%x DScale=%x 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)); -} - -static void -show_agp(struct device *d, int where, int cap) +show_rom(struct device *d, int reg) { - u32 t; + struct pci_dev *p = d->dev; + pciaddr_t rom = p->rom_base_addr; + 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; - t = cap & 0xff; - printf("AGP version %x.%x\n", cap/16, cap%16); - if (verbose < 2) + if (!rom && !flg && !len) return; - config_fetch(d, where + PCI_AGP_STATUS, PCI_AGP_SIZEOF - PCI_AGP_STATUS); - t = get_conf_long(d, where + PCI_AGP_STATUS); - printf("\t\tStatus: RQ=%d SBA%c 64bit%c FW%c Rate=%s%s%s\n", - (t & PCI_AGP_STATUS_RQ_MASK) >> 24U, - FLAG(t, PCI_AGP_STATUS_SBA), - FLAG(t, PCI_AGP_STATUS_64BIT), - FLAG(t, PCI_AGP_STATUS_FW), - (t & PCI_AGP_STATUS_RATE4) ? "4" : "", - (t & PCI_AGP_STATUS_RATE2) ? "2" : "", - (t & PCI_AGP_STATUS_RATE1) ? "1" : ""); - printf("\t\tCommand: RQ=%d SBA%c AGP%c 64bit%c FW%c Rate=%s%s%s\n", - (t & PCI_AGP_COMMAND_RQ_MASK) >> 24U, - FLAG(t, PCI_AGP_COMMAND_SBA), - FLAG(t, PCI_AGP_COMMAND_AGP), - FLAG(t, PCI_AGP_COMMAND_64BIT), - FLAG(t, PCI_AGP_COMMAND_FW), - (t & PCI_AGP_COMMAND_RATE4) ? "4" : "", - (t & PCI_AGP_COMMAND_RATE2) ? "2" : "", - (t & PCI_AGP_COMMAND_RATE1) ? "1" : ""); + putchar('\t'); + if ((rom & PCI_ROM_ADDRESS_MASK) && !(flg & PCI_ROM_ADDRESS_MASK)) + { + printf("[virtual] "); + flg = rom; + virtual = 1; + } + printf("Expansion ROM at "); + if (rom & PCI_ROM_ADDRESS_MASK) + printf(PCIADDR_T_FMT, rom & PCI_ROM_ADDRESS_MASK); + else if (flg & PCI_ROM_ADDRESS_MASK) + printf(""); + else + printf(""); + if (!(flg & PCI_ROM_ADDRESS_ENABLE)) + printf(" [disabled]"); + else if (!virtual && !(cmd & PCI_COMMAND_MEMORY)) + printf(" [disabled by cmd]"); + show_size(len); + putchar('\n'); } static void show_htype0(struct device *d) { - unsigned long rom = d->dev->rom_base_addr; - show_bases(d, 6); - if (rom & 1) - printf("\tExpansion ROM at %08lx%s\n", rom & PCI_ROM_ADDRESS_MASK, - (rom & PCI_ROM_ADDRESS_ENABLE) ? "" : " [disabled]"); - if (get_conf_word(d, PCI_STATUS) & PCI_STATUS_CAP_LIST) - { - int where = get_conf_byte(d, PCI_CAPABILITY_LIST); - 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); - cap = get_conf_word(d, where + PCI_CAP_FLAGS); - printf("[%02x] ", where); - if (id == 0xff) - { - printf("\n"); - break; - } - switch (id) - { - case PCI_CAP_ID_PM: - show_pm(d, where, cap); - break; - case PCI_CAP_ID_AGP: - show_agp(d, where, cap); - break; - default: - printf("#%02x [%04x]", id, cap); - } - where = next; - } - } + show_rom(d, PCI_ROM_ADDRESS); + show_caps(d, PCI_CAPABILITY_LIST); } static void show_htype1(struct device *d) { - struct pci_dev *p = d->dev; u32 io_base = get_conf_byte(d, PCI_IO_BASE); u32 io_limit = get_conf_byte(d, PCI_IO_LIMIT); u32 io_type = io_base & PCI_IO_RANGE_TYPE_MASK; @@ -432,8 +478,9 @@ show_htype1(struct device *d) u32 pref_base = get_conf_word(d, PCI_PREF_MEMORY_BASE); u32 pref_limit = get_conf_word(d, PCI_PREF_MEMORY_LIMIT); u32 pref_type = pref_base & PCI_PREF_RANGE_TYPE_MASK; - unsigned long rom = p->rom_base_addr; + word sec_stat = get_conf_word(d, PCI_SEC_STATUS); word brc = get_conf_word(d, PCI_BRIDGE_CONTROL); + int verb = verbose > 2; show_bases(d, 2); printf("\tBus: primary=%02x, secondary=%02x, subordinate=%02x, sec-latency=%d\n", @@ -454,53 +501,75 @@ show_htype1(struct device *d) io_base |= (get_conf_word(d, PCI_IO_BASE_UPPER16) << 16); io_limit |= (get_conf_word(d, PCI_IO_LIMIT_UPPER16) << 16); } - if (io_base) + if (io_base <= io_limit || verb) printf("\tI/O behind bridge: %08x-%08x\n", io_base, io_limit+0xfff); } if (mem_type != (mem_limit & PCI_MEMORY_RANGE_TYPE_MASK) || mem_type) printf("\t!!! Unknown memory range types %x/%x\n", mem_base, mem_limit); - else if (mem_base) + else { mem_base = (mem_base & PCI_MEMORY_RANGE_MASK) << 16; mem_limit = (mem_limit & PCI_MEMORY_RANGE_MASK) << 16; - printf("\tMemory behind bridge: %08x-%08x\n", mem_base, mem_limit + 0xfffff); + if (mem_base <= mem_limit || verb) + printf("\tMemory behind bridge: %08x-%08x\n", mem_base, mem_limit + 0xfffff); } if (pref_type != (pref_limit & PCI_PREF_RANGE_TYPE_MASK) || (pref_type != PCI_PREF_RANGE_TYPE_32 && pref_type != PCI_PREF_RANGE_TYPE_64)) printf("\t!!! Unknown prefetchable memory range types %x/%x\n", pref_base, pref_limit); - else if (pref_base) + else { pref_base = (pref_base & PCI_PREF_RANGE_MASK) << 16; pref_limit = (pref_limit & PCI_PREF_RANGE_MASK) << 16; - if (pref_type == PCI_PREF_RANGE_TYPE_32) - printf("\tPrefetchable memory behind bridge: %08x-%08x\n", pref_base, pref_limit + 0xfffff); - else - printf("\tPrefetchable memory behind bridge: %08x%08x-%08x%08x\n", - get_conf_long(d, PCI_PREF_BASE_UPPER32), - pref_base, - get_conf_long(d, PCI_PREF_LIMIT_UPPER32), - pref_limit); + if (pref_base <= pref_limit || verb) + { + if (pref_type == PCI_PREF_RANGE_TYPE_32) + printf("\tPrefetchable memory behind bridge: %08x-%08x\n", pref_base, pref_limit + 0xfffff); + else + printf("\tPrefetchable memory behind bridge: %08x%08x-%08x%08x\n", + get_conf_long(d, PCI_PREF_BASE_UPPER32), + pref_base, + get_conf_long(d, PCI_PREF_LIMIT_UPPER32), + pref_limit + 0xfffff); + } } - if (get_conf_word(d, PCI_SEC_STATUS) & PCI_STATUS_SIG_SYSTEM_ERROR) - printf("\tSecondary status: SERR\n"); - - if (rom & 1) - printf("\tExpansion ROM at %08lx%s\n", rom & PCI_ROM_ADDRESS_MASK, - (rom & PCI_ROM_ADDRESS_ENABLE) ? "" : " [disabled]"); + if (verbose > 1) + printf("\tSecondary status: 66MHz%c FastB2B%c ParErr%c DEVSEL=%s >TAbort%c 1) - printf("\tBridgeCtl: Parity%c SERR%c NoISA%c VGA%c MAbort%c >Reset%c FastB2B%c\n", - FLAG(brc, PCI_BRIDGE_CTL_PARITY), - FLAG(brc, PCI_BRIDGE_CTL_SERR), - FLAG(brc, PCI_BRIDGE_CTL_NO_ISA), - FLAG(brc, PCI_BRIDGE_CTL_VGA), - FLAG(brc, PCI_BRIDGE_CTL_MASTER_ABORT), - FLAG(brc, PCI_BRIDGE_CTL_BUS_RESET), - FLAG(brc, PCI_BRIDGE_CTL_FAST_BACK)); + { + printf("\tBridgeCtl: Parity%c SERR%c NoISA%c VGA%c MAbort%c >Reset%c FastB2B%c\n", + FLAG(brc, PCI_BRIDGE_CTL_PARITY), + FLAG(brc, PCI_BRIDGE_CTL_SERR), + FLAG(brc, PCI_BRIDGE_CTL_NO_ISA), + FLAG(brc, PCI_BRIDGE_CTL_VGA), + FLAG(brc, PCI_BRIDGE_CTL_MASTER_ABORT), + FLAG(brc, PCI_BRIDGE_CTL_BUS_RESET), + FLAG(brc, PCI_BRIDGE_CTL_FAST_BACK)); + printf("\t\tPriDiscTmr%c SecDiscTmr%c DiscTmrStat%c DiscTmrSERREn%c\n", + FLAG(brc, PCI_BRIDGE_CTL_PRI_DISCARD_TIMER), + FLAG(brc, PCI_BRIDGE_CTL_SEC_DISCARD_TIMER), + FLAG(brc, PCI_BRIDGE_CTL_DISCARD_TIMER_STATUS), + FLAG(brc, PCI_BRIDGE_CTL_DISCARD_TIMER_SERR_EN)); + } + + show_caps(d, PCI_CAPABILITY_LIST); } static void @@ -509,7 +578,8 @@ show_htype2(struct device *d) int i; word cmd = get_conf_word(d, PCI_COMMAND); word brc = get_conf_word(d, PCI_CB_BRIDGE_CONTROL); - word exca = get_conf_word(d, PCI_CB_LEGACY_MODE_BASE); + word exca; + int verb = verbose > 2; show_bases(d, 1); printf("\tBus: primary=%02x, secondary=%02x, subordinate=%02x, sec-latency=%d\n", @@ -517,17 +587,18 @@ 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); u32 limit = get_conf_long(d, PCI_CB_MEMORY_LIMIT_0 + p); - if (limit > base) - printf("Memory window %d: %08x-%08x%s%s\n", i, base, limit, + limit = limit + 0xfff; + if (base <= limit || verb) + printf("\tMemory window %d: %08x-%08x%s%s\n", i, base, limit, (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); @@ -538,11 +609,10 @@ show_htype2(struct device *d) limit &= 0xffff; } base &= PCI_CB_IO_RANGE_MASK; - if (!base) - continue; limit = (limit & PCI_CB_IO_RANGE_MASK) + 3; - printf("I/O window %d: %08x-%08x%s\n", i, base, limit, - (cmd & PCI_COMMAND_IO) ? "" : " [disabled]"); + if (base <= limit || verb) + printf("\tI/O window %d: %08x-%08x%s\n", i, base, limit, + (cmd & PCI_COMMAND_IO) ? "" : " [disabled]"); } if (get_conf_word(d, PCI_CB_SEC_STATUS) & PCI_STATUS_SIG_SYSTEM_ERROR) @@ -557,8 +627,17 @@ show_htype2(struct device *d) FLAG(brc, PCI_CB_BRIDGE_CTL_CB_RESET), FLAG(brc, PCI_CB_BRIDGE_CTL_16BIT_INT), FLAG(brc, PCI_CB_BRIDGE_CTL_POST_WRITES)); + + if (d->config_cached < 128) + { + printf("\t\n"); + return; + } + + exca = get_conf_word(d, PCI_CB_LEGACY_MODE_BASE); if (exca) printf("\t16-bit legacy interface ports at %04x\n", exca); + show_caps(d, PCI_CB_CAPABILITY_LIST); } static void @@ -567,7 +646,7 @@ show_verbose(struct device *d) struct pci_dev *p = d->dev; word status = get_conf_word(d, PCI_STATUS); word cmd = get_conf_word(d, PCI_COMMAND); - word class = get_conf_word(d, PCI_CLASS_DEVICE); + word class = p->device_class; byte bist = get_conf_byte(d, PCI_BIST); byte htype = get_conf_byte(d, PCI_HEADER_TYPE) & 0x7f; byte latency = get_conf_byte(d, PCI_LATENCY_TIMER); @@ -575,8 +654,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, subsys_d; - char ssnamebuf[256]; show_terse(d); @@ -584,43 +661,31 @@ show_verbose(struct device *d) { case PCI_HEADER_TYPE_NORMAL: if (class == PCI_CLASS_BRIDGE_PCI) - { - badhdr: - printf("\t!!! Header type %02x doesn't match class code %04x\n", htype, class); - return; - } + 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 != PCI_CLASS_BRIDGE_PCI) - goto badhdr; - irq = int_pin = min_gnt = max_lat = 0; - subsys_v = subsys_d = 0; + if ((class >> 8) != PCI_BASE_CLASS_BRIDGE) + printf("\t!!! Invalid class %04x for header type %02x\n", class, htype); + min_gnt = max_lat = 0; break; case PCI_HEADER_TYPE_CARDBUS: if ((class >> 8) != PCI_BASE_CLASS_BRIDGE) - goto badhdr; + printf("\t!!! Invalid class %04x for header type %02x\n", class, htype); min_gnt = max_lat = 0; - 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 (verbose && 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, - subsys_v, subsys_d)); + if (p->phy_slot) + printf("\tPhysical Slot: %s\n", p->phy_slot); if (verbose > 1) { - printf("\tControl: I/O%c Mem%c BusMaster%c SpecCycle%c MemWINV%c VGASnoop%c ParErr%c Stepping%c SERR%c FastB2B%c\n", + printf("\tControl: I/O%c Mem%c BusMaster%c SpecCycle%c MemWINV%c VGASnoop%c ParErr%c Stepping%c SERR%c FastB2B%c DisINTx%c\n", FLAG(cmd, PCI_COMMAND_IO), FLAG(cmd, PCI_COMMAND_MEMORY), FLAG(cmd, PCI_COMMAND_MASTER), @@ -630,8 +695,9 @@ show_verbose(struct device *d) FLAG(cmd, PCI_COMMAND_PARITY), FLAG(cmd, PCI_COMMAND_WAIT), FLAG(cmd, PCI_COMMAND_SERR), - FLAG(cmd, PCI_COMMAND_FAST_BACK)); - printf("\tStatus: Cap%c 66Mhz%c UDF%c FastB2B%c ParErr%c DEVSEL=%s >TAbort%c SERR%c TAbort%c SERR%c config_cnt; i++) + cnt = d->config_cached; + if (opt_hex >= 3 && config_fetch(d, cnt, 256-cnt)) + { + cnt = 256; + if (opt_hex >= 4 && config_fetch(d, 256, 4096-256)) + 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: - 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) { - printf("Device:\t%02x:%02x.%x\n", p->bus, p->dev, p->func); + printf((opt_machine >= 2) ? "Slot:\t" : "Device:\t"); + show_slot_name(d); + putchar('\n'); printf("Class:\t%s\n", - pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, get_conf_word(d, PCI_CLASS_DEVICE), 0)); + pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, p->device_class)); printf("Vendor:\t%s\n", pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id)); printf("Device:\t%s\n", @@ -756,51 +844,59 @@ show_machine(struct device *d) if (sv_id && sv_id != 0xffff) { printf("SVendor:\t%s\n", - pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id, sd_id)); + pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id)); printf("SDevice:\t%s\n", - pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, sv_id, sd_id)); + 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 { - printf("%02x:%02x.%x ", p->bus, p->dev, p->func); - printf("\"%s\" \"%s\" \"%s\"", - pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, - get_conf_word(d, PCI_CLASS_DEVICE), 0), - pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, - p->vendor_id, p->device_id), - pci_lookup_name(pacc, devbuf, sizeof(devbuf), PCI_LOOKUP_DEVICE, - p->vendor_id, p->device_id)); + show_slot_name(d); + print_shell_escaped(pci_lookup_name(pacc, classbuf, sizeof(classbuf), PCI_LOOKUP_CLASS, p->device_class)); + print_shell_escaped(pci_lookup_name(pacc, vendbuf, sizeof(vendbuf), PCI_LOOKUP_VENDOR, p->vendor_id, p->device_id)); + print_shell_escaped(pci_lookup_name(pacc, devbuf, sizeof(devbuf), PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id)); if (c = get_conf_byte(d, PCI_REVISION_ID)) printf(" -r%02x", c); if (c = get_conf_byte(d, PCI_CLASS_PROG)) printf(" -p%02x", c); if (sv_id && sv_id != 0xffff) - printf(" \"%s\" \"%s\"", - pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id, sd_id), - pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, sv_id, sd_id)); + { + print_shell_escaped(pci_lookup_name(pacc, svbuf, sizeof(svbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_VENDOR, sv_id)); + print_shell_escaped(pci_lookup_name(pacc, sdbuf, sizeof(sdbuf), PCI_LOOKUP_SUBSYSTEM | PCI_LOOKUP_DEVICE, p->vendor_id, p->device_id, sv_id, sd_id)); + } else printf(" \"\" \"\""); putchar('\n'); } } -static void +/*** Main show function ***/ + +void show_device(struct device *d) { - if (machine_readable) + if (opt_machine) show_machine(d); - else if (verbose) - show_verbose(d); else - show_terse(d); - if (show_hex) + { + 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 || show_hex) + if (verbose || opt_hex) putchar('\n'); } @@ -809,420 +905,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 busses connected to this bridge */ - unsigned int primary, secondary, subordinate; /* Bus numbers */ - struct device *br_dev; -}; - -struct bus { - unsigned int number; - struct bus *sibling; - struct device *first_dev, **last_dev; -}; - -static struct bridge host_bridge = { NULL, NULL, NULL, NULL, ~0, 0, ~0, NULL }; - -static struct bus * -find_bus(struct bridge *b, unsigned int n) -{ - struct bus *bus; - - for(bus=b->first_bus; bus; bus=bus->sibling) - if (bus->number == n) - break; - return bus; -} - -static struct bus * -new_bus(struct bridge *b, unsigned int n) -{ - struct bus *bus = xmalloc(sizeof(struct bus)); - - bus = xmalloc(sizeof(struct bus)); - 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->bus))) - { - struct bridge *c; - for(c=b->child; c; c=c->next) - if (c->secondary <= p->bus && p->bus <= c->subordinate) - return insert_dev(d, c); - bus = new_bus(b, p->bus); - } - /* Simple insertion at the end _does_ guarantee the correct order as the - * original device list was sorted by (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 = get_conf_word(d, PCI_CLASS_DEVICE); - 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)); - if (ht == PCI_HEADER_TYPE_BRIDGE) - { - 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); - } - else - { - 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); - } - *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 && 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->secondary)) - new_bus(b, 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(byte *line, byte *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 *, byte *, byte *); - -static void -show_tree_dev(struct device *d, byte *line, byte *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, "-[%02x]-", b->secondary); - else - p += sprintf(p, "-[%02x-%02x]-", 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, byte *line, byte *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, byte *line, byte *p) -{ - *p++ = '-'; - if (!b->first_bus->sibling) - { - if (b == &host_bridge) - p += sprintf(p, "[%02x]-", b->first_bus->number); - show_tree_bus(b->first_bus, line, p); - } - else - { - struct bus *u = b->first_bus; - byte *k; - - while (u->sibling) - { - k = p + sprintf(p, "+-[%02x]-", u->number); - show_tree_bus(u, line, k); - u = u->sibling; - } - k = p + sprintf(p, "\\-[%02x]-", 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) - { - struct pci_dev *p = pci_get_dev(pacc, 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"); - else if (!check_root()) - die("Only root can map the bus."); - bus_info = xmalloc(sizeof(struct bus_info) * 256); - bzero(bus_info, 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 @@ -1245,38 +931,60 @@ main(int argc, char **argv) switch (i) { case 'n': - pacc->numeric_ids = 1; + pacc->numeric_ids++; break; case 'v': verbose++; break; case 'b': pacc->buscentric = 1; - buscentric_view = 1; break; case 's': if (msg = pci_filter_parse_slot(&filter, optarg)) - die("-f: %s", msg); + die("-s: %s", msg); break; case 'd': if (msg = pci_filter_parse_id(&filter, optarg)) die("-d: %s", msg); break; case 'x': - show_hex++; + opt_hex++; break; case 't': - show_tree++; + opt_tree++; break; case 'i': - pacc->id_file_name = optarg; + pci_set_name_list_path(pacc, optarg, 0); break; case 'm': - machine_readable++; + opt_machine++; + break; + case 'p': + opt_pcimap = optarg; break; +#ifdef PCI_OS_LINUX + case 'k': + opt_kernel++; + break; +#endif case 'M': - map_mode++; + 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; @@ -1287,19 +995,29 @@ 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 (map_mode) + if (opt_map_mode) map_the_bus(); else { scan_devices(); sort_them(); - if (show_tree) + if (opt_tree) show_forest(); else show(); } + show_kernel_cleanup(); pci_cleanup(pacc); - return 0; + return (seen_errors ? 2 : 0); }